diff --git a/include/class_SnapShotDialog.inc b/include/class_SnapShotDialog.inc
index 531ca58c29ac5603d9fac725e08e75e1d8b28e00..456956845be54ca500c98b5328b1127f3ff35a38 100644
--- a/include/class_SnapShotDialog.inc
+++ b/include/class_SnapShotDialog.inc
@@ -321,9 +321,9 @@ class SnapShotDialog extends plugin
$display_data.= " - ".$entry['gosaSnapshotDN'][0];
}
- $field0 = array("string"=> $time_stamp , "attach"=> "style='vertical-align:top;width:120px;'");
- $field1 = array("string"=> htmlentities (utf8_decode(LDAP::fix($display_data))), "attach"=> "");
- $field2 = array("string"=> $actions ,
+ $field0 = array("html"=> $time_stamp , "attach"=> "style='vertical-align:top;width:120px;'");
+ $field1 = array("html"=> htmlentities (utf8_decode(LDAP::fix($display_data))), "attach"=> "");
+ $field2 = array("html"=> $actions ,
"attach"=> "style='border-right:0px;vertical-align:top;width:40px;text-align:right;'");
$DivListSnapShots->AddEntry(array($field0,$field1,$field2));
}
diff --git a/include/class_acl.inc b/include/class_acl.inc
index a7c42897197f16a8d68cb22901888398e0dffb83..ed1c90a6c0eefb6b8f90a88101a3dce6022ea97e 100644
--- a/include/class_acl.inc
+++ b/include/class_acl.inc
@@ -462,8 +462,8 @@ class acl extends plugin
$link = $this->assembleAclSummary($entry);
}
- $field1= array("string" => $this->aclTypes[$entry['type']], "attach" => "style='width:150px'");
- $field2= array("string" => $link);
+ $field1= array("html" => $this->aclTypes[$entry['type']], "attach" => "style='width:150px'");
+ $field2= array("html" => $link);
if($this->acl_is_writeable("")){
$action.= "<input type='image' name='sortup_$key' alt='up'
@@ -481,7 +481,7 @@ class acl extends plugin
alt='"._("Delete")."' name='acl_del_$key' title='".msgPool::delButton(_("ACL"))."'>";
}
- $field3= array("string" => $action, "attach" => "style='border-right:0px;width:50px;text-align:right;'");
+ $field3= array("html" => $action, "attach" => "style='border-right:0px;width:50px;text-align:right;'");
$aclList->AddEntry(array($field1, $field2, $field3));
}
@@ -528,9 +528,9 @@ class acl extends plugin
alt='"._("Delete")."' name='cat_del_$section' title='".msgPool::delButton(_("category ACL"))."'>";
}
- $field1= array("string" => $infos['description'], "attach" => "style='width:100px'");
- $field2= array("string" => $summary);
- $field3= array("string" => $actions, "attach" => "style='border-right:0px;width:50px'");
+ $field1= array("html" => $infos['description'], "attach" => "style='width:100px'");
+ $field2= array("html" => $summary);
+ $field3= array("html" => $actions, "attach" => "style='border-right:0px;width:50px'");
$aclList->AddEntry(array($field1, $field2, $field3));
}
@@ -664,9 +664,9 @@ class acl extends plugin
$option = "<input type='radio' name='selected_role' value='".base64_encode($dn)."'>";
}
- $field1 = array("string" => $option) ;
- $field2 = array("string" => $values['cn'], "attach" => "style='width:200px;'") ;
- $field3 = array("string" => $values['description'],"attach" => "style='border-right:0px;'") ;
+ $field1 = array("html" => $option) ;
+ $field2 = array("html" => $values['cn'], "attach" => "style='width:200px;'") ;
+ $field3 = array("html" => $values['description'],"attach" => "style='border-right:0px;'") ;
$D_List->AddEntry(array($field1,$field2,$field3));
}
diff --git a/include/class_divSelectBox.inc b/include/class_divSelectBox.inc
index ac95319050b0ac49ce8565cf2b0bf44731ef99b0..cbfcfe9f5ee98a0ec42079cc55fb8649cc2c42e9 100644
--- a/include/class_divSelectBox.inc
+++ b/include/class_divSelectBox.inc
@@ -29,8 +29,8 @@
* \brief This class contains all the functions to
* manage select box
*/
-class divSelectBox {
-
+class divSelectBox
+{
var $a_entries;
var $summary;
var $cols;
@@ -38,12 +38,12 @@ class divSelectBox {
// Members for page managment
var $height = '200px';
- // Added php 4 constructor
/*!
* \brief Default divSelectBox constructor
*/
- function divSelectBox() {
- $this->s_summary = "";
+ function __construct()
+ {
+ $this->s_summary = '';
$this->a_entries = array();
$this->cols = 0;
}
@@ -53,7 +53,8 @@ class divSelectBox {
*
* \param integer $h Height
*/
- function setHeight($h) {
+ function setHeight($h)
+ {
if (is_numeric($h)) {
$this->height = $h.'px';
} else {
@@ -66,35 +67,38 @@ class divSelectBox {
*
* \param array $a_entriedata
*/
- function AddEntry($a_entriedata) {
+ function AddEntry($a_entriedata)
+ {
$this->a_entries[] = $a_entriedata;
}
/*!
* \brief Draw the list
*/
- function DrawList(){
- $s_return = "";
- $s_return .= "<div style=\"padding-right:1px;padding-bottom:2px;height:".$this->height.";width:100%\">\n";
- $s_return .= "<div style=\"overflow: auto;width:100%;height:100%;\">\n";
- $s_return .= "<table ".
- "summary='".$this->s_summary."' ".
- "width='100%' ".
- "class='listingTable'".
- "style='overflow:scroll; ".
- "height:98%;".
- "padding-right:1px; ".
- "padding-bottom:2px;'".
- ">\n";
+ function DrawList()
+ {
+ $s_return = "";
+ $s_return .= '<div style="padding-right:1px;padding-bottom:2px;height:'.$this->height.';width:100%">'."\n";
+ $s_return .= '<div style="overflow: auto;width:100%;height:100%;">'."\n";
+ $s_return .= '<table '.
+ 'summary="'.$this->s_summary.'" '.
+ 'class="listingTable"'.
+ 'style="overflow:scroll; '.
+ 'height:98%;'.
+ 'width:100%;'.
+ 'padding-right:1px; '.
+ 'padding-bottom:2px;"'.
+ ">\n";
$s_return .= $this->_generatePage();
- $s_return .= "</table></div></div>";
+ $s_return .= '</table></div></div>';
return $s_return;
}
/*!
* \brief Get the number of entries
*/
- function _numentries(){
+ function _numentries()
+ {
$cnt = count($this->a_entries);
return $cnt;
}
@@ -104,66 +108,74 @@ class divSelectBox {
*
* \param string $msg
*/
- function SetSummary($msg){
+ function SetSummary($msg)
+ {
$this->s_summary = $msg;
}
/*!
* \brief Generate the page
*/
- function _generatePage(){
-
- $s_value = "";
- $s_key = "";
- $s_return = "";
- $str = "";
+ function _generatePage()
+ {
+ $s_value = '';
+ $s_key = '';
+ $s_return = '';
+ $str = '';
/* If divlist is empty, append a single white entry */
- if (count($this->a_entries)==0) {
- $str .= "<tr><td class='list1nohighlight' style='height:100%; border-right:0px;'> </td></tr>";
+ if (count($this->a_entries) == 0) {
+ $str .= '<tr><td style="height:100%; border-right:0px;"> </td></tr>';
return $str;
}
$i = $this->_numEntries();
- foreach($this->a_entries as $s_key => $s_value){
+ foreach ($this->a_entries as $s_key => $s_value) {
$i--;
$s_return .= "\n<tr>";
$cnt = 0;
- foreach($s_value as $s_key2 => $s_value2 ){
- $this->cols = count($s_value) ;
+ foreach ($s_value as $s_key2 => $s_value2) {
+ $this->cols = count($s_value);
$cnt++;
- if(!isset($s_value2['class'])){
+ if (!isset($s_value2['class'])) {
$class = "";
} else {
$class = "class='".$s_value2['class']."'";
}
- if(!isset($s_value2['attach'])){
+ if (!isset($s_value2['attach'])) {
$style = "";
} else {
- $style = " ".$s_value2['attach']." " ;
+ $style = " ".$s_value2['attach']." ";
}
$s_return .= "\n<td".$style.$class.">";
- $s_return .= $s_value2['string'];
- $s_return .= "</td>";
- }
- $s_return.="\n</tr>";
- }
- $s_return.="\n<tr>";
- for($i = 0 ; $i < ($this->cols) ; $i++) {
- if($i >= ($this->cols-1)){
- $s_return .= "<td class='list1nohighlight' style='height:100%;border:0px;'><div style='font-size:1px;'> </div></td>";
+ if (isset($s_value2['string'])) {
+ if ($s_value2['string'] === '') {
+ $s_return .= ' ';
+ } else {
+ $s_return .= htmlentities($s_value2['string'], ENT_COMPAT, 'UTF-8');
+ }
} else {
- $s_return .= "<td class='list1nohighlight' style='height:100%;'><div style='font-size:1px;'> </div></td>";
+ $s_return .= $s_value2['html'];
}
-
+ $s_return .= '</td>';
+ }
+ $s_return .= "\n</tr>";
+ }
+ $s_return .= "\n<tr>";
+ for ($i = 0; $i < ($this->cols); $i++) {
+ if ($i >= ($this->cols - 1)) {
+ $s_return .= '<td style="height:100%;border:0px;"><div style="font-size:1px;"> </div></td>';
+ } else {
+ $s_return .= '<td style="height:100%;"><div style="font-size:1px;"> </div></td>';
+ }
}
- $s_return.="</tr>";
+ $s_return .= '</tr>';
return $s_return;
}
}
diff --git a/plugins/admin/acl/class_aclRole.inc b/plugins/admin/acl/class_aclRole.inc
index 5add45715d8fb99072eb261d3a3f45ac69fb5f06..e535135b0b681e5bdc54693c427e1ef9a06a4ec1 100644
--- a/plugins/admin/acl/class_aclRole.inc
+++ b/plugins/admin/acl/class_aclRole.inc
@@ -307,8 +307,8 @@ class aclrole extends acl
$link = $this->assembleAclSummary($entry);
}
- $field1= array("string" => $this->aclTypes[$entry['type']], "attach" => "style='width:150px'");
- $field2= array("string" => $link);
+ $field1= array("html" => $this->aclTypes[$entry['type']], "attach" => "style='width:150px'");
+ $field2= array("html" => $link);
$action ="";
if($this->acl_is_writeable("gosaAclEntry")){
@@ -326,7 +326,7 @@ class aclrole extends acl
title='".msgPool::delButton(_("ACL"))."'>";
}
- $field3= array("string" => $action, "attach" => "style='border-right:0px;width:50px;text-align:right;'");
+ $field3= array("html" => $action, "attach" => "style='border-right:0px;width:50px;text-align:right;'");
$aclList->AddEntry(array($field1, $field2, $field3));
}
@@ -374,9 +374,9 @@ class aclrole extends acl
alt='"._("Delete")."' name='cat_del_$section' title='"._("Reset category ACL")."'>";
}
- $field1= array("string" => $infos['description'], "attach" => "style='width:140px'");
- $field2= array("string" => $summary);
- $field3= array("string" => $action, "attach" => "style='border-right:0px;width:50px'");
+ $field1= array("html" => $infos['description'], "attach" => "style='width:140px'");
+ $field2= array("html" => $summary);
+ $field3= array("html" => $action, "attach" => "style='border-right:0px;width:50px'");
$aclList->AddEntry(array($field1, $field2, $field3));
}