From: cajus Date: Mon, 25 Feb 2008 09:01:04 +0000 (+0000) Subject: Removed a couple of left over call time references X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9bbfb86b625d4bfb02a97b95075c5ef7f3f196cd;p=gosa.git Removed a couple of left over call time references git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@9094 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-core/include/class_plugin.inc b/gosa-core/include/class_plugin.inc index 3527494d8..acdcbfe08 100644 --- a/gosa-core/include/class_plugin.inc +++ b/gosa-core/include/class_plugin.inc @@ -358,7 +358,7 @@ class plugin } /* Handle tagging */ - $this->tag_attrs(&$this->attrs); + $this->tag_attrs($this->attrs); } @@ -964,7 +964,7 @@ class plugin } } - function tag_attrs($at, $dn= "", $tag= "", $show= false) + function tag_attrs(&$at, $dn= "", $tag= "", $show= false) { /* No dn? Self-operation... */ if ($dn == ""){ @@ -1004,14 +1004,14 @@ class plugin } /* Remove tags that may already be here... */ - remove_objectClass("gosaAdministrativeUnitTag", &$at); + remove_objectClass("gosaAdministrativeUnitTag", $at); if (isset($at['gosaUnitTag'])){ unset($at['gosaUnitTag']); } /* Set tag? */ if ($tag != ""){ - add_objectClass("gosaAdministrativeUnitTag", &$at); + add_objectClass("gosaAdministrativeUnitTag", $at); $at['gosaUnitTag']= $tag; } } diff --git a/gosa-plugins/fai/admin/fai/class_faiHook.inc b/gosa-plugins/fai/admin/fai/class_faiHook.inc index f1fec85fc..6067bfb9b 100644 --- a/gosa-plugins/fai/admin/fai/class_faiHook.inc +++ b/gosa-plugins/fai/admin/fai/class_faiHook.inc @@ -532,7 +532,7 @@ class faiHook extends plugin } /* Tag object */ - $this->tag_attrs(&$tmp, $sub_dn, $this->gosaUnitTag); + $this->tag_attrs($tmp, $sub_dn, $this->gosaUnitTag); if($obj['status'] == "delete"){ FAI::prepare_to_save_FAI_object($sub_dn,array(),true); diff --git a/gosa-plugins/fai/admin/fai/class_faiPackage.inc b/gosa-plugins/fai/admin/fai/class_faiPackage.inc index 277cf6646..c1b4b3f61 100644 --- a/gosa-plugins/fai/admin/fai/class_faiPackage.inc +++ b/gosa-plugins/fai/admin/fai/class_faiPackage.inc @@ -524,7 +524,7 @@ class faiPackage extends plugin $pkgdn = "FAIvariable=".$name.",".$this->dn; /* Tag object */ - $this->tag_attrs(&$pkgattrs, $pkgdn, $this->gosaUnitTag); + $this->tag_attrs($pkgattrs, $pkgdn, $this->gosaUnitTag); if(in_array($pkgattrs['FAIvariableType'],array("boolean","multiselect","password","select","string","text"))){ FAI::prepare_to_save_FAI_object($pkgdn,$pkgattrs); diff --git a/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc b/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc index 99417316e..d463f2a22 100644 --- a/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc +++ b/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc @@ -451,7 +451,7 @@ class faiPartitionTable extends plugin } /* Tag object */ - $this->tag_attrs(&$disk_attrs, $disk_dn, $this->gosaUnitTag); + $this->tag_attrs($disk_attrs, $disk_dn, $this->gosaUnitTag); if($disk['status'] == "delete"){ FAI::prepare_to_save_FAI_object($disk_dn,array(),true); @@ -496,7 +496,7 @@ class faiPartitionTable extends plugin } /* Tag object */ - $this->tag_attrs(&$partition_attrs, $partition_dn, $this->gosaUnitTag); + $this->tag_attrs($partition_attrs, $partition_dn, $this->gosaUnitTag); if($partition['status'] == "delete"){ FAI::prepare_to_save_FAI_object($partition_dn,array(),true); diff --git a/gosa-plugins/fai/admin/fai/class_faiScript.inc b/gosa-plugins/fai/admin/fai/class_faiScript.inc index d47ed33c3..87592976c 100644 --- a/gosa-plugins/fai/admin/fai/class_faiScript.inc +++ b/gosa-plugins/fai/admin/fai/class_faiScript.inc @@ -582,7 +582,7 @@ class faiScript extends plugin } /* Tag object */ - $this->tag_attrs(&$tmp, $sub_dn, $this->gosaUnitTag); + $this->tag_attrs($tmp, $sub_dn, $this->gosaUnitTag); if($obj['status'] == "delete"){ FAI::prepare_to_save_FAI_object($sub_dn,array(),true); diff --git a/gosa-plugins/fai/admin/fai/class_faiTemplate.inc b/gosa-plugins/fai/admin/fai/class_faiTemplate.inc index 50add1a37..863ee2b3e 100644 --- a/gosa-plugins/fai/admin/fai/class_faiTemplate.inc +++ b/gosa-plugins/fai/admin/fai/class_faiTemplate.inc @@ -501,7 +501,7 @@ class faiTemplate extends plugin } /* Tag object */ - $this->tag_attrs(&$tmp, $sub_dn, $this->gosaUnitTag); + $this->tag_attrs($tmp, $sub_dn, $this->gosaUnitTag); if($obj['status'] == "delete"){ FAI::prepare_to_save_FAI_object($sub_dn,array(),true); diff --git a/gosa-plugins/fai/admin/fai/class_faiVariable.inc b/gosa-plugins/fai/admin/fai/class_faiVariable.inc index 7229e3634..aea362f05 100644 --- a/gosa-plugins/fai/admin/fai/class_faiVariable.inc +++ b/gosa-plugins/fai/admin/fai/class_faiVariable.inc @@ -388,7 +388,7 @@ class faiVariable extends plugin } /* Tag object */ - $this->tag_attrs(&$tmp, $sub_dn, $this->gosaUnitTag); + $this->tag_attrs($tmp, $sub_dn, $this->gosaUnitTag); if($obj['status'] == "delete"){ FAI::prepare_to_save_FAI_object($sub_dn,array(),true); diff --git a/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc b/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc index a51a11622..f18076844 100644 --- a/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc +++ b/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc @@ -439,7 +439,7 @@ class appgroup extends plugin $all = $this->_get_all_entries(); $key = $this->_get_release_key($release); if(isset($all[$key]) && count($all[$key]['ENTRIES'])){ - $res = $this->_get_all_entries(TRUE,TRUE,&$all[$key]['ENTRIES']); + $res = $this->_get_all_entries(TRUE,TRUE,$all[$key]['ENTRIES']); return($res); } return(array()); @@ -914,7 +914,7 @@ class appgroup extends plugin @param Boolean $add_tags If TRUE, OPEN/CLOSE Tags will be appended. @param &Array Start here, Pointer to an array. */ - function _get_all_entries($add_tags = FALSE, $skip_release = FALSE, $cur = NULL) + function _get_all_entries($add_tags = FALSE, $skip_release = FALSE, &$cur = NULL) { $ret = array(); if($cur == NULL){ @@ -946,7 +946,7 @@ class appgroup extends plugin if(!$add_tags){ $ret[$tmp['UNIQID']] = &$cur[$key]; if(isset($entry['ENTRIES']) && count($entry['ENTRIES'])){ - $ret = array_merge($ret,$this->_get_all_entries($add_tags,$skip_release,&$cur[$key]['ENTRIES'])); + $ret = array_merge($ret,$this->_get_all_entries($add_tags,$skip_release,$cur[$key]['ENTRIES'])); } }else{ @@ -966,7 +966,7 @@ class appgroup extends plugin if($add){ $ret[] = array("TYPE" => "OPEN", "PARENT" => $entry['PARENT']); - $ret = array_merge($ret,$this->_get_all_entries($add_tags,$skip_release,&$cur[$key]['ENTRIES'])); + $ret = array_merge($ret,$this->_get_all_entries($add_tags,$skip_release,$cur[$key]['ENTRIES'])); $ret[] = array("TYPE" => "CLOSE" , "PARENT" => $entry['PARENT']); } } diff --git a/gosa-plugins/mail/personal/mail/sieve/class_parser.inc b/gosa-plugins/mail/personal/mail/sieve/class_parser.inc index 345895231..5326c2b37 100644 --- a/gosa-plugins/mail/personal/mail/sieve/class_parser.inc +++ b/gosa-plugins/mail/personal/mail/sieve/class_parser.inc @@ -189,7 +189,7 @@ class Parser function arguments_($parent_id, &$semantics) { - while ($this->argument_($parent_id, &$semantics)) + while ($this->argument_($parent_id, $semantics)) ; if ($this->status_ == true) @@ -215,14 +215,14 @@ class Parser return $this->success_(); } - return $this->stringlist_($parent_id, &$semantics); + return $this->stringlist_($parent_id, $semantics); } function stringlist_($parent_id, &$semantics) { if (!$this->scanner_->nextTokenIs('left-bracket')) { - return $this->string_($parent_id, &$semantics); + return $this->string_($parent_id, $semantics); } $token = $this->scanner_->nextToken(); @@ -234,7 +234,7 @@ class Parser while ($token['class'] != 'right-bracket') { - if (!$this->string_($parent_id, &$semantics)) + if (!$this->string_($parent_id, $semantics)) { return $this->status_; }