[R45phpbbmods-checkins] user_search/admin admin_user_search.php,1.7,1.8
Brought to you by:
rasadam
Menu
▾
▴
[R45phpbbmods-checkins] user_search/admin admin_user_search.php,1.7,1.8
|
From: Adam A. <ra...@us...> - 2004-11-17 22:45:36
|
Update of /cvsroot/r45phpbbmods/user_search/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14579/admin Modified Files: admin_user_search.php Log Message: Fixed Bug with + Characters being converted to spaces when url encoded Index: admin_user_search.php =================================================================== RCS file: /cvsroot/r45phpbbmods/user_search/admin/admin_user_search.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** admin_user_search.php 19 May 2004 21:44:41 -0000 1.7 --- admin_user_search.php 17 Nov 2004 22:45:16 -0000 1.8 *************** *** 222,226 **** { case 'search_username': ! $username = ( isset($HTTP_GET_VARS['username']) ) ? urldecode($HTTP_GET_VARS['username']) : $HTTP_POST_VARS['username']; $regex = ( $HTTP_POST_VARS['search_username_regex'] ) ? true : ( $HTTP_GET_VARS['regex'] ) ? true : false; --- 222,226 ---- { case 'search_username': ! $username = ( isset($HTTP_GET_VARS['username']) ) ? rawurldecode($HTTP_GET_VARS['username']) : $HTTP_POST_VARS['username']; $regex = ( $HTTP_POST_VARS['search_username_regex'] ) ? true : ( $HTTP_GET_VARS['regex'] ) ? true : false; *************** *** 232,236 **** break; case 'search_email': ! $email = ( isset($HTTP_GET_VARS['email']) ) ? urldecode($HTTP_GET_VARS['email']) : $HTTP_POST_VARS['email']; $regex = ( $HTTP_POST_VARS['search_email_regex'] ) ? true : ( $HTTP_GET_VARS['regex'] ) ? true : false; --- 232,236 ---- break; case 'search_email': ! $email = ( isset($HTTP_GET_VARS['email']) ) ? rawurldecode($HTTP_GET_VARS['email']) : $HTTP_POST_VARS['email']; $regex = ( $HTTP_POST_VARS['search_email_regex'] ) ? true : ( $HTTP_GET_VARS['regex'] ) ? true : false; *************** *** 242,246 **** break; case 'search_ip': ! $ip_address = ( isset($HTTP_POST_VARS['ip_address'] ) ) ? $HTTP_POST_VARS['ip_address'] : urldecode($HTTP_GET_VARS['ip_address']); if(!$ip_address) --- 242,246 ---- break; case 'search_ip': ! $ip_address = ( isset($HTTP_POST_VARS['ip_address'] ) ) ? $HTTP_POST_VARS['ip_address'] : rawurldecode($HTTP_GET_VARS['ip_address']); if(!$ip_address) *************** *** 250,257 **** break; case 'search_joindate': ! $date_type = ( isset($HTTP_POST_VARS['date_type'] ) ) ? $HTTP_POST_VARS['date_type'] : urldecode($HTTP_GET_VARS['date_type']); ! $date_day = ( isset($HTTP_POST_VARS['date_day'] ) ) ? $HTTP_POST_VARS['date_day'] : urldecode($HTTP_GET_VARS['date_day']); ! $date_month = ( isset($HTTP_POST_VARS['date_month'] ) ) ? $HTTP_POST_VARS['date_month'] : urldecode($HTTP_GET_VARS['date_month']); ! $date_year = ( isset($HTTP_POST_VARS['date_year'] ) ) ? $HTTP_POST_VARS['date_year'] : urldecode($HTTP_GET_VARS['date_year']); if(!$date_type || !$date_day || !$date_month || !$date_year) --- 250,257 ---- break; case 'search_joindate': ! $date_type = ( isset($HTTP_POST_VARS['date_type'] ) ) ? $HTTP_POST_VARS['date_type'] : rawurldecode($HTTP_GET_VARS['date_type']); ! $date_day = ( isset($HTTP_POST_VARS['date_day'] ) ) ? $HTTP_POST_VARS['date_day'] : rawurldecode($HTTP_GET_VARS['date_day']); ! $date_month = ( isset($HTTP_POST_VARS['date_month'] ) ) ? $HTTP_POST_VARS['date_month'] : rawurldecode($HTTP_GET_VARS['date_month']); ! $date_year = ( isset($HTTP_POST_VARS['date_year'] ) ) ? $HTTP_POST_VARS['date_year'] : rawurldecode($HTTP_GET_VARS['date_year']); if(!$date_type || !$date_day || !$date_month || !$date_year) *************** *** 261,265 **** break; case 'search_group': ! $group_id = ( isset($HTTP_POST_VARS['group_id'] ) ) ? $HTTP_POST_VARS['group_id'] : urldecode($HTTP_GET_VARS['group_id']); if(!$group_id) { --- 261,265 ---- break; case 'search_group': ! $group_id = ( isset($HTTP_POST_VARS['group_id'] ) ) ? $HTTP_POST_VARS['group_id'] : rawurldecode($HTTP_GET_VARS['group_id']); if(!$group_id) { *************** *** 268,273 **** break; case 'search_postcount': ! $postcount_type = ( isset($HTTP_POST_VARS['postcount_type'] ) ) ? $HTTP_POST_VARS['postcount_type'] : urldecode($HTTP_GET_VARS['postcount_type']); ! $postcount_value = ( isset($HTTP_POST_VARS['postcount_value'] ) ) ? $HTTP_POST_VARS['postcount_value'] : urldecode($HTTP_GET_VARS['postcount_value']); if(!$postcount_type || ( !$postcount_value && $postcount_value != 0)) --- 268,273 ---- break; case 'search_postcount': ! $postcount_type = ( isset($HTTP_POST_VARS['postcount_type'] ) ) ? $HTTP_POST_VARS['postcount_type'] : rawurldecode($HTTP_GET_VARS['postcount_type']); ! $postcount_value = ( isset($HTTP_POST_VARS['postcount_value'] ) ) ? $HTTP_POST_VARS['postcount_value'] : rawurldecode($HTTP_GET_VARS['postcount_value']); if(!$postcount_type || ( !$postcount_value && $postcount_value != 0)) *************** *** 277,282 **** break; case 'search_userfield': ! $userfield_type = ( isset($HTTP_POST_VARS['userfield_type'] ) ) ? $HTTP_POST_VARS['userfield_type'] : urldecode($HTTP_GET_VARS['userfield_type']); ! $userfield_value = ( isset($HTTP_POST_VARS['userfield_value'] ) ) ? $HTTP_POST_VARS['userfield_value'] : urldecode($HTTP_GET_VARS['userfield_value']); $regex = ( $HTTP_POST_VARS['search_userfield_regex'] ) ? true : ( $HTTP_GET_VARS['regex'] ) ? true : false; --- 277,282 ---- break; case 'search_userfield': ! $userfield_type = ( isset($HTTP_POST_VARS['userfield_type'] ) ) ? $HTTP_POST_VARS['userfield_type'] : rawurldecode($HTTP_GET_VARS['userfield_type']); ! $userfield_value = ( isset($HTTP_POST_VARS['userfield_value'] ) ) ? $HTTP_POST_VARS['userfield_value'] : rawurldecode($HTTP_GET_VARS['userfield_value']); $regex = ( $HTTP_POST_VARS['search_userfield_regex'] ) ? true : ( $HTTP_GET_VARS['regex'] ) ? true : false; *************** *** 288,292 **** break; case 'search_language': ! $language_type = ( isset($HTTP_POST_VARS['language_type'] ) ) ? $HTTP_POST_VARS['language_type'] : urldecode($HTTP_GET_VARS['language_type']); if(!$language_type) --- 288,292 ---- break; case 'search_language': ! $language_type = ( isset($HTTP_POST_VARS['language_type'] ) ) ? $HTTP_POST_VARS['language_type'] : rawurldecode($HTTP_GET_VARS['language_type']); if(!$language_type) *************** *** 297,301 **** break; case 'search_timezone': ! $timezone_type = ( isset($HTTP_POST_VARS['timezone_type'] ) ) ? $HTTP_POST_VARS['timezone_type'] : urldecode($HTTP_GET_VARS['timezone_type']); if(!$timezone_type && $timezone_type != 0) --- 297,301 ---- break; case 'search_timezone': ! $timezone_type = ( isset($HTTP_POST_VARS['timezone_type'] ) ) ? $HTTP_POST_VARS['timezone_type'] : rawurldecode($HTTP_GET_VARS['timezone_type']); if(!$timezone_type && $timezone_type != 0) *************** *** 306,310 **** break; case 'search_style': ! $style_type = ( isset($HTTP_POST_VARS['style_type'] ) ) ? $HTTP_POST_VARS['style_type'] : urldecode($HTTP_GET_VARS['style_type']); if(!$style_type) --- 306,310 ---- break; case 'search_style': ! $style_type = ( isset($HTTP_POST_VARS['style_type'] ) ) ? $HTTP_POST_VARS['style_type'] : rawurldecode($HTTP_GET_VARS['style_type']); if(!$style_type) *************** *** 315,319 **** break; case 'search_moderators': ! $moderators_forum = ( isset($HTTP_POST_VARS['moderators_forum'] ) ) ? $HTTP_POST_VARS['moderators_forum'] : urldecode($HTTP_GET_VARS['moderators_forum']); if(!$moderators_forum) --- 315,319 ---- break; case 'search_moderators': ! $moderators_forum = ( isset($HTTP_POST_VARS['moderators_forum'] ) ) ? $HTTP_POST_VARS['moderators_forum'] : rawurldecode($HTTP_GET_VARS['moderators_forum']); if(!$moderators_forum) *************** *** 325,329 **** case 'search_misc': default: ! $misc = ( isset($HTTP_POST_VARS['misc'] ) ) ? $HTTP_POST_VARS['misc'] : urldecode($HTTP_GET_VARS['misc']); if(!$misc) { --- 325,329 ---- case 'search_misc': default: ! $misc = ( isset($HTTP_POST_VARS['misc'] ) ) ? $HTTP_POST_VARS['misc'] : rawurldecode($HTTP_GET_VARS['misc']); if(!$misc) { *************** *** 365,369 **** { case 'search_username': ! $base_url .= "&search_username=true&username=".urlencode($username); $text = sprintf($lang['Search_for_username'], strip_tags(htmlspecialchars($username))); --- 365,369 ---- { case 'search_username': ! $base_url .= "&search_username=true&username=".rawurlencode($username); $text = sprintf($lang['Search_for_username'], strip_tags(htmlspecialchars($username))); *************** *** 410,414 **** break; case 'search_email': ! $base_url .= "&search_email=true&email=".urlencode($email); $text = sprintf($lang['Search_for_email'], strip_tags(htmlspecialchars($email))); --- 410,414 ---- break; case 'search_email': ! $base_url .= "&search_email=true&email=".rawurlencode($email); $text = sprintf($lang['Search_for_email'], strip_tags(htmlspecialchars($email))); *************** *** 455,459 **** break; case 'search_ip': ! $base_url .= "&search_ip=true&ip_address=".urlencode($ip_address); // Remove any whitespace --- 455,459 ---- break; case 'search_ip': ! $base_url .= "&search_ip=true&ip_address=".rawurlencode($ip_address); // Remove any whitespace *************** *** 607,611 **** break; case 'search_joindate': ! $base_url .= "&search_joindate=true&date_type=".urlencode($date_type)."&date_day=".urlencode($date_day)."&date_month=".urlencode($date_month)."&date_year=".urlencode($date_year); $date_type = trim(strtolower($date_type)); --- 607,611 ---- break; case 'search_joindate': ! $base_url .= "&search_joindate=true&date_type=".rawurlencode($date_type)."&date_day=".rawurlencode($date_day)."&date_month=".rawurlencode($date_month)."&date_year=".rawurlencode($date_year); $date_type = trim(strtolower($date_type)); *************** *** 662,666 **** $group_id = intval($group_id); ! $base_url .= "&search_group=true&group_id=".urlencode($group_id); if(!$group_id) --- 662,666 ---- $group_id = intval($group_id); ! $base_url .= "&search_group=true&group_id=".rawurlencode($group_id); if(!$group_id) *************** *** 705,709 **** $postcount_value = trim(strtolower($postcount_value)); ! $base_url .= "&search_postcount=true&postcount_type=".urlencode($postcount_type)."&postcount_value=".urlencode($postcount_value); switch($postcount_type) --- 705,709 ---- $postcount_value = trim(strtolower($postcount_value)); ! $base_url .= "&search_postcount=true&postcount_type=".rawurlencode($postcount_type)."&postcount_value=".rawurlencode($postcount_value); switch($postcount_type) *************** *** 782,786 **** break; case 'search_userfield': ! $base_url .= "&search_userfield=true&userfield_type=".urlencode($userfield_type)."&userfield_value=".urlencode($userfield_value); $text = strip_tags(htmlspecialchars($userfield_value)); --- 782,786 ---- break; case 'search_userfield': ! $base_url .= "&search_userfield=true&userfield_type=".rawurlencode($userfield_type)."&userfield_value=".rawurlencode($userfield_value); $text = strip_tags(htmlspecialchars($userfield_value)); *************** *** 868,872 **** break; case 'search_language': ! $base_url .= "&search_language=true&language_type=".urlencode($language_type); $language_type = trim(strtolower($language_type)); --- 868,872 ---- break; case 'search_language': ! $base_url .= "&search_language=true&language_type=".rawurlencode($language_type); $language_type = trim(strtolower($language_type)); *************** *** 889,893 **** break; case 'search_timezone': ! $base_url .= "&search_timezone=true&timezone_type=".urlencode($timezone_type); $text = sprintf($lang['Search_for_timezone'], strip_tags(htmlspecialchars($timezone_type))); --- 889,893 ---- break; case 'search_timezone': ! $base_url .= "&search_timezone=true&timezone_type=".rawurlencode($timezone_type); $text = sprintf($lang['Search_for_timezone'], strip_tags(htmlspecialchars($timezone_type))); *************** *** 904,908 **** break; case 'search_style': ! $base_url .= "&search_style=true&style_type=".urlencode($style_type); $style_type = intval($style_type); --- 904,908 ---- break; case 'search_style': ! $base_url .= "&search_style=true&style_type=".rawurlencode($style_type); $style_type = intval($style_type); *************** *** 937,941 **** break; case 'search_moderators': ! $base_url .= "&search_moderators=true&style_type=".urlencode($moderators_forum); $moderators_forum = intval($moderators_forum); --- 937,941 ---- break; case 'search_moderators': ! $base_url .= "&search_moderators=true&style_type=".rawurlencode($moderators_forum); $moderators_forum = intval($moderators_forum); *************** *** 979,983 **** $misc = trim(strtolower($misc)); ! $base_url .= "&search_misc=true&misc=".urlencode($misc); switch($misc) --- 979,983 ---- $misc = trim(strtolower($misc)); ! $base_url .= "&search_misc=true&misc=".rawurlencode($misc); switch($misc) *************** *** 1218,1222 **** 'U_VIEWPROFILE' => append_sid("../profile.$phpEx?mode=viewprofile&".POST_USERS_URL."=".$rowset[$i]['user_id']), ! 'U_VIEWPOSTS' => append_sid("../search.$phpEx?search_author=".urlencode($rowset[$i]['username'])), 'U_MANAGE' => append_sid("admin_users.$phpEx?mode=edit&".POST_USERS_URL."=".$rowset[$i]['user_id']), 'U_PERMISSIONS' => append_sid("admin_ug_auth.$phpEx?mode=user&".POST_USERS_URL."=".$rowset[$i]['user_id']), --- 1218,1222 ---- 'U_VIEWPROFILE' => append_sid("../profile.$phpEx?mode=viewprofile&".POST_USERS_URL."=".$rowset[$i]['user_id']), ! 'U_VIEWPOSTS' => append_sid("../search.$phpEx?search_author=".rawurlencode($rowset[$i]['username'])), 'U_MANAGE' => append_sid("admin_users.$phpEx?mode=edit&".POST_USERS_URL."=".$rowset[$i]['user_id']), 'U_PERMISSIONS' => append_sid("admin_ug_auth.$phpEx?mode=user&".POST_USERS_URL."=".$rowset[$i]['user_id']), |
