From: cajus Date: Wed, 12 Sep 2007 10:12:32 +0000 (+0000) Subject: Added a first set of reference changes - nearly untested X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0f0cdd3a98e4a9c1fb8c3dde2d2db000f28b44c5;p=gosa.git Added a first set of reference changes - nearly untested git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@7280 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/contrib/gosa.spec b/contrib/gosa.spec index f3c69c21b..a737bfaa8 100644 --- a/contrib/gosa.spec +++ b/contrib/gosa.spec @@ -21,7 +21,7 @@ Vendor: GONICUS GmbH Packager: Lars Scheiter Buildarch: noarch %if %{suse} -Requires: apache2,apache2-mod_php4,php4,php4-gd,php4-ldap,php4-mcrypt,php4-mysql,php4-imap,php4-iconv,php4-mbstring,php4-gettext,php4-session,ImageMagick +Requires: apache2,apache2-mod_php5,php5,php5-gd,php5-ldap,php5-mcrypt,php5-mysql,php5-imap,php5-iconv,php5-mbstring,php5-gettext,php5-session,ImageMagick %else Requires: httpd,php,php-ldap,php-imap,php-snmp,php-mysql,php-mbstring,ImageMagick %endif diff --git a/debian/apache.conf b/debian/apache.conf index 353b04b3a..506892834 100644 --- a/debian/apache.conf +++ b/debian/apache.conf @@ -1,4 +1,4 @@ -# Configuration for GOsa using php4. +# Example configuration for GOsa using PHP 5 # Set alias to gosa Alias /gosa /usr/share/gosa/html diff --git a/debian/changelog b/debian/changelog index 8962925cf..69c4cffe5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ gosa (2.6-1) unstable; urgency=low - * New upstream release + * New major upstream release - -- Cajus Pollmeier Mon, 03 Sep 2007 14:56:46 +0200 + -- Cajus Pollmeier Mon, 03 Sep 2007 14:56:46 +0200 gosa (2.5.13-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 8c617c8f7..b061c8b15 100644 --- a/debian/control +++ b/debian/control @@ -7,8 +7,8 @@ Standards-Version: 3.7.2.2 Package: gosa Architecture: all -Depends: php5 | php4 (>= 4:4.3.10-16), apache | apache-ssl | apache2-mpm-worker | apache2-mpm-threadpool | apache2-mpm-prefork | apache2-mpm-perchild, exim4 | mail-transport-agent, php5-gd | php4-gd, php4-imap | php5-imap, php4-ldap | php5-ldap, php4-mhash | php5-mhash, php4-mysql | php5-mysql, php4-imagick | php5-imagick | imagemagick (>= 5.4.4.5-1) | graphicsmagick-im-compat, fping, libcrypt-smbhash-perl, smarty, php4-recode | php5-recode, wwwconfig-common, smarty-gettext -Suggests: cyrus21-imapd (>= 2.1.11), postfix-ldap, php4-kadm5, etherwake, slapd, gosa-schema +Depends: php5, apache | apache-ssl | apache2-mpm-worker | apache2-mpm-threadpool | apache2-mpm-prefork | apache2-mpm-perchild, exim4 | mail-transport-agent, php5-gd,php5-imap, php5-ldap, php5-mhash, php5-mysql, php5-imagick | imagemagick (>= 5.4.4.5-1) | graphicsmagick-im-compat, fping, libcrypt-smbhash-perl, smarty, php5-recode, wwwconfig-common, smarty-gettext +Suggests: cyrus21-imapd (>= 2.1.11), postfix-ldap, etherwake, slapd, gosa-schema Description: Web Based LDAP Administration Program Provided is access to posix, shadow, samba, proxy, fax, pureftp and kerberos accounts. It is able to manage the postfix/cyrus server diff --git a/debian/rules b/debian/rules index 11cbc9a98..8f0f65432 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,6 @@ # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. # Some lines taken from debmake, by Cristoph Lameter. -SARGE_PACKAGE=`cat debian/changelog | head -n1 | grep sarge` # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -97,11 +96,9 @@ install-stamp: -rm -rf debian/gosa/usr/share/doc/gosa/guide* sed 's%"CONFIG_TEMPLATE_DIR", "../contrib/"%"CONFIG_TEMPLATE_DIR", "/usr/share/doc/gosa/contrib/"%g' debian/gosa/usr/share/gosa/include/functions.inc > debian/gosa/usr/share/gosa/include/functions.inc.new; \ mv debian/gosa/usr/share/gosa/include/functions.inc.new debian/gosa/usr/share/gosa/include/functions.inc; - -if [ -z "${SARGE_PACKAGE}" ]; then \ - rm -rf debian/gosa/usr/share/gosa/include/smarty; \ - sed 's%require("smarty/Smarty.class.php");%require("/usr/share/php/smarty/libs/Smarty.class.php");%g' debian/gosa/usr/share/gosa/include/php_setup.inc > debian/gosa/usr/share/gosa/include/php_setup.inc.new; \ - mv debian/gosa/usr/share/gosa/include/php_setup.inc.new debian/gosa/usr/share/gosa/include/php_setup.inc; \ - fi + rm -rf debian/gosa/usr/share/gosa/include/smarty; \ + sed 's%require("smarty/Smarty.class.php");%require("/usr/share/php/smarty/libs/Smarty.class.php");%g' debian/gosa/usr/share/gosa/include/php_setup.inc > debian/gosa/usr/share/gosa/include/php_setup.inc.new; \ + mv debian/gosa/usr/share/gosa/include/php_setup.inc.new debian/gosa/usr/share/gosa/include/php_setup.inc; \ install -D -m 644 debian/overrides-lintian debian/gosa/usr/share/lintian/overrides/gosa install -D -m 644 debian/overrides-linda debian/gosa/usr/share/linda/overrides/gosa touch install-stamp @@ -132,11 +129,7 @@ binary-indep: install cd debian/gosa && find ./etc -type f -print | sed -e 's#^./#/#' > DEBIAN/conffiles chmod 644 debian/gosa/DEBIAN/conffiles - -if [ -z "${SARGE_PACKAGE}" ]; then \ - dh_gencontrol; \ - else \ - dh_gencontrol -- -cdebian/control.sarge; \ - fi + dh_gencontrol dh_md5sums dh_builddeb diff --git a/html/main.php b/html/main.php index 2a25aa99b..4dfe7477e 100644 --- a/html/main.php +++ b/html/main.php @@ -391,7 +391,7 @@ $_SESSION['plist']= $plist; $_SESSION['config']= $config; /* Echo compilation time */ -//echo "

".get_MicroTimeDiff($start,microtime())."

"; +#echo "

".get_MicroTimeDiff($start,microtime())."

"; // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: ?> diff --git a/include/class_CopyPasteHandler.inc b/include/class_CopyPasteHandler.inc index 2650fc9c9..1d6a1f04a 100644 --- a/include/class_CopyPasteHandler.inc +++ b/include/class_CopyPasteHandler.inc @@ -18,9 +18,9 @@ class CopyPasteHandler { /* Create CP handler */ - function CopyPasteHandler($config) + function CopyPasteHandler(&$config) { - $this->config = $config; + $this->config = &$config; $this->current= NULL; $this->queue = array(); $this->setvar_array = array(); diff --git a/include/class_MultiSelectWindow.inc b/include/class_MultiSelectWindow.inc index 3f1f089c8..9d3b10008 100644 --- a/include/class_MultiSelectWindow.inc +++ b/include/class_MultiSelectWindow.inc @@ -74,9 +74,9 @@ class MultiSelectWindow{ } /* Contrucktion */ - function MultiSelectWindow($config, $filterName, $module) + function MultiSelectWindow(&$config, $filterName, $module) { - $this->config = $config; + $this->config = &$config; $this->module = $module; $this->SaveButtonString = _("Save"); $this->CloseButtonString = _("Close"); diff --git a/include/class_SnapShotDialog.inc b/include/class_SnapShotDialog.inc index 66211bfd0..1431eb4ec 100755 --- a/include/class_SnapShotDialog.inc +++ b/include/class_SnapShotDialog.inc @@ -20,10 +20,10 @@ class SnapShotDialog extends plugin var $last_list = array(); - function SnapShotDialog($config,$dn,$parent) + function SnapShotDialog(&$config, $dn, &$parent) { plugin::plugin($config,$dn); - $this->parent = $parent; + $this->parent = &$parent; $this->ui = get_userinfo(); } diff --git a/include/class_acl.inc b/include/class_acl.inc index 85ed63162..4fbdbe962 100644 --- a/include/class_acl.inc +++ b/include/class_acl.inc @@ -31,7 +31,7 @@ class acl extends plugin var $savedAclContents= array(); var $myAclObjects = array(); - function acl ($config, $parent, $dn= NULL) + function acl (&$config, $parent, $dn= NULL) { /* Include config object */ plugin::plugin($config, $dn); @@ -47,7 +47,7 @@ class acl extends plugin ksort($this->gosaAclEntry); /* Save parent - we've to know more about it than other plugins... */ - $this->parent= $parent; + $this->parent= &$parent; /* Container? */ if (preg_match('/^(o|ou|c|l|dc)=/i', $dn)){ diff --git a/include/class_log.inc b/include/class_log.inc index 462be2892..af687c39e 100644 --- a/include/class_log.inc +++ b/include/class_log.inc @@ -55,7 +55,7 @@ class log { $entry['user']= "unkown"; }else{ - $this->config = $_SESSION['config']; + $this->config = &$_SESSION['config']; $ui = get_userinfo(); $entry['user']= @$ui->dn; } diff --git a/include/class_mail-methods-cyrus.inc b/include/class_mail-methods-cyrus.inc index 3993f96a4..f191fbf07 100644 --- a/include/class_mail-methods-cyrus.inc +++ b/include/class_mail-methods-cyrus.inc @@ -23,9 +23,9 @@ class mailMethodCyrus extends mailMethod var $mbox= "-"; var $config; var $gosaMailServer= ""; -var $uattrib= "uid"; + var $uattrib= "uid"; - function mailMethodCyrus($config) + function mailMethodCyrus(&$config) { $this->config= $config->data['SERVERS']['IMAP']; } diff --git a/include/class_mail-methods-golab.inc b/include/class_mail-methods-golab.inc index 36304f25a..e8d581c6b 100644 --- a/include/class_mail-methods-golab.inc +++ b/include/class_mail-methods-golab.inc @@ -30,7 +30,7 @@ class mailMethodGolab extends mailMethodCyrus "gosaMailQuota" => "cyrus-userquota", "gosaMailServer" => "kolabHomeServer"); - function mailMethodGolab($config) + function mailMethodGolab(&$config) { $this->config= $config->data['SERVERS']['IMAP']; } diff --git a/include/class_mail-methods-kolab.inc b/include/class_mail-methods-kolab.inc index d2eecd487..04027c388 100644 --- a/include/class_mail-methods-kolab.inc +++ b/include/class_mail-methods-kolab.inc @@ -30,7 +30,7 @@ class mailMethodKolab extends mailMethodCyrus "gosaMailQuota" => "cyrus-userquota", "gosaMailServer" => "kolabHomeServer"); - function mailMethodKolab($config) + function mailMethodKolab(&$config) { $this->config= $config->data['SERVERS']['IMAP']; } diff --git a/include/class_mail-methods-sendmail-cyrus.inc b/include/class_mail-methods-sendmail-cyrus.inc index f8cb7c3de..686431ed3 100644 --- a/include/class_mail-methods-sendmail-cyrus.inc +++ b/include/class_mail-methods-sendmail-cyrus.inc @@ -22,7 +22,7 @@ require_once("class_mail-methods-cyrus.inc"); class mailMethodSendmailCyrus extends mailMethodCyrus { - function mailMethodSendmailCyrus($config) + function mailMethodSendmailCyrus(&$config) { $this->config= $config->data['SERVERS']['IMAP']; } diff --git a/include/class_mail-methods.inc b/include/class_mail-methods.inc index 2e67f7eaa..1874648a9 100644 --- a/include/class_mail-methods.inc +++ b/include/class_mail-methods.inc @@ -23,7 +23,7 @@ class mailMethod { var $uattrib= "uid"; - function mailMethod($config) + function mailMethod(&$config) { } diff --git a/include/class_password-methods-kerberos.inc b/include/class_password-methods-kerberos.inc index 4e8ff4862..835ec8bec 100644 --- a/include/class_password-methods-kerberos.inc +++ b/include/class_password-methods-kerberos.inc @@ -23,7 +23,7 @@ class passwordMethodkerberos extends passwordMethod function passwordMethodkerberos($config) { - $this->config=$config; + $this->config= &$config; } function is_available() diff --git a/include/class_password-methods.inc b/include/class_password-methods.inc index e0b96c0db..493cb5cf0 100644 --- a/include/class_password-methods.inc +++ b/include/class_password-methods.inc @@ -64,7 +64,7 @@ class passwordMethod // this function returns all loaded classes for password encryption - function get_available_methods() + static function get_available_methods() { $ret =false; $all = get_declared_classes(); diff --git a/include/class_plugin.inc b/include/class_plugin.inc index c4057ea67..2966e8d44 100644 --- a/include/class_plugin.inc +++ b/include/class_plugin.inc @@ -125,10 +125,10 @@ class plugin \param dn Distinguished name to initialize plugin from \sa plugin() */ - function plugin ($config, $dn= NULL, $parent= NULL) + function plugin (&$config, $dn= NULL, $parent= NULL) { /* Configuration is fine, allways */ - $this->config= $config; + $this->config= &$config; $this->dn= $dn; /* Handle new accounts, don't read information from LDAP */ @@ -1220,14 +1220,14 @@ class plugin points to our ldap snapshot server */ $ldap= $this->config->get_ldap_link(); $ldap->cd($this->config->current['BASE']); - $tmp = $this->config->current; + $cfg= &$this->config->current; /* check if there are special server configurations for snapshots */ - if(isset($tmp['SNAPSHOT_SERVER'])){ - $server = $tmp['SNAPSHOT_SERVER']; - $user = $tmp['SNAPSHOT_USER']; - $password = $tmp['SNAPSHOT_PASSWORD']; - $snapldapbase = $tmp['SNAPSHOT_BASE']; + if(isset($cfg['SNAPSHOT_SERVER'])){ + $server = $cfg['SNAPSHOT_SERVER']; + $user = $cfg['SNAPSHOT_USER']; + $password = $cfg['SNAPSHOT_PASSWORD']; + $snapldapbase = $cfg['SNAPSHOT_BASE']; $ldap_to = new LDAP($user,$password, $server); $ldap_to -> cd ($snapldapbase); show_ldap_error($ldap->get_error(), sprintf(_("Method get available snapshots with dn '%s' failed."),$this->dn)); @@ -1237,7 +1237,7 @@ class plugin /* Prepare bases and some other infos */ $base = $this->config->current['BASE']; - $snap_base = $tmp['SNAPSHOT_BASE']; + $snap_base = $cfg['SNAPSHOT_BASE']; $base_of_object = preg_replace ('/^[^,]+,/i', '', $dn); $new_base = preg_replace("/".normalizePreg($base)."$/","",$base_of_object).$snap_base; $tmp = array(); @@ -1276,14 +1276,14 @@ class plugin points to our ldap snapshot server */ $ldap= $this->config->get_ldap_link(); $ldap->cd($this->config->current['BASE']); - $tmp = $this->config->current; + $cfg= &$this->config->current; /* check if there are special server configurations for snapshots */ - if(isset($tmp['SNAPSHOT_SERVER'])){ - $server = $tmp['SNAPSHOT_SERVER']; - $user = $tmp['SNAPSHOT_USER']; - $password = $tmp['SNAPSHOT_PASSWORD']; - $snapldapbase = $tmp['SNAPSHOT_BASE']; + if(isset($cfg['SNAPSHOT_SERVER'])){ + $server = $cfg['SNAPSHOT_SERVER']; + $user = $cfg['SNAPSHOT_USER']; + $password = $cfg['SNAPSHOT_PASSWORD']; + $snapldapbase = $cfg['SNAPSHOT_BASE']; $ldap_to = new LDAP($user,$password, $server); $ldap_to->cd ($snapldapbase); show_ldap_error($ldap->get_error(), sprintf(_("Method get deleted snapshots with dn '%s' failed."),$this->dn)); @@ -1293,7 +1293,7 @@ class plugin /* Prepare bases */ $base = $this->config->current['BASE']; - $snap_base = $tmp['SNAPSHOT_BASE']; + $snap_base = $cfg['SNAPSHOT_BASE']; $new_base = preg_replace("/".normalizePreg($base)."$/","",$base_of_object).$snap_base; /* Fetch all objects and check if they do not exist anymore */ @@ -1340,14 +1340,14 @@ class plugin $ldap= $this->config->get_ldap_link(); $ldap->cd($this->config->current['BASE']); - $tmp = $this->config->current; + $cfg= &$this->config->current; /* check if there are special server configurations for snapshots */ - if(isset($tmp['SNAPSHOT_SERVER'])){ - $server = $tmp['SNAPSHOT_SERVER']; - $user = $tmp['SNAPSHOT_USER']; - $password = $tmp['SNAPSHOT_PASSWORD']; - $snapldapbase = $tmp['SNAPSHOT_BASE']; + if(isset($cfg['SNAPSHOT_SERVER'])){ + $server = $cfg['SNAPSHOT_SERVER']; + $user = $cfg['SNAPSHOT_USER']; + $password = $cfg['SNAPSHOT_PASSWORD']; + $snapldapbase = $cfg['SNAPSHOT_BASE']; $ldap_to = new LDAP($user,$password, $server); $ldap_to->cd ($snapldapbase); show_ldap_error($ldap->get_error(), sprintf(_("Restore snapshot with dn '%s' failed."),$snapldapbase)); @@ -1556,8 +1556,6 @@ class plugin */ function update_acls($old_dn,$new_dn,$output_changes = FALSE) { - global $config; - /* Check if old_dn is empty. This should never happen */ if(empty($old_dn) || empty($new_dn)){ trigger_error("Failed to check acl dependencies, wrong dn given."); @@ -1575,8 +1573,8 @@ class plugin /* get_ldap configuration */ $update = array(); - $ldap = $config->get_ldap_link(); - $ldap->cd ($config->current['BASE']); + $ldap = $this->config->get_ldap_link(); + $ldap->cd ($this->config->current['BASE']); $ldap->search("(&(objectClass=gosaAcl)(gosaAclEntry=*))",array("cn","gosaAclEntry")); while($attrs = $ldap->fetch()){ diff --git a/include/class_pluglist.inc b/include/class_pluglist.inc index 3468ce3bd..78f290597 100644 --- a/include/class_pluglist.inc +++ b/include/class_pluglist.inc @@ -31,10 +31,10 @@ class pluglist { var $info= array(); var $headlines = array(); - function pluglist($config, $ui) + function pluglist(&$config, &$ui) { - $this->ui= $ui; - $this->config= $config; + $this->ui= &$ui; + $this->config= &$config; /* Create dirlist for all plugins */ $this->dirlist= $this->get_plugins ($this->dirlist, $this->config->data); @@ -56,7 +56,7 @@ class pluglist { $this->info['all']['plSelfModify']= FALSE; } - function get_plugins($list, $config) + function get_plugins($list, &$config) { /* Error reporting, because I'm getting strange messages in PHP 4.2.x */ if (!isset($config['PATH']) && !isset($config['CLASS'])){ diff --git a/include/class_tabs.inc b/include/class_tabs.inc index 3be731dcb..cb9bee89d 100644 --- a/include/class_tabs.inc +++ b/include/class_tabs.inc @@ -33,155 +33,145 @@ class tabs var $by_object= array(); var $SubDialog = false; - function tabs($config, $data, $dn, $acl_category= "") + function tabs(&$config, $data, $dn, $acl_category= "") { - /* Save dn */ - $this->dn= $dn; - $this->config= $config; - - $baseobject= NULL; - - foreach ($data as $tab){ - $this->by_name[$tab['CLASS']]= $tab['NAME']; - - if ($baseobject == NULL){ - $baseobject= new $tab['CLASS']($this->config, $this->dn); - $this->by_object[$tab['CLASS']]= $baseobject; - } else { - $this->by_object[$tab['CLASS']]= new $tab['CLASS']($this->config, $this->dn, $baseobject); - } - - $this->by_object[$tab['CLASS']]->parent= &$this; - $this->by_object[$tab['CLASS']]->set_acl_category($acl_category); - - /* Initialize current */ - if ($this->current == ""){ - $this->current= $tab['CLASS']; - } - } + /* Save dn */ + $this->dn= $dn; + $this->config= &$config; + + $baseobject= NULL; + + foreach ($data as &$tab){ + $this->by_name[$tab['CLASS']]= $tab['NAME']; + + if ($baseobject == NULL){ + $baseobject= new $tab['CLASS']($this->config, $this->dn); + $this->by_object[$tab['CLASS']]= $baseobject; + } else { + $this->by_object[$tab['CLASS']]= new $tab['CLASS']($this->config, $this->dn, $baseobject); + } + + $this->by_object[$tab['CLASS']]->parent= &$this; + $this->by_object[$tab['CLASS']]->set_acl_category($acl_category); + + /* Initialize current */ + if ($this->current == ""){ + $this->current= $tab['CLASS']; + } + } } function execute() { - /* Rotate current to last */ - $this->last= $this->current; - - /* Look for pressed tab button */ - foreach ($this->by_object as $class => $obj){ - if (isset($_POST[$class]) || (isset($_POST['arg']) && $_POST['arg'] == "$class")){ - $this->current= $class; - break; - } - } - - /* Save last tab object */ - if ($this->last == $this->current){ - $this->save_object(TRUE); - } else { - $this->save_object(FALSE); - } - - /* Build tab line */ - $display= $this->gen_tabs(); - - /* Show object */ - $display.= "\n"; - $display.= "
\n"; - - $obj= $this->by_object[$this->current]; - $display.= $obj->execute(); - if (is_php4()){ - $this->by_object[$this->current]= $obj; - } + /* Rotate current to last */ + $this->last= $this->current; + + /* Look for pressed tab button */ + foreach ($this->by_object as $class => &$obj){ + if (isset($_POST[$class]) || (isset($_POST['arg']) && $_POST['arg'] == "$class")){ + $this->current= $class; + break; + } + } + + /* Save last tab object */ + if ($this->last == $this->current){ + $this->save_object(TRUE); + } else { + $this->save_object(FALSE); + } + + /* Build tab line */ + $display= $this->gen_tabs(); + + /* Show object */ + $display.= "\n"; + $display.= "
\n"; - /* Footer for tabbed dialog */ - $display.= "
"; - return ($display); + $display.= $this->by_object[$this->current]->execute(); + + /* Footer for tabbed dialog */ + $display.= "
"; + + return ($display); } function save_object($save_current= FALSE) { - /* Save last tab */ - if ($this->last != ""){ - @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, - $this->last, "Saving"); - - $obj= $this->by_object[$this->last]; - $obj->save_object (); - if (is_php4()){ - $this->by_object[$this->last]= $obj; + /* Save last tab */ + if ($this->last != ""){ + @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, + $this->last, "Saving"); + + $this->by_object[$this->last]->save_object (); } - } - /* Skip if curent and last are the same object */ - if ($this->last == $this->current){ - return; - } + /* Skip if curent and last are the same object */ + if ($this->last == $this->current){ + return; + } - $obj= $this->by_object[$this->current]; - $this->disabled= $obj->parent->disabled; + $obj= @$this->by_object[$this->current]; + $this->disabled= $obj->parent->disabled; - if ($save_current){ - @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, - $this->current, "Saving (current)"); + if ($save_current){ + @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, + $this->current, "Saving (current)"); - $obj->save_object (); - if (is_php4()){ - $this->by_object[$this->current]= $obj; + $obj->save_object (); } - } } function gen_tabs() { - $display= ""; - $display.= ""; - $index= 0; - $style= array("tab_left", "tab_active", "tab_near_active", "tab_right"); - foreach ($this->by_name as $class => $name){ - - /* Activate right tabs with style "tab_right" - Activate near current with style "tab_near_active" */ - if ($index == 2 || $index == 1){ - $index++; - } - - /* Activate current tab with style "tab_active " */ - if ($class == $this->current){ - $index++; - } - - /* Paint tab */ - $display.= "
"; - - /* Shorten string if its too long for the tab headers*/ - $title= _($name); - if (mb_strlen($title, 'UTF-8') > 28){ - $title= mb_substr($title,0, 25, 'UTF-8')."..."; - } - - /* nobr causes w3c warnings so we use   to keep the tab name in one line */ - $title= preg_replace("/ /"," ",$title); - - /* Take care about notifications */ - if ($this->by_object[$class]->pl_notify){ - $notify= "id=\"notify\""; - } else { - $notify= ""; + $display= ""; + $display.= ""; + $index= 0; + $style= array("tab_left", "tab_active", "tab_near_active", "tab_right"); + foreach ($this->by_name as $class => $name){ + + /* Activate right tabs with style "tab_right" + Activate near current with style "tab_near_active" */ + if ($index == 2 || $index == 1){ + $index++; + } + + /* Activate current tab with style "tab_active " */ + if ($class == $this->current){ + $index++; + } + + /* Paint tab */ + $display.= "
"; + + /* Shorten string if its too long for the tab headers*/ + $title= _($name); + if (mb_strlen($title, 'UTF-8') > 28){ + $title= mb_substr($title,0, 25, 'UTF-8')."..."; + } + + /* nobr causes w3c warnings so we use   to keep the tab name in one line */ + $title= preg_replace("/ /"," ",$title); + + /* Take care about notifications */ + if ($this->by_object[$class]->pl_notify){ + $notify= "id=\"notify\""; + } else { + $notify= ""; + } + + if ($_SESSION['js']==FALSE){ + $display.= "
$title\n"; + $display.= "
 
"; - if ($_SESSION['js']==FALSE){ - $display.= "
$title\n"; - $display.= "
 
"; - - return($display); + return($display); } @@ -193,31 +183,33 @@ class tabs function delete() { - /* Check if all plugins will ACK for deletion */ - foreach (array_reverse($this->by_object) as $key => $obj){ - $reason= $obj->allow_remove(); - if ($reason != ""){ - print_red(sprintf(_("Delete process has been canceled by plugin '%s': %s"), $key, $reason)); - return; - } - } - - /* Delete for all plugins */ - foreach (array_reverse($this->by_object) as $key => $obj){ - $obj->remove_from_parent(); - } + /* Check if all plugins will ACK for deletion */ +echo "F"; + foreach (array_reverse($this->by_object) as $key => $obj){ + $reason= $obj->allow_remove(); + if ($reason != ""){ + print_red(sprintf(_("Delete process has been canceled by plugin '%s': %s"), $key, $reason)); + return; + } + } + + /* Delete for all plugins */ +echo "F"; + foreach (array_reverse($this->by_object) as $obj){ + $obj->remove_from_parent(); + } } function password_change_needed() { - /* Ask all plugins for needed password changes */ - foreach ($this->by_object as $key => $obj){ - if ($obj->password_change_needed()){ - return TRUE; - } - } - - return FALSE; + /* Ask all plugins for needed password changes */ + foreach ($this->by_object as &$obj){ + if ($obj->password_change_needed()){ + return TRUE; + } + } + + return FALSE; } function check($ignore_account= FALSE) @@ -228,27 +220,24 @@ class tabs $current_set = FALSE; /* Check all plugins */ - foreach ($this->by_object as $key => $obj){ + foreach ($this->by_object as $key => &$obj){ if ($obj->is_account || $ignore_account || $obj->ignore_account){ @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__,$key, "Checking"); $msg = $obj->check(); - if (is_php4()){ - $this->by_object[$key]= $obj; - } if (count($msg)){ - $this->by_object[$key]->pl_notify= TRUE; + $obj->pl_notify= TRUE; if(!$current_set){ $current_set = TRUE; $this->current= $key; $messages = $msg; } }else{ - $this->by_object[$key]->pl_notify= FALSE; + $obj->pl_notify= FALSE; } }else{ - $this->by_object[$key]->pl_notify= FALSE; + $obj->pl_notify= FALSE; } } return ($messages); @@ -256,35 +245,32 @@ class tabs function save($ignore_account= FALSE) { - /* Save all plugins */ - foreach ($this->by_object as $key => $obj){ - @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, - $key, "Saving"); - - $obj->dn= $this->dn; - - if ($obj->is_account || $ignore_account || $obj->ignore_account){ - if ($obj->save() == 1){ - return (1); - } - } else { - $obj->remove_from_parent(); - } - } - return (0); + /* Save all plugins */ + foreach ($this->by_object as $key => &$obj){ + @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, + $key, "Saving"); + + $obj->dn= $this->dn; + + if ($obj->is_account || $ignore_account || $obj->ignore_account){ + if ($obj->save() == 1){ + return (1); + } + } else { + $obj->remove_from_parent(); + } + } + return (0); } function adapt_from_template($dn) { - foreach ($this->by_object as $key => $obj){ - @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, - $key, "Adapting"); - $obj->parent= &$this; - $obj->adapt_from_template($dn); - if (is_php4()){ - $this->by_object[$key]= $obj; - } - } + foreach ($this->by_object as $key => &$obj){ + @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, + $key, "Adapting"); + $obj->parent= &$this; + $obj->adapt_from_template($dn); + } } @@ -292,9 +278,9 @@ class tabs */ function saveCopyDialog() { - foreach ($this->by_object as $key => $obj){ + foreach ($this->by_object as &$obj){ if($obj->is_account){ - $this->by_object[$key]->saveCopyDialog(); + $obj->saveCopyDialog(); } } } @@ -306,9 +292,9 @@ class tabs { $ret = ""; $this->SubDialog = false; - foreach ($this->by_object as $key => $obj){ + foreach ($this->by_object as &$obj){ if($obj->is_account){ - $tmp = $this->by_object[$key]->getCopyDialog(); + $tmp = $obj->getCopyDialog(); if($tmp['status'] == "SubDialog"){ $this->SubDialog = true; return($tmp['string']); @@ -326,28 +312,27 @@ class tabs function addSpecialTabs() { - $this->by_name['acl']= _("ACL"); - $this->by_object['acl']= new acl($this->config, $this, $this->dn); - $this->by_object['acl']->parent= &$this; - $this->by_name['reference']= _("References"); - $this->by_object['reference']= new reference($this->config, $this->dn); - $this->by_object['reference']->parent= &$this; + $this->by_name['acl']= _("ACL"); + $this->by_object['acl']= new acl($this->config, $this, $this->dn); + $this->by_object['acl']->parent= &$this; + $this->by_name['reference']= _("References"); + $this->by_object['reference']= new reference($this->config, $this->dn); + $this->by_object['reference']->parent= &$this; } function set_acl_base($base= "") { - /* Update reference, transfer variables */ - $first= ($base == ""); - foreach ($this->by_object as $name => $obj){ - if ($first){ - $first= FALSE; - $base= $obj->acl_base; - } else { - $obj->set_acl_base($base); - $this->by_object[$name]= $obj; - } - } + /* Update reference, transfer variables */ + $first= ($base == ""); + foreach ($this->by_object as &$obj){ + if ($first){ + $first= FALSE; + $base= $obj->acl_base; + } else { + $obj->set_acl_base($base); + } + } } } diff --git a/include/class_userinfo.inc b/include/class_userinfo.inc index 783b66822..ac33f535d 100644 --- a/include/class_userinfo.inc +++ b/include/class_userinfo.inc @@ -37,8 +37,8 @@ class userinfo /* get acl's an put them into the userinfo object attr subtreeACL (userdn:components, userdn:component1#sub1#sub2,component2,...) */ - function userinfo($config, $userdn){ - $this->config= $config; + function userinfo(&$config, $userdn){ + $this->config= &$config; $ldap= $this->config->get_ldap_link(); $ldap->cat($userdn,array('sn', 'givenName', 'uid', 'gidNumber', 'preferredLanguage', 'gosaUnitTag')); $attrs= $ldap->fetch(); @@ -286,11 +286,6 @@ class userinfo } } - /* Load departments here, if we are using php4 */ - if(is_php4() && !count($this->config->departments)){ - $this->config->get_departments(); - } - /* For all gosaDepartments */ foreach ($this->config->departments as $dn){ $acl= array("r" => "", "w" => "", "c" => "", "d" => "", "m" => "", "a" => ""); diff --git a/include/functions.inc b/include/functions.inc index 7c559dbbe..0d27f10b1 100644 --- a/include/functions.inc +++ b/include/functions.inc @@ -745,7 +745,7 @@ function get_module_permission() } -function get_userinfo() +function &get_userinfo() { global $ui; @@ -753,7 +753,7 @@ function get_userinfo() } -function get_smarty() +function &get_smarty() { global $smarty; @@ -1335,7 +1335,7 @@ function is_global($name) } -function get_global($name) +function &get_global($name) { return $_SESSION[$name]; } @@ -1966,7 +1966,7 @@ function array_key_ics($ikey, $items) } -function search_config($arr, $name, $return) +function search_config(&$arr, $name, $return) { if (is_array($arr)){ foreach ($arr as $a){ @@ -2170,14 +2170,6 @@ function gosa_ldap_explode_dn($dn,$config = NULL,$verify_in_ldap=false) return($ret); } -function is_php4() -{ - if (isset($_SESSION['PHP4COMPATIBLE'])){ - return true; - } - return (preg_match('/^4/', phpversion())); -} - /* Add "str_split" if this function is missing. * This function is only available in PHP5 */ diff --git a/include/sieve/class_sieveManagement.inc b/include/sieve/class_sieveManagement.inc index 90b4b54ef..a300ea2ac 100644 --- a/include/sieve/class_sieveManagement.inc +++ b/include/sieve/class_sieveManagement.inc @@ -58,7 +58,7 @@ class sieveManagement extends plugin /* Initialize the class and load all sieve scripts * try to parse them and display errors */ - function sieveManagement($config,$dn,$parent,$uattrib) + function sieveManagement(&$config,$dn,&$parent,$uattrib) { /* Check given parameter */ if(!isset($parent->$uattrib)){ @@ -66,7 +66,7 @@ class sieveManagement extends plugin } $this->uattrib = $uattrib; - $this->parent = $parent; + $this->parent = &$parent; plugin::plugin($config,$dn); /* Get sieve, if this fail abort class initialization */ diff --git a/plugins/addons/addressbook/class_addressbook.inc b/plugins/addons/addressbook/class_addressbook.inc index 730d6367c..a2eb279b5 100644 --- a/plugins/addons/addressbook/class_addressbook.inc +++ b/plugins/addons/addressbook/class_addressbook.inc @@ -56,10 +56,10 @@ class addressbook extends plugin var $abobjectclass= "dc=addressbook"; - function addressbook ($config, $dn= NULL) + function addressbook (&$config, $dn= NULL) { /* Include config object */ - $this->config= $config; + $this->config= &$config; /* Check if there is a special ldap-sub-tree specified, instead of dc=addressbook, */ $aoc = search_config($this->config->data['MENU'], "addressbook", "LDAP_OBJECT_CLASS"); diff --git a/plugins/addons/godfs/class_dfsManagment.inc b/plugins/addons/godfs/class_dfsManagment.inc index 0ad7ee431..f1f9b04d8 100644 --- a/plugins/addons/godfs/class_dfsManagment.inc +++ b/plugins/addons/godfs/class_dfsManagment.inc @@ -17,10 +17,10 @@ class dfsManagment extends plugin { var $dfstab = NULL; /* The constructor just saves a copy of the config. You may add what ever you need. */ - function dfsManagment ($config, $ui) { + function dfsManagment (&$config, &$ui) { /* save config for later use */ - $this->config = $config; - $this->ui = $ui; + $this->config = &$config; + $this->ui = &$ui; } diff --git a/plugins/addons/godfs/class_dfsgeneric.inc b/plugins/addons/godfs/class_dfsgeneric.inc index 8f4f7d3cb..b8c3f4da6 100644 --- a/plugins/addons/godfs/class_dfsgeneric.inc +++ b/plugins/addons/godfs/class_dfsgeneric.inc @@ -14,9 +14,8 @@ var $attributes = array(); var $objectclasses = array(); - function dfsgeneric($config, $dn) { + function dfsgeneric(&$config, $dn) { plugin::plugin($config, $dn); - $this->config = $config; $this->dn = $dn; $this->orig_dn = $dn; } diff --git a/plugins/addons/gotomasses/class_goto_task.inc b/plugins/addons/gotomasses/class_goto_task.inc index 0da6a9b2a..589fefe88 100644 --- a/plugins/addons/gotomasses/class_goto_task.inc +++ b/plugins/addons/gotomasses/class_goto_task.inc @@ -33,13 +33,13 @@ class goto_task extends plugin var $configure_dhcp = FALSE; var $configure_dns = FALSE; - function goto_task($config,$parent,$data = array()) + function goto_task(&$config, &$parent, $data = array()) { /* Set parent object */ - $this->parent = $parent; + $this->parent = &$parent; /* Intialize plugin */ - $this->config = $config; + $this->config = &$config; if(count($data)){ $tmp = $this->get_array_values(); foreach($this->attributes as $attr){ diff --git a/plugins/addons/gotomasses/class_gotomasses.inc b/plugins/addons/gotomasses/class_gotomasses.inc index 79bfcbf46..67d4d3946 100644 --- a/plugins/addons/gotomasses/class_gotomasses.inc +++ b/plugins/addons/gotomasses/class_gotomasses.inc @@ -20,10 +20,10 @@ class gotomasses extends plugin var $ids_to_remove = array(); - function gotomasses($config, $dn= NULL) + function gotomasses(&$config, $dn= NULL) { /* Include config object */ - $this->config= $config; + $this->config= &$config; /* Define source file */ $this->data_file = CONFIG_DIR."/gotomasses_machines"; diff --git a/plugins/addons/gotomasses/class_target_list.inc b/plugins/addons/gotomasses/class_target_list.inc index 248f59428..703454e4c 100644 --- a/plugins/addons/gotomasses/class_target_list.inc +++ b/plugins/addons/gotomasses/class_target_list.inc @@ -25,7 +25,7 @@ class target_list extends MultiSelectWindow var $ui ; - function target_list($config,$Targets_used) + function target_list(&$config,$Targets_used) { MultiSelectWindow::MultiSelectWindow($config, "Targetselection", array("ogroup","gotomasses")); diff --git a/plugins/addons/ldapmanager/class_csvimport.inc b/plugins/addons/ldapmanager/class_csvimport.inc index 95d96fd7a..66131ca21 100644 --- a/plugins/addons/ldapmanager/class_csvimport.inc +++ b/plugins/addons/ldapmanager/class_csvimport.inc @@ -15,10 +15,10 @@ class csvimport extends plugin var $objectclasses= array(); var $view_logged = FALSE; - function csvimport ($config, $dn= NULL) + function csvimport (&$config, $dn= NULL) { /* Include config object */ - $this->config= $config; + $this->config= &$config; $this->ui = get_userinfo(); } diff --git a/plugins/addons/ldapmanager/class_export.inc b/plugins/addons/ldapmanager/class_export.inc index 64ea7c309..aa988a312 100644 --- a/plugins/addons/ldapmanager/class_export.inc +++ b/plugins/addons/ldapmanager/class_export.inc @@ -11,10 +11,10 @@ class ldifexport extends plugin var $objectclasses= array(); var $view_logged = FALSE; - function ldifexport ($config, $dn= NULL) + function ldifexport (&$config, $dn= NULL) { /* Include config object */ - $this->config= $config; + $this->config= &$config; $this->ui = get_userinfo(); } diff --git a/plugins/addons/ldapmanager/class_exportxls.inc b/plugins/addons/ldapmanager/class_exportxls.inc index 10100dadb..3331cbacd 100644 --- a/plugins/addons/ldapmanager/class_exportxls.inc +++ b/plugins/addons/ldapmanager/class_exportxls.inc @@ -14,10 +14,10 @@ class xlsexport extends plugin var $ui; var $view_logged = FALSE; - function xlsexport ($config, $dn= NULL) + function xlsexport (&$config, $dn= NULL) { /* Include config object */ - $this->config= $config; + $this->config= &$config; $this->ui = get_userinfo(); } diff --git a/plugins/addons/ldapmanager/class_import.inc b/plugins/addons/ldapmanager/class_import.inc index ca5a02ea0..71edbb2a2 100644 --- a/plugins/addons/ldapmanager/class_import.inc +++ b/plugins/addons/ldapmanager/class_import.inc @@ -13,10 +13,10 @@ class ldifimport extends plugin var $ui; var $view_logged = FALSE; - function ldifimport ($config, $dn= NULL) + function ldifimport (&$config, $dn= NULL) { /* Include config object */ - $this->config= $config; + $this->config= &$config; $this->ui = get_userinfo(); } diff --git a/plugins/addons/ldapmanager/class_ldif.inc b/plugins/addons/ldapmanager/class_ldif.inc index 8f0c783ec..d24e208fb 100644 --- a/plugins/addons/ldapmanager/class_ldif.inc +++ b/plugins/addons/ldapmanager/class_ldif.inc @@ -12,7 +12,7 @@ class ldif extends plugin var $objectclasses= array(); var $ldif; - function ldif ($config) + function ldif (&$config) { /* Include config object */ $this->ldif= new ldiftab($config, $config->data['TABS']['LDIFTAB'], ""); diff --git a/plugins/addons/logview/class_gosa_logview.inc b/plugins/addons/logview/class_gosa_logview.inc index bc81e16ae..6bd5d940f 100644 --- a/plugins/addons/logview/class_gosa_logview.inc +++ b/plugins/addons/logview/class_gosa_logview.inc @@ -25,10 +25,10 @@ class gosa_logview extends plugin var $view_logged = FALSE; - function gosa_logview ($config, $dn= NULL) + function gosa_logview (&$config, $dn= NULL) { /* Include config object */ - $this->config= $config; + $this->config= &$config; $this->ui = get_userinfo(); /* Restore last filter settings */ diff --git a/plugins/addons/logview/class_logview.inc b/plugins/addons/logview/class_logview.inc index 22bd6ad1d..b5eb5bdd3 100644 --- a/plugins/addons/logview/class_logview.inc +++ b/plugins/addons/logview/class_logview.inc @@ -21,10 +21,10 @@ class logview extends plugin var $range = 25; var $view_logged = FALSE; - function logview ($config, $dn= NULL) + function logview (&$config, $dn= NULL) { /* Include config object */ - $this->config= $config; + $this->config= &$config; /* Get global filter config */ if (!is_global("logfilter")){ diff --git a/plugins/addons/mailqueue/class_mailqueue.inc b/plugins/addons/mailqueue/class_mailqueue.inc index f33ba88b7..7d8762107 100644 --- a/plugins/addons/mailqueue/class_mailqueue.inc +++ b/plugins/addons/mailqueue/class_mailqueue.inc @@ -21,9 +21,9 @@ class mailqueue extends plugin var $range = 20; var $view_logged = FALSE; - function mailqueue($config, $dn= NULL) + function mailqueue(&$config, $dn= NULL) { - $this->config = $config; + $this->config = &$config; if (isset($this->config->current['MAILQUEUESCRIPTPATH'])){ $this->mailQueueScript = $this->config->current['MAILQUEUESCRIPTPATH']; } diff --git a/plugins/addons/notifications/class_msgplug.inc b/plugins/addons/notifications/class_msgplug.inc index 363a980b5..f21292ac5 100644 --- a/plugins/addons/notifications/class_msgplug.inc +++ b/plugins/addons/notifications/class_msgplug.inc @@ -25,10 +25,10 @@ class msgplug extends plugin var $module = "msgplug"; var $view_logged = FALSE; - function msgplug ($config, $dn= NULL) + function msgplug (&$config, $dn= NULL) { /* Include config object */ - $this->config= $config; + $this->config= &$config; $ui= get_userinfo(); $tag= $ui->gosaUnitTag; diff --git a/plugins/admin/acl/class_aclManagement.inc b/plugins/admin/acl/class_aclManagement.inc index 04839ad30..99457bc34 100644 --- a/plugins/admin/acl/class_aclManagement.inc +++ b/plugins/admin/acl/class_aclManagement.inc @@ -36,11 +36,11 @@ class aclManagement extends plugin var $CopyPasteHandler; var $start_pasting_copied_objects = FALSE; - function aclManagement($config, $ui) + function aclManagement(&$config, &$ui) { /* Save configuration for internal use */ - $this->config = $config; - $this->ui = $ui; + $this->config = &$config; + $this->ui = &$ui; /* Copy & Paste enabled ?*/ if((isset($this->config->data['MAIN']['ENABLECOPYPASTE']))&&(preg_match("/true/i",$this->config->data['MAIN']['ENABLECOPYPASTE']))){ diff --git a/plugins/admin/acl/class_aclRole.inc b/plugins/admin/acl/class_aclRole.inc index aab0e6ec1..0744742f8 100644 --- a/plugins/admin/acl/class_aclRole.inc +++ b/plugins/admin/acl/class_aclRole.inc @@ -33,7 +33,7 @@ class aclrole extends acl var $orig_dn; var $base =""; - function aclrole ($config, $dn= NULL) + function aclrole (&$config, $dn= NULL) { /* Include config object */ plugin::plugin($config, $dn); diff --git a/plugins/admin/acl/class_divListACL.inc b/plugins/admin/acl/class_divListACL.inc index 56d0d2662..f7068fedd 100644 --- a/plugins/admin/acl/class_divListACL.inc +++ b/plugins/admin/acl/class_divListACL.inc @@ -20,11 +20,11 @@ class divListACL extends MultiSelectWindow var $action_col_size; - function divListACL ($config,$parent) + function divListACL (&$config, &$parent) { MultiSelectWindow::MultiSelectWindow($config, "ACLs", "acl"); - $this->parent = $parent; + $this->parent = &$parent; $this->ui = get_userinfo(); /* Set list strings */ diff --git a/plugins/admin/applications/class_applicationGeneric.inc b/plugins/admin/applications/class_applicationGeneric.inc index b895dfd41..5e8ee67da 100644 --- a/plugins/admin/applications/class_applicationGeneric.inc +++ b/plugins/admin/applications/class_applicationGeneric.inc @@ -29,7 +29,7 @@ class application extends plugin var $isReleaseApplikation = false; - function application ($config, $dn= NULL, $parent= NULL) + function application (&$config, $dn= NULL, $parent= NULL) { plugin::plugin ($config, $dn, $parent); diff --git a/plugins/admin/applications/class_applicationManagement.inc b/plugins/admin/applications/class_applicationManagement.inc index bf562185c..fd0104482 100644 --- a/plugins/admin/applications/class_applicationManagement.inc +++ b/plugins/admin/applications/class_applicationManagement.inc @@ -44,11 +44,11 @@ class applicationManagement extends plugin return(false); } - function applicationManagement ($config, $ui) + function applicationManagement (&$config, &$ui) { /* Save configuration for internal use */ - $this->config = $config; - $this->ui = $ui; + $this->config = &$config; + $this->ui = &$ui; /* Check if copy & paste is activated */ if($this->config->boolValueIsTrue("MAIN","ENABLECOPYPASTE")){ diff --git a/plugins/admin/applications/class_applicationParameters.inc b/plugins/admin/applications/class_applicationParameters.inc index 34edcdb9f..af3d2d422 100644 --- a/plugins/admin/applications/class_applicationParameters.inc +++ b/plugins/admin/applications/class_applicationParameters.inc @@ -16,7 +16,7 @@ class applicationParameters extends plugin var $CopyPasteVars = array("option_name","option_value"); - function applicationParameters ($config, $dn= NULL, $parent= NULL) + function applicationParameters (&$config, $dn= NULL, $parent= NULL) { plugin::plugin ($config, $dn, $parent); diff --git a/plugins/admin/applications/class_divListApplication.inc b/plugins/admin/applications/class_divListApplication.inc index 3cfeea35d..0e4ae0230 100755 --- a/plugins/admin/applications/class_divListApplication.inc +++ b/plugins/admin/applications/class_divListApplication.inc @@ -18,13 +18,13 @@ class divListApplication extends MultiSelectWindow var $SaveAdditionalVars = array("selectedRelease"); - function divListApplication ($config,$parent) + function divListApplication (&$config,&$parent) { MultiSelectWindow::MultiSelectWindow($config,"Application", "application"); $this->selectedRelease = "ou=apps,".$_SESSION['CurrentMainBase']; - $this->parent = $parent; + $this->parent = &$parent; $this->ui = get_userinfo(); /* Set list strings */ diff --git a/plugins/admin/departments/class_departmentGeneric.inc b/plugins/admin/departments/class_departmentGeneric.inc index 44079824d..ba32c90e7 100644 --- a/plugins/admin/departments/class_departmentGeneric.inc +++ b/plugins/admin/departments/class_departmentGeneric.inc @@ -60,7 +60,7 @@ class department extends plugin var $orig_base = ""; var $orig_ou = ""; - function department ($config, $dn) + function department (&$config, $dn) { plugin::plugin($config, $dn); diff --git a/plugins/admin/departments/class_departmentManagement.inc b/plugins/admin/departments/class_departmentManagement.inc index 05aa89ebc..db43a0544 100644 --- a/plugins/admin/departments/class_departmentManagement.inc +++ b/plugins/admin/departments/class_departmentManagement.inc @@ -45,11 +45,11 @@ class departmentManagement extends plugin var $ObjectTaggingRequested = false; // Object must be tagged, an iframe will be shown. var $RecursiveRemoveRequested = false; // Is true, if this object must be moved, an iframe will be displayed in this case - function departmentManagement ($config, $ui) + function departmentManagement (&$config, &$ui) { - $this->ui= $ui; + $this->ui= &$ui; $this->dn= ""; - $this->config= $config; + $this->config= &$config; $this->DivListDepartment = new divListDepartment($this->config,$this); } diff --git a/plugins/admin/departments/class_divListDepartment.inc b/plugins/admin/departments/class_divListDepartment.inc index 6e1c66765..675c5b0a8 100755 --- a/plugins/admin/departments/class_divListDepartment.inc +++ b/plugins/admin/departments/class_divListDepartment.inc @@ -16,11 +16,11 @@ class divListDepartment extends MultiSelectWindow var $parent ; var $ui ; - function divListDepartment ($config,$parent) + function divListDepartment (&$config, &$parent) { MultiSelectWindow::MultiSelectWindow($config, "Department", "department"); - $this->parent = $parent; + $this->parent = &$parent; $this->ui = get_userinfo(); /* Set list strings */ diff --git a/plugins/admin/fai/class_askClassName.inc b/plugins/admin/fai/class_askClassName.inc index d6bf8cca3..be6a2dec1 100644 --- a/plugins/admin/fai/class_askClassName.inc +++ b/plugins/admin/fai/class_askClassName.inc @@ -17,7 +17,7 @@ class askClassName extends plugin var $ClassName = ""; var $ClassAlreadyExists = false; - function askClassName ($config, $dn= NULL,$ui = false, $objectClass) + function askClassName (&$config, $dn= NULL,$ui = false, $objectClass) { $this->ui = $ui; $this->objectClass = $objectClass; diff --git a/plugins/admin/fai/class_divListFai.inc b/plugins/admin/fai/class_divListFai.inc index d586dec92..860be1ac2 100644 --- a/plugins/admin/fai/class_divListFai.inc +++ b/plugins/admin/fai/class_divListFai.inc @@ -26,7 +26,7 @@ class divListFai extends MultiSelectWindow var $SaveAdditionalVars = array("selectedBranch"); - function divListFai ($config,$parent) + function divListFai (&$config,$parent) { MultiSelectWindow::MultiSelectWindow($config, "Fai", "fai"); diff --git a/plugins/admin/fai/class_faiHook.inc b/plugins/admin/fai/class_faiHook.inc index b68058fd4..48b560c1b 100644 --- a/plugins/admin/fai/class_faiHook.inc +++ b/plugins/admin/fai/class_faiHook.inc @@ -39,7 +39,7 @@ class faiHook extends plugin var $FAIstate = ""; var $ui; - function faiHook ($config, $dn= NULL) + function faiHook (&$config, $dn= NULL) { /* Load Attributes */ plugin::plugin ($config, $dn); diff --git a/plugins/admin/fai/class_faiHookEntry.inc b/plugins/admin/fai/class_faiHookEntry.inc index 52b4e76b0..0d12d8e35 100644 --- a/plugins/admin/fai/class_faiHookEntry.inc +++ b/plugins/admin/fai/class_faiHookEntry.inc @@ -25,7 +25,7 @@ class faiHookEntry extends plugin var $parent = NULL; var $FAIstate = ""; - function faiHookEntry ($config, $dn= NULL,$object=false) + function faiHookEntry (&$config, $dn= NULL,$object=false) { plugin::plugin ($config, $dn); if($dn != "new"){ diff --git a/plugins/admin/fai/class_faiManagement.inc b/plugins/admin/fai/class_faiManagement.inc index 20c50d07b..d2d7756d3 100644 --- a/plugins/admin/fai/class_faiManagement.inc +++ b/plugins/admin/fai/class_faiManagement.inc @@ -61,7 +61,7 @@ class faiManagement extends plugin /* construction/reconstruction */ - function faiManagement ($config, $ui) + function faiManagement (&$config, $ui) { /* Set defaults */ $this->dn = ""; diff --git a/plugins/admin/fai/class_faiPackage.inc b/plugins/admin/fai/class_faiPackage.inc index e607b6016..a14352d65 100644 --- a/plugins/admin/fai/class_faiPackage.inc +++ b/plugins/admin/fai/class_faiPackage.inc @@ -63,7 +63,7 @@ class faiPackage extends plugin "pending", "dpkgc" ); - function faiPackage ($config, $dn= NULL) + function faiPackage (&$config, $dn= NULL) { /* Load Attributes */ plugin::plugin ($config, $dn); diff --git a/plugins/admin/fai/class_faiPackageConfiguration.inc b/plugins/admin/fai/class_faiPackageConfiguration.inc index 63c2f90d5..18f3e2b6c 100644 --- a/plugins/admin/fai/class_faiPackageConfiguration.inc +++ b/plugins/admin/fai/class_faiPackageConfiguration.inc @@ -16,7 +16,7 @@ class faiPackageConfiguration extends plugin var $pkg_config ; var $obj; - function faiPackageConfiguration ($config, $dn= NULL,$obj,$path,$pkg_config) + function faiPackageConfiguration (&$config, $dn= NULL,$obj,$path,$pkg_config) { plugin::plugin ($config, $dn); $this->obj = $obj; diff --git a/plugins/admin/fai/class_faiPackageEntry.inc b/plugins/admin/fai/class_faiPackageEntry.inc index d522a6ab8..1b22ba869 100644 --- a/plugins/admin/fai/class_faiPackageEntry.inc +++ b/plugins/admin/fai/class_faiPackageEntry.inc @@ -21,7 +21,7 @@ class faiPackageEntry extends plugin /* Array with available class names */ var $FAIAllclasses = array(); - function faiPackageEntry ($config, $dn= NULL,$pkgs,$selected=array()) + function faiPackageEntry (&$config, $dn= NULL,$pkgs,$selected=array()) { plugin::plugin ($config, $dn); diff --git a/plugins/admin/fai/class_faiPartitionTable.inc b/plugins/admin/fai/class_faiPartitionTable.inc index 2920d02bd..df1b8a53e 100644 --- a/plugins/admin/fai/class_faiPartitionTable.inc +++ b/plugins/admin/fai/class_faiPartitionTable.inc @@ -24,7 +24,7 @@ class faiPartitionTable extends plugin var $view_logged = FALSE; - function faiPartitionTable ($config, $dn= NULL) + function faiPartitionTable (&$config, $dn= NULL) { /* Load Attributes */ plugin::plugin ($config, $dn); diff --git a/plugins/admin/fai/class_faiPartitionTableEntry.inc b/plugins/admin/fai/class_faiPartitionTableEntry.inc index 1223d9e59..991ed324d 100644 --- a/plugins/admin/fai/class_faiPartitionTableEntry.inc +++ b/plugins/admin/fai/class_faiPartitionTableEntry.inc @@ -24,7 +24,7 @@ class faiPartitionTableEntry extends plugin var $FAIstate = ""; - function faiPartitionTableEntry ($config, $dn= NULL,$usedDiskNames=array(),$disk=false) + function faiPartitionTableEntry (&$config, $dn= NULL,$usedDiskNames=array(),$disk=false) { plugin::plugin ($config, $dn); $this->UsedAttrs = array("cn","description","FAIpartitionType","FAIpartitionNr","FAIfsType","FAImountPoint","FAIpartitionSize", diff --git a/plugins/admin/fai/class_faiProfile.inc b/plugins/admin/fai/class_faiProfile.inc index e20bb04ef..361cb8afd 100644 --- a/plugins/admin/fai/class_faiProfile.inc +++ b/plugins/admin/fai/class_faiProfile.inc @@ -29,7 +29,7 @@ class faiProfile extends plugin var $FAIstate = ""; var $view_logged = FALSE; - function faiProfile($config, $dn= NULL) + function faiProfile(&$config, $dn= NULL) { /* Load Attributes */ plugin::plugin ($config, $dn); diff --git a/plugins/admin/fai/class_faiProfileEntry.inc b/plugins/admin/fai/class_faiProfileEntry.inc index bd8de6829..56e74f96c 100644 --- a/plugins/admin/fai/class_faiProfileEntry.inc +++ b/plugins/admin/fai/class_faiProfileEntry.inc @@ -16,7 +16,7 @@ class faiProfileEntry extends plugin var $FAIAllclasses = array(); var $ui; - function faiProfileEntry ($config, $dn= NULL,$used=array(),$objects=false) + function faiProfileEntry (&$config, $dn= NULL,$used=array(),$objects=false) { plugin::plugin ($config, $dn); diff --git a/plugins/admin/fai/class_faiScript.inc b/plugins/admin/fai/class_faiScript.inc index e7a395ae9..4e4b35ca6 100644 --- a/plugins/admin/fai/class_faiScript.inc +++ b/plugins/admin/fai/class_faiScript.inc @@ -43,7 +43,7 @@ class faiScript extends plugin var $view_logged = FALSE; var $ui; - function faiScript ($config, $dn= NULL) + function faiScript (&$config, $dn= NULL) { /* Load Attributes */ plugin::plugin ($config, $dn); diff --git a/plugins/admin/fai/class_faiScriptEntry.inc b/plugins/admin/fai/class_faiScriptEntry.inc index 4f5cf2990..5761751c2 100644 --- a/plugins/admin/fai/class_faiScriptEntry.inc +++ b/plugins/admin/fai/class_faiScriptEntry.inc @@ -23,7 +23,7 @@ class faiScriptEntry extends plugin var $parent = NULL; var $FAIstate = ""; - function faiScriptEntry ($config, $dn= NULL,$object=false) + function faiScriptEntry (&$config, $dn= NULL,$object=false) { plugin::plugin ($config, $dn); if($dn != "new"){ diff --git a/plugins/admin/fai/class_faiSummaryTab.inc b/plugins/admin/fai/class_faiSummaryTab.inc index 034f8cefe..a6fa6dab0 100644 --- a/plugins/admin/fai/class_faiSummaryTab.inc +++ b/plugins/admin/fai/class_faiSummaryTab.inc @@ -33,7 +33,7 @@ class faiSummaryTab extends plugin{ var $parent = NULL; var $ui = NULL; - function faiSummaryTab($config,$dn)//,$parent) + function faiSummaryTab(&$config,$dn)//,$parent) { plugin::plugin($config,$dn);//,$parent); diff --git a/plugins/admin/fai/class_faiTemplate.inc b/plugins/admin/fai/class_faiTemplate.inc index 09d8e2321..21efe27d0 100644 --- a/plugins/admin/fai/class_faiTemplate.inc +++ b/plugins/admin/fai/class_faiTemplate.inc @@ -40,7 +40,7 @@ class faiTemplate extends plugin var $ui; var $view_logged = FALSE; - function faiTemplate ($config, $dn= NULL) + function faiTemplate (&$config, $dn= NULL) { /* Load Attributes */ plugin::plugin ($config, $dn); diff --git a/plugins/admin/fai/class_faiTemplateEntry.inc b/plugins/admin/fai/class_faiTemplateEntry.inc index 203c789ba..d661c8155 100644 --- a/plugins/admin/fai/class_faiTemplateEntry.inc +++ b/plugins/admin/fai/class_faiTemplateEntry.inc @@ -28,7 +28,7 @@ class faiTemplateEntry extends plugin var $parent = NULL; var $FAIstate = ""; - function faiTemplateEntry ($config, $dn= NULL,$object=false) + function faiTemplateEntry (&$config, $dn= NULL,$object=false) { plugin::plugin ($config, $dn); diff --git a/plugins/admin/fai/class_faiVariable.inc b/plugins/admin/fai/class_faiVariable.inc index f275209ef..56fd969f0 100644 --- a/plugins/admin/fai/class_faiVariable.inc +++ b/plugins/admin/fai/class_faiVariable.inc @@ -38,7 +38,7 @@ class faiVariable extends plugin var $ui ; var $view_logged = FALSE; - function faiVariable ($config, $dn= NULL) + function faiVariable (&$config, $dn= NULL) { /* Load Attributes */ plugin::plugin ($config, $dn); diff --git a/plugins/admin/fai/class_faiVariableEntry.inc b/plugins/admin/fai/class_faiVariableEntry.inc index ce47af952..2bcb8548e 100644 --- a/plugins/admin/fai/class_faiVariableEntry.inc +++ b/plugins/admin/fai/class_faiVariableEntry.inc @@ -21,7 +21,7 @@ class faiVariableEntry extends plugin var $parent = NULL; var $FAIstate = ""; - function faiVariableEntry ($config, $dn= NULL,$object=false) + function faiVariableEntry (&$config, $dn= NULL,$object=false) { plugin::plugin ($config, $dn); if((isset($object['cn'])) && (!empty($object['cn']))){ diff --git a/plugins/admin/groups/class_divListGroup.inc b/plugins/admin/groups/class_divListGroup.inc index a4aa79333..af5ab8aaf 100644 --- a/plugins/admin/groups/class_divListGroup.inc +++ b/plugins/admin/groups/class_divListGroup.inc @@ -24,11 +24,11 @@ class divListGroup extends MultiSelectWindow var $parent ; var $ui ; - function divListGroup ($config,$parent) + function divListGroup (&$config, &$parent) { MultiSelectWindow::MultiSelectWindow($config, "Groups", "groups"); - $this->parent = $parent; + $this->parent = &$parent; $this->ui = get_userinfo(); /* Set list strings */ diff --git a/plugins/admin/groups/class_groupApplication.inc b/plugins/admin/groups/class_groupApplication.inc index c77456864..5a2418c05 100644 --- a/plugins/admin/groups/class_groupApplication.inc +++ b/plugins/admin/groups/class_groupApplication.inc @@ -41,7 +41,7 @@ class appgroup extends plugin var $ui = NULL; var $no_release_acls = false; - function appgroup ($config, $dn= NULL, $parent= NULL) + function appgroup (&$config, $dn= NULL, $parent= NULL) { /* Check if we have relase mangement enabled and prepare group application for release management */ diff --git a/plugins/admin/groups/class_groupGeneric.inc b/plugins/admin/groups/class_groupGeneric.inc index 2a8f2a55a..da836f268 100644 --- a/plugins/admin/groups/class_groupGeneric.inc +++ b/plugins/admin/groups/class_groupGeneric.inc @@ -49,7 +49,7 @@ class group extends plugin var $CopyPasteVars = array("force_gid","fon_group","smbgroup","groupType","sambaSID","sambaDomainName","SID","nagios_group","sambaGroupType"); - function group ($config, $dn= NULL) + function group (&$config, $dn= NULL) { /* Set rfc2307bis flag */ if (isset($config->current['RFC2307BIS']) && ($config->current['RFC2307BIS']== "true")){ diff --git a/plugins/admin/groups/class_groupMail.inc b/plugins/admin/groups/class_groupMail.inc index dc99297ce..448f4952d 100644 --- a/plugins/admin/groups/class_groupMail.inc +++ b/plugins/admin/groups/class_groupMail.inc @@ -59,7 +59,7 @@ class mailgroup extends plugin var $objectclasses= array("gosaMailAccount"); var $CopyPasteVars = array("quotaUsage","imapacl"); - function mailgroup ($config, $dn= NULL, $ui= NULL) + function mailgroup (&$config, $dn= NULL, $ui= NULL) { /* Initialise all available attributes ... if possible */ diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc index 093515154..ae158df80 100644 --- a/plugins/admin/groups/class_groupManagement.inc +++ b/plugins/admin/groups/class_groupManagement.inc @@ -34,11 +34,11 @@ class groupManagement extends plugin var $ShowPrimaryCheckBox= false; var $start_pasting_copied_objects = FALSE; - function groupManagement ($config, $ui) + function groupManagement (&$config, &$ui) { /* Save configuration for internal use */ - $this->config = $config; - $this->ui = $ui; + $this->config = &$config; + $this->ui = &$ui; /* Copy & Paste enabled ?*/ if((isset($this->config->data['MAIN']['ENABLECOPYPASTE']))&&(preg_match("/true/i",$this->config->data['MAIN']['ENABLECOPYPASTE']))){ diff --git a/plugins/admin/mimetypes/class_divListMimeTypes.inc b/plugins/admin/mimetypes/class_divListMimeTypes.inc index cf5f165f7..6a6d7447e 100755 --- a/plugins/admin/mimetypes/class_divListMimeTypes.inc +++ b/plugins/admin/mimetypes/class_divListMimeTypes.inc @@ -20,14 +20,14 @@ class divListMimeTypes extends MultiSelectWindow var $SaveAdditionalVars = array("selectedRelease"); - function divListMimeTypes ($config,$parent) + function divListMimeTypes (&$config, &$parent) { /* Create divlist and setup */ MultiSelectWindow::MultiSelectWindow($config, "Mimetypes", "mimetypes"); /* initialize required attributes */ $this->selectedRelease = "ou=mime,".$_SESSION['CurrentMainBase']; - $this->parent = $parent; + $this->parent = &$parent; $this->ui = get_userinfo(); $this->AvailableReleases= $this->parent->getReleases($this->selectedBase); diff --git a/plugins/admin/mimetypes/class_mimetypeGeneric.inc b/plugins/admin/mimetypes/class_mimetypeGeneric.inc index e7585c90b..27e4b7e6d 100644 --- a/plugins/admin/mimetypes/class_mimetypeGeneric.inc +++ b/plugins/admin/mimetypes/class_mimetypeGeneric.inc @@ -56,7 +56,7 @@ class mimetype extends plugin /* Orig_Dn is used to verify if this object is new or only edited */ var $orig_dn = ""; - function mimetype($config,$dn= NULL) + function mimetype(&$config,$dn= NULL) { plugin::plugin ($config, $dn); diff --git a/plugins/admin/mimetypes/class_mimetypeManagement.inc b/plugins/admin/mimetypes/class_mimetypeManagement.inc index 598027771..d6e8f7927 100755 --- a/plugins/admin/mimetypes/class_mimetypeManagement.inc +++ b/plugins/admin/mimetypes/class_mimetypeManagement.inc @@ -36,11 +36,11 @@ class mimetypeManagement extends plugin var $start_pasting_copied_objects = FALSE; - function mimetypeManagement ($config, $ui) + function mimetypeManagement (&$config, &$ui) { /* Save configuration for internal use */ - $this->config = $config; - $this->ui = $ui; + $this->config = &$config; + $this->ui = &$ui; /* Check if copy & paste is activated */ if($this->config->boolValueIsTrue("MAIN","ENABLECOPYPASTE")){ diff --git a/plugins/admin/ogroups/class_divListOGroup.inc b/plugins/admin/ogroups/class_divListOGroup.inc index d9f243fa8..ffc399d07 100755 --- a/plugins/admin/ogroups/class_divListOGroup.inc +++ b/plugins/admin/ogroups/class_divListOGroup.inc @@ -27,7 +27,7 @@ class divListOGroup extends MultiSelectWindow var $parent ; var $ui ; - function divListOGroup ($config,$parent) + function divListOGroup (&$config,$parent) { MultiSelectWindow::MultiSelectWindow($config, "OGroups", "ogroups"); diff --git a/plugins/admin/ogroups/class_mailogroup.inc b/plugins/admin/ogroups/class_mailogroup.inc index 1040dc626..33878acda 100644 --- a/plugins/admin/ogroups/class_mailogroup.inc +++ b/plugins/admin/ogroups/class_mailogroup.inc @@ -12,7 +12,7 @@ class mailogroup extends plugin var $members= array(); var $view_logged = FALSE; - function mailogroup ($config, $dn= NULL, $parent= NULL) + function mailogroup (&$config, $dn= NULL, $parent= NULL) { plugin::plugin($config, $dn, $parent); diff --git a/plugins/admin/ogroups/class_ogroup.inc b/plugins/admin/ogroups/class_ogroup.inc index f5eab4910..22699c893 100644 --- a/plugins/admin/ogroups/class_ogroup.inc +++ b/plugins/admin/ogroups/class_ogroup.inc @@ -36,7 +36,7 @@ class ogroup extends plugin var $attributes= array("cn", "description", "gosaGroupObjects","member"); var $objectclasses= array("top", "gosaGroupOfNames"); - function ogroup ($config, $dn= NULL) + function ogroup (&$config, $dn= NULL) { plugin::plugin ($config, $dn); $this->orig_dn= $dn; diff --git a/plugins/admin/ogroups/class_ogroupManagement.inc b/plugins/admin/ogroups/class_ogroupManagement.inc index 82550f477..5cd51a387 100644 --- a/plugins/admin/ogroups/class_ogroupManagement.inc +++ b/plugins/admin/ogroups/class_ogroupManagement.inc @@ -35,10 +35,10 @@ class ogroupManagement extends plugin var $DivListOGroup = NULL; var $start_pasting_copied_objects = FALSE; - function ogroupManagement ($config, $dn= NULL) + function ogroupManagement (&$config, $dn= NULL) { /* Include config object */ - $this->config= $config; + $this->config= &$config; $this->ui= get_userinfo(); /* Copy & Paste enabled ? diff --git a/plugins/admin/ogroups/class_phonequeue.inc b/plugins/admin/ogroups/class_phonequeue.inc index 4a24a0b68..f3e90d73e 100644 --- a/plugins/admin/ogroups/class_phonequeue.inc +++ b/plugins/admin/ogroups/class_phonequeue.inc @@ -63,7 +63,7 @@ class phonequeue extends plugin * - Parse phone options flags * - Get phone numbers */ - function phonequeue ($config, $dn= NULL) + function phonequeue (&$config, $dn= NULL) { plugin::plugin($config, $dn); diff --git a/plugins/admin/ogroups/class_termgroup.inc b/plugins/admin/ogroups/class_termgroup.inc index 2c759829e..68886fce0 100644 --- a/plugins/admin/ogroups/class_termgroup.inc +++ b/plugins/admin/ogroups/class_termgroup.inc @@ -28,7 +28,7 @@ class termgroup extends plugin var $view_logged = FALSE; - function termgroup ($config, $dn= NULL, $parent= NULL) + function termgroup (&$config, $dn= NULL, $parent= NULL) { /*************** Some initialisations diff --git a/plugins/admin/systems/class_SelectDeviceType.inc b/plugins/admin/systems/class_SelectDeviceType.inc index 65bd07d86..c17b8ef5f 100644 --- a/plugins/admin/systems/class_SelectDeviceType.inc +++ b/plugins/admin/systems/class_SelectDeviceType.inc @@ -18,7 +18,7 @@ class SelectDeviceType extends plugin var $ObjectGroup = ""; var $SystemType = ""; - function SelectDeviceType ($config, $dn= NULL) + function SelectDeviceType (&$config, $dn= NULL) { plugin::plugin ($config, $dn); diff --git a/plugins/admin/systems/class_ServiceAddDialog.inc b/plugins/admin/systems/class_ServiceAddDialog.inc index 86ab833ac..47e97012d 100644 --- a/plugins/admin/systems/class_ServiceAddDialog.inc +++ b/plugins/admin/systems/class_ServiceAddDialog.inc @@ -10,7 +10,7 @@ class ServiceAddDialog extends plugin{ var $objectclasses = array(); var $parent = NULL; - function ServiceAddDialog($config,$dn,$parent) + function ServiceAddDialog(&$config,$dn,$parent) { plugin::plugin($config); $this->parent = $parent; diff --git a/plugins/admin/systems/class_baseSelectDialog.inc b/plugins/admin/systems/class_baseSelectDialog.inc index 0a1040c7a..ecdd4da28 100644 --- a/plugins/admin/systems/class_baseSelectDialog.inc +++ b/plugins/admin/systems/class_baseSelectDialog.inc @@ -10,7 +10,7 @@ class baseSelectDialog extends MultiSelectWindow var $allowedBases = array(); var $parent = NULL; - function baseSelectDialog ($config,$parent,$onlyAllowThisBases = array()) + function baseSelectDialog (&$config,$parent,$onlyAllowThisBases = array()) { echo "Need to pass module via parameter!
"; $module= "all"; diff --git a/plugins/admin/systems/class_componentGeneric.inc b/plugins/admin/systems/class_componentGeneric.inc index 9b890a547..108f1f405 100644 --- a/plugins/admin/systems/class_componentGeneric.inc +++ b/plugins/admin/systems/class_componentGeneric.inc @@ -23,7 +23,7 @@ class componentGeneric extends plugin var $netConfigDNS; var $view_logged = FALSE; - function componentgeneric ($config, $dn= NULL, $parent= NULL) + function componentgeneric (&$config, $dn= NULL, $parent= NULL) { plugin::plugin ($config, $dn, $parent); diff --git a/plugins/admin/systems/class_dhcpGroup.inc b/plugins/admin/systems/class_dhcpGroup.inc index eb61c4822..e29ae0332 100644 --- a/plugins/admin/systems/class_dhcpGroup.inc +++ b/plugins/admin/systems/class_dhcpGroup.inc @@ -23,7 +23,7 @@ class dhcpGroup extends dhcpPlugin /* attribute list for save action */ var $objectclasses= array('top', 'dhcpGroup', 'dhcpOptions'); - function dhcpGroup($attrs) + function dhcpGroup(&$attrs) { /* Load statements / options */ dhcpPlugin::dhcpPlugin($attrs); diff --git a/plugins/admin/systems/class_divListSystem.inc b/plugins/admin/systems/class_divListSystem.inc index 1bc74b72d..2e55d8461 100644 --- a/plugins/admin/systems/class_divListSystem.inc +++ b/plugins/admin/systems/class_divListSystem.inc @@ -26,7 +26,7 @@ class divListSystem extends MultiSelectWindow var $parent ; var $ui ; - function divListSystem ($config,$parent) + function divListSystem (&$config,$parent) { MultiSelectWindow::MultiSelectWindow($config, "System", array("server", "workstation", diff --git a/plugins/admin/systems/class_glpiAccount.inc b/plugins/admin/systems/class_glpiAccount.inc index 2859930ea..76d45fd38 100644 --- a/plugins/admin/systems/class_glpiAccount.inc +++ b/plugins/admin/systems/class_glpiAccount.inc @@ -65,7 +65,7 @@ class glpiAccount extends plugin /* Contructor Sets default values and checks if we already have an existing glpi account */ - function glpiAccount ($config, $dn= NULL, $parent= NULL) + function glpiAccount (&$config, $dn= NULL, $parent= NULL) { plugin::plugin ($config, $dn, $parent); $this->ui= get_userinfo(); diff --git a/plugins/admin/systems/class_glpiAttachmentPool.inc b/plugins/admin/systems/class_glpiAttachmentPool.inc index 7d7c13d7d..f4453243d 100644 --- a/plugins/admin/systems/class_glpiAttachmentPool.inc +++ b/plugins/admin/systems/class_glpiAttachmentPool.inc @@ -25,7 +25,7 @@ class glpiAttachmentPool extends plugin var $delAttach= ""; - function glpiAttachmentPool ($config, $dn= NULL,$used=NULL) + function glpiAttachmentPool (&$config, $dn= NULL,$used=NULL) { plugin::plugin ($config, $dn); if(!isset($_SESSION['GlpiAttachmentFilter'])){ diff --git a/plugins/admin/systems/class_glpiDeviceManagement.inc b/plugins/admin/systems/class_glpiDeviceManagement.inc index 607182873..e7d53a9a9 100644 --- a/plugins/admin/systems/class_glpiDeviceManagement.inc +++ b/plugins/admin/systems/class_glpiDeviceManagement.inc @@ -26,7 +26,7 @@ class glpiDeviceManagement extends plugin var $delete = array(); - function glpiDeviceManagement ($config, $dn= NULL,$used=NULL) + function glpiDeviceManagement (&$config, $dn= NULL,$used=NULL) { plugin::plugin ($config, $dn); diff --git a/plugins/admin/systems/class_glpiManufacturer.inc b/plugins/admin/systems/class_glpiManufacturer.inc index 9ae1ea800..8e676d8ee 100644 --- a/plugins/admin/systems/class_glpiManufacturer.inc +++ b/plugins/admin/systems/class_glpiManufacturer.inc @@ -28,7 +28,7 @@ class glpiManufacturer extends plugin var $email =""; var $ID =-1; - function glpiManufacturer($config, $dn= NULL, $parent= NULL) + function glpiManufacturer(&$config, $dn= NULL, $parent= NULL) { plugin::plugin ($config, $dn, $parent); $this->ui = get_userinfo(); diff --git a/plugins/admin/systems/class_glpiPrinterAccount.inc b/plugins/admin/systems/class_glpiPrinterAccount.inc index 9645a1e0b..9a461b785 100644 --- a/plugins/admin/systems/class_glpiPrinterAccount.inc +++ b/plugins/admin/systems/class_glpiPrinterAccount.inc @@ -71,7 +71,7 @@ class glpiPrinterAccount extends plugin /* Contructor Sets default values and checks if we already have an existing glpi account */ - function glpiPrinterAccount ($config, $dn= NULL, $parent= NULL) + function glpiPrinterAccount (&$config, $dn= NULL, $parent= NULL) { plugin::plugin ($config, $dn, $parent); $this->ui= get_userinfo(); diff --git a/plugins/admin/systems/class_glpiPrinterCartridges.inc b/plugins/admin/systems/class_glpiPrinterCartridges.inc index 672f324af..85e0805c6 100644 --- a/plugins/admin/systems/class_glpiPrinterCartridges.inc +++ b/plugins/admin/systems/class_glpiPrinterCartridges.inc @@ -23,7 +23,7 @@ class glpiPrinterCartridges extends plugin var $del = 0; - function glpiPrinterCartridges ($config,$dn,$type) + function glpiPrinterCartridges (&$config,$dn,$type) { plugin::plugin ($config, $dn); diff --git a/plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc b/plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc index c130618a4..e1d86fcb6 100644 --- a/plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc +++ b/plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc @@ -34,7 +34,7 @@ class glpiPrinterCartridgesEdit extends plugin var $edit_type =false; - function glpiPrinterCartridgesEdit ($config, $dn,$printer_type,$values = NULL ) + function glpiPrinterCartridgesEdit (&$config, $dn,$printer_type,$values = NULL ) { plugin::plugin ($config, $dn); foreach($this->attributes as $val){ diff --git a/plugins/admin/systems/class_glpiSelectUser.inc b/plugins/admin/systems/class_glpiSelectUser.inc index 0e1ef9828..7073b12a4 100644 --- a/plugins/admin/systems/class_glpiSelectUser.inc +++ b/plugins/admin/systems/class_glpiSelectUser.inc @@ -19,7 +19,7 @@ class glpiSelectUser extends plugin var $PostVarName = ""; - function glpiSelectUser ($config, $dn= NULL,$postvar) + function glpiSelectUser (&$config, $dn= NULL,$postvar) { plugin::plugin ($config, $dn); diff --git a/plugins/admin/systems/class_goCupsServer.inc b/plugins/admin/systems/class_goCupsServer.inc index e4e3f8b98..a21271c5b 100644 --- a/plugins/admin/systems/class_goCupsServer.inc +++ b/plugins/admin/systems/class_goCupsServer.inc @@ -23,7 +23,7 @@ class goCupsServer extends goService{ var $goCupsServerStatus = ""; var $view_logged =FALSE; - function goCupsServer($config,$dn) + function goCupsServer(&$config,$dn) { goService::goService($config,$dn); $this->DisplayName = _("Print service"); diff --git a/plugins/admin/systems/class_goFaxServer.inc b/plugins/admin/systems/class_goFaxServer.inc index 074df7086..deb02580e 100644 --- a/plugins/admin/systems/class_goFaxServer.inc +++ b/plugins/admin/systems/class_goFaxServer.inc @@ -26,7 +26,7 @@ class goFaxServer extends goService { var $cn = ""; var $view_logged =FALSE; - function goFaxServer($config,$dn) + function goFaxServer(&$config,$dn) { goService::goService($config,$dn); $this->DisplayName = _("FAX database"); diff --git a/plugins/admin/systems/class_goFonServer.inc b/plugins/admin/systems/class_goFonServer.inc index 7408a7800..9d3b3624d 100644 --- a/plugins/admin/systems/class_goFonServer.inc +++ b/plugins/admin/systems/class_goFonServer.inc @@ -29,7 +29,7 @@ class goFonServer extends goService{ var $view_logged =FALSE; - function goFonServer($config,$dn) + function goFonServer(&$config,$dn) { goService::goService($config,$dn); $this->DisplayName = _("VoIP service"); diff --git a/plugins/admin/systems/class_goGlpiServer.inc b/plugins/admin/systems/class_goGlpiServer.inc index 83ee39ef9..f126d6bb3 100644 --- a/plugins/admin/systems/class_goGlpiServer.inc +++ b/plugins/admin/systems/class_goGlpiServer.inc @@ -28,7 +28,7 @@ class goGlpiServer extends goService { var $view_logged =FALSE; - function goGlpiServer($config,$dn) + function goGlpiServer(&$config,$dn) { goService::goService($config,$dn); $this->DisplayName = _("Inventory database"); diff --git a/plugins/admin/systems/class_goImapServer.inc b/plugins/admin/systems/class_goImapServer.inc index 3fb4fe957..41f39fab8 100644 --- a/plugins/admin/systems/class_goImapServer.inc +++ b/plugins/admin/systems/class_goImapServer.inc @@ -44,7 +44,7 @@ class goImapServer extends goService { var $Actions = array(); var $conflicts = array("goImapServer","kolab"); - function goImapServer($config,$dn) + function goImapServer(&$config,$dn) { goService::goService($config,$dn); diff --git a/plugins/admin/systems/class_goKrbServer.inc b/plugins/admin/systems/class_goKrbServer.inc index e49c2ba4f..f3b1150f7 100644 --- a/plugins/admin/systems/class_goKrbServer.inc +++ b/plugins/admin/systems/class_goKrbServer.inc @@ -25,7 +25,7 @@ class goKrbServer extends goService{ var $goKrbPassword =""; var $view_logged =FALSE; - function goKrbServer($config,$dn) + function goKrbServer(&$config,$dn) { goService::goService($config,$dn); $this->DisplayName = _("Kerberos service"); diff --git a/plugins/admin/systems/class_goLdapServer.inc b/plugins/admin/systems/class_goLdapServer.inc index 7e35f52e3..f5abb6d24 100644 --- a/plugins/admin/systems/class_goLdapServer.inc +++ b/plugins/admin/systems/class_goLdapServer.inc @@ -23,7 +23,7 @@ class goLdapServer extends goService{ var $goLdapBase = ""; var $view_logged =FALSE; - function goLdapServer($config,$dn) + function goLdapServer(&$config,$dn) { goService::goService($config,$dn); $this->DisplayName = _("LDAP service"); diff --git a/plugins/admin/systems/class_goLogDBServer.inc b/plugins/admin/systems/class_goLogDBServer.inc index 4d95ca872..974240dcf 100644 --- a/plugins/admin/systems/class_goLogDBServer.inc +++ b/plugins/admin/systems/class_goLogDBServer.inc @@ -25,7 +25,7 @@ class goLogDBServer extends goService{ var $view_logged =FALSE; - function goLogDBServer($config,$dn) + function goLogDBServer(&$config,$dn) { goService::goService($config,$dn); $this->DisplayName = _("Logging database"); diff --git a/plugins/admin/systems/class_goMailServer.inc b/plugins/admin/systems/class_goMailServer.inc index b97c3955d..55d3f5845 100644 --- a/plugins/admin/systems/class_goMailServer.inc +++ b/plugins/admin/systems/class_goMailServer.inc @@ -41,7 +41,7 @@ class goMailServer extends goService{ var $conflicts = array("goMailServer","kolab"); var $view_logged =FALSE; - function goMailServer($config,$dn) + function goMailServer(&$config,$dn) { goService::goService($config,$dn); $this->DisplayName = _("Mail smtp service (Postfix)"); diff --git a/plugins/admin/systems/class_goNtpServer.inc b/plugins/admin/systems/class_goNtpServer.inc index aeb5a4b97..234a06b96 100644 --- a/plugins/admin/systems/class_goNtpServer.inc +++ b/plugins/admin/systems/class_goNtpServer.inc @@ -24,7 +24,7 @@ class goNtpServer extends goService{ var $cn = ""; var $view_logged =FALSE; - function goNtpServer($config,$dn) + function goNtpServer(&$config,$dn) { goService::goService($config,$dn); $this->DisplayName = _("Time service (NTP)"); diff --git a/plugins/admin/systems/class_goService.inc b/plugins/admin/systems/class_goService.inc index 49c44125f..63b8850dc 100644 --- a/plugins/admin/systems/class_goService.inc +++ b/plugins/admin/systems/class_goService.inc @@ -20,7 +20,7 @@ class goService extends plugin{ /* Construcktion */ - function goService($config,$dn) + function goService(&$config,$dn) { plugin::plugin($config,$dn); $this->DisplayName = _("Empty service"); diff --git a/plugins/admin/systems/class_goShareServer.inc b/plugins/admin/systems/class_goShareServer.inc index 6b7f39aa3..8e5981bdd 100644 --- a/plugins/admin/systems/class_goShareServer.inc +++ b/plugins/admin/systems/class_goShareServer.inc @@ -26,7 +26,7 @@ class goShareServer extends goService{ var $mounts_to_add = array(); var $view_logged =FALSE; - function goShareServer($config,$dn) + function goShareServer(&$config,$dn) { goService::goService($config,$dn); diff --git a/plugins/admin/systems/class_goSpamServer.inc b/plugins/admin/systems/class_goSpamServer.inc index 329522fa7..a0945699f 100644 --- a/plugins/admin/systems/class_goSpamServer.inc +++ b/plugins/admin/systems/class_goSpamServer.inc @@ -43,7 +43,7 @@ class gospamserver extends goService{ var $acl = NULL; var $view_logged =FALSE; - function gospamserver($config,$dn, $parent= NULL) + function gospamserver(&$config,$dn, $parent= NULL) { /* Init class */ goService::goService($config,$dn, $parent); diff --git a/plugins/admin/systems/class_goSpamServerRule.inc b/plugins/admin/systems/class_goSpamServerRule.inc index e0935bc2e..c8eed5d4e 100644 --- a/plugins/admin/systems/class_goSpamServerRule.inc +++ b/plugins/admin/systems/class_goSpamServerRule.inc @@ -8,7 +8,7 @@ class goSpamServerRule extends plugin { var $orig_name = ""; var $view_logged =FALSE; - function goSpamServerRule($config,$dn,$name = "",$rule ="") + function goSpamServerRule(&$config,$dn,$name = "",$rule ="") { plugin::plugin($config,$dn); $this->name = $this->orig_name= $name; diff --git a/plugins/admin/systems/class_goSyslogServer.inc b/plugins/admin/systems/class_goSyslogServer.inc index b94093026..81f15bab0 100644 --- a/plugins/admin/systems/class_goSyslogServer.inc +++ b/plugins/admin/systems/class_goSyslogServer.inc @@ -23,7 +23,7 @@ class goSyslogServer extends goService{ var $goSyslogServerStatus = ""; var $view_logged =FALSE; - function goSyslogServer($config,$dn) + function goSyslogServer(&$config,$dn) { goService::goService($config,$dn); $this->DisplayName = _("Logging service"); diff --git a/plugins/admin/systems/class_goTerminalServer.inc b/plugins/admin/systems/class_goTerminalServer.inc index 21b721b76..5fa4184ba 100644 --- a/plugins/admin/systems/class_goTerminalServer.inc +++ b/plugins/admin/systems/class_goTerminalServer.inc @@ -26,7 +26,7 @@ class goTerminalServer extends goService{ var $view_logged =FALSE; - function goTerminalServer($config,$dn) + function goTerminalServer(&$config,$dn) { goService::goService($config,$dn); $this->DisplayName = _("Terminal service"); diff --git a/plugins/admin/systems/class_goVirusServer.inc b/plugins/admin/systems/class_goVirusServer.inc index 7e02b9701..dd76a6a12 100644 --- a/plugins/admin/systems/class_goVirusServer.inc +++ b/plugins/admin/systems/class_goVirusServer.inc @@ -41,7 +41,7 @@ class govirusserver extends goService{ var $avDatabaseMirror = ""; var $view_logged =FALSE; - function govirusserver($config,$dn, $parent= NULL) + function govirusserver(&$config,$dn, $parent= NULL) { /* Init class */ goService::goService($config,$dn, $parent); diff --git a/plugins/admin/systems/class_gosaLogServer.inc b/plugins/admin/systems/class_gosaLogServer.inc index 3458a6273..bcfffeb52 100644 --- a/plugins/admin/systems/class_gosaLogServer.inc +++ b/plugins/admin/systems/class_gosaLogServer.inc @@ -22,7 +22,7 @@ class gosaLogServer extends goService{ var $view_logged =FALSE; - function gosaLogServer($config,$dn) + function gosaLogServer(&$config,$dn) { goService::goService($config,$dn); $this->DisplayName = _("GOsa logging service"); diff --git a/plugins/admin/systems/class_phoneGeneric.inc b/plugins/admin/systems/class_phoneGeneric.inc index fc2ce9d60..2c1c65dbe 100644 --- a/plugins/admin/systems/class_phoneGeneric.inc +++ b/plugins/admin/systems/class_phoneGeneric.inc @@ -54,7 +54,7 @@ class phoneGeneric extends plugin var $objectclasses= array("top", "goFonHardware"); - function phonegeneric ($config, $dn= NULL, $parent= NULL) + function phonegeneric (&$config, $dn= NULL, $parent= NULL) { plugin::plugin ($config, $dn, $parent); $this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses, true); diff --git a/plugins/admin/systems/class_printGeneric.inc b/plugins/admin/systems/class_printGeneric.inc index 25a78d57f..9f772281e 100644 --- a/plugins/admin/systems/class_printGeneric.inc +++ b/plugins/admin/systems/class_printGeneric.inc @@ -52,9 +52,9 @@ class printgeneric extends plugin var $view_logged = FALSE; var $parent; - function printgeneric ($config, $dn,$parent_init,$parent) + function printgeneric (&$config, $dn,$parent_init,$parent) { - $this->config = $config; + $this->config = &$config; $this->dn = $dn; /* If parent was posted(the tabs object) we can detect the printer type. */ diff --git a/plugins/admin/systems/class_printerPPDDialog.inc b/plugins/admin/systems/class_printerPPDDialog.inc index f6812ef8a..a691ffc77 100644 --- a/plugins/admin/systems/class_printerPPDDialog.inc +++ b/plugins/admin/systems/class_printerPPDDialog.inc @@ -27,7 +27,7 @@ class printerPPDDialog extends plugin var $cn = "" ; // Used to tag the ppds modified by the printer object, var $dialog = NULL; // Contains sub dialogs - function printerPPDDialog ($config, $dn= NULL,$ppdfile=NULL ) + function printerPPDDialog (&$config, $dn= NULL, $ppdfile=NULL ) { plugin::plugin ($config, $dn); $this->depselect = $this->config->current['BASE']; diff --git a/plugins/admin/systems/class_printerPPDSelectionDialog.inc b/plugins/admin/systems/class_printerPPDSelectionDialog.inc index 6bd420e69..7914d8d46 100644 --- a/plugins/admin/systems/class_printerPPDSelectionDialog.inc +++ b/plugins/admin/systems/class_printerPPDSelectionDialog.inc @@ -17,7 +17,7 @@ class printerPPDSelectionDialog extends plugin var $current_del_id = ""; var $Vendor = ""; - function printerPPDSelectionDialog ($config, $dn= NULL,$list=false,$headers=false,$ppd=false) + function printerPPDSelectionDialog (&$config, $dn= NULL,$list=false,$headers=false,$ppd=false) { plugin::plugin ($config, $dn); $this->list = $list; diff --git a/plugins/admin/systems/class_selectUserToPrinterDialog.inc b/plugins/admin/systems/class_selectUserToPrinterDialog.inc index f4964c15b..8ed9f8c37 100644 --- a/plugins/admin/systems/class_selectUserToPrinterDialog.inc +++ b/plugins/admin/systems/class_selectUserToPrinterDialog.inc @@ -23,7 +23,7 @@ class selectUserToPrinterDialog extends plugin var $type = ""; var $search_cat = ""; - function selectUserToPrinterDialog ($config, $dn= NULL,$type=false ) + function selectUserToPrinterDialog (&$config, $dn= NULL,$type=false ) { plugin::plugin ($config, $dn); $this->depselect = $this->config->current['BASE']; diff --git a/plugins/admin/systems/class_servDHCP.inc b/plugins/admin/systems/class_servDHCP.inc index 2392bb12f..f22860b68 100644 --- a/plugins/admin/systems/class_servDHCP.inc +++ b/plugins/admin/systems/class_servDHCP.inc @@ -23,7 +23,7 @@ class servdhcp extends goService var $take_over_id = -1; var $display_warning = TRUE; - function servdhcp ($config, $dn= NULL, $parent= NULL) + function servdhcp (&$config, $dn= NULL, $parent= NULL) { plugin::plugin ($config, $dn, $parent); diff --git a/plugins/admin/systems/class_servDNS.inc b/plugins/admin/systems/class_servDNS.inc index 89d2f3f36..4662a0d17 100644 --- a/plugins/admin/systems/class_servDNS.inc +++ b/plugins/admin/systems/class_servDNS.inc @@ -32,7 +32,7 @@ class servdns extends goService var $take_over_id = -1; - function servdns ($config, $dn= NULL, $parent= NULL) + function servdns (&$config, $dn= NULL, $parent= NULL) { plugin::plugin ($config, $dn, $parent); diff --git a/plugins/admin/systems/class_servDNSeditZone.inc b/plugins/admin/systems/class_servDNSeditZone.inc index 1f1ee73a6..dfe48c506 100644 --- a/plugins/admin/systems/class_servDNSeditZone.inc +++ b/plugins/admin/systems/class_servDNSeditZone.inc @@ -43,7 +43,7 @@ class servdnseditZone extends plugin var $ZoneObject = array(); - function servdnseditZone ($config, $dn= NULL,$attrs = array()) + function servdnseditZone (&$config, $dn= NULL,$attrs = array()) { plugin::plugin ($config, $dn); diff --git a/plugins/admin/systems/class_servDNSeditZoneEntries.inc b/plugins/admin/systems/class_servDNSeditZoneEntries.inc index b87d22c1e..1d8037a07 100644 --- a/plugins/admin/systems/class_servDNSeditZoneEntries.inc +++ b/plugins/admin/systems/class_servDNSeditZoneEntries.inc @@ -21,7 +21,7 @@ class servDNSeditZoneEntries extends plugin var $disableDialog = false; // Dialog will be disabled, if this zone is new - function servDNSeditZoneEntries ($config,$dn, $zoneObject) + function servDNSeditZoneEntries (&$config,$dn, &$zoneObject) { plugin::plugin ($config, $dn); diff --git a/plugins/admin/systems/class_servGeneric.inc b/plugins/admin/systems/class_servGeneric.inc index 37e4aef73..116628786 100644 --- a/plugins/admin/systems/class_servGeneric.inc +++ b/plugins/admin/systems/class_servGeneric.inc @@ -40,7 +40,7 @@ class servgeneric extends plugin var $fai_activated =FALSE; var $view_logged = FALSE; - function servgeneric ($config, $dn= NULL, $parent= NULL) + function servgeneric (&$config, $dn= NULL, $parent= NULL) { /* Check if FAI is activated */ $tmp = search_config($config->data,"faiManagement","CLASS"); diff --git a/plugins/admin/systems/class_servKolab.inc b/plugins/admin/systems/class_servKolab.inc index 8f3a9c6a5..5cefbabe4 100644 --- a/plugins/admin/systems/class_servKolab.inc +++ b/plugins/admin/systems/class_servKolab.inc @@ -43,7 +43,7 @@ class servkolab extends goService { var $DisplayName = "Kolab mail service"; var $StatusFlag = ""; - function servkolab($config, $dn = NULL, $parent= NULL) + function servkolab(&$config, $dn = NULL, $parent= NULL) { /* Setting the hostname and tell this Plugin that we are the kolab extension*/ $this->hostname = preg_replace('/^cn=([^,]+),.*$/', '\1', $dn); diff --git a/plugins/admin/systems/class_servNfs.inc b/plugins/admin/systems/class_servNfs.inc index fbacff142..37597d03c 100644 --- a/plugins/admin/systems/class_servNfs.inc +++ b/plugins/admin/systems/class_servNfs.inc @@ -30,7 +30,7 @@ class servnfs extends plugin var $parent = NULL; var $view_logged = FALSE; - function servnfs ($config, $parent,$entry= false,$mount =false) + function servnfs (&$config, $parent,$entry= false,$mount =false) { $this->parent = $parent; $dn = $parent->dn; diff --git a/plugins/admin/systems/class_servRepository.inc b/plugins/admin/systems/class_servRepository.inc index 7ea32fe9d..aa370c1ab 100644 --- a/plugins/admin/systems/class_servRepository.inc +++ b/plugins/admin/systems/class_servRepository.inc @@ -30,7 +30,7 @@ class servrepository extends goService var $view_logged = FALSE; var $fai_activated = FALSE; - function servrepository ($config, $dn= NULL, $parent= NULL) + function servrepository (&$config, $dn= NULL, $parent= NULL) { plugin::plugin ($config, $dn, $parent); diff --git a/plugins/admin/systems/class_servRepositorySetup.inc b/plugins/admin/systems/class_servRepositorySetup.inc index f186bf912..e8c512746 100644 --- a/plugins/admin/systems/class_servRepositorySetup.inc +++ b/plugins/admin/systems/class_servRepositorySetup.inc @@ -22,7 +22,7 @@ class servRepositorySetup extends plugin var $cn = ""; var $parent = ""; - function servRepositorySetup ($config, $dn= NULL,$data = false) + function servRepositorySetup (&$config, $dn= NULL,$data = false) { plugin::plugin ($config, $dn); if($data != false){ diff --git a/plugins/admin/systems/class_serverService.inc b/plugins/admin/systems/class_serverService.inc index 239a5476e..215bbd712 100644 --- a/plugins/admin/systems/class_serverService.inc +++ b/plugins/admin/systems/class_serverService.inc @@ -33,7 +33,7 @@ class ServerService extends plugin var $acl ; var $cn; - function ServerService ($config, $dn) + function ServerService (&$config, $dn) { plugin::plugin($config); $this->dn= $dn; diff --git a/plugins/admin/systems/class_systemManagement.inc b/plugins/admin/systems/class_systemManagement.inc index 5b8f7daf9..30e90a744 100644 --- a/plugins/admin/systems/class_systemManagement.inc +++ b/plugins/admin/systems/class_systemManagement.inc @@ -41,7 +41,7 @@ class systems extends plugin var $start_pasting_copied_objects = FALSE; var $CopyPasteHandler = NULL; - function systems ($config, $ui) + function systems (&$config, $ui) { /* Save configuration for internal use */ $this->config= $config; diff --git a/plugins/admin/systems/class_termDNS.inc b/plugins/admin/systems/class_termDNS.inc index b828cc218..5856eeef5 100644 --- a/plugins/admin/systems/class_termDNS.inc +++ b/plugins/admin/systems/class_termDNS.inc @@ -42,7 +42,7 @@ class termDNS extends plugin /* Terminal dns */ - function termDNS ($config, $dn,$objectClasses,$IPisMust = false) + function termDNS (&$config, $dn,$objectClasses,$IPisMust = false) { /* We need to know which objectClasses are used, to store the ip/mac * Because of different type of devices diff --git a/plugins/admin/systems/class_terminalGeneric.inc b/plugins/admin/systems/class_terminalGeneric.inc index 775d95dca..3eef5f61f 100644 --- a/plugins/admin/systems/class_terminalGeneric.inc +++ b/plugins/admin/systems/class_terminalGeneric.inc @@ -60,7 +60,7 @@ class termgeneric extends plugin var $member_of_ogroup = FALSE; - function termgeneric ($config, $dn= NULL, $parent= NULL) + function termgeneric (&$config, $dn= NULL, $parent= NULL) { /* Check if FAI is activated */ $tmp = search_config($config->data,"faiManagement","CLASS"); diff --git a/plugins/admin/systems/class_terminalInfo.inc b/plugins/admin/systems/class_terminalInfo.inc index 7ce3d2bb9..29ee7d335 100644 --- a/plugins/admin/systems/class_terminalInfo.inc +++ b/plugins/admin/systems/class_terminalInfo.inc @@ -36,7 +36,7 @@ class terminfo extends plugin "ghGfxAdapter", "ghSoundAdapter", "gotoLastUser"); var $objectclasses= array("GOhard"); - function terminfo ($config, $dn= NULL, $parent= NULL) + function terminfo (&$config, $dn= NULL, $parent= NULL) { plugin::plugin ($config,$dn); diff --git a/plugins/admin/systems/class_terminalService.inc b/plugins/admin/systems/class_terminalService.inc index 510408a07..0d07ef0b1 100644 --- a/plugins/admin/systems/class_terminalService.inc +++ b/plugins/admin/systems/class_terminalService.inc @@ -65,7 +65,7 @@ class termservice extends plugin var $objectclasses= array("GOhard"); - function termservice ($config, $dn= NULL, $parent= NULL) + function termservice (&$config, $dn= NULL, $parent= NULL) { plugin::plugin ($config, $dn, $parent); diff --git a/plugins/admin/systems/class_terminalStartup.inc b/plugins/admin/systems/class_terminalStartup.inc index 6f0421abe..33d4ad297 100644 --- a/plugins/admin/systems/class_terminalStartup.inc +++ b/plugins/admin/systems/class_terminalStartup.inc @@ -33,7 +33,7 @@ class termstartup extends plugin var $orig_dn= ""; var $ignore_account= TRUE; - function termstartup ($config, $dn= NULL, $parent= NULL) + function termstartup (&$config, $dn= NULL, $parent= NULL) { plugin::plugin ($config, $dn, $parent); diff --git a/plugins/admin/systems/class_winGeneric.inc b/plugins/admin/systems/class_winGeneric.inc index 97de3be8b..cbabc12ae 100644 --- a/plugins/admin/systems/class_winGeneric.inc +++ b/plugins/admin/systems/class_winGeneric.inc @@ -46,7 +46,7 @@ class wingeneric extends plugin var $view_logged = FALSE; - function wingeneric ($config, $dn= NULL, $parent= NULL) + function wingeneric (&$config, $dn= NULL, $parent= NULL) { plugin::plugin ($config, $dn, $parent); $this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses); diff --git a/plugins/admin/systems/class_workstationGeneric.inc b/plugins/admin/systems/class_workstationGeneric.inc index 4fbba7854..a61bf9599 100644 --- a/plugins/admin/systems/class_workstationGeneric.inc +++ b/plugins/admin/systems/class_workstationGeneric.inc @@ -66,7 +66,7 @@ class workgeneric extends plugin var $member_of_ogroup = FALSE; - function workgeneric ($config, $dn= NULL, $parent= NULL) + function workgeneric (&$config, $dn= NULL, $parent= NULL) { $tmp = search_config($config->data,"faiManagement","CLASS"); if(!empty($tmp)){ diff --git a/plugins/admin/systems/class_workstationService.inc b/plugins/admin/systems/class_workstationService.inc index d0d45262f..5b0be8928 100644 --- a/plugins/admin/systems/class_workstationService.inc +++ b/plugins/admin/systems/class_workstationService.inc @@ -59,7 +59,7 @@ class workservice extends plugin var $XKbLayouts =array(); var $XKbVariants =array(); - function workservice ($config, $dn= NULL, $parent= NULL) + function workservice (&$config, $dn= NULL, $parent= NULL) { plugin::plugin ($config, $dn, $parent); diff --git a/plugins/admin/systems/class_workstationStartup.inc b/plugins/admin/systems/class_workstationStartup.inc index 0f7f3d37c..5396a0608 100644 --- a/plugins/admin/systems/class_workstationStartup.inc +++ b/plugins/admin/systems/class_workstationStartup.inc @@ -58,7 +58,7 @@ class workstartup extends plugin var $member_of_ogroup = FALSE; - function workstartup ($config, $dn= NULL, $parent= NULL) + function workstartup (&$config, $dn= NULL, $parent= NULL) { /* Check if FAI is active */ $tmp = search_config($config->data,"faiManagement","CLASS"); diff --git a/plugins/admin/users/class_divListUsers.inc b/plugins/admin/users/class_divListUsers.inc index 35b057b27..843930b7c 100644 --- a/plugins/admin/users/class_divListUsers.inc +++ b/plugins/admin/users/class_divListUsers.inc @@ -24,7 +24,7 @@ class divListUsers extends MultiSelectWindow var $parent ; var $ui ; - function divListUsers ($config,$parent) + function divListUsers (&$config,$parent) { MultiSelectWindow::MultiSelectWindow($config, "Users", "users"); diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc index 57b3cf06a..8623b53fc 100644 --- a/plugins/admin/users/class_userManagement.inc +++ b/plugins/admin/users/class_userManagement.inc @@ -41,11 +41,11 @@ class userManagement extends plugin var $start_pasting_copied_objects = FALSE; - function userManagement($config, $ui) + function userManagement(&$config, $ui) { /* Save configuration for internal use */ - $this->config= $config; - $this->ui= $ui; + $this->config= &$config; + $this->ui= &$ui; /* Copy & Paste handler */ if ($this->config->boolValueIsTrue("main", "enableCopyPaste")){ diff --git a/plugins/generic/references/class_reference.inc b/plugins/generic/references/class_reference.inc index bc2c1e5ae..d808f00ba 100644 --- a/plugins/generic/references/class_reference.inc +++ b/plugins/generic/references/class_reference.inc @@ -10,10 +10,10 @@ class reference extends plugin var $fold= array(); var $objectCache= array(); - function reference ($config, $dn= NULL) + function reference (&$config, $dn= NULL) { /* Include config object */ - $this->config= $config; + $this->config= &$config; $this->dn= $dn; /* Fill translation array */ diff --git a/plugins/gofax/blocklists/class_blocklistManagement.inc b/plugins/gofax/blocklists/class_blocklistManagement.inc index b0146012f..d72a44dd1 100644 --- a/plugins/gofax/blocklists/class_blocklistManagement.inc +++ b/plugins/gofax/blocklists/class_blocklistManagement.inc @@ -24,12 +24,12 @@ class blocklist extends plugin var $view_logged = FALSE; var $CopyPasteHandler = NULL; - function blocklist ($config, $ui) + function blocklist (&$config, $ui) { /* Init class */ $this->ui = $ui; $this->dn = ""; - $this->config = $config; + $this->config = &$config; $this->base = $_SESSION['CurrentMainBase']; $this->DivListBlocklist = new divListBlocklist($this->config,$this); $this->set_acl_category("gofaxlist"); diff --git a/plugins/gofax/blocklists/class_divListBlocklists.inc b/plugins/gofax/blocklists/class_divListBlocklists.inc index 2e78c656b..9bd0406c0 100755 --- a/plugins/gofax/blocklists/class_divListBlocklists.inc +++ b/plugins/gofax/blocklists/class_divListBlocklists.inc @@ -20,7 +20,7 @@ class divListBlocklist extends MultiSelectWindow var $parent ; var $ui ; - function divListBlocklist ($config,$parent) + function divListBlocklist (&$config, &$parent) { MultiSelectWindow::MultiSelectWindow($config, "Blocklists", "gofaxlist"); diff --git a/plugins/gofax/faxaccount/class_gofaxAccount.inc b/plugins/gofax/faxaccount/class_gofaxAccount.inc index ade7e57a7..95eb474aa 100644 --- a/plugins/gofax/faxaccount/class_gofaxAccount.inc +++ b/plugins/gofax/faxaccount/class_gofaxAccount.inc @@ -49,7 +49,7 @@ class gofaxAccount extends plugin var $objectclasses= array("goFaxAccount"); - function gofaxAccount ($config, $dn= NULL) + function gofaxAccount (&$config, $dn= NULL) { /* General initialization */ plugin::plugin ($config, $dn); diff --git a/plugins/gofax/faxreports/class_faxreport.inc b/plugins/gofax/faxreports/class_faxreport.inc index d0d2b18ff..b3628ad7a 100644 --- a/plugins/gofax/faxreports/class_faxreport.inc +++ b/plugins/gofax/faxreports/class_faxreport.inc @@ -33,11 +33,11 @@ class faxreport extends plugin /* Create class */ - function faxreport ($config, $ui) + function faxreport (&$config, &$ui) { /* Include config object */ $this->config = $config; - $this->ui = $ui; + $this->ui = &$ui; $this->search_base = get_base_from_people($ui->dn); $this->year = date("Y"); $this->month = date("m"); diff --git a/plugins/gofon/conference/class_divListConferences.inc b/plugins/gofon/conference/class_divListConferences.inc index c6632864d..e688523ce 100755 --- a/plugins/gofon/conference/class_divListConferences.inc +++ b/plugins/gofon/conference/class_divListConferences.inc @@ -20,7 +20,7 @@ class divListConference extends MultiSelectWindow var $parent ; var $ui ; - function divListConference ($config,$parent) + function divListConference (&$config,$parent) { MultiSelectWindow::MultiSelectWindow($config,"Conferences", "gofonconference"); diff --git a/plugins/gofon/conference/class_phoneConferenceGeneric.inc b/plugins/gofon/conference/class_phoneConferenceGeneric.inc index 24e0fa19b..9d580039f 100644 --- a/plugins/gofon/conference/class_phoneConferenceGeneric.inc +++ b/plugins/gofon/conference/class_phoneConferenceGeneric.inc @@ -63,7 +63,7 @@ class conference extends plugin var $objectclasses= array("top", "goFonConference"); - function conference ($config, $dn, $plugin= NULL) + function conference (&$config, $dn, $plugin= NULL) { plugin::plugin($config, $dn, $plugin); $this->is_account = TRUE; diff --git a/plugins/gofon/conference/class_phoneConferenceManagment.inc b/plugins/gofon/conference/class_phoneConferenceManagment.inc index c79968277..ff67ff17d 100644 --- a/plugins/gofon/conference/class_phoneConferenceManagment.inc +++ b/plugins/gofon/conference/class_phoneConferenceManagment.inc @@ -43,7 +43,7 @@ class phoneConferenceManagment extends plugin var $start_pasting_copied_objects = FALSE; /* Initialise Class */ - function phoneConferenceManagment ($config, $ui) + function phoneConferenceManagment (&$config, $ui) { $this->ui = $ui; $this->dn = ""; diff --git a/plugins/gofon/fonreports/class_fonreport.inc b/plugins/gofon/fonreports/class_fonreport.inc index dc72ddd94..a17500b84 100644 --- a/plugins/gofon/fonreports/class_fonreport.inc +++ b/plugins/gofon/fonreports/class_fonreport.inc @@ -27,7 +27,7 @@ class fonreport extends plugin var $view_logged = FALSE; /* Construct class */ - function fonreport ($config, $ui) + function fonreport (&$config, $ui) { /* Include config object */ $this->config = $config; diff --git a/plugins/gofon/macro/class_divListMacros.inc b/plugins/gofon/macro/class_divListMacros.inc index 682e9606a..3dae68dfe 100755 --- a/plugins/gofon/macro/class_divListMacros.inc +++ b/plugins/gofon/macro/class_divListMacros.inc @@ -20,7 +20,7 @@ class divListMacro extends MultiSelectWindow var $parent ; var $ui ; - function divListMacro ($config,$parent) + function divListMacro (&$config,$parent) { MultiSelectWindow::MultiSelectWindow($config,"Macros", "gofonmacro"); diff --git a/plugins/gofon/macro/class_gofonMacro.inc b/plugins/gofon/macro/class_gofonMacro.inc index 7078cf998..660f40f78 100755 --- a/plugins/gofon/macro/class_gofonMacro.inc +++ b/plugins/gofon/macro/class_gofonMacro.inc @@ -51,7 +51,7 @@ class macro extends plugin //! The Konstructor /*! Konstructor, load class with attributes of the given dn*/ - function macro ($config, $dn= NULL, $parent= NULL) + function macro (&$config, $dn= NULL, $parent= NULL) { plugin::plugin ($config, $dn, $parent); diff --git a/plugins/gofon/macro/class_gofonMacroManagement.inc b/plugins/gofon/macro/class_gofonMacroManagement.inc index d51135a01..fc40f41a5 100755 --- a/plugins/gofon/macro/class_gofonMacroManagement.inc +++ b/plugins/gofon/macro/class_gofonMacroManagement.inc @@ -34,7 +34,7 @@ class gofonMacro extends plugin var $CopyPasteHandler = NULL; var $start_pasting_copied_objects = FALSE; - function gofonMacro($config, $ui) + function gofonMacro(&$config, $ui) { /* Save configuration for internal use */ $this->config= $config; diff --git a/plugins/gofon/macro/class_gofonMacroParameters.inc b/plugins/gofon/macro/class_gofonMacroParameters.inc index 2960bbeb8..614e17d74 100755 --- a/plugins/gofon/macro/class_gofonMacroParameters.inc +++ b/plugins/gofon/macro/class_gofonMacroParameters.inc @@ -43,7 +43,7 @@ class macroParameter extends plugin - Set attributes from openldap (edit) - Set attributes from default (new) */ - function macroParameter ($config, $dn= NULL, $parent= NULL) + function macroParameter (&$config, $dn= NULL, $parent= NULL) { plugin::plugin ($config, $dn, $parent); diff --git a/plugins/gofon/phoneaccount/class_phoneAccount.inc b/plugins/gofon/phoneaccount/class_phoneAccount.inc index 169393524..4fd56b7e4 100644 --- a/plugins/gofon/phoneaccount/class_phoneAccount.inc +++ b/plugins/gofon/phoneaccount/class_phoneAccount.inc @@ -48,7 +48,7 @@ class phoneAccount extends plugin var $view_logged = FALSE; - function phoneAccount ($config, $dn= NULL, $parent= NULL) + function phoneAccount (&$config, $dn= NULL, $parent= NULL) { plugin::plugin ($config, $dn, $parent); diff --git a/plugins/personal/connectivity/class_connectivity.inc b/plugins/personal/connectivity/class_connectivity.inc index f66e5cecf..0704ffe11 100644 --- a/plugins/personal/connectivity/class_connectivity.inc +++ b/plugins/personal/connectivity/class_connectivity.inc @@ -25,7 +25,7 @@ class connectivity extends plugin var $CopyPasteVars = array("plugin","plugin_name"); - function connectivity ($config, $dn= NULL,$parent =NULL) + function connectivity (&$config, $dn= NULL,$parent =NULL) { /* Preseed permissions */ $this->dn= $dn; diff --git a/plugins/personal/connectivity/class_intranetAccount.inc b/plugins/personal/connectivity/class_intranetAccount.inc index 20b3d784b..f5baf7e4c 100644 --- a/plugins/personal/connectivity/class_intranetAccount.inc +++ b/plugins/personal/connectivity/class_intranetAccount.inc @@ -35,7 +35,7 @@ class intranetAccount extends plugin \version 1.00 \date 1.07.2005 */ - function intranetAccount ($config, $dn= NULL, $parent=NULL) + function intranetAccount (&$config, $dn= NULL, $parent=NULL) { plugin::plugin ($config, $dn,$parent); diff --git a/plugins/personal/connectivity/class_kolabAccount.inc b/plugins/personal/connectivity/class_kolabAccount.inc index 5e83d5f14..1ce362488 100644 --- a/plugins/personal/connectivity/class_kolabAccount.inc +++ b/plugins/personal/connectivity/class_kolabAccount.inc @@ -23,7 +23,7 @@ class kolabAccount extends plugin var $view_logged = FALSE; var $uid = ""; - function kolabAccount ($config, $dn= NULL,$parent = NULL) + function kolabAccount (&$config, $dn= NULL,$parent = NULL) { plugin::plugin ($config, $dn, $parent); diff --git a/plugins/personal/connectivity/class_opengwAccount.inc b/plugins/personal/connectivity/class_opengwAccount.inc index 4d1879418..8a589c113 100644 --- a/plugins/personal/connectivity/class_opengwAccount.inc +++ b/plugins/personal/connectivity/class_opengwAccount.inc @@ -35,7 +35,7 @@ class opengwAccount extends plugin var $view_logged = FALSE; var $uid = ""; - function opengwAccount ($config, $dn= NULL) + function opengwAccount (&$config, $dn= NULL) { plugin::plugin ($config, $dn); diff --git a/plugins/personal/connectivity/class_oxchangeAccount.inc b/plugins/personal/connectivity/class_oxchangeAccount.inc index e76cb2cd4..6fe7b9a45 100644 --- a/plugins/personal/connectivity/class_oxchangeAccount.inc +++ b/plugins/personal/connectivity/class_oxchangeAccount.inc @@ -580,7 +580,7 @@ class oxchangeAccount extends plugin var $dnmode= ""; var $uid =""; - function oxchangeAccount ($config, $dn= NULL) + function oxchangeAccount (&$config, $dn= NULL) { plugin::plugin ($config, $dn); for ($i=0;$iconfig->data['TABS']['CONNECTIVITY']);$i++){ diff --git a/plugins/personal/connectivity/class_phpgwAccount.inc b/plugins/personal/connectivity/class_phpgwAccount.inc index bd3036422..9a9457071 100644 --- a/plugins/personal/connectivity/class_phpgwAccount.inc +++ b/plugins/personal/connectivity/class_phpgwAccount.inc @@ -18,7 +18,7 @@ class phpgwAccount extends plugin var $uid = ""; var $view_logged = FALSE; - function phpgwAccount ($config, $dn= NULL) + function phpgwAccount (&$config, $dn= NULL) { plugin::plugin ($config, $dn); diff --git a/plugins/personal/connectivity/class_phpscheduleitAccount.inc b/plugins/personal/connectivity/class_phpscheduleitAccount.inc index 627229452..825df3d9b 100644 --- a/plugins/personal/connectivity/class_phpscheduleitAccount.inc +++ b/plugins/personal/connectivity/class_phpscheduleitAccount.inc @@ -33,7 +33,7 @@ class phpscheduleitAccount extends plugin var $ReadOnly =false; var $view_logged = FALSE; - function phpscheduleitAccount ($config, $dn= NULL) + function phpscheduleitAccount (&$config, $dn= NULL) { plugin::plugin ($config, $dn); } diff --git a/plugins/personal/connectivity/class_pptpAccount.inc b/plugins/personal/connectivity/class_pptpAccount.inc index 1efe423c9..4fe717c81 100644 --- a/plugins/personal/connectivity/class_pptpAccount.inc +++ b/plugins/personal/connectivity/class_pptpAccount.inc @@ -34,7 +34,7 @@ class pptpAccount extends plugin var $view_logged = FALSE; var $uid =""; - function pptpAccount ($config, $dn= NULL) + function pptpAccount (&$config, $dn= NULL) { plugin::plugin ($config, $dn); diff --git a/plugins/personal/connectivity/class_proxyAccount.inc b/plugins/personal/connectivity/class_proxyAccount.inc index feeabd9e6..e286cd66c 100644 --- a/plugins/personal/connectivity/class_proxyAccount.inc +++ b/plugins/personal/connectivity/class_proxyAccount.inc @@ -23,7 +23,7 @@ class proxyAccount extends plugin var $uid = ""; var $view_logged = FALSE; - function proxyAccount ($config, $dn= NULL) + function proxyAccount (&$config, $dn= NULL) { plugin::plugin ($config, $dn); diff --git a/plugins/personal/connectivity/class_pureftpdAccount.inc b/plugins/personal/connectivity/class_pureftpdAccount.inc index c0ad64358..669b818b9 100644 --- a/plugins/personal/connectivity/class_pureftpdAccount.inc +++ b/plugins/personal/connectivity/class_pureftpdAccount.inc @@ -26,7 +26,7 @@ class pureftpdAccount extends plugin var $ReadOnly; var $view_logged = FALSE; - function pureftpdAccount ($config, $dn= NULL, $parent= NULL) + function pureftpdAccount (&$config, $dn= NULL, $parent= NULL) { plugin::plugin ($config, $dn, $parent); diff --git a/plugins/personal/connectivity/class_webdavAccount.inc b/plugins/personal/connectivity/class_webdavAccount.inc index e3e588e2d..7783e7f48 100644 --- a/plugins/personal/connectivity/class_webdavAccount.inc +++ b/plugins/personal/connectivity/class_webdavAccount.inc @@ -13,7 +13,7 @@ class webdavAccount extends plugin var $view_logged = FALSE; var $uid =""; - function webdavAccount ($config, $dn= NULL) + function webdavAccount (&$config, $dn= NULL) { plugin::plugin ($config, $dn); diff --git a/plugins/personal/environment/class_environment.inc b/plugins/personal/environment/class_environment.inc index 8f3d00bf7..36597d19b 100644 --- a/plugins/personal/environment/class_environment.inc +++ b/plugins/personal/environment/class_environment.inc @@ -79,7 +79,7 @@ class environment extends plugin var $OrigCn; var $add_del_printer_member_was_called = false; - function environment ($config, $dn= NULL) + function environment (&$config, $dn= NULL) { plugin::plugin ($config, $dn); diff --git a/plugins/personal/environment/class_hotplugDialog.inc b/plugins/personal/environment/class_hotplugDialog.inc index 704838234..da5ad0891 100644 --- a/plugins/personal/environment/class_hotplugDialog.inc +++ b/plugins/personal/environment/class_hotplugDialog.inc @@ -26,7 +26,7 @@ class hotplugDialog extends plugin var $deplist = "/"; var $skipThese = array(); - function hotplugDialog ($config, $dn= NULL,$use_existing=false ,$skipThese = array()) + function hotplugDialog (&$config, $dn= NULL,$use_existing=false ,$skipThese = array()) { $this->use_existing = $use_existing; $this->skipThese = $skipThese; diff --git a/plugins/personal/environment/class_kioskManagementDialog.inc b/plugins/personal/environment/class_kioskManagementDialog.inc index 1c8b3fc7e..1e8bc9697 100644 --- a/plugins/personal/environment/class_kioskManagementDialog.inc +++ b/plugins/personal/environment/class_kioskManagementDialog.inc @@ -16,7 +16,7 @@ class kioskManagementDialog extends plugin var $baseDir = "../kiosk/"; - function kioskManagementDialog ($config, $dn= NULL,$attach=false ) + function kioskManagementDialog (&$config, $dn= NULL,$attach=false ) { $this->config= $config; $this->dn= $dn; diff --git a/plugins/personal/environment/class_logonManagementDialog.inc b/plugins/personal/environment/class_logonManagementDialog.inc index 6d5c4a5a2..f125ad096 100644 --- a/plugins/personal/environment/class_logonManagementDialog.inc +++ b/plugins/personal/environment/class_logonManagementDialog.inc @@ -23,7 +23,7 @@ class logonManagementDialog extends plugin var $real_LogonName = ""; - function logonManagementDialog ($config, $dn= NULL,$data=false) + function logonManagementDialog (&$config, $dn= NULL,$data=false) { plugin::plugin ($config, $dn); diff --git a/plugins/personal/environment/class_selectPrinterDialog.inc b/plugins/personal/environment/class_selectPrinterDialog.inc index 3e2935621..fea177be4 100644 --- a/plugins/personal/environment/class_selectPrinterDialog.inc +++ b/plugins/personal/environment/class_selectPrinterDialog.inc @@ -19,7 +19,7 @@ class selectPrinterDialog extends plugin var $ui = NULL; var $subtreesearch = FALSE; - function selectPrinterDialog ($config, $dn= NULL,$alreadyused=array() ) + function selectPrinterDialog (&$config, $dn= NULL,$alreadyused=array() ) { $this->AlreadyAssigned = $alreadyused; plugin::plugin ($config, $dn); diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc index 75f07e360..489570e86 100644 --- a/plugins/personal/generic/class_user.inc +++ b/plugins/personal/generic/class_user.inc @@ -107,7 +107,7 @@ class user extends plugin /* constructor, if 'dn' is set, the node loads the given 'dn' from LDAP */ - function user ($config, $dn= NULL) + function user (&$config, $dn= NULL) { $this->config= $config; /* Configuration is fine, allways */ @@ -519,7 +519,7 @@ class user extends plugin $this->pw_storage= $this->config->current['HASH']; } - $temp = @passwordMethod::get_available_methods(); + $temp= passwordMethod::get_available_methods(); $hashes = $temp['name']; /* Load attributes and acl's */ diff --git a/plugins/personal/mail/class_mailAccount.inc b/plugins/personal/mail/class_mailAccount.inc index 381351314..601f40085 100644 --- a/plugins/personal/mail/class_mailAccount.inc +++ b/plugins/personal/mail/class_mailAccount.inc @@ -66,7 +66,7 @@ class mailAccount extends plugin /* constructor, if 'dn' is set, the node loads the given 'dn' from LDAP */ - function mailAccount ($config, $dn= NULL) + function mailAccount (&$config, $dn= NULL) { /* Load bases attributes */ plugin::plugin($config, $dn); diff --git a/plugins/personal/nagios/class_nagiosAccount.inc b/plugins/personal/nagios/class_nagiosAccount.inc index 2650ab093..e32e5857a 100644 --- a/plugins/personal/nagios/class_nagiosAccount.inc +++ b/plugins/personal/nagios/class_nagiosAccount.inc @@ -64,7 +64,7 @@ class nagiosAccount extends plugin /* constructor, if 'dn' is set, the node loads the given 'dn' from LDAP */ - function nagiosAccount ($config, $dn= NULL) + function nagiosAccount (&$config, $dn= NULL) { /* Configuration is fine, allways */ $this->config= $config; diff --git a/plugins/personal/netatalk/class_netatalk.inc b/plugins/personal/netatalk/class_netatalk.inc index b322a151f..8e14e8213 100644 --- a/plugins/personal/netatalk/class_netatalk.inc +++ b/plugins/personal/netatalk/class_netatalk.inc @@ -74,7 +74,7 @@ class netatalk extends plugin { var $uid =""; /* The constructor just saves a copy of the config. You may add what ever you need. */ - function netatalk($config, $dn = NULL) { + function netatalk(&$config, $dn = NULL) { /* Include config object */ $this->config = $config; diff --git a/plugins/personal/password/class_password.inc b/plugins/personal/password/class_password.inc index df80924b8..8f137a30d 100644 --- a/plugins/personal/password/class_password.inc +++ b/plugins/personal/password/class_password.inc @@ -24,7 +24,7 @@ class password extends plugin var $plHeadline = "Password"; var $plDescription = "This does something"; - function password($config, $dn= NULL, $parent= NULL) + function password(&$config, $dn= NULL, $parent= NULL) { plugin::plugin($config, $dn, $parent); } diff --git a/plugins/personal/posix/class_posixAccount.inc b/plugins/personal/posix/class_posixAccount.inc index e2bddd34d..cbdfbee15 100644 --- a/plugins/personal/posix/class_posixAccount.inc +++ b/plugins/personal/posix/class_posixAccount.inc @@ -82,7 +82,7 @@ class posixAccount extends plugin /* constructor, if 'dn' is set, the node loads the given 'dn' from LDAP */ - function posixAccount ($config, $dn= NULL) + function posixAccount (&$config, $dn= NULL) { /* Configuration is fine, allways */ $this->config= $config; diff --git a/plugins/personal/samba/class_sambaAccount.inc b/plugins/personal/samba/class_sambaAccount.inc index 8421e659d..d66ec57e0 100644 --- a/plugins/personal/samba/class_sambaAccount.inc +++ b/plugins/personal/samba/class_sambaAccount.inc @@ -92,7 +92,7 @@ class sambaAccount extends plugin var $dialog = NULL; var $CopyPasteVars = array("kickoff_time_set","logoff_time_set","logon_time_set","mungedObject","orig_sambaDomainName"); - function sambaAccount ($config, $dn= NULL) + function sambaAccount (&$config, $dn= NULL) { /* Load attributes depending on the samba version */ $this->samba3= ($config->current['SAMBAVERSION'] == 3); diff --git a/plugins/personal/samba/class_sambaLogonHours.inc b/plugins/personal/samba/class_sambaLogonHours.inc index f889e95cf..95de60d0a 100644 --- a/plugins/personal/samba/class_sambaLogonHours.inc +++ b/plugins/personal/samba/class_sambaLogonHours.inc @@ -8,7 +8,7 @@ class sambaLogonHours extends plugin var $timezone = 0; var $config; - function sambaLogonHours ($config, $dn, $slh) + function sambaLogonHours (&$config, $dn, $slh) { plugin::plugin($config,$dn); $this->sambaLogonHours = $slh; diff --git a/plugins/personal/scalix/class_scalixAccount.inc b/plugins/personal/scalix/class_scalixAccount.inc index 234a373b2..e91448394 100644 --- a/plugins/personal/scalix/class_scalixAccount.inc +++ b/plugins/personal/scalix/class_scalixAccount.inc @@ -55,7 +55,7 @@ class scalixAccount extends plugin /* constructor, if 'dn' is set, the node loads the given 'dn' from LDAP */ - function scalixAccount ($config, $dn= NULL) + function scalixAccount (&$config, $dn= NULL) { /* dn shouldn't be NULL */ if($dn == NULL){ diff --git a/setup/class_setupStep_Checks.inc b/setup/class_setupStep_Checks.inc index 5af36b6c4..99e34ddfa 100644 --- a/setup/class_setupStep_Checks.inc +++ b/setup/class_setupStep_Checks.inc @@ -62,7 +62,7 @@ class Step_Checks extends setup_step /* PHP version check */ $N = _("Checking PHP version"); - $D = sprintf(_("PHP must be of version %s / %s or above."),"4.3.10","5.2.0"); + $D = sprintf(_("PHP must be of version %s or above."), "5.2.0"); $S = _("GOsa requires functionality that is not available (or buggy) in older PHP versions. Please update to a supported version."); $R = $this->check_php_version(); $M = TRUE; @@ -71,7 +71,7 @@ class Step_Checks extends setup_step /* Checking imap extension */ $N = _("Checking for LDAP support"); $D = _("This is the main extension used by GOsa and therefore really required."); - $S = _("The ldap extension (php4-ldap/php5-ldap) is required to communicate with your LDAP server."); + $S = _("The ldap extension (php5-ldap) is required to communicate with your LDAP server."); $R = is_callable("ldap_bind"); $M = TRUE; $this->basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M ); @@ -95,7 +95,7 @@ class Step_Checks extends setup_step /* Check for installed mhash module */ $N = _("Checking for mhash support"); $D = _("You'll need this module to make use of SSHA encryption"); - $S = _("The mhash module for PHP 4/5 is not available.Please install php4-mhash/php5-mhash."); + $S = _("The mhash module for PHP 5 is not available.Please install php5-mhash."); $R = is_callable("mhash"); $M = FALSE; $this->basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M ); @@ -103,7 +103,7 @@ class Step_Checks extends setup_step /* Is imap module available */ $N = _("Checking for IMAP support"); $D = _("The IMAP module is needed to communicate with the IMAP server. GOsa retrieves status information, creates and deletes mail users, etc."); - $S = _("This module is used to communicate with your mail server. Please install php4-imap/php5-imap."); + $S = _("This module is used to communicate with your mail server. Please install php5-imap."); $R = is_callable("imap_open"); $M = TRUE; $this->basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M ); @@ -119,7 +119,7 @@ class Step_Checks extends setup_step /* Mysql module loaded ? */ $N = _("Checking for MySQL support"); $D = _("MySQL support is needed to communicate with several supported databases."); - $S = _("This module is required to communicate with database servers (GOfax, asterisk, GLPI, etc.). Please install php4-mysql/php5-mysql"); + $S = _("This module is required to communicate with database servers (GOfax, asterisk, GLPI, etc.). Please install php5-mysql"); $R = is_callable("mysql_query"); $M = TRUE; $this->basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M ); @@ -135,7 +135,7 @@ class Step_Checks extends setup_step /* Snmp module available ? */ $N = _("Checking for SNMP support"); $D = _("The simple network management protocol is needed to get status information from clients."); - $S = _("This module is required for client monitoring. Please install php4-snmp/php5-snmp."); + $S = _("This module is required for client monitoring. Please install php5-snmp."); $R = is_callable("snmpget"); $M = FALSE; $this->basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M ); @@ -247,14 +247,12 @@ class Step_Checks extends setup_step $this->config_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M ); /* Emulating old stuff? */ - if (!preg_match('/^4/', phpversion())){ - $N = "zend.ze1_compatibility_mode = "._("Off").""; - $D = _("Increase your server performance by setting magic_quotes_gpc to 'off'."); - $S = _("Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."); - $R = !ini_get('zend.ze1_compatibility_mode'); - $M = FALSE; - $this->config_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M ); - } + $N = "zend.ze1_compatibility_mode = "._("Off").""; + $D = _("Increase your server performance by setting magic_quotes_gpc to 'off'."); + $S = _("Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."); + $R = !ini_get('zend.ze1_compatibility_mode'); + $M = FALSE; + $this->config_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M ); /* Configuration file @@ -306,11 +304,7 @@ class Step_Checks extends setup_step with the current version of GOsa */ function check_php_version() { - if(preg_match("/^5/",phpversion())){ - return(version_compare(phpversion(),"5.2.0",">=")); - }else{ - return(version_compare(phpversion(),"4.3.10",">=")); - } + return(version_compare(phpversion(),"5.2.0",">=")); } }