X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fapplications%2Fclass_applicationManagement.inc;h=261b19617f614da68115c5b7f14f0cf29721c093;hb=2c0515a09cbb244ec32757b8372f7e55830a67e3;hp=86e5891fd13b971a071e5e1231169fc8baa842b8;hpb=07853ec87fb4aba06800bf95b5716bdb0138c629;p=gosa.git

diff --git a/plugins/admin/applications/class_applicationManagement.inc b/plugins/admin/applications/class_applicationManagement.inc
index 86e5891fd..261b19617 100644
--- a/plugins/admin/applications/class_applicationManagement.inc
+++ b/plugins/admin/applications/class_applicationManagement.inc
@@ -247,7 +247,7 @@ class applicationManagement extends plugin
 			/* Lock the current entry, so nobody will edit it during deletion */
 			add_lock ($this->dn, $this->ui->dn);
 			$smarty= get_smarty();
-			$smarty->assign("intro", sprintf(_("You're about to delete the application '%s'."), $this->dn));
+			$smarty->assign("intro", sprintf(_("You're about to delete the application '%s'."), LDAP::fix($this->dn)));
 			return($smarty->fetch (get_template_path('remove.tpl', TRUE)));
 		} else {
 
@@ -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>";
           }
@@ -329,26 +329,26 @@ class applicationManagement extends plugin
           " <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()'>$options</select>".
+          _("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");
@@ -445,7 +445,13 @@ 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);