Added additional <br> tags to msgPool::deleteInfo

[gosa.git] / gosa-core / include / class_MultiSelectWindow.inc

diff --git a/gosa-core/include/class_MultiSelectWindow.inc b/gosa-core/include/class_MultiSelectWindow.inc
index 45891d6254ad37921c16166f3abb5adb99432650..e76ee82ffe76c1f3b03b584ae666d11c30ea83f5 100644 (file)
--- a/gosa-core/include/class_MultiSelectWindow.inc
+++ b/gosa-core/include/class_MultiSelectWindow.inc
@@ -211,7 +211,7 @@ class MultiSelectWindow{
 
 
   /* Return default header part. With back, home and root icons and department selection */
-  function get_default_header()
+  function get_default_header($seperator= TRUE)
   {
     $enable_back = TRUE;
     $enable_root = TRUE;
@@ -260,9 +260,10 @@ class MultiSelectWindow{
    
     /* And at least draw reload button, this button is enabled everytime */ 
     $listhead .=  " <input class='center' type='image' src='images/lists/reload.png' align='middle'
-      title='"._("Reload list")."' name='submit_department' alt='"._("Submit")."'>&nbsp;".
-      " <img   class='center' src='images/lists/seperator.png' align='middle' alt='-' height='16' width='1'>&nbsp;";
-
+      title='"._("Reload list")."' name='submit_department' alt='"._("Submit")."'>&nbsp;";
+    if ($seperator){
+      $listhead.= " <img   class='center' src='images/lists/seperator.png' align='middle' alt='-' height='16' width='1'>&nbsp;";
+    }
     return ($listhead);
   }
 
@@ -402,9 +403,9 @@ class MultiSelectWindow{
 
                        /* Check if box is checked */
                        if($box['default'] == true){
-                               $boxes .="<input type='checkbox' name=\"".$box['name']."\" value='1' title=\"".htmlentities($box['value'])."\" checked ".$boxClick.">&nbsp;".$box['string']."<br>";
+                               $boxes .="<input type='checkbox' name=\"".$box['name']."\" value='1' title=\"".htmlspecialchars($box['value'])."\" checked ".$boxClick.">&nbsp;".$box['string']."<br>";
                        }else{
-                               $boxes .="<input type='checkbox' name=\"".$box['name']."\" value='1' title=\"".htmlentities($box['value'])."\" ".$boxClick.">&nbsp;".$box['string']."<br>";
+                               $boxes .="<input type='checkbox' name=\"".$box['name']."\" value='1' title=\"".htmlspecialchars($box['value'])."\" ".$boxClick.">&nbsp;".$box['string']."<br>";
                        }
                }
                $smarty->assign("CheckBoxes", $boxes);
@@ -422,7 +423,7 @@ class MultiSelectWindow{
                                </td>
                                <td width=\"99%\">
                                <input id=\"".$regex['name']."\" type=\"text\" style='width:99%' name=\"".$regex['name']."\" maxlength='20'
-                               value=\"".htmlentities($regex['value'])."\" title=\"".htmlentities($regex['string'])."\"> 
+                               value=\"".htmlspecialchars($regex['value'])."\" title=\"".htmlspecialchars($regex['string'])."\"> 
                                </td>
                                </tr>
                                </table>";
@@ -658,7 +659,6 @@ class MultiSelectWindow{
           $str = "<img class='center' src='images/lists/restore_grey.png' alt=''>&nbsp;";
         }
       }
-#      $str .= "<img class='center' src='images/lists/seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;";
     }
     return($str);
   }