From 5863a2595461e184def22930346129956c68644f Mon Sep 17 00:00:00 2001 From: hickert Date: Fri, 12 Jan 2007 04:25:55 +0000 Subject: [PATCH] Removed some debug output git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@5544 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../admin/systems/class_glpiDeviceManagement.inc | 2 +- plugins/admin/systems/class_printGeneric.inc | 13 ++++++++++--- plugins/admin/systems/class_termDNS.inc | 1 - 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/plugins/admin/systems/class_glpiDeviceManagement.inc b/plugins/admin/systems/class_glpiDeviceManagement.inc index 9fe20a9f1..6573cb9a6 100644 --- a/plugins/admin/systems/class_glpiDeviceManagement.inc +++ b/plugins/admin/systems/class_glpiDeviceManagement.inc @@ -114,7 +114,7 @@ class glpiDeviceManagement extends plugin }elseif(isset($tmp['designation'])){ $smarty->assign("warning", sprintf(_("You're about to delete the glpi device '%s'."), $tmp['designation'])); }else{ - print_a(_("Can't detect object name.")); + print_red(_("Can't detect object name.")); } return($smarty->fetch(get_template_path('remove_glpi.tpl', TRUE))); diff --git a/plugins/admin/systems/class_printGeneric.inc b/plugins/admin/systems/class_printGeneric.inc index b74997283..bef4941b2 100644 --- a/plugins/admin/systems/class_printGeneric.inc +++ b/plugins/admin/systems/class_printGeneric.inc @@ -286,10 +286,17 @@ class printgeneric extends plugin $smarty->assign("StandAlone",false); } - /* Do we need to flip is_account state? */ + if (isset($_POST['modify_state'])){ - $this->is_modified = true; - $this->is_account= !$this->is_account; + + /* Only change account state if allowed */ + if($this->is_account && $this->acl == "#all#"){ + $this->is_account= !$this->is_account; + $this->is_modified = true; + }elseif(!$this->is_account && chkacl($this->acl,"create") == "" && !((empty($this->cn)) && ($this->dn != "new"))){ + $this->is_account= !$this->is_account; + $this->is_modified = true; + } } /* Do we represent a valid printer? */ diff --git a/plugins/admin/systems/class_termDNS.inc b/plugins/admin/systems/class_termDNS.inc index 4b2cd52b9..47287a897 100644 --- a/plugins/admin/systems/class_termDNS.inc +++ b/plugins/admin/systems/class_termDNS.inc @@ -422,7 +422,6 @@ class termDNS extends plugin /* Add || Update new DNS entries */ - print_a($tmp); foreach($tmp['add'] as $dn => $attrs){ $ldap->cd($dn); $ldap->cat($dn, array('dn')); -- 2.30.2