Code

Fixed categorie saving
[gosa.git] / plugins / admin / fai / class_faiManagement.inc
index e3a8e5675fc233ffbe83950fbbe4d47d67cd2f1d..55e8499b1ef067f51692e48c21cb6685af0ca6ba 100644 (file)
@@ -25,7 +25,6 @@ require "tabsScript.inc";
 require "tabsProfile.inc";
 require "tabsPackage.inc";
 
-
 class faiManagement extends plugin
 {
        /* Definitions */
@@ -84,6 +83,7 @@ class faiManagement extends plugin
 
        function execute()
        {
+
        /* Call parent execute */
        plugin::execute();
 
@@ -262,6 +262,7 @@ class faiManagement extends plugin
                        $a_setup = ($this->get_type($entry));
                
                        $this->dn = $entry['dn'];
+                       add_lock ($this->dn, $this->ui->dn);
 
                        $this->dialog= new $a_setup[0]($this->config,
                                        $this->config->data['TABS'][$a_setup[2]],$this->dn);
@@ -335,6 +336,11 @@ class faiManagement extends plugin
                        $faifilter['regex']=$_GET['search']."*";
                }
 
+               /* Department select */
+               if((isset($_POST['base']))&&($s_action=="")){
+                       $faifilter['base']=$_POST['base'];
+               }
+
                /* remove double asterisks and save new filter */
                $faifilter['regex'] = preg_replace("/\*\*/","*",$faifilter['regex']);
                $_SESSION['faifilter']= $faifilter;
@@ -347,6 +353,7 @@ class faiManagement extends plugin
                        $this->dialog=NULL;
                        $this->is_dialog = false;
                        unset($_SESSION['objectinfo']);
+                       del_lock ($this->dn);
                }
 
                /* This check if the given tab could be saved 
@@ -360,6 +367,7 @@ class faiManagement extends plugin
                                        print_red($msg);
                                }
                        }else{
+                               del_lock ($this->dn);
                                $this->dialog->save();
                                unset($this->dialog);
                                $this->dialog=NULL;
@@ -381,14 +389,14 @@ class faiManagement extends plugin
                                
                        }elseif(((isset($this->dialog->current))&&(!$this->dialog->by_object[$this->dialog->current]->is_dialog))){
                                $display.= "<p style=\"text-align:right\">\n";
-                               $display.= "<input type=submit name=\"edit_finish\" value=\""._("Finish")."\">\n";
+                               $display.= "<input type=\"submit\" name=\"edit_finish\" value=\""._("Finish")."\">\n";
                                $display.= "&nbsp;\n";
-                               $display.= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
+                               $display.= "<input type=\"submit\" name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
                                $display.= "</p>";
                        }elseif(!isset($this->dialog->current)){
                                $display.= "<p style=\"text-align:right\">\n";
-                               $display.= "<input type=submit name=\"edit_continue\" value=\""._("Continue")."\">&nbsp;";
-                               $display.= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
+                               $display.= "<input type=\"submit\" name=\"edit_continue\" value=\""._("Continue")."\">&nbsp;";
+                               $display.= "<input type=\"submit\" name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
                                $display.= "</p>";
                        }
                        return($display);
@@ -404,7 +412,7 @@ class faiManagement extends plugin
                $options= "";
                foreach ($this->config->idepartments as $key => $value){
                        if ($faifilter['base'] == $key){
-                               $options.= "<option selected value='$key'>$value</option>";
+                               $options.= "<option selected='selected' value='$key'>$value</option>";
                        } else {
                                $options.= "<option value='$key'>$value</option>";
                        }
@@ -416,44 +424,44 @@ class faiManagement extends plugin
                $faihead = 
                        "<div style='background:#F0F0F9;padding:5px;'>&nbsp;".
 
-                       "<input type='image' src='images/list_up.png' align='middle' 
+                       "<input class='center' type='image' src='images/list_up.png' align='middle' 
                        title='"._("Go up one department")."' name='dep_back' alt='"._("Up"). "'>&nbsp;".
 
-                       "<input type='image' src='images/list_root.png' align='middle' 
+                       "<input class='center' type='image' src='images/list_root.png' align='middle' 
                        title='"._("Go to root department")."' name='dep_root' alt='".      _("Root")."'>&nbsp;".
 
-                       "<input type='image' src='images/list_home.png' align='middle' 
+                       "<input class='center' type='image' src='images/list_home.png' align='middle' 
                        title='"._("Go to users home department")."' name='dep_home' alt='"._("Home")."'>&nbsp;".
 
-                       "<img src=\"images/list_seperator.png\" alt=\"\" align=\"middle\" height=\"16\" width=\"1\">&nbsp;".
+                       "<img class='center' src=\"images/list_seperator.png\" alt=\"\" align=\"middle\" height=\"16\" width=\"1\">&nbsp;".
                        
-                       " <input type='image' src='images/fai_new_profile.png' align='middle' 
+                       " <input class='center' type='image' src='images/fai_new_profile.png' align='middle' 
                        title='"._("New profile")."' name='Create_profile' alt='"._("P")."'>&nbsp;".
                        
-                       "<img src=\"images/list_seperator.png\" alt=\"\" align=\"middle\" height=\"16\" width=\"1\">&nbsp;".
+                       "<img class='center' src=\"images/list_seperator.png\" alt=\"\" align=\"middle\" height=\"16\" width=\"1\">&nbsp;".
                                
-                       " <input type='image' src='images/fai_new_partitionTable.png' align='middle' 
+                       " <input class='center' type='image' src='images/fai_new_partitionTable.png' align='middle' 
                        title='"._("New partition table")."' name='Create_partition' alt='"._("PT")."'>&nbsp;".
 
-                       " <input type='image' src='images/fai_new_script.png' align='middle' 
+                       " <input class='center' type='image' src='images/fai_new_script.png' align='middle' 
                        title='"._("New scripts")."' name='Create_script' alt='"._("S")."'>&nbsp;".
 
-                       " <input type='image' src='images/fai_new_hook.png' align='middle' 
+                       " <input class='center' type='image' src='images/fai_new_hook.png' align='middle' 
                        title='"._("New hooks")."' name='Create_hook' alt='"._("H")."'>&nbsp;".
 
-                       " <input type='image' src='images/fai_new_variable.png' align='middle' 
+                       " <input class='center' type='image' src='images/fai_new_variable.png' align='middle' 
                        title='"._("New variables")."' name='Create_variable' alt='"._("V")."'>&nbsp;".
                        
-                       " <input type='image' src='images/fai_new_template.png' align='middle' 
+                       " <input class='center' type='image' src='images/fai_new_template.png' align='middle' 
                        title='"._("New templates")."' name='Create_template' alt='"._("T")."'>&nbsp;".
 
-                       " <input type='image' src='images/fai_new_packages.png' align='middle' 
+                       " <input class='center' type='image' src='images/fai_new_packages.png' align='middle' 
                        title='"._("New package list")."' name='Create_package' alt='"._("PK")."'>&nbsp;".
 
-                       " <img src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;".
+                       " <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;".
 
-                       _("Current base")."&nbsp;<select name='base' onChange='mainform.submit()'>$options</select>".
-                       " <input type='image' src='images/list_submit.png' align='middle' title='"._("Submit department")."' name='submit_department' alt='"._("Submit")."'>&nbsp;".
+                       _("Current base")."&nbsp;<select name='base' onChange='mainform.submit()' class='center'>$options</select>".
+                       " <input class='center' type='image' src='images/list_submit.png' align='middle' title='"._("Submit department")."' name='submit_department' alt='"._("Submit")."'>&nbsp;".
                        
                        "</div>";
 
@@ -465,16 +473,16 @@ class faiManagement extends plugin
                $divlist->SetSummary(_("This table displays all systems, in the selected tree."));
 
                $divlist->SetHeader(array(
-                                       array("string" => "&nbsp;"),
-                                       array("string" => _("Name of FAI class")),
-                                       array("string" => _("Class type")),
-                                       array("string" => _("Actions"), "attach"=>"style='border-right:none;width:40px;'")));
+                                       array("string" => "&nbsp;", "attach" => "style='text-align:center;width:20px;'"),
+                                       array("string" => _("Name of FAI class"), "attach" => "style=''"),
+                                       array("string" => _("Class type"), "attach" => "style='width:200px;'"),
+                                       array("string" => _("Actions"), "attach" => "style='width:60px;border-right:0px;text-align:right;'")));
 
 
-               $action  = "<input type='image' src='images/edit.png'   alt='"._("edit")."'   name='entry_edit_%KEY%' title='"._("Edit class")."'>";
-               $action .= "<input type='image' src='images/edittrash.png' alt='"._("delete")."' name='entry_delete_%KEY%' title='"._("Delete class")."'>";
+               $action  = "<input class='center' type='image' src='images/edit.png'    alt='"._("edit")."'   name='entry_edit_%KEY%' title='"._("Edit class")."'>";
+               $action .= "<input class='center' type='image' src='images/edittrash.png' alt='"._("delete")."' name='entry_delete_%KEY%' title='"._("Delete class")."'>";
 
-               $editlink ="<a href='?plug=".$_GET['plug']."&edit_entry=%KEY%'>%NAME%</a>";             
+               $editlink ="<a href='?plug=".$_GET['plug']."&amp;edit_entry=%KEY%'>%NAME%</a>";                 
                $linkopen = "<a href='?plug=".$_GET['plug']."&amp;act=dep_open&amp;dep_id=%s'>%s</a>";
 
                foreach($this->departments as $key => $val) {
@@ -492,10 +500,10 @@ class faiManagement extends plugin
 
 
                        $title = $this->config->departments[$key];
-                       $field0 = array("string" => "<img src='images/".$non_empty."folder.png' title='"._("department")."' alt='department'>",                     "attach"=>"style='width:20px;'");
-                       $field1 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "title='".$title."'");
-                       $field2 = array("string" => "");
-                       $field3 = array("string" => "","attach"=>"style='text-align:right;border-right:none;'");
+                       $field0 = array("string" => "<img src='images/".$non_empty."folder.png' title='"._("department")."' alt='department'>", "attach" => "style='text-align:center;width:20px;'");
+                       $field1 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "style='' title='".$title."'");
+                       $field2 = array("string" => "&nbsp;", "attach" => "style='width:200px;'");
+                       $field3 = array("string" => "&nbsp;", "attach" => "style='width:60px;border-right:0px;text-align:right;'");
 
                        $divlist->AddEntry( array($field0,$field1,$field2,$field3));
 
@@ -514,53 +522,53 @@ class faiManagement extends plugin
                                                if(!$faifilter['ShowPartitions']){ 
                                                        $abort = true;
                                                }
-                                       $img="<img src='images/fai_partitionTable.png' title='"._("Partition table")."' alt='PT'>";
+                                       $img="<img class='center' src='images/fai_partitionTable.png' title='"._("Partition table")."' alt='PT'>";
                                        $info = _("Partition table");
                                        break;
                                        case "FAIpackageList"           : 
                                                if(!$faifilter['ShowPackages']){ 
                                                        $abort = true;
                                                }
-                                       $img="<img src='images/fai_packages.png' title='"._("Package list")."' alt='PL'>";
+                                       $img="<img class='center' src='images/fai_packages.png' title='"._("Package list")."' alt='PL'>";
                                        $info = _("Package list");
                                        break;
                                        case "FAIscript"                        : 
                                                if(!$faifilter['ShowScripts']){ 
                                                        $abort = true;
                                                }
-                                       $img="<img src='images/fai_script.png' title='"._("Scripts")."' alt='S'>";
+                                       $img="<img class='center' src='images/fai_script.png' title='"._("Scripts")."' alt='S'>";
                                        $info = _("Scripts");
                                        break;
                                        case "FAIvariable"                      : 
                                                if(!$faifilter['ShowVariables']){ 
                                                        $abort = true;
                                                }
-                                       $img="<img src='images/fai_variable.png' title='"._("Variables")."' alt='V'>";
+                                       $img="<img class='center' src='images/fai_variable.png' title='"._("Variables")."' alt='V'>";
                                        $info = _("Variables");
                                        break;
                                        case "FAIhook"                          :
                                                if(!$faifilter['ShowHooks']){ 
                                                        $abort = true;
                                                }
-                                       $img="<img src='images/fai_hook.png' title='"._("Hooks")."' alt='H'>";
+                                       $img="<img class='center' src='images/fai_hook.png' title='"._("Hooks")."' alt='H'>";
                                        $info = _("Hooks");
                                        break;
                                        case "FAIprofile"                       : 
                                                if(!$faifilter['ShowProfiles']){ 
                                                        $abort = true;
                                                }
-                                       $img="<img src='images/fai_profile.png' title='"._("Profile")."' alt='P'>";
+                                       $img="<img class='center' src='images/fai_profile.png' title='"._("Profile")."' alt='P'>";
                                        $info = _("Profile");
                                        break;
                                        case "FAItemplate"                      : 
                                                if(!$faifilter['ShowTemplates']){ 
                                                        $abort = true;
                                                }
-                                       $img="<img src='images/fai_template.png' title='"._("Templates")."' alt='T'>";
+                                       $img="<img class='center' src='images/fai_template.png' title='"._("Templates")."' alt='T'>";
                                        $info = _("Templates");
                                        break;
                                        default                                         : 
-                                       $img="<img src='images/empty.png' alt=''>";$info = "";break;
+                                       $img="<img class='center' src='images/empty.png' alt=''>";$info = "";break;
 
                                }
                                
@@ -571,10 +579,10 @@ class faiManagement extends plugin
                                                $desc= "";
                                        }
 
-                                       $field1 = array("string" => $img , "attach" => "style='height:26px;width=20px;'");
-                                       $field2 = array("string" => preg_replace(array("/%KEY%/","/%NAME%/"),array($key,$value['cn'].$desc),$editlink) , "attach" => "");
-                                       $field3 = array("string" => $info, "attach" => "");
-                                       $field4 = array("string" => preg_replace("/%KEY%/",$key,$action) , "attach"=>"style='text-align:right;border:none'");
+                                       $field1 = array("string" => $img , "attach" => "style='text-align:center;width:20px;'");
+                                       $field2 = array("string" => preg_replace(array("/%KEY%/","/%NAME%/"),array($key,$value['cn'].$desc),$editlink) , "attach" => "style=''");
+                                       $field3 = array("string" => $info, "attach" => "style='width:200px;'");
+                                       $field4 = array("string" => preg_replace("/%KEY%/",$key,$action) , "attach" => "style='width:60px;border-right:0px;text-align:right;'");
                                        $divlist->AddEntry(array($field1,$field2,$field3,$field4));
 
                        }
@@ -597,6 +605,7 @@ class faiManagement extends plugin
                $smarty->assign("alphabet"              , generate_alphabet());
                $smarty->assign("apply"                 , apply_filter());
                $smarty->assign("search_image"  , get_template_path('images/search.png'));
+               $smarty->assign("hint", print_sizelimit_warning());
 
                $display        = $smarty->fetch(get_template_path('headpage.tpl', TRUE, dirname(__FILE__)));
                return ($display);
@@ -637,10 +646,10 @@ class faiManagement extends plugin
                }
                ksort($tmp);
                foreach($tmp as $value){
-                       if($value["description"][0]!=".."){
+                       if(isset($value["description"][0])){
                                $this->departments[$value['dn']]=convert_department_dn2($value['dn'])." - [".$value["description"][0]."]";
                        }else{
-                               $this->departments[$value['dn']]=$value["description"][0];
+                               $this->departments[$value['dn']]=convert_department_dn2($value['dn']);//$value["description"][0];
                        }
                }