X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fapplications%2Fclass_applicationManagement.inc;h=26cb834c5e3b797ea7623a32d59889381ee7a6ad;hb=969b5c3e6fb3643d2b9b77bcb92b7c329f22512b;hp=8924f4382169ffce8f537c61ada935d60ce37cf4;hpb=7051f96d9beec19e62dd0dacf5c4036333e9fcba;p=gosa.git

diff --git a/plugins/admin/applications/class_applicationManagement.inc b/plugins/admin/applications/class_applicationManagement.inc
index 8924f4382..26cb834c5 100644
--- a/plugins/admin/applications/class_applicationManagement.inc
+++ b/plugins/admin/applications/class_applicationManagement.inc
@@ -301,9 +301,9 @@ class applicationManagement extends plugin
                 /* Don't show buttons if tab dialog requests this */
                 if (!$this->apptabs->by_object[$this->apptabs->current]->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>";
                 }
                 return ($display);
@@ -315,7 +315,7 @@ class applicationManagement extends plugin
         $options= "";
         foreach ($this->config->idepartments as $key => $value){
           if ($appfilter['depselect'] == $key){
-            $options.= "<option selected value='$key'>$value</option>";
+            $options.= "<option selected='selected' value='$key'>$value</option>";
           } else {
             $options.= "<option value='$key'>$value</option>";
           }
@@ -323,39 +323,39 @@ class applicationManagement extends plugin
 	
         // Managment
         $listhead = "<div style='background:#F0F0F9;padding:5px;'>".
-          " <input type='image' align='middle' src='images/list_back.png' title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'>&nbsp;".
-          " <input type='image' src='images/list_root.png' align='middle' title='"._("Go to root department")."' name='dep_root' alt='"._("Root")."'>&nbsp;".
-          " <input type='image' align='middle' src='images/list_home.png' title='"._("Go to users department")."' alt='"._("Home")."' name='dep_home'>&nbsp;".
-          " <img src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;".
-          " <input type='image' align='middle' src='images/list_new_app.png' alt='"._("new")."' title='"._("Create new application")."' name='appl_new'>&nbsp;".
-          " <img src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;".
-          _("Current base")."&nbsp;<select name='depselect' onChange='mainform.submit()'>$options</select>".
-          " <input type='image' src='images/list_submit.png' align='middle' title='"._("Submit department")."' name='submit_department' alt='"._("Submit")."'>&nbsp;".
+          " <input class='center' type='image' align='middle' src='images/list_back.png' title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'>&nbsp;".
+          " <input class='center' type='image' src='images/list_root.png' align='middle' title='"._("Go to root department")."' name='dep_root' alt='"._("Root")."'>&nbsp;".
+          " <input class='center' type='image' align='middle' src='images/list_home.png' title='"._("Go to users department")."' alt='"._("Home")."' name='dep_home'>&nbsp;".
+          " <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;".
+          " <input class='center' type='image' align='middle' src='images/list_new_app.png' alt='"._("new")."' title='"._("Create new application")."' name='appl_new'>&nbsp;".
+          " <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;".
+          _("Current base")."&nbsp;<select name='depselect' 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>";
 
 
-        $actions = "<input type='image' src='images/edit.png' alt='"._("edit")."' name='appl_edit_%KEY%' title='"._("Edit this entry")."'>";
-        $actions.= "<input type='image' src='images/edittrash.png' alt='"._("delete")."' name='appl_del_%KEY%' title='"._("Delete this entry")."'>";
+        $actions = "<input class='center' type='image' src='images/edit.png' alt='"._("edit")."' name='appl_edit_%KEY%' title='"._("Edit this entry")."'>";
+        $actions.= "<input class='center' type='image' src='images/edittrash.png' alt='"._("delete")."' name='appl_del_%KEY%' title='"._("Delete this entry")."'>";
 
         // Defining Links
         $linkopen = "<a href='?plug=".$_GET['plug']."&amp;act=dep_open&amp;dep_id=%s'>%s</a>";
 
         // image Buttons
         $editlink = "<a href='?plug=".$_GET['plug']."&amp;id=%s&amp;act=edit_entry'>%s</a>";
-        $userimg  = "<img src='images/select_groups.png' alt='User'    title='%s'>";
+        $userimg  = "<img class='center' src='images/select_groups.png' alt='User'    title='%s'>";
 
         // Extension images
-        $applimg  = "<img src='images/select_application.png' alt='A'  title='"._("Application")."'>";
+        $applimg  = "<img class='center' src='images/select_application.png' alt='A'  title='"._("Application")."'>";
 
         // Space
-        $empty    = "<img src='images/empty.png' style='width:16px;height:16px;' alt=''>";
+        $empty    = "<img class='center' src='images/empty.png' style='width:16px;height:16px;' alt=''>";
 
 
         $divlist = new divlist("applicationtabs");
         $divlist->SetHeader(array(
               array("string" => "&nbsp;", "attach" => "style='text-align:center;width:20px;'"),
               array("string" => _("Application name")." / "._("Department"), "attach" => "style=''"),
-              array("string" => _("Actions"), "attach" => "style='width:52px;border-right:0px;text-align:right;'")
+              array("string" => _("Actions"), "attach" => "style='width:60px;border-right:0px;text-align:right;'")
               ));
 
 
@@ -378,7 +378,7 @@ class applicationManagement extends plugin
 
           $field1 = array("string" => "<img src='images/".$non_empty."folder.png' alt='department'>", "attach" => "style='text-align:center;width:20px;'");
           $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "style=''");
-          $field3 = array("string" => "&nbsp;", "attach" => "style='width:52px;border-right:0px;text-align:right;'");
+          $field3 = array("string" => "&nbsp;", "attach" => "style='width:60px;border-right:0px;text-align:right;'");
 
           $divlist->AddEntry(array($field1,$field2,$field3));
         }
@@ -393,7 +393,7 @@ class applicationManagement extends plugin
           }
           $field1 = array("string" => sprintf($applimg,$val['dn']), "attach" => "style='text-align:center;width:20px;'");
           $field2 = array("string" => sprintf($editlink,$key,($val['cn']['0'].$desc)), "attach" => "style='' ".$title);
-          $field3 = array("string" => preg_replace("/%KEY%/", $key, $actions), "attach" => "style='width:52px;border-right:0px;text-align:right;'");
+          $field3 = array("string" => preg_replace("/%KEY%/", $key, $actions), "attach" => "style='width:60px;border-right:0px;text-align:right;'");
 
           $divlist->AddEntry(array($field1,$field2,$field3));
         }
@@ -445,13 +445,17 @@ class applicationManagement extends plugin
          * We also need to search for the departments
          * So we are able to navigate like in konquerer
          */
-        $base2 = preg_replace("/ou=people,/i","",$base);
+        $peopleOU = get_people_ou();
+
+        if(empty($peopleOU)){
+          $base2 = $base;
+        }else{
+          $base2 = preg_replace("/".$peopleOU."/i","",$base);    
+        }
 
         $res3 =  get_list2($this->ui->subtreeACL, "(&(|(ou=$regex)(description=$regex))(objectClass=gosaDepartment))",
             TRUE, $base2, array("ou", "description"), TRUE);
 
-
-
         $this->departments= array();
         $tmp = array();
         foreach ($res3 as $value){
@@ -459,10 +463,10 @@ class applicationManagement 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];
           }
         }