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 cc8b4c56567b366e729c06c27fbb14bb3c938cc5..e76ee82ffe76c1f3b03b584ae666d11c30ea83f5 100644 (file)
--- a/gosa-core/include/class_MultiSelectWindow.inc
+++ b/gosa-core/include/class_MultiSelectWindow.inc
@@ -77,7 +77,7 @@ class MultiSelectWindow{
   }
 
        /* Adds a regex input field to the current dialog */
-       function AddRegex($name,$string,$value,$conn,$image="images/search.png")
+       function AddRegex($name,$string,$value,$conn,$image="images/lists/search.png")
        {
                $arr = array();
 
@@ -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;
@@ -239,7 +239,7 @@ class MultiSelectWindow{
       $listhead .= " <input class='center' type='image' src='images/lists/root.png' align='middle'
         title='"._("Go to root department")."' name='dep_root' alt='"._("Root")."'>&nbsp;";
     }else{
-      $listhead .= " <img src='images/list_root_gray.png' class='center' alt='"._("Root")."'>&nbsp;";
+      $listhead .= " <img src='images/lists/root_grey.png' class='center' alt='"._("Root")."'>&nbsp;";
     }
 
     /* Draw back button */
@@ -247,7 +247,7 @@ class MultiSelectWindow{
       $listhead .= " <input class='center' type='image' align='middle' src='images/lists/back.png'
         title='"._("Go up one department")."' alt='"._("Up")."'                name='dep_back'>&nbsp;";
     }else{
-      $listhead .= " <img src='images/list_back_gray.png' class='center' alt='"._("Up")."'>&nbsp;";
+      $listhead .= " <img src='images/lists/back_grey.png' class='center' alt='"._("Up")."'>&nbsp;";
     }
 
     /* Draw home button */
@@ -255,14 +255,15 @@ class MultiSelectWindow{
       $listhead .= " <input class='center' type='image' align='middle' src='images/lists/home.png'
         title='"._("Go to users department")."' alt='"._("Home")."'            name='dep_home'>&nbsp;";
     }else{
-      $listhead .= " <img src='images/list_home_gray.png' class='center' alt='"._("Home")."'>&nbsp;";
+      $listhead .= " <img src='images/lists/home_grey.png' class='center' alt='"._("Home")."'>&nbsp;";
     }
    
     /* 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/list_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>";
@@ -452,12 +453,12 @@ class MultiSelectWindow{
                $smarty->assign("DivList"                       , $divlist->DrawList()."\n\n\n\n\n".$this->footer."\n\n\n\n\n");
 
                if($this->is_headpage){
-                       $smarty->assign("tree_image",           get_template_path('images/tree.png'));
+                       $smarty->assign("tree_image",           get_template_path('images/lists/search-subtree.png'));
                        $smarty->assign("infoimage",            get_template_path('images/info.png'));
                        $smarty->assign("launchimage",          get_template_path('images/launch.png'));
                        $smarty->assign("apply",                        apply_filter());
                }else{
-                       $smarty->assign("tree_image",           get_template_path('images/tree.png'));
+                       $smarty->assign("tree_image",           get_template_path('images/lists/search-subtree.png'));
                        $smarty->assign("infoimage",            get_template_path('images/info_small.png'));
                        $smarty->assign("launchimage",          get_template_path('images/rocket.png'));
                        $smarty->assign("apply",                        apply_filter());
@@ -645,20 +646,19 @@ class MultiSelectWindow{
       }
       if($ok){
         if($layer_menu){
-          $str = "..|<img class='center' src='images/restore.png' alt='"._("Restore")."'>&nbsp;"._("Restore")."|RestoreDeletedSnapShot|\n";
+          $str = "..|<img class='center' src='images/lists/restore.png' alt='"._("Restore")."'>&nbsp;"._("Restore")."|RestoreDeletedSnapShot|\n";
         }else{
-          $str = "<input class='center' type='image' align='middle' src='images/restore.png'
+          $str = "<input class='center' type='image' align='middle' src='images/lists/restore.png'
             title='"._("Restore snapshopts of already deleted objects")."' 
             alt='"._("Restore")."' name='RestoreDeletedSnapShot'>&nbsp;"; 
         }
       }else{
         if($layer_menu){
-          $str = "..|<img class='center' src='images/restore_grey.png' alt=''>&nbsp;"._("Restore")."||\n";
+          $str = "..|<img class='center' src='images/lists/restore_grey.png' alt=''>&nbsp;"._("Restore")."||\n";
         }else{
-          $str = "<img class='center' src='images/restore_grey.png' alt=''>&nbsp;";
+          $str = "<img class='center' src='images/lists/restore_grey.png' alt=''>&nbsp;";
         }
       }
-#      $str .= "<img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;";
     }
     return($str);
   }
@@ -670,10 +670,10 @@ class MultiSelectWindow{
     if($this->parent->snapshotEnabled()){
 
       if(count($this->parent->Available_SnapsShots($dn))){
-        $str.= "<input class='center' type='image' src='images/restore.png'
+        $str.= "<input class='center' type='image' src='images/lists/restore.png'
           alt='"._("Restore snapshot")."' name='RestoreSnapShotDialog_".base64_encode($dn)."' title='"._("Restore snapshot")."'>&nbsp;";
       } else {
-        $str = "<img class='center' src='images/restore_grey.png' alt=''>&nbsp;";
+        $str = "<img class='center' src='images/lists/restore_grey.png' alt=''>&nbsp;";
       }
 
       $str.= "<input class='center' type='image' src='images/snapshot.png'
@@ -744,7 +744,7 @@ class MultiSelectWindow{
                        $nkey= normalizePreg($key);
                        foreach($this->config->departments as $keyd=>$vald ){
                                if(preg_match('/$nkey\/.*/',$keyd)){
-                                       $non_empty="full";
+                                       $non_empty="-full";
                                }
                        }
 
@@ -757,7 +757,7 @@ class MultiSelectWindow{
         }
       }
 
-                       $row[]=$field1=array("string"=>"<img src='images/".$non_empty."folder.png' alt='department'>","attach"=>"style='text-align:center;width:20px;'");
+                       $row[]=$field1=array("string"=>"<img src='images/lists/folder".$non_empty.".png' alt='department'>","attach"=>"style='text-align:center;width:20px;'");
                        $row[]=$field2=array("string"=>sprintf($linkopen,base64_encode($key),$val), "attach" => "style=''");
 
                        if($numtabs > 2){