Fixes: #1471 workstationGeneric should use simplePlugin

contrib/fusiondirectory.conf

@@ -41,7 +41,7 @@
       <plugin acl="application" class="applicationManagement" />
       <plugin acl="mimetypes" class="mimetypeManagement" />
       <plugin acl="devices" class="deviceManagement" />
-      <plugin acl="terminal/termgeneric,workstation/workgeneric,server/servgeneric,phone/phoneGeneric,printer/printgeneric,component/componentGeneric,winworkstation/wingeneric" class="systemManagement" />
+      <plugin acl="terminal/termgeneric,workstation/workstationGeneric,server/serverGeneric,phone/phoneGeneric,printer/printgeneric,component/componentGeneric,winworkstation/wingeneric" class="systemManagement" />
       <!-- Use 'lockDn'      for dn
                'lockName'    for name
                'lockType'    for branch/freeze -->
@@ -191,7 +191,7 @@
   </termtabs>
 
   <servertabs>
-     <tab class="servgeneric" name="Generic" />
+     <tab class="serverGeneric" name="Generic" />
      <tab class="ServerService" name="Services" />
      <tab class="netgroupSystem" name="NIS Netgroup" />
      <tab class="faiSummaryTab" name="Deployment summary" />
@@ -200,7 +200,7 @@
   </servertabs>
 
   <workstationtabs>
-     <tab class="workgeneric" name="Generic" />
+     <tab class="workstationGeneric" name="Generic" />
      <tab class="workservice" name="Devices" />
      <tab class="netgroupSystem" name="NIS Netgroup" />
      <tab class="printgeneric" name="Printer" />

contrib/man/fusiondirectory.conf.5

@@ -1389,7 +1389,7 @@ class definition.
 To enable the burn CD image function, you can specify the
 .I systemIsoHook
 in the
-.I workgeneric
+.I workstationGeneric
 class. You will get a CD symbol in the systems list - which calls
 the hook if pressed.
 

include/class_msg_dialog.inc

@@ -82,19 +82,18 @@ class msg_dialog
       $this->i_Type  = $i_type;
 
       /* Append trace information, only if error messages are enabled */
-      if( isset($config) &&
-        is_object($config) &&
-        $config->get_cfg_value("displayerrors") == "TRUE" ){
-        $this->a_Trace   = debug_backtrace();
+      if (isset($config) && is_object($config) &&
+        $config->get_cfg_value("displayerrors") == "TRUE") {
+        $this->a_Trace = debug_backtrace();
       }
-      if(!session::is_set('msg_dialogs')){
-        session::set('msg_dialogs',array());
+      if (!session::is_set('msg_dialogs')) {
+        session::set('msg_dialogs', array());
       }
-      if($this->i_Type == FATAL_ERROR_DIALOG){
+      if ($this->i_Type == FATAL_ERROR_DIALOG) {
         restore_error_handler();
         error_reporting(E_ALL);
         echo $this->execute();
-      }else{
+      } else {
         $msg_dialogs   = session::get('msg_dialogs');
         $msg_dialogs[] = $this;
         session::set('msg_dialogs',$msg_dialogs);

include/php_setup.inc

@@ -65,10 +65,10 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
   }
 
   /* Error messages are hidden in FusionDirectory, so we only send them to the logging class and abort here */
-  if(isset($config->data) && $config->get_cfg_value("displayerrors") != "true"){
+  if (isset($config->data) && $config->get_cfg_value("displayerrors") != "TRUE") {
 
     /* Write to syslog */
-    if(class_exists("log") && !preg_match("/No such object/",$errstr)){
+    if (class_exists("log") && !preg_match("/No such object/",$errstr)) {
       new log("view","error","",array(),"PHP error: $errstr ($errfile, line $errline)");
     }
 
@@ -77,7 +77,7 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
   }
 
   /* Send all errors to logging class, except "Ldap : No such object" messages*/
-  if(class_exists("log") && !preg_match("/No such object/",$errstr)){
+  if (class_exists("log") && !preg_match("/No such object/", $errstr)) {
     new log("debug","all",$errfile,array(),"Type:".$errno.", Message:".$errstr.", File:".$errfile.", Line: ".$errline);
   }
 

plugins/admin/ogroups/class_ogroup.inc

@@ -489,9 +489,9 @@ class ogroup extends plugin
           "DN"=> get_ou('applicationRDN')   ,"ACL" => "application"),
         "departments"     => array("OBJ"=>"department", "CLASS"=>"gosaDepartment" ,
           "DN"=> ""                        ,"ACL" => "department"),
-        "servers"         => array("OBJ"=>"servgeneric", "CLASS"=>"goServer"       ,
+        "servers"         => array("OBJ"=>"serverGeneric", "CLASS"=>"goServer"       ,
           "DN"=> get_ou('serverRDN')        ,"ACL" => "server"),
-        "workstations"    => array("OBJ"=>"workgeneric", "CLASS"=>"gotoWorkstation",
+        "workstations"    => array("OBJ"=>"workstationGeneric", "CLASS"=>"gotoWorkstation",
           "DN"=> get_ou('workstationRDN')   ,"ACL" => "workstation"),
         "winstations"     => array("OBJ"=>"wingeneric", "CLASS"=>"sambaSamAccount",
           "DN"=> get_ou('sambaMachineAccountRDN')     ,"ACL" => "winstation"),

plugins/admin/ogroups/objectSelect/selectObject-list.xml

@@ -23,7 +23,7 @@
       <label>Server</label>
       <objectClass>goServer</objectClass>
       <category>server</category>
-      <class>servgeneric</class>
+      <class>serverGeneric</class>
       <image>plugins/systems/images/select_server.png</image>
     </objectType>
 
@@ -31,7 +31,7 @@
       <label>Workstation</label>
       <objectClass>gotoWorkstation</objectClass>
       <category>workstation</category>
-      <class>workgeneric</class>
+      <class>workstationGeneric</class>
       <image>plugins/systems/images/select_workstation.png</image>
     </objectType>
 

plugins/personal/posix/trustSelect/trust-list.xml

@@ -14,7 +14,7 @@
       <label>Server</label>
       <objectClass>goServer</objectClass>
       <category>server</category>
-      <class>servgeneric</class>
+      <class>serverGeneric</class>
       <image>plugins/systems/images/select_server.png</image>
     </objectType>
 
@@ -22,7 +22,7 @@
       <label>Workstation</label>
       <objectClass>gotoWorkstation</objectClass>
       <category>workstation</category>
-      <class>workgeneric</class>
+      <class>workstationGeneric</class>
       <image>plugins/systems/images/select_workstation.png</image>
     </objectType>