diff --git a/include/class_plugin.inc b/include/class_plugin.inc index c104f7d2481ae5aad7a54af00bd41b971c3a7836..f1d967a90089be76b966c7d80a3edec0bf06360e 100644 --- a/include/class_plugin.inc +++ b/include/class_plugin.inc @@ -68,8 +68,8 @@ class plugin \sa plugin::plugin() */ - var $is_account= FALSE; - var $initially_was_account= FALSE; + var $is_account = FALSE; + var $initially_was_account = FALSE; /*! \brief Mark plugin as template @@ -80,42 +80,42 @@ class plugin \sa plugin::save() plugin::execute() */ - var $is_template= FALSE; - var $ignore_account= FALSE; - var $is_modified= FALSE; + var $is_template = FALSE; + var $ignore_account = FALSE; + var $is_modified = FALSE; /*! \brief Represent temporary LDAP data This is only used internally. */ - var $attrs= array(); + var $attrs = array(); /* Keep set of conflicting plugins */ - var $conflicts= array(); + var $conflicts = array(); /* Save unit tags */ - var $gosaUnitTag= ""; - var $skipTagging= FALSE; + var $gosaUnitTag = ""; + var $skipTagging = FALSE; /*! \brief Used standard values dn */ - var $dn= ""; - var $uid= ""; - var $sn= ""; - var $givenName= ""; - var $acl= "*none*"; - var $dialog= FALSE; + var $dn = ""; + var $uid = ""; + var $sn = ""; + var $givenName = ""; + var $acl = "*none*"; + var $dialog = FALSE; var $snapDialog = NULL; /* attribute list for save action */ - var $attributes= array(); - var $objectclasses= array(); - var $is_new= TRUE; - var $saved_attributes= array(); + var $attributes = array(); + var $objectclasses = array(); + var $is_new = TRUE; + var $saved_attributes = array(); var $acl_base= ""; var $acl_category= ""; diff --git a/include/class_tabs.inc b/include/class_tabs.inc index e8dc15678ca6fb4ec057f6e9fad2a34a668dd02c..669a4e3e52541a3f210a2c6bddd6cfd2f3a5a0ed 100644 --- a/include/class_tabs.inc +++ b/include/class_tabs.inc @@ -304,7 +304,7 @@ class tabs * * \param boolean $ignore_account false */ - function check($ignore_account = FALSE) + function check() { $messages = array(); @@ -312,7 +312,7 @@ class tabs /* Check all plugins */ foreach ($this->by_object as $key => &$obj) { - if ($obj->is_account || $ignore_account || $obj->ignore_account) { + if ($obj->is_account || $obj->ignore_account) { @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__,$key, "Checking"); $msg = $obj->check(); @@ -339,19 +339,18 @@ class tabs * * \param boolean $ignore_account false */ - function save($ignore_account = FALSE) + function save() { /* Save all plugins */ - foreach ($this->by_object as $key => &$obj){ - @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, - $key, "Saving"); + foreach ($this->by_object as $key => &$obj) { + @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $key, "Saving"); $obj->dn = $this->dn; if (!$obj instanceof plugin && !$obj instanceOf management) { trigger_error("Something went wrong while saving ".$obj->dn.". Object class '".get_class($obj)."'."); } else { - if ($obj->is_account || $ignore_account || $obj->ignore_account) { + if ($obj->is_account || $obj->ignore_account) { if ($obj->save() == 1) { return 1; } diff --git a/plugins/admin/acl/tabs_acl.inc b/plugins/admin/acl/tabs_acl.inc index 26e3093da8dcc03154cfd430cf0c57fa448f81a3..652d74fa6f5fe718391f82dfbd69189c7529202f 100644 --- a/plugins/admin/acl/tabs_acl.inc +++ b/plugins/admin/acl/tabs_acl.inc @@ -29,16 +29,6 @@ class acltab extends tabs parent::__construct($config, $data, $dn, "", $copied_object); } - function save($ignore_account = FALSE) - { - return parent::save(); - } - - function save_object($ignore_account = FALSE) - { - return parent::save_object(); - } - function execute() { $display = parent::execute(); diff --git a/plugins/admin/departments/tabs_department.inc b/plugins/admin/departments/tabs_department.inc index 74b15db8c1bddec074be337329eb86d2370813a8..f3ae3e9e7bf25f95e618c7f11b1f2a86aa238893 100644 --- a/plugins/admin/departments/tabs_department.inc +++ b/plugins/admin/departments/tabs_department.inc @@ -52,7 +52,7 @@ class deptabs extends tabs return parent::check(TRUE); } - function save($ignore_account = FALSE) + function save() { $baseobject = &$this->by_object[$this->base_name]; $namingAttr = $baseobject->namingAttr; @@ -74,9 +74,7 @@ class deptabs extends tabs $this->dn = $new_dn; $baseobject->dn = $this->dn; - if (!$ignore_account) { - parent::save(TRUE); - } + parent::save(); } } ?> diff --git a/plugins/admin/groups/tabs_group.inc b/plugins/admin/groups/tabs_group.inc index 9c39ac59761e24246ab29333be9d429f37239682..0ffe9f0e480d17c188246a7f4be9d665986d98ca 100644 --- a/plugins/admin/groups/tabs_group.inc +++ b/plugins/admin/groups/tabs_group.inc @@ -54,7 +54,7 @@ class grouptabs extends tabs tabs::delete(); } - function save($ignore_account = FALSE) + function save() { $baseobject = $this->getBaseObject(); diff --git a/plugins/admin/ogroups/tabs_ogroups.inc b/plugins/admin/ogroups/tabs_ogroups.inc index 75e3a5e703fe96bbc0d4ecda4dd50473f488240a..047d4693eca5a1f3949db3548c73d807e64d8081 100644 --- a/plugins/admin/ogroups/tabs_ogroups.inc +++ b/plugins/admin/ogroups/tabs_ogroups.inc @@ -275,7 +275,7 @@ class ogrouptabs extends tabs } - function save($ignore_account = FALSE) + function save() { $baseobject = $this->by_object['ogroup']; diff --git a/plugins/admin/users/tabs_user.inc b/plugins/admin/users/tabs_user.inc index 51e0f4cf801c1d3c565d1d35ed677fbcf6961277..33926d36b2477b8906eb5026de5b7e3b83c9fcd7 100644 --- a/plugins/admin/users/tabs_user.inc +++ b/plugins/admin/users/tabs_user.inc @@ -109,7 +109,7 @@ class usertabs extends tabs $this->set_acl_base(); } - function save($ignore_account = FALSE) + function save() { /* Check for new 'dn', in order to propagate the 'dn' to all plugins */ diff --git a/plugins/config/tabs_configInLdap.inc b/plugins/config/tabs_configInLdap.inc index b4ec56effe32148b08ca860eeb2a951462eeabd8..d50d910964a023e7d7981b4023310e8adde051e4 100644 --- a/plugins/config/tabs_configInLdap.inc +++ b/plugins/config/tabs_configInLdap.inc @@ -20,10 +20,10 @@ class tabs_configInLdap extends tabs { - function save ($ignore_account = FALSE) + function save () { global $config; - parent::save($ignore_account); + parent::save(); $config->check_and_reload(TRUE); $plist = session::global_get('plist'); if ($plist) {