makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 21:38:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/8713] Rename untrimed_variable() to untrimmed_variable().

Browse source 
PHPBB3-8713
This commit is contained in:
Andreas Fischer 2012-09-08 14:15:56 +02:00
parent b62c37c579
commit f2607fc9e8
7 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/includes/acp/acp_language.php
View file

@ -100,11 +100,11 @@ class acp_language
switch ($method) switch ($method)
{ {
case 'ftp': case 'ftp':
$transfer = new ftp(request_var('host', ''), request_var('username', ''), $request->untrimed_variable('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', '')); $transfer = new ftp(request_var('host', ''), request_var('username', ''), $request->untrimmed_variable('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', ''));
break; break;
case 'ftp_fsock': case 'ftp_fsock':
$transfer = new ftp_fsock(request_var('host', ''), request_var('username', ''), $request->untrimed_variable('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', '')); $transfer = new ftp_fsock(request_var('host', ''), request_var('username', ''), $request->untrimmed_variable('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', ''));
break; break;
default: default:
@ -404,7 +404,7 @@ class acp_language
trigger_error($user->lang['INVALID_UPLOAD_METHOD'], E_USER_ERROR); trigger_error($user->lang['INVALID_UPLOAD_METHOD'], E_USER_ERROR);
} }
$transfer = new $method(request_var('host', ''), request_var('username', ''), $request->untrimed_variable('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', '')); $transfer = new $method(request_var('host', ''), request_var('username', ''), $request->untrimmed_variable('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', ''));
if (($result = $transfer->open_session()) !== true) if (($result = $transfer->open_session()) !== true)
{ {

4
phpBB/includes/acp/acp_users.php
View file

@ -770,8 +770,8 @@ class acp_users
'username' => utf8_normalize_nfc(request_var('user', $user_row['username'], true)), 'username' => utf8_normalize_nfc(request_var('user', $user_row['username'], true)),
'user_founder' => request_var('user_founder', ($user_row['user_type'] == USER_FOUNDER) ? 1 : 0), 'user_founder' => request_var('user_founder', ($user_row['user_type'] == USER_FOUNDER) ? 1 : 0),
'email' => strtolower(request_var('user_email', $user_row['user_email'])), 'email' => strtolower(request_var('user_email', $user_row['user_email'])),
'new_password' => $request->untrimed_variable('new_password', '', true), 'new_password' => $request->untrimmed_variable('new_password', '', true),
'password_confirm' => $request->untrimed_variable('password_confirm', '', true), 'password_confirm' => $request->untrimmed_variable('password_confirm', '', true),
); );
// Validation data - we do not check the password complexity setting here // Validation data - we do not check the password complexity setting here

4
phpBB/includes/functions.php
View file

@ -3044,11 +3044,11 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
trigger_error('NO_AUTH_ADMIN'); trigger_error('NO_AUTH_ADMIN');
} }
$password = $request->untrimed_variable('password_' . $credential, '', true); $password = $request->untrimmed_variable('password_' . $credential, '', true);
} }
else else
{ {
$password = $request->untrimed_variable('password', '', true); $password = $request->untrimmed_variable('password', '', true);
} }
$username = request_var('username', '', true); $username = request_var('username', '', true);

4
phpBB/includes/request/request.php
View file

@ -222,7 +222,7 @@ class phpbb_request implements phpbb_request_interface
* @return mixed The value of $_REQUEST[$var_name] run through {@link set_var set_var} to ensure that the type is the * @return mixed The value of $_REQUEST[$var_name] run through {@link set_var set_var} to ensure that the type is the
* the same as that of $default. If the variable is not set $default is returned. * the same as that of $default. If the variable is not set $default is returned.
*/ */
public function untrimed_variable($var_name, $default, $multibyte, $super_global = phpbb_request_interface::REQUEST) public function untrimmed_variable($var_name, $default, $multibyte, $super_global = phpbb_request_interface::REQUEST)
{ {
return $this->_variable($var_name, $default, $multibyte, $super_global, false); return $this->_variable($var_name, $default, $multibyte, $super_global, false);
} }
@ -338,7 +338,7 @@ class phpbb_request implements phpbb_request_interface
} }
/** /**
* Helper function used by variable() and untrimed_variable(). * Helper function used by variable() and untrimmed_variable().
* *
* @param string|array $var_name The form variable's name from which data shall be retrieved. * @param string|array $var_name The form variable's name from which data shall be retrieved.
* If the value is an array this may be an array of indizes which will give * If the value is an array this may be an array of indizes which will give

6
phpBB/includes/ucp/ucp_profile.php
View file

@ -46,9 +46,9 @@ class ucp_profile
$data = array( $data = array(
'username' => utf8_normalize_nfc(request_var('username', $user->data['username'], true)), 'username' => utf8_normalize_nfc(request_var('username', $user->data['username'], true)),
'email' => strtolower(request_var('email', $user->data['user_email'])), 'email' => strtolower(request_var('email', $user->data['user_email'])),
'new_password' => $request->untrimed_variable('new_password', '', true), 'new_password' => $request->untrimmed_variable('new_password', '', true),
'cur_password' => $request->untrimed_variable('cur_password', '', true), 'cur_password' => $request->untrimmed_variable('cur_password', '', true),
'password_confirm' => $request->untrimed_variable('password_confirm', '', true), 'password_confirm' => $request->untrimmed_variable('password_confirm', '', true),
); );
add_form_key('ucp_reg_details'); add_form_key('ucp_reg_details');

4
phpBB/includes/ucp/ucp_register.php
View file

@ -170,8 +170,8 @@ class ucp_register
$data = array( $data = array(
'username' => utf8_normalize_nfc(request_var('username', '', true)), 'username' => utf8_normalize_nfc(request_var('username', '', true)),
'new_password' => $request->untrimed_variable('new_password', '', true), 'new_password' => $request->untrimmed_variable('new_password', '', true),
'password_confirm' => $request->untrimed_variable('password_confirm', '', true), 'password_confirm' => $request->untrimmed_variable('password_confirm', '', true),
'email' => strtolower(request_var('email', '')), 'email' => strtolower(request_var('email', '')),
'lang' => basename(request_var('lang', $user->lang_name)), 'lang' => basename(request_var('lang', $user->lang_name)),
'tz' => request_var('tz', $timezone), 'tz' => request_var('tz', $timezone),

4
phpBB/install/install_update.php
View file

@ -862,7 +862,7 @@ class install_update extends module
$test_connection = false; $test_connection = false;
if ($test_ftp_connection || $submit) if ($test_ftp_connection || $submit)
{ {
$transfer = new $method(request_var('host', ''), request_var('username', ''), $request->untrimed_variable('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', '')); $transfer = new $method(request_var('host', ''), request_var('username', ''), $request->untrimmed_variable('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', ''));
$test_connection = $transfer->open_session(); $test_connection = $transfer->open_session();
// Make sure that the directory is correct by checking for the existence of common.php // Make sure that the directory is correct by checking for the existence of common.php
@ -948,7 +948,7 @@ class install_update extends module
} }
else else
{ {
$transfer = new $method(request_var('host', ''), request_var('username', ''), $request->untrimed_variable('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', '')); $transfer = new $method(request_var('host', ''), request_var('username', ''), $request->untrimmed_variable('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', ''));
$transfer->open_session(); $transfer->open_session();
} }