[mxbb-commits] core/includes/shared/phpbb3/includes functions.php, 1.25, 1.26

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/includes/shared/phpbb3/includes
In directory vz-cvs-4.sog:/tmp/cvs-serv9572

Modified Files:
	functions.php 
Log Message:


Index: functions.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** functions.php	8 Jul 2009 15:29:05 -0000	1.25
--- functions.php	25 Nov 2012 04:22:57 -0000	1.26
***************
*** 649,655 ****
  	 * @param int $minimum_time The minimum acceptable age for a submitted form in seconds
  	 */
! 	public static function check_form_key( $form_name, $timespan = false, $return_page = '', $trigger = false, $minimum_time = false )
  	{
! 		global $board_config, $user;
  		if ( $timespan === false )
  		{
--- 649,655 ----
  	 * @param int $minimum_time The minimum acceptable age for a submitted form in seconds
  	 */
! 	public static function check_form_key($form_name, $timespan = false, $return_page = '', $trigger = false, $minimum_time = false)
  	{
! 		global $board_config, $mx_user;
  		if ( $timespan === false )
  		{
***************
*** 671,677 ****
  			if ( ( $diff >= $minimum_time ) && ( ( $diff <= $timespan ) || $timespan == -1 ) )
  			{
! 				$token_sid = ( $user->data['user_id'] == ANONYMOUS && !empty( $board_config['form_token_sid_guests'] ) ) ? $user->session_id : '';
  
! 				$key = sha1( $creation_time . $user->data['user_form_salt'] . $form_name . $token_sid );
  				if ( $key === $token )
  				{
--- 671,677 ----
  			if ( ( $diff >= $minimum_time ) && ( ( $diff <= $timespan ) || $timespan == -1 ) )
  			{
! 				$token_sid = ( $mx_user->data['user_id'] == ANONYMOUS && !empty( $board_config['form_token_sid_guests'] ) ) ? $mx_user->session_id : '';
  
! 				$key = sha1( $creation_time . $mx_user->data['user_form_salt'] . $form_name . $token_sid );
  				if ( $key === $token )
  				{
***************
*** 682,686 ****
  		if ( $trigger )
  		{
! 			trigger_error( $user->lang['FORM_INVALID'] . $return_page );
  		}
  		print '<pre>';
--- 682,686 ----
  		if ( $trigger )
  		{
! 			trigger_error( $mx_user->lang['FORM_INVALID'] . $return_page );
  		}
  		print '<pre>';
***************
*** 696,700 ****
  	public static function group_create( &$group_id, $type, $name, $desc, $group_attributes, $allow_desc_bbcode = false, $allow_desc_urls = false, $allow_desc_smilies = false )
  	{
! 		global $phpbb_root_path, $board_config, $db, $user, $file_upload;
  
  		$error = array();
--- 696,700 ----
  	public static function group_create( &$group_id, $type, $name, $desc, $group_attributes, $allow_desc_bbcode = false, $allow_desc_urls = false, $allow_desc_smilies = false )
  	{
! 		global $phpbb_root_path, $board_config, $db, $mx_user, $file_upload;
  
  		$error = array();
***************
*** 717,721 ****
  		if ( !utf8_strlen( $name ) || utf8_strlen( $name ) > 60 )
  		{
! 			$error[] = ( !utf8_strlen( $name ) ) ? $user->lang['GROUP_ERR_USERNAME'] : $user->lang['GROUP_ERR_USER_LONG'];
  		}
  
--- 717,721 ----
  		if ( !utf8_strlen( $name ) || utf8_strlen( $name ) > 60 )
  		{
! 			$error[] = ( !utf8_strlen( $name ) ) ? $mx_user->lang['GROUP_ERR_USERNAME'] : $mx_user->lang['GROUP_ERR_USER_LONG'];
  		}
  
***************
*** 723,732 ****
  		if ( !empty( $err ) )
  		{
! 			$error[] = $user->lang[$err];
  		}
  
  		if ( !in_array( $type, array( GROUP_OPEN, GROUP_CLOSED, GROUP_HIDDEN, GROUP_SPECIAL, GROUP_FREE ) ) )
  		{
! 			$error[] = $user->lang['GROUP_ERR_TYPE'];
  		}
  
--- 723,732 ----
  		if ( !empty( $err ) )
  		{
! 			$error[] = $mx_user->lang[$err];
  		}
  
  		if ( !in_array( $type, array( GROUP_OPEN, GROUP_CLOSED, GROUP_HIDDEN, GROUP_SPECIAL, GROUP_FREE ) ) )
  		{
! 			$error[] = $mx_user->lang['GROUP_ERR_TYPE'];
  		}
  
***************
*** 832,836 ****
  			}
  
! 			$name = ( $type == GROUP_SPECIAL ) ? $user->lang['G_' . $name] : $name;
  			//add_log( 'admin', $log, $name );
  
--- 832,836 ----
  			}
  
! 			$name = ( $type == GROUP_SPECIAL ) ? $mx_user->lang['G_' . $name] : $name;
  			//add_log( 'admin', $log, $name );
  
***************
*** 2471,2482 ****
  	* @param bool $trigger If true, the function will triger an error when encountering an invalid form
  	*/
! 	public static function check_form_key($form_name, $timespan = false, $return_page = '', $trigger = false)
  	{
! 		global $config, $user;
  
  		if ($timespan === false)
  		{
  			// we enforce a minimum value of half a minute here.
! 			$timespan = ($config['form_token_lifetime'] == -1) ? -1 : max(30, $config['form_token_lifetime']);
  		}
  
--- 2471,2482 ----
  	* @param bool $trigger If true, the function will triger an error when encountering an invalid form
  	*/
! 	public static function check_form_key($form_name, $timespan = false, $return_page = '', $trigger = false, $minimum_time = false)
  	{
! 		global $board_config, $mx_user, $_POST;
  
  		if ($timespan === false)
  		{
  			// we enforce a minimum value of half a minute here.
! 			$timespan = ($board_config['form_token_lifetime'] == -1) ? -1 : max(30, $board_config['form_token_lifetime']);
  		}
  
***************
*** 2491,2496 ****
  			if ($diff && ($diff <= $timespan || $timespan === -1))
  			{
! 				$token_sid = ($user->data['user_id'] == ANONYMOUS && !empty($config['form_token_sid_guests'])) ? $user->session_id : '';
! 				$key = sha1($creation_time . $user->data['user_form_salt'] . $form_name . $token_sid);
  
  				if ($key === $token)
--- 2491,2496 ----
  			if ($diff && ($diff <= $timespan || $timespan === -1))
  			{
! 				$token_sid = ($mx_user->data['user_id'] == ANONYMOUS && !empty($board_config['form_token_sid_guests'])) ? $mx_user->session_id : '';
! 				$key = sha1($creation_time . $mx_user->data['user_form_salt'] . $form_name . $token_sid);
  
  				if ($key === $token)
***************
*** 2503,2507 ****
  		if ($trigger)
  		{
! 			trigger_error($user->lang['FORM_INVALID'] . $return_page);
  		}
  
--- 2503,2507 ----
  		if ($trigger)
  		{
! 			trigger_error($mx_user->lang['FORM_INVALID'] . $return_page);
  		}