Added status flag fix

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

diff --git a/plugins/admin/systems/class_goCupsServer.inc b/plugins/admin/systems/class_goCupsServer.inc
index 427f7e842356357766f9b033119ab1a5798879ad..05375062db3b68f45e9c955911fa9084ebfc100d 100644 (file)
--- a/plugins/admin/systems/class_goCupsServer.inc
+++ b/plugins/admin/systems/class_goCupsServer.inc
@@ -8,7 +8,7 @@ class goCupsServer extends plugin{
 
   /* This plugin only writes its objectClass */
   var $objectclasses    = array("goCupsServer");
-  var $attributes       = array("goCupsServerStatus");
+  var $attributes       = array();
   var $StatusFlag       = "goCupsServerStatus";
  
   /* This class can't be assigned twice so it conflicts with itsself */

diff --git a/plugins/admin/systems/class_goFaxServer.inc b/plugins/admin/systems/class_goFaxServer.inc
index 8572f6dfafd29cfa8de555f1c1fa8e72548dba97..b5c4783751b3917098806372dc9d0982115e6cff 100644 (file)
--- a/plugins/admin/systems/class_goFaxServer.inc
+++ b/plugins/admin/systems/class_goFaxServer.inc
@@ -8,7 +8,7 @@ class goFaxServer extends plugin{
 
   /* This plugin only writes its objectClass */
   var $objectclasses    = array("goFaxServer");
-  var $attributes       = array("goFaxServerStatus","goFaxAdmin", "goFaxPassword");
+  var $attributes       = array("goFaxAdmin", "goFaxPassword");
   var $StatusFlag       = "goFaxServerStatus";
  
   /* This class can't be assigned twice so it conflicts with itsself */

diff --git a/plugins/admin/systems/class_goFonServer.inc b/plugins/admin/systems/class_goFonServer.inc
index 7f65e8e40585775bfc3297228e2a771a1c42bd5d..074d287ddbb3740ce4f18e6db1503bae7e775620 100644 (file)
--- a/plugins/admin/systems/class_goFonServer.inc
+++ b/plugins/admin/systems/class_goFonServer.inc
@@ -8,7 +8,7 @@ class goFonServer extends plugin{
 
   /* This plugin only writes its objectClass */
   var $objectclasses    = array("goFonServer");
-  var $attributes       = array("goFonServerStatus","goFonAdmin", "goFonPassword","goFonAreaCode", "goFonCountryCode");
+  var $attributes       = array("goFonAdmin", "goFonPassword","goFonAreaCode", "goFonCountryCode");
   var $StatusFlag       = "goFonServerStatus";
  
   /* This class can't be assigned twice so it conflicts with itsself */

diff --git a/plugins/admin/systems/class_goGlpiServer.inc b/plugins/admin/systems/class_goGlpiServer.inc
index 4d3418ef30647b911949f789c6f0724d7e350b06..9129d1411c096aacbe062399d27992079eb314ec 100644 (file)
--- a/plugins/admin/systems/class_goGlpiServer.inc
+++ b/plugins/admin/systems/class_goGlpiServer.inc
@@ -8,7 +8,7 @@ class goGlpiServer extends plugin{
 
   /* This plugin only writes its objectClass */
   var $objectclasses    = array("goGlpiServer");
-  var $attributes       = array("goGlpiServerStatus","goGlpiAdmin","goGlpiDatabase","goGlpiPassword");
+  var $attributes       = array("goGlpiAdmin","goGlpiDatabase","goGlpiPassword");
   var $StatusFlag       = "goGlpiServerStatus";
  
   /* This class can't be assigned twice so it conflicts with itsself */

diff --git a/plugins/admin/systems/class_goImapServer.inc b/plugins/admin/systems/class_goImapServer.inc
index c1571e64fd349168ba9929d1ac93474f31066fe4..a7760919f9bc302aa8741c4ec20c70c96fbb1cbf 100644 (file)
--- a/plugins/admin/systems/class_goImapServer.inc
+++ b/plugins/admin/systems/class_goImapServer.inc
@@ -14,8 +14,7 @@ class goImapServer extends plugin{
   var $DisplayName      = "";
   var $dn               = NULL;
   var $StatusFlag       = "goImapServerStatus";
-  var $attributes       = array("goImapServerStatus",
-                                "goImapName","goImapConnect","goImapAdmin","goImapPassword",
+  var $attributes       = array("goImapName","goImapConnect","goImapAdmin","goImapPassword",
                                 "goImapSieveServer","goImapSievePort",
                                 "cyrusImap","cyrusImapSSL","cyrusPop3","cyrusPop3SSL");
 

diff --git a/plugins/admin/systems/class_goKrbServer.inc b/plugins/admin/systems/class_goKrbServer.inc
index 0b3b79c4f64129c6b50a320554e1ad1482ec9c89..edc0895365f2351510e1a25c7c6076926df8b9f7 100644 (file)
--- a/plugins/admin/systems/class_goKrbServer.inc
+++ b/plugins/admin/systems/class_goKrbServer.inc
@@ -8,7 +8,7 @@ class goKrbServer extends plugin{
 
   /* This plugin only writes its objectClass */
   var $objectclasses    = array("goKrbServer");
-  var $attributes       = array("goKrbServerStatus","goKrbRealm", "goKrbAdmin","goKrbPassword");
+  var $attributes       = array("goKrbRealm", "goKrbAdmin","goKrbPassword");
   var $StatusFlag       = "goKrbServerStatus";
  
   /* This class can't be assigned twice so it conflicts with itsself */

diff --git a/plugins/admin/systems/class_goLdapServer.inc b/plugins/admin/systems/class_goLdapServer.inc
index 8cce87d2d5d3111af06696c576f67c269048eb7e..271dabdf002d192c4fb63a23fffefc4778d498fd 100644 (file)
--- a/plugins/admin/systems/class_goLdapServer.inc
+++ b/plugins/admin/systems/class_goLdapServer.inc
@@ -8,7 +8,7 @@ class goLdapServer extends plugin{
 
   /* This plugin only writes its objectClass */
   var $objectclasses    = array("goLdapServer");
-  var $attributes       = array("goLdapServerStatus","goLdapBase");
+  var $attributes       = array("goLdapBase");
   var $StatusFlag       = "goLdapServerStatus";
 
   /* This class can't be assigned twice so it conflicts with itsself */

diff --git a/plugins/admin/systems/class_goLogDBServer.inc b/plugins/admin/systems/class_goLogDBServer.inc
index 2003937a5459ac7f3c9f92f44ac69b7432b99020..aa43f9548a5ad13b5ff5d55c585ee6ec1556c5b6 100644 (file)
--- a/plugins/admin/systems/class_goLogDBServer.inc
+++ b/plugins/admin/systems/class_goLogDBServer.inc
@@ -8,7 +8,7 @@ class goLogDBServer extends plugin{
 
   /* This plugin only writes its objectClass */
   var $objectclasses    = array("goLogDBServer");
-  var $attributes       = array("goLogDBServerStatus","goLogAdmin", "goLogPassword");
+  var $attributes       = array("goLogAdmin", "goLogPassword");
   var $StatusFlag       = "goLogDBServerStatus";
 
   /* This class can't be assigned twice so it conflicts with itsself */

diff --git a/plugins/admin/systems/class_goMailServer.inc b/plugins/admin/systems/class_goMailServer.inc
index 95fe64bd990561767d71dc2805a2bf23793e3fc7..5bb4c8a82bec3e7dd5bcb4218914ab3ddd856838 100644 (file)
--- a/plugins/admin/systems/class_goMailServer.inc
+++ b/plugins/admin/systems/class_goMailServer.inc
@@ -13,7 +13,7 @@ class goMailServer extends plugin{
   var $DisplayName      = "";
   var $dn               = NULL;
   var $StatusFlag       = "goMailServerStatus";
-  var $attributes       = array("goMailServerStatus","description","postfixHeaderSizeLimit",
+  var $attributes       = array("description","postfixHeaderSizeLimit",
       "postfixMailboxSizeLimit","postfixMessageSizeLimit",
       "postfixMyDestinations","postfixMyDomain","postfixMyhostname",
       "postfixMyNetworks","postfixRelayhost","postfixTransportTable",

diff --git a/plugins/admin/systems/class_goNtpServer.inc b/plugins/admin/systems/class_goNtpServer.inc
index dbfc1401dd323b3fb2673d3cf160651526484451..8cb692ffab41356cd38194d19b6694f97501b022 100644 (file)
--- a/plugins/admin/systems/class_goNtpServer.inc
+++ b/plugins/admin/systems/class_goNtpServer.inc
@@ -8,7 +8,7 @@ class goNtpServer extends plugin{
 
   /* This plugin only writes its objectClass */
   var $objectclasses    = array("goNtpServer");
-  var $attributes       = array("goTimeSource","goNtpServerStatus");
+  var $attributes       = array("goTimeSource");
   var $StatusFlag       = "goNtpServerStatus";
 
   /* This class can't be assigned twice so it conflicts with itsself */

diff --git a/plugins/admin/systems/class_goShareServer.inc b/plugins/admin/systems/class_goShareServer.inc
index 6c968e94816781badeabdc027447a38ad1cbe491..fb2d1a5a138685a64cfc3a0540269cda39c9edfb 100644 (file)
--- a/plugins/admin/systems/class_goShareServer.inc
+++ b/plugins/admin/systems/class_goShareServer.inc
@@ -8,7 +8,7 @@ class goShareServer extends plugin{
 
   /* This plugin only writes its objectClass */
   var $objectclasses    = array("goShareServer");
-  var $attributes       = array("goShareServerStatus","goExportEntry");
+  var $attributes       = array("goExportEntry");
   var $StatusFlag       = "goShareServerStatus";
 
   /* This class can't be assigned twice so it conflicts with itsself */

diff --git a/plugins/admin/systems/class_goSyslogServer.inc b/plugins/admin/systems/class_goSyslogServer.inc
index a84670e21da55345136a2cbb19aeedb797e56dcc..2aa5a33ed0a939f765adc148bb979996ed66e210 100644 (file)
--- a/plugins/admin/systems/class_goSyslogServer.inc
+++ b/plugins/admin/systems/class_goSyslogServer.inc
@@ -8,7 +8,7 @@ class goSyslogServer extends plugin{
 
   /* This plugin only writes its objectClass */
   var $objectclasses    = array("goSyslogServer");
-  var $attributes       = array("goSyslogServerStatus");
+  var $attributes       = array();
   var $StatusFlag       = "goSyslogServerStatus";
  
   /* This class can't be assigned twice so it conflicts with itsself */

diff --git a/plugins/admin/systems/class_goTerminalServer.inc b/plugins/admin/systems/class_goTerminalServer.inc
index 262ad19a13c52e874a5bd55e41352cef56940d9c..501546fc618a48de2847dae2a21d8314fb0efe23 100644 (file)
--- a/plugins/admin/systems/class_goTerminalServer.inc
+++ b/plugins/admin/systems/class_goTerminalServer.inc
@@ -8,7 +8,7 @@ class goTerminalServer extends plugin{
 
   /* This plugin only writes its objectClass */
   var $objectclasses    = array("goTerminalServer");
-  var $attributes       = array("goTerminalServerStatus","goXdmcpIsEnabled", "goFontPath");
+  var $attributes       = array("goXdmcpIsEnabled", "goFontPath");
   var $StatusFlag       = "goTerminalServerStatus";
  
   /* This class can't be assigned twice so it conflicts with itsself */

diff --git a/plugins/admin/systems/class_serverService.inc b/plugins/admin/systems/class_serverService.inc
index 34b66573ed11e816a54f9bd020a90fdbc447cf78..7f8754d3b84846da65c4a0dbb24c5c9763f7942d 100644 (file)
--- a/plugins/admin/systems/class_serverService.inc
+++ b/plugins/admin/systems/class_serverService.inc
@@ -188,9 +188,24 @@ class ServerService extends plugin
     /* Dispaly services overview */
     $this->divList->execute();
     $list = array();
+
+    $ldap = $this->config->get_ldap_link();
+    $ldap->cd($this->dn);
+    $ldap->cat($this->dn);
+    
+    if($ldap->count()){
+      $attrs = $ldap->fetch();
+    }else{
+      $attrs = array();
+    }
+
     foreach($this->plugins as $name => $obj){
       if($obj->is_account){
-        $list[$name] = $obj->getListEntry(); 
+        $flag = $this->plugins[$name]->StatusFlag;
+        if(isset($attrs[$flag][0])){
+          $this->plugins[$name]->$flag = $attrs[$flag][0];
+        }
+        $list[$name] = $this->plugins[$name]->getListEntry(); 
       }
     }
     $this->divList -> setEntries($list);