![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2bd7372)
raw | patch | inline | side by side (parent: 2bd7372)
| author | cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Wed, 12 Sep 2007 10:12:32 +0000 (10:12 +0000) | ||
| committer | cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Wed, 12 Sep 2007 10:12:32 +0000 (10:12 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@7280 594d385d-05f5-0310-b6e9-bd551577e9d8
181 files changed:
diff --git a/contrib/gosa.spec b/contrib/gosa.spec
index f3c69c21b5be0b176fc6af108ec923b9d70075fe..a737bfaa875d8bf9ca1ce9b5314cbd52378d1c33 100644 (file)
--- a/contrib/gosa.spec
+++ b/contrib/gosa.spec
Packager: Lars Scheiter <lars.scheiter@GONICUS.de>
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 353b04b3ad9f80fd302c280735cb8edb0a4238bd..506892834d1a744d2f3b54565c3564317120f0d7 100644 (file)
--- a/debian/apache.conf
+++ b/debian/apache.conf
-# 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 8962925cf1090658922e19e3d899cce367f49439..69c4cffe5331e37c64eadb4f7984bdddf79b4e26 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
gosa (2.6-1) unstable; urgency=low
- * New upstream release
+ * New major upstream release
- -- Cajus Pollmeier <cajus@frost> Mon, 03 Sep 2007 14:56:46 +0200
+ -- Cajus Pollmeier <cajus@debian.org> 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 8c617c8f728826c6de27f150fede822c3e3dfb84..b061c8b15d64eb8d6b2bb7f01a3b1576b499cdfd 100644 (file)
--- a/debian/control
+++ b/debian/control
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 11cbc9a98b019ca8d20b7b4e939e628aed02b188..8f0f654320fb42ae73ac8817c76354257b052194 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
# 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
-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
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 2a25aa99be64dcdae1296069e9972bfd6e6f1321..4dfe7477e5e2e70a343dd43b4799adb91b292c8a 100644 (file)
--- a/html/main.php
+++ b/html/main.php
$_SESSION['config']= $config;
/* Echo compilation time */
-//echo "<p align='right'>".get_MicroTimeDiff($start,microtime())."</p>";
+#echo "<p align='right'>".get_MicroTimeDiff($start,microtime())."</p>";
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
?>
index 2650fc9c98242c151cec5a7ae8e7da4938847e3b..1d6a1f04ac07b87f3308f9074ec63a0eea69e489 100644 (file)
/* 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();
index 3f1f089c83cec7f40ab4073c42062cb52a41ebf3..9d3b10008d59553723e9353114984316a412634e 100644 (file)
}
/* 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");
index 66211bfd029c91e024cf433d78f4d7cee8691317..1431eb4ec59860c1f064c6e68120177c2f785c4d 100755 (executable)
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 85ed6316235a3915948c60c2ba9e7d573f2f371f..4fbdbe962f21d6e956a880730bf62765e58446a0 100644 (file)
--- a/include/class_acl.inc
+++ b/include/class_acl.inc
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);
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 462be2892e3b53566e64def61b51400c6afe14ca..af687c39e605b2c64bcdc03cd0d0f0bc9ed97470 100644 (file)
--- a/include/class_log.inc
+++ b/include/class_log.inc
$entry['user']= "unkown";
}else{
- $this->config = $_SESSION['config'];
+ $this->config = &$_SESSION['config'];
$ui = get_userinfo();
$entry['user']= @$ui->dn;
}
index 3993f96a492f1cee3717af0a73b6f73aa7ebe2be..f191fbf07edd433fd9ac49c48c54225bed8c9ac7 100644 (file)
var $mbox= "-";
var $config;
var $gosaMailServer= "";
-var $uattrib= "uid";
+ var $uattrib= "uid";
- function mailMethodCyrus($config)
+ function mailMethodCyrus(&$config)
{
$this->config= $config->data['SERVERS']['IMAP'];
}
index 36304f25a50051c7b679b46ae9089366e24eceb4..e8d581c6b6354250159d48cf33fc2ea3ef6fa91b 100644 (file)
"gosaMailQuota" => "cyrus-userquota",
"gosaMailServer" => "kolabHomeServer");
- function mailMethodGolab($config)
+ function mailMethodGolab(&$config)
{
$this->config= $config->data['SERVERS']['IMAP'];
}
index d2eecd487f4db3b9fadbbfc520bc61db6c7dc209..04027c38873ed3fda977105778067d7069357eeb 100644 (file)
"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 f8cb7c3de3b8fe6abedcf29285d6e7cb68f2037f..686431ed341732cab1addcbc9a7db4061d8e43d8 100644 (file)
class mailMethodSendmailCyrus extends mailMethodCyrus
{
- function mailMethodSendmailCyrus($config)
+ function mailMethodSendmailCyrus(&$config)
{
$this->config= $config->data['SERVERS']['IMAP'];
}
index 2e67f7eaa6eb45c2348a2b44ebcafbb2611c6602..1874648a9c9e86d0117ede05f2249333f1df16f8 100644 (file)
{
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 4e8ff4862e93c258b8b2a50f91d96ebc4e86fa1a..835ec8bec3de4cddd9cc95aa71cc0484ce7e2f52 100644 (file)
function passwordMethodkerberos($config)
{
- $this->config=$config;
+ $this->config= &$config;
}
function is_available()
index e0b96c0dbafde5719ad5fb740092ca22a1bc5867..493cb5cf0d94a00251f160c89aae234dfe00e2c3 100644 (file)
// this function returns all loaded classes for password encryption
- function get_available_methods()
+ static function get_available_methods()
{
$ret =false;
$all = get_declared_classes();
index c4057ea67b5229127cc0e62dcdace0702dc7250b..2966e8d44f93e1a1bd72b4122eac6ab58de2a44f 100644 (file)
--- a/include/class_plugin.inc
+++ b/include/class_plugin.inc
\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 */
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));
/* 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();
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));
/* 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 */
$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));
*/
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.");
/* 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()){
index 3468ce3bdb43564a5837e8780ff03eea21c32f70..78f290597c1f17b13ff3a55e0b1f2531a85e7864 100644 (file)
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);
$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 3be731dcbcb0e780a173b2b7981b974353e8ba62..cb9bee89d25a57f9f2f73761a9743e3d3c9ec99e 100644 (file)
--- a/include/class_tabs.inc
+++ b/include/class_tabs.inc
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.= "<table summary=\"\" cellpadding=4 cellspacing=0 border=0 style=\"width:100%; background-color:#F8F8F8; border-style:solid; border-color:#AAA; border-top-width:0px; border-bottom-width:1px; border-left-width:1px; border-right-width:1px;\">\n";
- $display.= "<tr><td>\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.= "<table summary=\"\" cellpadding=4 cellspacing=0 border=0 style=\"width:100%; background-color:#F8F8F8; border-style:solid; border-color:#AAA; border-top-width:0px; border-bottom-width:1px; border-left-width:1px; border-right-width:1px;\">\n";
+ $display.= "<tr><td>\n";
- /* Footer for tabbed dialog */
- $display.= "</td></tr></table>";
- return ($display);
+ $display.= $this->by_object[$this->current]->execute();
+
+ /* Footer for tabbed dialog */
+ $display.= "</td></tr></table>";
+
+ 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= "<input type=\"hidden\" name=\"arg\" value=\"\">";
- $display.= "<table summary=\"\" cellpadding=0 cellspacing=0 border=0 style=\"width:100%;\"><tr>";
- $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.= "<td style=\"vertical-align:bottom;width:1px;white-space:nowrap;\">";
-
- /* 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= "<input type=\"hidden\" name=\"arg\" value=\"\">";
+ $display.= "<table summary=\"\" cellpadding=0 cellspacing=0 border=0 style=\"width:100%;\"><tr>";
+ $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.= "<td style=\"vertical-align:bottom;width:1px;white-space:nowrap;\">";
+
+ /* 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.= "<div ".$notify." class=\"$style[$index]\"><input type=\"submit\" name=\"$class\"".
+ " class=\"$style[$index]\" value=\"$title\"";
+ } else {
+ $display.= "<div ".$notify." class=\"$style[$index]\"><a class=\"$style[$index]\" onclick=\"return true;\" href=\"javascript:document.mainform.arg.value='$class';document.mainform.submit();\">$title</a";
+ }
+ $display.= "></div></td>";
}
+ $display.= "<td style=\"vertical-align:bottom;\">\n";
+ $display.= "<div class=\"tab_border\"> </div></td></tr></table>";
- if ($_SESSION['js']==FALSE){
- $display.= "<div ".$notify." class=\"$style[$index]\"><input type=\"submit\" name=\"$class\"".
- " class=\"$style[$index]\" value=\"$title\"";
- } else {
- $display.= "<div ".$notify." class=\"$style[$index]\"><a class=\"$style[$index]\" onclick=\"return true;\" href=\"javascript:document.mainform.arg.value='$class';document.mainform.submit();\">$title</a";
- }
- $display.= "></div></td>";
- }
- $display.= "<td style=\"vertical-align:bottom;\">\n";
- $display.= "<div class=\"tab_border\"> </div></td></tr></table>";
-
- return($display);
+ return($display);
}
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)
$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);
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);
+ }
}
*/
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();
}
}
}
{
$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']);
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);
+ }
+ }
}
}
index 783b66822fe500558313f1ca8a27c726243f02a5..ac33f535d5d9ddf03e899ec9862ad6b2ae6b6fd7 100644 (file)
/* 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();
}
}
- /* 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 7c559dbbea42e3c88fe606d812f1cfff5d7a80d6..0d27f10b18a98374620ac515fc057a20b31a6d87 100644 (file)
--- a/include/functions.inc
+++ b/include/functions.inc
}
-function get_userinfo()
+function &get_userinfo()
{
global $ui;
}
-function get_smarty()
+function &get_smarty()
{
global $smarty;
}
-function get_global($name)
+function &get_global($name)
{
return $_SESSION[$name];
}
}
-function search_config($arr, $name, $return)
+function search_config(&$arr, $name, $return)
{
if (is_array($arr)){
foreach ($arr as $a){
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
*/
index 90b4b54efc1abed34864ce5db604017247889de5..a300ea2ac5dfc96e0932980e0142067595ef4dea 100644 (file)
/* 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)){
}
$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 730d6367c85b59958c7a36ec7d6e09be9ce7f80f..a2eb279b557e4962b28a1765866a5194eabef25c 100644 (file)
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 0ad7ee43104d55fd1cf70069c94d1fcb25fc9a16..f1f9b04d83409da135438db7cf5c24014f5f1ac6 100644 (file)
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;
}
index 8f4f7d3cb3c1dd91e7cb92c7676b53af433d7ba7..b8c3f4da63eed9ddaf26ad7071b6938e453a2d3e 100644 (file)
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 0da6a9b2af7498bfd2e61baaaff56273a0956e6e..589fefe88e13609f2f57abd15f09b2cde347e4a7 100644 (file)
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 79bfcbf460026f2684bd0587486b3d0f26e27ab6..67d4d3946795321d489cec40fb758f2f035277fe 100644 (file)
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 248f594280957e1d64d42449bebdcbf56d3d57da..703454e4c6772c1df978963fade49e238bc1556e 100644 (file)
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 95d96fd7afedfe7a87119fb77cf75d7c99f56432..66131ca2162830500a40c195eb5e02fe38785250 100644 (file)
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 64ea7c309ba2aa48b979c97c6020ceb8050c39c8..aa988a31209d04b612dafd4e6d44d2bfa919b427 100644 (file)
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 10100dadbd97230faec59bc5bfae5b3a399f2998..3331cbacd10c5c30d5ac0d2899178953f16a9162 100644 (file)
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 ca5a02ea0ce7c9b4dae600ed41463110dd92185d..71edbb2a2da5a557445379299c9d4882d369e505 100644 (file)
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();
}
index 8f0c783eca52031a607c21a58a113120e562599a..d24e208fbcde11358cde34ffffb368e2abc13470 100644 (file)
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 bc81e16ae8c4631d04ecd58aed5f368d929b44d7..6bd5d940fc10ac5fac6287d8134066df14c3146c 100644 (file)
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 */
index 22bd6ad1d2f326fd81e32d82ea5638b22d1952ab..b5eb5bdd375941d08328d53cad9d6137b08cbc01 100644 (file)
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 f33ba88b7f63bc0e0a2e39a4f444abe007240456..7d8762107d86f53cdd7e25e84af3e47bcdef0a5e 100644 (file)
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 363a980b522d2d53033d047a0b0908e99fc9da48..f21292ac5886951c2a4c9505de9d2e23ebbdeb65 100644 (file)
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;
index 04839ad30215654ffd92e6ff3b14f2a8197ff505..99457bc347a4a91fd0340507d13a1101a12526b0 100644 (file)
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']))){
index aab0e6ec10edb2454d52eb3789f345e6f7b5ee2b..0744742f839d053907a44b2682b47eca6edc11d6 100644 (file)
var $orig_dn;
var $base ="";
- function aclrole ($config, $dn= NULL)
+ function aclrole (&$config, $dn= NULL)
{
/* Include config object */
plugin::plugin($config, $dn);
index 56d0d2662eff47e870427f0c8e2673327139c4ec..f7068feddaf75a9f1d754fecd34cbb7db5b1904c 100644 (file)
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 b895dfd4180039c642a0691fa6bfeb0f4cb6f190..5e8ee67da6f2a75ac760083caa3666cf2cb74c1a 100644 (file)
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 bf562185c6f232f553638348ae02dd46da20199f..fd0104482c33dfb9b362c1b016859abefebee0c7 100644 (file)
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 34edcdb9fec45c58725b8d0722841f0faa515a69..af3d2d422e4eb37a89d4e1e5f67c6f68cf4d6a6d 100644 (file)
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 3cfeea35db5341510fa356608d4c66783d38d61e..0e4ae0230d82ba4a519199b876b518b1d37ea36a 100755 (executable)
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 44079824dfd3f5b02daa90d51145f1a8556d27cc..ba32c90e7254cb217c7177ab270f1973d8dfd8c2 100644 (file)
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 05aa89ebc83ca0837391799b8dac594d50028da4..db43a0544fa1bcd8c949a06f2e4bb01600bdee47 100644 (file)
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 6e1c66765769217a37791d04777967940161adda..675c5b0a8ddb334fc257602a92a56bb1cb30b061 100755 (executable)
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 */
index d6bf8cca3319d9994279cf33770d440a13919180..be6a2dec1860f3c30185a3b6a127afed7fb8d047 100644 (file)
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;
index d586dec9228bc187a1d3985f89d8c3b2fda97ac6..860be1ac2e20b1db59d76de91b71573c6ffb7fa4 100644 (file)
var $SaveAdditionalVars = array("selectedBranch");
- function divListFai ($config,$parent)
+ function divListFai (&$config,$parent)
{
MultiSelectWindow::MultiSelectWindow($config, "Fai", "fai");
index b68058fd4a06cf25368a6a3459082ae75c034be5..48b560c1b2e388e604a99862b8daf159b4cda166 100644 (file)
var $FAIstate = "";
var $ui;
- function faiHook ($config, $dn= NULL)
+ function faiHook (&$config, $dn= NULL)
{
/* Load Attributes */
plugin::plugin ($config, $dn);
index 52b4e76b03076afe4ab00cb11d11248bdb63aafd..0d12d8e35adc7f73b1999081e392b1b6fd955952 100644 (file)
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"){
index 20c50d07b3d899f2e947c7c4978c90b39470cec3..d2d7756d388ab9d4beb923928e45c9a53390d494 100644 (file)
/* construction/reconstruction
*/
- function faiManagement ($config, $ui)
+ function faiManagement (&$config, $ui)
{
/* Set defaults */
$this->dn = "";
index e607b601697f0740f8b156f25cd1f3b5e2aee34d..a14352d65d2eab959c0fafb4da78c05013fb5d2d 100644 (file)
"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 63c2f90d5ad9d52d1a1c220e26526f718765489d..18f3e2b6c737c515bfe55c0a76ae975a3c525ee4 100644 (file)
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 d522a6ab8332123ab43cc22523113e3fab26e451..1b22ba86966df7adf96f9765832ee18d4127468c 100644 (file)
/* 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 2920d02bd45fd066257522b93036bc03dfecd466..df1b8a53e5b5ed0d6858e9a5b6dd65b5d2c9b23b 100644 (file)
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 1223d9e598e1ed1245dc188074ac4bfb1225d7d2..991ed324dbe24e3de7679eef680a0a57ddfe7047 100644 (file)
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",
index e20bb04ef136f9cdd2c6c53b9da7d9311572867f..361cb8afd5fa712b2fd5dab64e75150ff3787490 100644 (file)
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 bd8de6829f789842cb508ef88ffc8b6ed1d03af5..56e74f96cbac2aa3ddfa4a9a0b895a62b71c5ed1 100644 (file)
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);
index e7a395ae9e4fb2a2fced9ed048ee6c6039a5e786..4e4b35ca600d56901a08ac7bd551e005ccbd154d 100644 (file)
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 4f5cf2990f647fff755bbdeee24b3c1f3a999d13..5761751c2257516ca2e836494fd7ea8703bd0ce4 100644 (file)
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"){
index 034f8cefe107b388f1f5a2a2cb6ee0acc628486e..a6fa6dab02d61b752bd1448ac73c994da6e6badd 100644 (file)
var $parent = NULL;
var $ui = NULL;
- function faiSummaryTab($config,$dn)//,$parent)
+ function faiSummaryTab(&$config,$dn)//,$parent)
{
plugin::plugin($config,$dn);//,$parent);
index 09d8e232122a51cbcdd7e6fc3dac03aaba3f7c8d..21efe27d04f55a178710c01f446864c59a750142 100644 (file)
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 203c789baa6769a8a6b7eb2894faffa903cc7a70..d661c81550f0d12e13ffd171957226ebe2ed15f6 100644 (file)
var $parent = NULL;
var $FAIstate = "";
- function faiTemplateEntry ($config, $dn= NULL,$object=false)
+ function faiTemplateEntry (&$config, $dn= NULL,$object=false)
{
plugin::plugin ($config, $dn);
index f275209efd8083132075c471e2d6b6e8f2b78239..56fd969f0e3fa3820d037f3e5c1bdc6dc199c363 100644 (file)
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 ce47af952a3d6623b1aeea4f53dacce9df55d310..2bcb8548e1a8b343d61e22b9e397fedee1a47a4e 100644 (file)
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 a4aa79333ab10b5544bc203cacbcc80f21069471..af5ab8aaf3694969606187ca28f181fcd4346e43 100644 (file)
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 c774568645da6706865d3da69877a8a92e7d351f..5a2418c0588f14fa609bef4e2720ee7af1943602 100644 (file)
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 2a8f2a55a0e5090db8640d49d8e63873203f92ef..da836f268985ef296f1b6b3123221a5b02a036cc 100644 (file)
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")){
index dc99297ce48e93e2705dc34852e5ef21e1eca988..448f4952d01605a7d6127f54bed99985e875c33c 100644 (file)
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 0935151545fa7267191ff858a410a68557889b97..ae158df8050ec759485baaba6dc11b4157409003 100644 (file)
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 cf5f165f70ac19613aa860ca97c406437e6aece7..6a6d7447ef73d99aa24a3ff072cfad5c2a00b9a2 100755 (executable)
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 e7585c90b44a1c5551795b8774f10673367c4637..27e4b7e6d4d253f04d3adf1314b470acaef8c88c 100644 (file)
/* 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 598027771eacd501d0bf3f50db3682a36a20d28e..d6e8f79275c1c136916a8cae3025fda1438e9561 100755 (executable)
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 d9f243fa862da30c2c403a67292bb342d6d4526a..ffc399d07e23dcde7bbf1827a5e904d81b59e1d1 100755 (executable)
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 1040dc626a0269fb76e3709574f24860acc9f09f..33878acda0264f352c4aaa9ee650fa5c73a63071 100644 (file)
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);
index f5eab49103165efc80138d9a997d702b629d12be..22699c89306d4f6695d67420cf5fc6c5cef1a984 100644 (file)
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 82550f477e61818cad138804579339fca8bb9070..5cd51a38797d6a32410ccce86ee424a6a5e3c341 100644 (file)
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 4a24a0b682b99db46b871bb9be15be28fd9d54aa..f3e90d73ec2103985ccdfc6d985a2d58a56646df 100644 (file)
* - Parse phone options flags
* - Get phone numbers
*/
- function phonequeue ($config, $dn= NULL)
+ function phonequeue (&$config, $dn= NULL)
{
plugin::plugin($config, $dn);
index 2c759829e891250265451d489ef753d79655277b..68886fce03c345ff00fbe9a3d993e577f17c1da2 100644 (file)
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 65bd07d86a2f495acf0cc65f83f7aae1acf2a59d..c17b8ef5f1f2e5777aa5e6ccb8a43c001416ed4c 100644 (file)
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 86ab833aca2c9e22bf54c1a3b18e8cb64dcb7292..47e97012d8964f9281254dca8a3b9490ccf47906 100644 (file)
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 0a1040c7a22909d72193cfec8ba8122ab60fb998..ecdd4da28f93a9272797c8e9927006f34a98d3c2 100644 (file)
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!<br>";
$module= "all";
diff --git a/plugins/admin/systems/class_componentGeneric.inc b/plugins/admin/systems/class_componentGeneric.inc
index 9b890a547b10fad692b226665785bd1a4d3df045..108f1f405096d7499e4e47da5adaa4c446be9325 100644 (file)
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);
index eb61c48225a8b32e98a8bdd2bbc11c06f30937ed..e29ae0332f4430f54ab174067068c95cca908446 100644 (file)
/* 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 1bc74b72d4f794a13bcddf0293d4734d1d19df4f..2e55d84614663bd111150d490cbc490e68a7d75c 100644 (file)
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 2859930ea078954314811be2400244db6d37e0e9..76d45fd382c22e02e2362893cf3f5db062cb9306 100644 (file)
/* 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 7d7c13d7dda8ed775512b45f4951e9d5a17ca3cd..f4453243daf2b1bab7648c9d42d316ad70cd24ed 100644 (file)
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 607182873975d83154dc171aafae2fbcbbf7a203..e7d53a9a9ec49b352f6630821e192c1850721522 100644 (file)
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 9ae1ea8003b2c5214d303c747443f7c15d41a05b..8e676d8eeeae19cb97c300b714d9ec1228103a29 100644 (file)
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 9645a1e0bec1375547e32c09ba87f79dce3991da..9a461b785ec261ed8e06bd8d4ac03f417f110fcc 100644 (file)
/* 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 672f324af87390353837d5facdfe1f89e7ff30ca..85e0805c6f4e966ea0f8c81804651f66751a4d83 100644 (file)
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 c130618a4afb7e78799145d5c0a1c52ee2c8e3cc..e1d86fcb61219743b22ce0126367c13fbd4b9306 100644 (file)
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 0e1ef982811d9c83ed03099c065b6cc3c8abe9d4..7073b12a40564807837d986f706cd683fb9f518b 100644 (file)
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 e4e3f8b984507920ab4e800a9fde1a827920b16b..a21271c5b30364f2de06809ecdfd0cff738277b6 100644 (file)
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 074df70864f8f2ba32ae2818c238b356efb282d7..deb02580e347732e370ee98b23904df88340c77d 100644 (file)
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 7408a7800ae6ce7260cdfe6470e48e39da609b45..9d3b3624d43230f0215d006472160e108d83a39d 100644 (file)
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 83ee39ef92740c91017d7c75a7a8da238626bf4e..f126d6bb379eb1213993c4b82c6325fcf5188899 100644 (file)
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 3fb4fe9578ce7508936bed77f5800e94d8f30e0b..41f39fab81d9ec7cd19ee1c407b61f6ea639b022 100644 (file)
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 e49c2ba4f320965979b3e6105836f20b5f29e361..f3b1150f742d639fcdff6a2c2d34a711678abc99 100644 (file)
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 7e35f52e3af4d0cbc4479bfbf56b69f30d9f6746..f5abb6d2436beb6e45efb26d50e1530989cc66d2 100644 (file)
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 4d95ca8726afe7d34e43b499c4f7fe47081fafa0..974240dcf9845ac38510e202a249e03118dd04b3 100644 (file)
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 b97c3955d9b48435e0e57f0677a120e1b66e1cec..55d3f5845ca05532e1b43c5e687779070fc561f3 100644 (file)
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 aeb5a4b974f2b8a569f7128da21e8a7c7f838992..234a06b96278ede28f421b0adb641b3f6541fe5a 100644 (file)
var $cn = "";
var $view_logged =FALSE;
- function goNtpServer($config,$dn)
+ function goNtpServer(&$config,$dn)
{
goService::goService($config,$dn);
$this->DisplayName = _("Time service (NTP)");
index 49c44125f615eb26c5d9677eba050c8118f3eab1..63b8850dc4ee11585353cc0a1af37f55c0a66e01 100644 (file)
/* 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 6b7f39aa382c514633f11ddc96f9bfc75fe96d00..8e5981bdd881d661a94b9469c252ca0df5a2b119 100644 (file)
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 329522fa74097934aa56de03433b2e1ecdb49ba5..a0945699f7448dd8c180a170d935040134377cba 100644 (file)
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 e0935bc2edceccbb7b301920b8d5a4de4eea3333..c8eed5d4ec998ddaaad17f85ff008ad41432c8cd 100644 (file)
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 b94093026aeccc62fac5fda973f875a2dd8b9f46..81f15bab0c82f4a8bfb869ed6ebb8b52b66f64aa 100644 (file)
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 21b721b761cfa80a56ea5c6343f1aeeb30ebea09..5fa4184baffb5d54d79d7ad241d87cda3e6c7ee2 100644 (file)
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 7e02b97016a38d92b44ee568a0ad67cc91230ba5..dd76a6a126624f0e8eec32f7ac07e5faf8e050e4 100644 (file)
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 3458a6273f667860fe2aa6cbe0ccfafa4a5e6a90..bcfffeb52737af67f9d17e2f7c7d1864491433b2 100644 (file)
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 fc2ce9d6095333faa52b59a352e0bd8556558ace..2c1c65dbe5b2c2164d014acdc1c6a137909d11d5 100644 (file)
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 25a78d57f0c03a984086360dee0e91f56e66a427..9f772281ee8189be45acd7775f8846dadee6975e 100644 (file)
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 f6812ef8a6c97023404d3f3379b43fa4a99e53f0..a691ffc77030c1c2628fce8e4c3392a32f77f4d1 100644 (file)
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 6bd420e690809e7f1e2c21c73a996bc2b9a81543..7914d8d46535bbfb0a9e77edc19ce14e4eb0d74a 100644 (file)
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 f4964c15bee797ecb7c218125806ccee1182c5e6..8ed9f8c3784cb3765bbdf5f428cd74c7214eb852 100644 (file)
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'];
index 2392bb12fd5481823bdd31b8968add3c99a5ebeb..f22860b68fedd2025652df67d0b056fd0fe18a36 100644 (file)
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);
index 89d2f3f367ea5d8eee7d4e883ce540ff13a763bf..4662a0d170f9426fb1beb4a600af0eda9faa8bf0 100644 (file)
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 1f1ee73a635b3734c4d03ea2afb711e25206232b..dfe48c506de726d951823314c53ce50fde31a873 100644 (file)
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 b87d22c1e3e7c6e460b599cc4f349c31e357dbc1..1d8037a0702435b70e1e6fcf36f79439d5e60568 100644 (file)
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 37e4aef73e76c6ffa502a8d1a1f0d2edcc66ab1a..116628786e14a2ee21968b3b5ab93cf7199d682c 100644 (file)
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");
index 8f3a9c6a5744e9ea3116cac68b9f09909f9504b6..5cefbabe46d71cea5011d2190722aa81658dc159 100644 (file)
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);
index fbacff14202baafc3951c13329c492dd11c65829..37597d03cbed8950c1cac87880911c9314d4dae6 100644 (file)
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 7ea32fe9dab41349aab4aa322a20ff90f93d55fc..aa370c1ab7b6e7081f738be256c1b85e3949ab9e 100644 (file)
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 f186bf912a499a6ae5f029c8362f8e1dcb801d4b..e8c51274646cc8ec96a49338bff4c9e86612f23a 100644 (file)
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 239a5476e4a93be5da1d98f26f29d3c79488ca3a..215bbd712b2dad64117409e00c44ec17bd479d96 100644 (file)
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 5b8f7daf9ec84ba9ae343ed436b8b2811917f5f3..30e90a744f5f28b04ff32bb0aee27a35b2b3d649 100644 (file)
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;
index b828cc21821bbfaf1268d8be2e4434327db20d73..5856eeef53630b9aeea10c6187117162d508649c 100644 (file)
/* 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 775d95dca4202875202483a68cb8a3f2c9b7d6de..3eef5f61fc393c99f9d71a0c5bab4cca66853cff 100644 (file)
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 7ce3d2bb98c0d5e824287ff6854b223069676b6b..29ee7d33553733ce19bc9da246a6190f40fb8369 100644 (file)
"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 510408a07ab9d66996feee1519fa3bb6bf1e5318..0d07ef0b135dbaf2e803a6c4085245f2301266cd 100644 (file)
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 6f0421abe00993a3eaebefa7d71d64c350af3f26..33d4ad297544fe8f5bf91541415ff83e40ee36f6 100644 (file)
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 97de3be8bde7509911ed6c24fdd55fe3768d7098..cbabc12ae1cd406a6d13821a8dd046eabd9ff898 100644 (file)
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 4fbba785479041a6a2905e24e5678af40bff1f43..a61bf95991f0b290a7afb98fb82dbde6bd90e65b 100644 (file)
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 d0d45262fdf991d43595a5c18a3c7874019eb0d3..5b0be8928384a14be613ca99b65a2a107d6d9d40 100644 (file)
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 0f7f3d37cde59dad074c0a1d37c5a322ea7cc0a0..5396a0608d7a9e21c4eb077086635669e228a89a 100644 (file)
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 35b057b2766aeda1a13401817d6157de205ea0ff..843930b7c098e0308139776d84b362867e50f49d 100644 (file)
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 57b3cf06ad858358c1d3e1b1e18db0d9f7de3c65..8623b53fc68acf2036ae053f7f96db632f43b379 100644 (file)
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 bc2c1e5aec7f0a4b532d4d4fa1afc2fbdd641db3..d808f00ba33e55c2220ce15eb3a830774495c164 100644 (file)
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 b0146012fe49f11719c3f5aea44272b7e1bb62fd..d72a44dd1c7dcb9ec34d748e337507d111fd3d01 100644 (file)
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 2e78c656bbf1171be9b80be4aa88f2ae4082702d..9bd0406c0a0bd82cf2502850a6b2669a9fac0e71 100755 (executable)
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 ade7e57a7ad186d59b238f21c51128e1c13a6bc4..95eb474aa2cda206f8348e727929de25f267aee4 100644 (file)
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 d0d2b18ff019715c618c308650d15390d2513b5b..b3628ad7a3c7d6b5e309a19df16d4e8b5446a018 100644 (file)
/* 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 c6632864db67485643239d7e92fe22eaf656337b..e688523cea55e87b1890e8793ab927f79eb7dd43 100755 (executable)
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 24e0fa19b760ab2bc1ae8981b7ecd3f1cfccf996..9d580039f0bcd76314870e81680fb6a6b8edbf66 100644 (file)
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 c79968277e6e42e03531311c15ad037d963743f4..ff67ff17dc81ede2afc7ce2341a64fdea2bed5fa 100644 (file)
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 dc72ddd94f70a5136cd69951fb9d420b9970a218..a17500b84ad74bbab59bb84533c3a3ef1d7b5197 100644 (file)
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 682e9606aa9446ad28b6be5106d0f1a77a7c5c15..3dae68dfee92b152e45224977dc5f6ea8efcb6b4 100755 (executable)
var $parent ;
var $ui ;
- function divListMacro ($config,$parent)
+ function divListMacro (&$config,$parent)
{
MultiSelectWindow::MultiSelectWindow($config,"Macros", "gofonmacro");
index 7078cf998efc6af5a0214dc1a379b7a728ef1e43..660f40f788d2e15fd8b873030de193c8c5fe44c5 100755 (executable)
//! 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 d51135a015acf23f074fb0217965315c8cab4044..fc40f41a54d2d11df54cde37d1381080b9c9b629 100755 (executable)
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 2960bbeb87c12b54174833e0afa8b6d96bbf835a..614e17d74698c3bf64a94debd0a3e9c38dc5de53 100755 (executable)
- 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 1693935245549a6bb16f4ec9973481e220742bc9..4fd56b7e4502be7b011b597a0afd342efee3b3db 100644 (file)
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 f66e5cecf250bcbb13f93c582025bf8c9a20c9c9..0704ffe111009d6628eb2676370de53a5a83008a 100644 (file)
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 20b3d784be404a4ef6476442be4d4a0bd42c5433..f5baf7e4c954981a4c2ce04056dc739a78347d8e 100644 (file)
\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 5e83d5f14b99f957e79d9ca9f172a44108da6595..1ce36248855aa8c351258209499d920e2fd850a9 100644 (file)
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 4d18794184e95513338925f61a131c5673eb8270..8a589c113d5053a06c836f7a50aba35cec0c90b5 100644 (file)
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 e76cb2cd438f17d08ceb518be8dfcee0fc5c8daa..6fe7b9a4533c7fd84ed91af61b516170e1cee89c 100644 (file)
var $dnmode= "";
var $uid ="";
- function oxchangeAccount ($config, $dn= NULL)
+ function oxchangeAccount (&$config, $dn= NULL)
{
plugin::plugin ($config, $dn);
for ($i=0;$i<count($this->config->data['TABS']['CONNECTIVITY']);$i++){
diff --git a/plugins/personal/connectivity/class_phpgwAccount.inc b/plugins/personal/connectivity/class_phpgwAccount.inc
index bd3036422cb8ad77d1067eb93f8aeee79db07dc9..9a9457071abae427520dadbfc85a8464e5bd3777 100644 (file)
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 6272294521f52142d202e1ec694b254c94088522..825df3d9b1f1df68719f79f3ebc68ef7223154ce 100644 (file)
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 1efe423c908b259beaa8f9fc4f905c9d11fdee67..4fe717c810fc3ab81cf57ce35bcb247a05880403 100644 (file)
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 feeabd9e602478900a55eea1b9f4b3fe8027b64c..e286cd66c622da6c8384817ec28ac1dd524bfc52 100644 (file)
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 c0ad6435811644c608f6d4a16a2e94ae95cc8fc3..669b818b966f2144bdb017e07631531f412658f0 100644 (file)
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 e3e588e2d5e49437533939a9db01a60e7ce2ff3c..7783e7f48553676dface37a9a1c581141b44bd69 100644 (file)
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 8f3d00bf715554985b6aef56063f5dc2747a9a55..36597d19b987b4efde492f321f83129c39f044f8 100644 (file)
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 704838234408c88e4e422432bfe4e98984d058e5..da5ad0891124c56185ff4f5e6dfa3a9d7e5963a8 100644 (file)
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 1c8b3fc7e8edb16b14196065d2837f377fedf85d..1e8bc9697c5ec495e6acf88dd5a5591d4ce3fb58 100644 (file)
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 6d5c4a5a25b52e0603c26ce7c3e61371846e089f..f125ad096784c88f23fc3d4a83fdead663b02169 100644 (file)
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 3e29356213fe48645eb94f6400a0ef26e34893f4..fea177be4e2874a5491db732226551b0b703c17e 100644 (file)
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);
index 75f07e360c1595922dcc0e6430c12285db0c0093..489570e868ab1d4c4f07f31d4c19e420bed56597 100644 (file)
/* 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 */
$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 381351314aae8625d6287ba43ad81402c25ed85c..601f400854c489f5db0667fc5fe58d2a11b96ade 100644 (file)
/* 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 2650ab0938f3dba8ff76cb7a2a61240f1708c5d5..e32e5857a7d6d5fa835228ad95e99059e29cfdff 100644 (file)
/* 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 b322a151f16d3d34d0a9a84939c832a5f445af53..8e14e8213bd564f0ae7de791a43fdb174c80c895 100644 (file)
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 df80924b8f7cb4fd0261661d1fcfb78caec126a5..8f137a30df19b5b7c8e994452124b10ea1d51544 100644 (file)
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 e2bddd34d39bb18e70c92b9fdd4cdeb4838fada6..cbdfbee15285bfb4b2897c3307cc917c4e482e0a 100644 (file)
/* 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 8421e659d059f591381633db441f5dd35695d14e..d66ec57e0eee7796dca618e4a392132f742d3302 100644 (file)
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 f889e95cfc2c1e475206c9a2f7483aab259d9276..95de60d0ad5aae2b74ae4d9fc79bbb74bb668206 100644 (file)
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 234a373b27fea45a67fabba0ca14792aeb9baaa8..e914483945177281952ddce351912a662644fe3d 100644 (file)
/* 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){
index 5af36b6c49080f15fe4c8198e598deaf3a50da23..99e34ddfae8c9e709f63f949c21a39d4c696d11e 100644 (file)
/* 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;
/* 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 );
/* 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 );
/* 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 );
/* 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 );
/* 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 );
$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 = <b>"._("Off")."</b>";
- $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 = <b>"._("Off")."</b>";
+ $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
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",">="));
}
}