Some bugfixes

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3827 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/include/class_config.inc b/include/class_config.inc
index 33bc836d86b9ff021e93452545e522b1b9ed29d3..6aa0277886795d0f9b4199f8287000500a6e4527 100644 (file)
--- a/include/class_config.inc
+++ b/include/class_config.inc
@@ -113,8 +113,8 @@ class config  {
                     $this->currentLocation= $name;
 
                     /* Add location elements */
-                    $this->data['LOCATIONS'][$name]= $attrs;
-                  }
+                      $this->data['LOCATIONS'][$name]= $attrs;
+                    }
                   break;
 
                   /* Handle referral tags */

diff --git a/plugins/admin/systems/class_printGeneric.inc b/plugins/admin/systems/class_printGeneric.inc
index 7c51299fe51f3e6c49e77dbf020cce1e3f62d089..c61bda5fb2b19dba967df3125a73b17938fa6945 100644 (file)
--- a/plugins/admin/systems/class_printGeneric.inc
+++ b/plugins/admin/systems/class_printGeneric.inc
@@ -352,16 +352,16 @@ class printgeneric extends plugin
     $smarty->assign("baseACL", chkacl($this->acl,"base"));
 
     if(isset($_POST['AddUser'])){
-      $this->dialog = new selectUserToPrinterDialog($this->config, get_userinfo(),"AddUser");
+      $this->dialog = new selectUserToPrinterDialog($this->config, NULL,"AddUser");
     }
     if(isset($_POST['AddGroup'])){
-      $this->dialog = new selectUserToPrinterDialog($this->config, get_userinfo(),"AddGroup");
+      $this->dialog = new selectUserToPrinterDialog($this->config, NULL,"AddGroup");
     }
     if(isset($_POST['AddAdminUser'])){
-      $this->dialog = new selectUserToPrinterDialog($this->config, get_userinfo(),"AddAdminUser");
+      $this->dialog = new selectUserToPrinterDialog($this->config, NULL,"AddAdminUser");
     }
     if(isset($_POST['AddAdminGroup'])){
-      $this->dialog = new selectUserToPrinterDialog($this->config, get_userinfo(),"AddAdminGroup");
+      $this->dialog = new selectUserToPrinterDialog($this->config, NULL,"AddAdminGroup");
     }
 
     /* Display ppd configure/select dialog      */

diff --git a/plugins/admin/systems/class_servService.inc b/plugins/admin/systems/class_servService.inc
index 2c9f9381e69b60425fc4b0ffd0f32928c1957888..a471336316f869fee4b9ccf1a636dca8cd93b6f1 100644 (file)
--- a/plugins/admin/systems/class_servService.inc
+++ b/plugins/admin/systems/class_servService.inc
@@ -45,7 +45,8 @@ class servservice extends plugin
   {
     
     plugin::plugin ($config, $dn);
-    
+   
+    /* Check if mount objectClass is available */ 
     $ldap = $this->config->get_ldap_link();
     $avl_objectclasses = $ldap->get_objectclasses();
     if (isset($avl_objectclasses["mount"])) {

diff --git a/plugins/admin/systems/class_workstationService.inc b/plugins/admin/systems/class_workstationService.inc
index b62048e8036ba1ec366a6961ce4d1de1d7e6c372..dabcaa0337d1c85eced46f6609dbe79aefa1ae6d 100644 (file)
--- a/plugins/admin/systems/class_workstationService.inc
+++ b/plugins/admin/systems/class_workstationService.inc
@@ -106,7 +106,7 @@ class workservice extends plugin
     }
 
     $this->MouseTypes= array("ImPS/2" => "ImPS/2", "PS/2" => "PS/2", "Microsoft" => "Microsoft", 
-                              "Logitech" => "Microsoft");
+                              "Logitech" => "Logitech");
 
     $this->MousePorts= array("/dev/ttyS0"  =>"/dev/ttyS0", 
                              "/dev/ttyS1"       => "/dev/ttyS1",          "/dev/psaux"  =>"/dev/psaux", 

diff --git a/plugins/admin/systems/workstationStartup.tpl b/plugins/admin/systems/workstationStartup.tpl
index 7c4c25397b5b4ca7a668d43cb64eb196835a588d..a31b1b2b50fc6e62c434b702384fe806cee90988 100644 (file)
--- a/plugins/admin/systems/workstationStartup.tpl
+++ b/plugins/admin/systems/workstationStartup.tpl
@@ -101,7 +101,7 @@
                        <option disabled>&nbsp;</option>
                </select>       
                <input name="AddClass" value="{t}Add{/t}" type="submit"> 
-               <input name="DelClass" value="{t}Delete{/t}" type="submit"> 
+<!--           <input name="DelClass" value="{t}Delete{/t}" type="submit"> -->
        {/if}
                </td>
        </tr>