Index: ftplogin/ftp_index.php =================================================================== --- ftplogin/ftp_index.php (revision 3400) +++ ftplogin/ftp_index.php (working copy) @@ -230,8 +230,8 @@ if( $path == '' ){ $path = '/'; } - if( ! session_is_registered( 'ftp_path' ) ){ - session_register( 'ftp_path' ); + if( ! isset( $_SESSION['ftp_path'] ) ){ + $_SESSION['ftp_path']=""; } $_SESSION['ftp_path'][$PHP_AUTH_USER] = $path; } Index: ftplogin/ftp_functions.php =================================================================== --- ftplogin/ftp_functions.php (revision 3400) +++ ftplogin/ftp_functions.php (working copy) @@ -203,9 +203,9 @@ function setPath($path) { global $PHP_AUTH_USER; - if(!session_is_registered('ftp_path')) + if(!isset($_SESSION['ftp_path'])) { - session_register('ftp_path'); + $_SESSION['ftp_path']=""; } $_SESSION['ftp_path'][$PHP_AUTH_USER] = $path; } Index: include/elements/data/class.TableView.php =================================================================== --- include/elements/data/class.TableView.php (revision 3400) +++ include/elements/data/class.TableView.php (working copy) @@ -67,9 +67,7 @@ function &Title( $poTitle = NULL ){ global $DEBUG; if( !is_null( $poTitle ) ) { - $laArgs = func_get_args(); - - call_user_func_array( array(&$this,'setTitle'), &$laArgs ); + call_user_func_array( array(&$this,'setTitle'), func_get_args() ); } return $this->moTitle; } Index: include/class.Pager.php =================================================================== --- include/class.Pager.php (revision 3400) +++ include/class.Pager.php (working copy) @@ -107,8 +107,8 @@ /* -------------------- Initialize -------------------- */ function Initialize ( &$po_Source ) { - $po_Source->SetItemsPerPage ( get_class(&$this) ); - $po_Source->SetSort ( get_class(&$this) ); + $po_Source->SetItemsPerPage ( get_class($this) ); + $po_Source->SetSort ( get_class($this) ); $this->ma_ItemsPerPage = array( 5, 10, 20, 50, 100 ); $this->mo_Source =& $po_Source; @@ -396,7 +396,7 @@ } elseif ( is_object($lm_Error) ) { - $lm_Error->AddErrors ( &$this ); + $lm_Error->AddErrors ( $this ); $this->ShowAddError(); exit; } @@ -419,7 +419,7 @@ } elseif ( is_object($lm_Error) ) { - $lm_Error->AddErrors ( &$this ); + $lm_Error->AddErrors ( $this ); // todo: need better processing } elseif ( $this->IsEditPage() ) @@ -948,7 +948,7 @@ $lo_Data->AppendFields( $lo_Checkbox ); } $lo_Data->SetTotal( $lo_Source->TotalElements( $this->ma_SearchColumns ) ); - $lo_Data->SetCookiePrefix( get_class(&$this) ); + $lo_Data->SetCookiePrefix( get_class($this) ); $lo_Data->SetDefault(); $lo_Data->AppendHidden( new TextDataField( "Y", "ListEdit" ) ); for( $i=0; $i < count( $this->ma_HiddenFields ); $i++ ) Index: include/class.Mysql.php =================================================================== --- include/class.Mysql.php (revision 3400) +++ include/class.Mysql.php (working copy) @@ -148,7 +148,7 @@ return @mysql_insert_id($this->handle); } - function Quote($str) + static function Quote($str) { return addslashes($str); } Index: include/class.PathBar.php =================================================================== --- include/class.PathBar.php (revision 3400) +++ include/class.PathBar.php (working copy) @@ -445,4 +445,4 @@ } } -?> \ No newline at end of file +?> Index: include/class.Actor.php =================================================================== --- include/class.Actor.php (revision 3400) +++ include/class.Actor.php (working copy) @@ -102,7 +102,7 @@ function CallOnServices ( $ps_Method ) { $la_Arguments = func_get_args(); - array_unshift ( $la_Arguments, &$this->ma_Services ); + array_unshift ( $la_Arguments, $this->ma_Services ); call_user_func_array ( array( &$this, "CallOnColumns" ), $la_Arguments ); } /* -------------------- end services & limits -------------------- */ @@ -130,14 +130,14 @@ /* -------------------- Get... -------------------- */ - function &Name( $pcName = NULL ) { + function Name( $pcName = NULL ) { if( is_string( $pcName ) ) { $this->ms_Name = $pcName; } return $this->ms_Name; } - function &Number( $piNum = NULL ) { + function Number( $piNum = NULL ) { if( is_numeric( $piNum ) ) { $this->ms_Number = $piNum; } @@ -156,7 +156,7 @@ return $this->ms_Password; } - function &Password( $pcPwd = NULL){ + function Password( $pcPwd = NULL){ if(is_string($pcPwd)){ return $this->ms_Password = $pcPwd; } @@ -171,4 +171,4 @@ } -?> \ No newline at end of file +?> Index: include/pagers/class.MenuBlocksPager.php =================================================================== --- include/pagers/class.MenuBlocksPager.php (revision 3400) +++ include/pagers/class.MenuBlocksPager.php (working copy) @@ -70,8 +70,8 @@ $this->ms_ItemsPerPage = intval(ff_GetFromPostGet ("ItemsPerPage")); elseif( ff_GetFromPostGet("step") ) $this->ms_ItemsPerPage = intval( ff_GetFromPostGet("step") ); - elseif ( array_key_exists( get_class(&$this)."_ItemsPerPage", $_COOKIE ) ) - $this->ms_ItemsPerPage = intval($_COOKIE[get_class(&$this)."_ItemsPerPage"]); + elseif ( array_key_exists( get_class($this)."_ItemsPerPage", $_COOKIE ) ) + $this->ms_ItemsPerPage = intval($_COOKIE[get_class($this)."_ItemsPerPage"]); else $this->ms_ItemsPerPage = 10; $this->ms_StartItem = $this->ms_PageNumber*$this->ms_ItemsPerPage; Index: login.php =================================================================== --- login.php (revision 3400) +++ login.php (working copy) @@ -157,7 +157,7 @@ case USERTYPE_USER: if( array_key_exists( '_cat', $_POST ) && $_POST['_cat'] == 'ftp' ){ - if( session_is_registered( 'ftp_path' ) && + if( isset( $_SESSION['ftp_path'] ) && array_key_exists( $account_info['login'], $_SESSION['ftp_path'] ) @@ -174,7 +174,7 @@ break; case USERTYPE_FTPUSER: - if(session_is_registered('ftp_path') && + if(isset($_SESSION['ftp_path']) && array_key_exists($account_info['login'], $_SESSION['ftp_path'])){ unset($_SESSION['ftp_path'][$account_info['login']]); } Index: reseller/userredirect.php =================================================================== --- reseller/userredirect.php (revision 3400) +++ reseller/userredirect.php (working copy) @@ -39,8 +39,7 @@ $PHP_AUTH_USER ); $redir = '/user/' . $user . '/'; } - if( ! session_is_registered('_del_settings' ) ) { - session_register('_del_settings'); + if( ! isset($_SESSION['_del_settings'] ) ) { $_SESSION['_del_settings'] = array(); } if( ! array_key_exists( $ServerID, $_SESSION['_del_settings'] ) ){ Index: reseller/auth.php =================================================================== --- reseller/auth.php (revision 3400) +++ reseller/auth.php (working copy) @@ -115,7 +115,7 @@ $confixx_interface_version = 'powp'; $shortlang = 'en'; -if( session_is_registered('_del_settings') && +if( isset($_SESSION['_del_settings']) && array_key_exists( $ServerID, $_SESSION['_del_settings'] ) && array_key_exists( $PHP_AUTH_USER, $_SESSION['_del_settings'][$ServerID] ) ){ $shortlang = $_SESSION['_del_settings'][$ServerID][$PHP_AUTH_USER]['shortlang']; Index: reg/auth.php =================================================================== --- reg/auth.php (revision 3400) +++ reg/auth.php (working copy) @@ -115,7 +115,7 @@ ## set language ## set language -if( session_is_registered('_del_settings') && +if( isset($_SESSION['_del_settings']) && array_key_exists( $ServerID, $_SESSION['_del_settings'] ) && array_key_exists( $PHP_AUTH_USER, $_SESSION['_del_settings'][$ServerID] ) ){ $shortlang = $_SESSION['_del_settings'][$ServerID][$PHP_AUTH_USER]['shortlang']; Index: admin/resredirect.php =================================================================== --- admin/resredirect.php (revision 3400) +++ admin/resredirect.php (working copy) @@ -25,8 +25,7 @@ $redir = '../user/' . $_GET['reseller'] . '/'; } - if( ! session_is_registered( '_del_settings' ) ){ - session_register( '_del_settings' ); + if( ! isset( $_SESSION['_del_settings'] ) ){ $_SESSION['_del_settings'] = array(); } if( ! array_key_exists( $ServerID, $_SESSION['_del_settings'] ) ){ Index: admin/auth.php =================================================================== --- admin/auth.php (revision 3400) +++ admin/auth.php (working copy) @@ -147,7 +147,7 @@ } ## set language -if( session_is_registered('_del_settings') && +if( isset($_SESSION['_del_settings']) && array_key_exists( $ServerID, $_SESSION['_del_settings'] ) && array_key_exists( $PHP_AUTH_USER, $_SESSION['_del_settings'][$ServerID] ) ){ $shortlang = $_SESSION['_del_settings'][$ServerID][$PHP_AUTH_USER]['shortlang']; Index: admin/allgemein_start.php =================================================================== --- admin/allgemein_start.php (revision 3400) +++ admin/allgemein_start.php (working copy) @@ -18,7 +18,6 @@ include_once( '../include/elements/data/class.TableView.php' ); include_once( '../include/cron_functions.php' ); include_once( '../include/class.Traffic.php' ); - global $DEBUG; //$DEBUG=1; Index: master/adminredirect.php =================================================================== --- master/adminredirect.php (revision 3400) +++ master/adminredirect.php (working copy) @@ -55,8 +55,7 @@ - if( ! session_is_registered( '_del_settings' ) ){ - session_register( '_del_settings' ); + if( ! isset( $_SESSION['_del_settings'] ) ){ $_SESSION['_del_settings'] = array(); } if( ! array_key_exists( $ServerID, $_SESSION['_del_settings'] ) ){ @@ -78,4 +77,4 @@ header('Location: ' . $redir); -?> \ No newline at end of file +?> Index: master/auth.php =================================================================== --- master/auth.php (revision 3400) +++ master/auth.php (working copy) @@ -185,7 +185,6 @@ db_close(); +if( empty($ret_path) || ! isSafePath( $ret_path ) ) $ret_path = ''; -if( ! isSafePath( $ret_path ) ) $ret_path = ''; - ?> Index: sessions.inc.php =================================================================== --- sessions.inc.php (revision 3400) +++ sessions.inc.php (working copy) @@ -332,11 +332,11 @@ function addSUser($user, $pass, $type, $pcComeFrom = '' ){/*{{{*/ global $ServerID; - if( ! session_is_registered( '_users' ) ){ - session_register( '_users' ); + if( ! isset( $_SESSION['_users'] ) ){ + $_SESSION['_users']=""; } - if( ! session_is_registered( '_server_id' ) ){ - session_register( '_server_id' ); + if( ! isset( $_SESSION['_server_id'] ) ){ + $_SESSION['_server_id']=""; } $_SESSION['_server_id'] = $ServerID; Index: user/auth.php =================================================================== --- user/auth.php (revision 3572) +++ user/auth.php (working copy) @@ -143,7 +143,7 @@ $confixx_interface_version = 'xp30'; ## set language -if( session_is_registered( '_del_settings' ) && +if( isset( $_SESSION['_del_settings'] ) && array_key_exists( $ServerID, $_SESSION['_del_settings'] ) && array_key_exists( $PHP_AUTH_USER, $_SESSION['_del_settings'][$ServerID] ) ){