From b25dfd0913f2ca5666124740c30156fa0a6abaef Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 23 Jun 2010 05:55:08 -0400
Subject: [PATCH] - removed PHP closing tag
---
program/include/html.php | 104 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 89 insertions(+), 15 deletions(-)
diff --git a/program/include/html.php b/program/include/html.php
index 704d10a..54a6cde 100644
--- a/program/include/html.php
+++ b/program/include/html.php
@@ -5,7 +5,7 @@
| program/include/html.php |
| |
| This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005-2008, RoundCube Dev, - Switzerland |
+ | Copyright (C) 2005-2010, RoundCube Dev, - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -15,7 +15,7 @@
| Author: Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
- $Id: $
+ $Id$
*/
@@ -32,9 +32,9 @@
protected $allowed = array();
protected $content;
- public static $common_attrib = array('id','class','style','title','align');
- public static $containers = array('div','span','p','h1','h2','h3','form','textarea','table','tr','th','td');
public static $lc_tags = true;
+ public static $common_attrib = array('id','class','style','title','align');
+ public static $containers = array('iframe','div','span','p','h1','h2','h3','form','textarea','table','thead','tbody','tr','th','td','style','script');
/**
* Constructor
@@ -98,7 +98,7 @@
if (is_string($attr)) {
$attr = array('class' => $attr);
}
- return self::tag('div', $attr, $cont, self::$common_attrib);
+ return self::tag('div', $attr, $cont, array_merge(self::$common_attrib, array('onclick')));
}
/**
@@ -129,7 +129,8 @@
if (is_string($attr)) {
$attr = array('src' => $attr);
}
- return self::tag('img', $attr + array('alt' => ''), null, array_merge(self::$common_attrib, array('src','alt','width','height','border','usemap')));
+ return self::tag('img', $attr + array('alt' => ''), null, array_merge(self::$common_attrib,
+ array('src','alt','width','height','border','usemap')));
}
/**
@@ -145,7 +146,8 @@
if (is_string($attr)) {
$attr = array('href' => $attr);
}
- return self::tag('a', $attr, $cont, array_merge(self::$common_attrib, array('href','target','name','onclick','onmouseover','onmouseout','onmousedown','onmouseup')));
+ return self::tag('a', $attr, $cont, array_merge(self::$common_attrib,
+ array('href','target','name','onclick','onmouseover','onmouseout','onmousedown','onmouseup')));
}
/**
@@ -178,6 +180,22 @@
$attr = array('for' => $attr);
}
return self::tag('label', $attr, $cont, array_merge(self::$common_attrib, array('for')));
+ }
+
+ /**
+ * Derrived method to create <iframe></iframe>
+ *
+ * @param mixed Hash array with tag attributes or string with frame source (src)
+ * @return string HTML code
+ * @see html::tag()
+ */
+ public static function iframe($attr = null, $cont = null)
+ {
+ if (is_string($attr)) {
+ $attr = array('src' => $attr);
+ }
+ return self::tag('iframe', $attr, $cont, array_merge(self::$common_attrib,
+ array('src','name','width','height','border','frameborder')));
}
/**
@@ -248,7 +266,9 @@
{
protected $tagname = 'input';
protected $type = 'text';
- protected $allowed = array('type','name','value','size','tabindex','autocomplete','checked','onchange','onclick','disabled');
+ protected $allowed = array('type','name','value','size','tabindex',
+ 'autocomplete','checked','onchange','onclick','disabled','readonly',
+ 'spellcheck','results','maxlength','src');
public function __construct($attrib = array())
{
@@ -416,7 +436,8 @@
class html_textarea extends html
{
protected $tagname = 'textarea';
- protected $allowed = array('name','rows','cols','wrap','tabindex','onchange','disabled');
+ protected $allowed = array('name','rows','cols','wrap','tabindex',
+ 'onchange','disabled','readonly','spellcheck');
/**
* Get HTML code for this object
@@ -442,11 +463,12 @@
unset($this->attrib['value']);
}
- if (!empty($value) && !ereg('mce_editor', $this->attrib['class'])) {
+ if (!empty($value) && !preg_match('/mce_editor/', $this->attrib['class'])) {
$value = Q($value, 'strict', false);
}
- return self::tag($this->tagname, $this->attrib, $value, array_merge(self::$common_attrib, $this->allowed));
+ return self::tag($this->tagname, $this->attrib, $value,
+ array_merge(self::$common_attrib, $this->allowed));
}
}
@@ -473,7 +495,8 @@
{
protected $tagname = 'select';
protected $options = array();
- protected $allowed = array('name','size','tabindex','autocomplete','multiple','onchange','disabled');
+ protected $allowed = array('name','size','tabindex','autocomplete',
+ 'multiple','onchange','disabled');
/**
* Add a new option to this drop-down
@@ -531,7 +554,9 @@
class html_table extends html
{
protected $tagname = 'table';
- protected $allowed = array('id','class','style','width','summary','cellpadding','cellspacing','border');
+ protected $allowed = array('id','class','style','width','summary',
+ 'cellpadding','cellspacing','border');
+
private $header = array();
private $rows = array();
private $rowindex = 0;
@@ -576,13 +601,41 @@
public function add_header($attr, $cont)
{
if (is_string($attr))
- $attr = array('class' => $attr);
+ $attr = array('class' => $attr);
$cell = new stdClass;
$cell->attrib = $attr;
$cell->content = $cont;
$this->header[] = $cell;
}
+
+ /**
+ * Remove a column from a table
+ * Useful for plugins making alterations
+ *
+ * @param string $class
+ */
+ public function remove_column($class)
+ {
+ // Remove the header
+ foreach($this->header as $index=>$header){
+ if($header->attrib['class'] == $class){
+ unset($this->header[$index]);
+ break;
+ }
+ }
+
+ // Remove cells from rows
+ foreach($this->rows as $i=>$row){
+ foreach($row->cells as $j=>$cell){
+ if($cell->attrib['class'] == $class){
+ unset($this->rows[$i]->cells[$j]);
+ break;
+ }
+ }
+ }
+ }
+
/**
* Jump to next row
@@ -598,6 +651,18 @@
$this->rows[$this->rowindex]->cells = array();
}
+ /**
+ * Set current row attrib
+ *
+ * @param array Row attributes
+ */
+ public function set_row_attribs($attr = array())
+ {
+ if (is_string($attr))
+ $attr = array('class' => $attr);
+
+ $this->rows[$this->rowindex]->attrib = $attr;
+ }
/**
* Build HTML output of the table data
@@ -642,6 +707,15 @@
unset($this->attrib['cols'], $this->attrib['rowsonly']);
return parent::show();
}
+
+ /**
+ * Count number of rows
+ *
+ * @return The number of rows
+ */
+ public function size()
+ {
+ return count($this->rows);
+ }
}
-?>
\ No newline at end of file
--
Gitblit v1.9.1