From eb1927a41de9af1a5ccc0421c04c137909dd94bd Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 23 Aug 2005 11:51:27 +0000 Subject: [PATCH] fixed, access violatio git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@1210 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/systems/class_servService.inc | 35 +++++++++------------ 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/plugins/admin/systems/class_servService.inc b/plugins/admin/systems/class_servService.inc index b1120f36b..850a95515 100644 --- a/plugins/admin/systems/class_servService.inc +++ b/plugins/admin/systems/class_servService.inc @@ -7,24 +7,25 @@ class servservice extends plugin var $cli_description= "Some longer text\nfor help"; var $cli_parameters= array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser"); - var $goExportEntry = array(); - var $goTimeSource = array(); - var $goLdapBase= ""; - var $goXdmcpIsEnabled =""; - var $goFontPath= ""; - var $goNTPServer=""; - var $goLdapServer=""; - var $goTerminalServer=""; - var $goSyslogServer=""; - var $goCupsServer=""; - var $o_subWindow = NULL; + var $goExportEntry = array(); + var $goTimeSource = array(); + var $goLdapBase = ""; + var $goXdmcpIsEnabled = ""; + var $goFontPath = ""; + var $goNTPServer = ""; + var $goShareServer = ""; + var $goLdapServer = ""; + var $goTerminalServer = ""; + var $goSyslogServer = ""; + var $goCupsServer = ""; + var $o_subWindow = NULL; /* attribute list for save action */ var $ignore_account= TRUE; var $attributes = array("goLdapBase","goXdmcpIsEnabled","goFontPath"); var $possible_objectclasses= array( "goShareServer", "goNtpServer", "goServer", "goLdapServer", "goTerminalServer", "goSyslogServer", "goCupsServer"); - var $objectclasses = array("top","goServer"); + var $objectclasses = array( "top","goServer"); var $additionaloc = array( "goShareServer" => array("goExportEntry"), "goNtpServer" => array("goTimeSource"), "goLdapServer" => array("goLdapBase"), @@ -246,7 +247,6 @@ class servservice extends plugin /* Save to LDAP */ function save() { - plugin::save(); $tmp= array(); @@ -257,7 +257,7 @@ class servservice extends plugin $tmp[]= $oc; } } - + /* Merge our current objectclasses */ foreach($this->objectclasses as $oc){ if (!in_array_ics($oc, $tmp)){ @@ -284,13 +284,6 @@ class servservice extends plugin } } } - $oc = array(); - foreach($this->attrs['objectClass'] as $name){ - if($name!="goShareServer"){ - $oc[]=$name; - } - } - $this->attrs['objectClass']=$oc; /* Write to LDAP */ $ldap= $this->config->get_ldap_link(); -- 2.30.2