From 2405aae8f51dfb9a2b6df5ca807369cad4673cbf Mon Sep 17 00:00:00 2001 From: hickert Date: Mon, 11 Jan 2010 14:47:45 +0000 Subject: [PATCH] Updated activation queue git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15141 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../systems/admin/systems/class_systemManagement.inc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gosa-plugins/systems/admin/systems/class_systemManagement.inc b/gosa-plugins/systems/admin/systems/class_systemManagement.inc index d4f6c2c59..da3ad1e12 100644 --- a/gosa-plugins/systems/admin/systems/class_systemManagement.inc +++ b/gosa-plugins/systems/admin/systems/class_systemManagement.inc @@ -509,7 +509,12 @@ class systemManagement extends management $ldap->cd($this->config->current['BASE']); // Walk through systems to activate - foreach($this->activationQueue as $dn => $data){ + while(count($this->activationQueue)){ + + // Get next entry + reset($this->activationQueue); + $dn = key($this->activationQueue); + $data= $this->activationQueue[$dn]; if(!isset($data['SS'])) continue; @@ -540,6 +545,7 @@ class systemManagement extends management // Open object an preset some values like the objects base del_lock($dn); management::editEntry('editEntry',array($dn),array(),$tabClass,$tabDesc, $aclCategory); + $this->displayApplyBtn = FALSE; $this->tabObject->set_acl_base($headpage->getBase()); if($data['OG'] != "none"){ $this->tabObject->base = preg_replace("/^[^,]+,".preg_quote(get_ou('ogroupRDN'), '/')."/i", "", $data['OG']); @@ -631,6 +637,9 @@ class systemManagement extends management $this->activate_new_device($this->last_dn); unset($this->activationQueue[$this->last_dn]); } + + // Avoid using values from an older input dialog + $_POST = array(); $this->handleActivationQueue(); } -- 2.30.2