diff --git a/info.textgrid.middleware.tgauth.rbac/lib/Helper.class.php b/info.textgrid.middleware.tgauth.rbac/lib/Helper.class.php index 2ef0f54050594e53c822673fab3144012dddbe15..240d4138a4515df436111031a396479206439df9 100755 --- a/info.textgrid.middleware.tgauth.rbac/lib/Helper.class.php +++ b/info.textgrid.middleware.tgauth.rbac/lib/Helper.class.php @@ -72,7 +72,7 @@ class Helper implements iHelper { // Im letzten Eintrag muss der Laendercode stehen - $arrAddress['countrycode'] = trim( strtolower( array_pop( &$arrRawAddress ) ) ); + $arrAddress['countrycode'] = trim( strtolower( array_pop( $arrRawAddress ) ) ); if( preg_match( "/^de$/i", trim( $arrAddress['countrycode'] ) ) ) { @@ -143,8 +143,8 @@ class Helper implements iHelper { $i = 0; // Schleifenvariable - preg_match_all( "/[a-z]{2}/i", $inServerString, &$arrCode ); - preg_match_all( "/[a-z]{2}-[a-z]{2}/i", $inServerString, &$arrCombination ); + preg_match_all( "/[a-z]{2}/i", $inServerString, $arrCode ); + preg_match_all( "/[a-z]{2}-[a-z]{2}/i", $inServerString, $arrCombination ); // Nur der erste Array-Eintrag ist von Interesse in diesem Fall @@ -159,7 +159,7 @@ class Helper implements iHelper { // Der hintere Teil bezieht sich auf das Land. Wenn aber hinterer und vorderer // Teil gleich sind, darf es trotzdem nicht auf die Blacklist. - !preg_match( "/" . $arrTmp[0] . "/", $arrTmp[1] ) ? array_push( &$arrBlacklist, $arrTmp[1] ) : false; + !preg_match( "/" . $arrTmp[0] . "/", $arrTmp[1] ) ? array_push( $arrBlacklist, $arrTmp[1] ) : false; } @@ -169,7 +169,7 @@ class Helper implements iHelper { if( !in_array( $arrCode[$i], $arrReturn ) && !in_array( $arrCode[$i], $arrBlacklist ) ) { - array_push( &$arrReturn, strtolower( $arrCode[$i] ) ); + array_push( $arrReturn, strtolower( $arrCode[$i] ) ); } diff --git a/info.textgrid.middleware.tgauth.rbac/lib/Number.class.php b/info.textgrid.middleware.tgauth.rbac/lib/Number.class.php index a4fe7c3724514ba8cf134e70d824721e373df1dc..b348b95070d944916bd8f5d971b3ffd35c73b126 100755 --- a/info.textgrid.middleware.tgauth.rbac/lib/Number.class.php +++ b/info.textgrid.middleware.tgauth.rbac/lib/Number.class.php @@ -50,7 +50,7 @@ class Number implements iNumber { // ## expand ######################################################## function expand( $inNumber, $inDigit ) { - settype( &$inNumber, "string" ); + settype( $inNumber, "string" ); while( strlen( $inNumber ) < $inDigit ) { diff --git a/info.textgrid.middleware.tgauth.rbac/lib/XML.class.php b/info.textgrid.middleware.tgauth.rbac/lib/XML.class.php index 95f612fce8694cdecfe285fe0d9fab39896c97a6..04d20606798325ab1a707bd57f8e7be76e2225ed 100755 --- a/info.textgrid.middleware.tgauth.rbac/lib/XML.class.php +++ b/info.textgrid.middleware.tgauth.rbac/lib/XML.class.php @@ -84,7 +84,7 @@ class XML implements iXML { // zur Version und zum verwendeten Zeichensatz nicht. // Dieser muss hier manuell ausgewertet werden. $arrXmlHeader = Array(); - preg_match( "/<\?\s*xml\s.+\?>/i", $inData, &$arrXmlHeader ); + preg_match( "/<\?\s*xml\s.+\?>/i", $inData, $arrXmlHeader ); if( sizeof( $arrXmlHeader ) == 1 ) { @@ -102,12 +102,12 @@ class XML implements iXML { if( (sizeof( $arrXmlHeader ) == 1) && !preg_match( "/encoding\s*=\s*.?utf[-]?8/i", $arrXmlHeader[0] ) ) { - xml_parse_into_struct( $parser, utf8_encode( $inData ), &$arrVal, &$index ); + xml_parse_into_struct( $parser, utf8_encode( $inData ), $arrVal, $index ); } else { - xml_parse_into_struct( $parser, $inData, &$arrVal, &$index ); + xml_parse_into_struct( $parser, $inData, $arrVal, $index ); } @@ -212,7 +212,7 @@ class XML implements iXML { foreach( $arrAttribute as $key => $value ) { $arrMatch = Array(); - if( preg_match( "/^xmlns:(.+)$/i", $key, &$arrMatch ) ) { + if( preg_match( "/^xmlns:(.+)$/i", $key, $arrMatch ) ) { $inArrNamespace[$arrMatch[1]] = $value; @@ -310,7 +310,7 @@ class XML implements iXML { foreach( $arrAttribute as $key => $value ) { $arrMatch = Array(); - if( preg_match( "/^xmlns:(.+)$/i", $key, &$arrMatch ) ) { + if( preg_match( "/^xmlns:(.+)$/i", $key, $arrMatch ) ) { $inArrNamespace[$arrMatch[1]] = $value; diff --git a/info.textgrid.middleware.tgauth.rbac/rbac/RBAC.class.php b/info.textgrid.middleware.tgauth.rbac/rbac/RBAC.class.php index 7120a3591c9e558b5e760222092c384bd73a4032..2af173f457a5b22964eeb7562f62900f3df7bb57 100755 --- a/info.textgrid.middleware.tgauth.rbac/rbac/RBAC.class.php +++ b/info.textgrid.middleware.tgauth.rbac/rbac/RBAC.class.php @@ -189,7 +189,7 @@ class RBAC { if( method_exists( $extension, $inFunctionName ) && !method_exists( $this->objSystem, $inFunctionName ) ) { - $result = call_user_func_array( Array( &$this->arrExtension[$className], $inFunctionName ), $inArrParameter ); + $result = call_user_func_array( Array( $this->arrExtension[$className], $inFunctionName ), $inArrParameter ); $foundInExtension = true; break; @@ -204,7 +204,7 @@ class RBAC { if( method_exists( $this->objSystem, $inFunctionName ) ) { - $result = call_user_func_array( Array( &$this->objSystem, $inFunctionName ), $inArrParameter ); + $result = call_user_func_array( Array( $this->objSystem, $inFunctionName ), $inArrParameter ); if( isset( $this->arrEvent[$inFunctionName]['outputfilter'] ) ) { diff --git a/info.textgrid.middleware.tgauth.rbac/rbac/RBACcore.class.php b/info.textgrid.middleware.tgauth.rbac/rbac/RBACcore.class.php index 3e4682e57b39943bb3f164c0a4692c5b9576f8ac..ccec78c1cd77807f4265b0e3ae933e4e5b9d9ee2 100755 --- a/info.textgrid.middleware.tgauth.rbac/rbac/RBACcore.class.php +++ b/info.textgrid.middleware.tgauth.rbac/rbac/RBACcore.class.php @@ -88,7 +88,7 @@ class RBACcore implements iRBACcore { // Create a role connection if( $this->sameConnectionParams( "user", "role" ) ) { - $this->conn['role'] = &$this->conn['user']; + $this->conn['role'] = $this->conn['user']; } else { @@ -107,12 +107,12 @@ class RBACcore implements iRBACcore { // Create a session connection if( $this->sameConnectionParams( "session", "user" ) ) { - $this->conn['session'] = &$this->conn['user']; + $this->conn['session'] = $this->conn['user']; } elseif( $this->sameConnectionParams( "session", "role" ) ) { - $this->conn['session'] = &$this->conn['role']; + $this->conn['session'] = $this->conn['role']; } else { @@ -131,17 +131,17 @@ class RBACcore implements iRBACcore { // Create a resource connection if( $this->sameConnectionParams( "resource", "user" ) ) { - $this->conn['resource'] = &$this->conn['user']; + $this->conn['resource'] = $this->conn['user']; } elseif( $this->sameConnectionParams( "resource", "role" ) ) { - $this->conn['resource'] = &$this->conn['role']; + $this->conn['resource'] = $this->conn['role']; } elseif( $this->sameConnectionParams( "resource", "session" ) ) { - $this->conn['resource'] = &$this->conn['session']; + $this->conn['resource'] = $this->conn['session']; } else { @@ -2211,7 +2211,7 @@ class RBACcore implements iRBACcore { $element = ""; - while( $element = array_pop( &$inArray ) ) { + while( $element = array_pop( $inArray ) ) { if( !in_array( $element, $inArray ) ) { diff --git a/info.textgrid.middleware.tgauth.rbac/rbac/RBAClimitedHirarchical.class.php b/info.textgrid.middleware.tgauth.rbac/rbac/RBAClimitedHirarchical.class.php index 6213b597ccba5b03426ed423c60cbd6a04df3988..9c73dc7e737df1fbd8f2b50b325d532ac5811980 100755 --- a/info.textgrid.middleware.tgauth.rbac/rbac/RBAClimitedHirarchical.class.php +++ b/info.textgrid.middleware.tgauth.rbac/rbac/RBAClimitedHirarchical.class.php @@ -127,7 +127,7 @@ class RBAClimitedHirarchical extends RBACcore implements iRBAClimitedHirarchical // Cut off the first element - array_shift( &$arrTmpSplit ); + array_shift( $arrTmpSplit ); } @@ -616,7 +616,7 @@ class RBAClimitedHirarchical extends RBACcore implements iRBAClimitedHirarchical // Cut off the first element - array_shift( &$arrTmpSplit ); + array_shift( $arrTmpSplit ); } diff --git a/info.textgrid.middleware.tgauth.rbac/rbacSoap/TgReview.class.php b/info.textgrid.middleware.tgauth.rbac/rbacSoap/TgReview.class.php index e4391e8548eca9020d50fef782b8be91528f8e0c..e5bbcb40eb66521bd6c40cddb15e0690d9d684b8 100755 --- a/info.textgrid.middleware.tgauth.rbac/rbacSoap/TgReview.class.php +++ b/info.textgrid.middleware.tgauth.rbac/rbacSoap/TgReview.class.php @@ -235,7 +235,7 @@ class TgReview { for( $i = 0; $i < sizeof( $arrPermission ); $i++ ) { - array_push( &$result->permissionset, new permission( $arrPermission[$i]['operation'], + array_push( $result->permissionset, new permission( $arrPermission[$i]['operation'], $arrPermission[$i]['resource'] ) ); } @@ -396,7 +396,7 @@ class TgReview { for( $i = 0; $i < sizeof( $arrPermission ); $i++ ) { - array_push( &$result->permissionset, new permission( $arrPermission[$i]['operation'], + array_push( $result->permissionset, new permission( $arrPermission[$i]['operation'], $arrPermission[$i]['resource'] ) ); } @@ -453,7 +453,7 @@ class TgReview { for( $i = 0; $i < sizeof( $arrPermission ); $i++ ) { - array_push( &$result->permissionset, new permission( $arrPermission[$i]['operation'], + array_push( $result->permissionset, new permission( $arrPermission[$i]['operation'], $arrPermission[$i]['resource'] ) ); } diff --git a/info.textgrid.middleware.tgauth.rbac/rbacSoap/tgextra-crud.php b/info.textgrid.middleware.tgauth.rbac/rbacSoap/tgextra-crud.php index f249dcf2f15f8c6c9b346cc88c990d3a6501f66a..b007c04c493dd2704bc114f2214e3409630a72b6 100755 --- a/info.textgrid.middleware.tgauth.rbac/rbacSoap/tgextra-crud.php +++ b/info.textgrid.middleware.tgauth.rbac/rbacSoap/tgextra-crud.php @@ -15,7 +15,7 @@ require_once( "TgExtraCrud.class.php" ); // Dont be so verbose with messages and notices. -error_reporting( E_ERROR | E_USER_ERROR ); +//error_reporting( E_ERROR | E_USER_ERROR ); // ############################################################# diff --git a/info.textgrid.middleware.tgauth.rbac/rbacSoap/tgsystem.php b/info.textgrid.middleware.tgauth.rbac/rbacSoap/tgsystem.php index d55efd8ac05536f016bc111c88ad39e4cc63b8ad..7ac8d535c3aef02331d0b70ce28585ff1832c103 100755 --- a/info.textgrid.middleware.tgauth.rbac/rbacSoap/tgsystem.php +++ b/info.textgrid.middleware.tgauth.rbac/rbacSoap/tgsystem.php @@ -13,7 +13,7 @@ require_once( "TgSystem.class.php" ); // Dont be so verbose with messages and notices. -error_reporting( E_ERROR | E_USER_ERROR ); +//error_reporting( E_ERROR | E_USER_ERROR ); // #############################################################