|
From: Meik S. <acy...@us...> - 2007-09-22 18:29:39
|
Update of /cvsroot/phpbb/phpBB2/includes/ucp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9449/ucp Modified Files: ucp_groups.php ucp_pm.php ucp_pm_compose.php ucp_pm_options.php ucp_zebra.php Log Message: #i62 - #i65 gone through every javascript invocation and making sure we adhere to our coding guidelines. Index: ucp_zebra.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/includes/ucp/ucp_zebra.php,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** ucp_zebra.php 27 Jul 2007 17:32:46 -0000 1.42 --- ucp_zebra.php 22 Sep 2007 18:29:39 -0000 1.43 *************** *** 232,236 **** 'U_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=ucp&field=add'), - 'UA_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=ucp&field=add', false), 'S_USERNAME_OPTIONS' => $s_username_options, --- 232,235 ---- Index: ucp_groups.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/includes/ucp/ucp_groups.php,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** ucp_groups.php 22 Jul 2007 20:10:09 -0000 1.63 --- ucp_groups.php 22 Sep 2007 18:29:39 -0000 1.64 *************** *** 679,683 **** 'U_SWATCH' => append_sid("{$phpbb_root_path}adm/swatch.$phpEx", 'form=ucp&name=group_colour'), - 'UA_SWATCH' => append_sid("{$phpbb_root_path}adm/swatch.$phpEx", 'form=ucp&name=group_colour', false), 'S_UCP_ACTION' => $this->u_action . "&action=$action&g=$group_id", 'L_AVATAR_EXPLAIN' => sprintf($user->lang['AVATAR_EXPLAIN'], $config['avatar_max_width'], $config['avatar_max_height'], round($config['avatar_filesize'] / 1024))) --- 679,682 ---- *************** *** 791,796 **** 'U_ACTION' => $this->u_action . "&g=$group_id", 'U_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=ucp&field=usernames'), ! 'UA_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=ucp&field=usernames', false)) ! ); break; --- 790,794 ---- 'U_ACTION' => $this->u_action . "&g=$group_id", 'U_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=ucp&field=usernames'), ! )); break; Index: ucp_pm_options.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/includes/ucp/ucp_pm_options.php,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** ucp_pm_options.php 15 Aug 2007 17:31:03 -0000 1.31 --- ucp_pm_options.php 22 Sep 2007 18:29:39 -0000 1.32 *************** *** 444,449 **** 'U_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=ucp&field=rule_string&select_single=true'), ! 'UA_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=ucp&field=rule_string&select_single=true', false)) ! ); $rule_lang = $action_lang = $check_lang = array(); --- 444,448 ---- 'U_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=ucp&field=rule_string&select_single=true'), ! )); $rule_lang = $action_lang = $check_lang = array(); Index: ucp_pm.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/includes/ucp/ucp_pm.php,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** ucp_pm.php 5 Sep 2007 13:32:38 -0000 1.42 --- ucp_pm.php 22 Sep 2007 18:29:39 -0000 1.43 *************** *** 96,100 **** 'MESSAGE' => $l_new_message, 'S_NOT_LOGGED_IN' => ($user->data['user_id'] == ANONYMOUS) ? true : false, ! 'CLICK_TO_VIEW' => sprintf($user->lang['CLICK_VIEW_PRIVMSG'], '<a href="' . append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&folder=inbox') . '" onclick="jump_to_inbox(); return false;">', '</a>'), 'U_INBOX' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&folder=inbox'), 'UA_INBOX' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&folder=inbox', false)) --- 96,100 ---- 'MESSAGE' => $l_new_message, 'S_NOT_LOGGED_IN' => ($user->data['user_id'] == ANONYMOUS) ? true : false, ! 'CLICK_TO_VIEW' => sprintf($user->lang['CLICK_VIEW_PRIVMSG'], '<a href="' . append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&folder=inbox') . '" onclick="jump_to_inbox(this.href); return false;">', '</a>'), 'U_INBOX' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&folder=inbox'), 'UA_INBOX' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&folder=inbox', false)) Index: ucp_pm_compose.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/includes/ucp/ucp_pm_compose.php,v retrieving revision 1.101 retrieving revision 1.102 diff -C2 -d -r1.101 -r1.102 *** ucp_pm_compose.php 13 Sep 2007 15:01:01 -0000 1.101 --- ucp_pm_compose.php 22 Sep 2007 18:29:39 -0000 1.102 *************** *** 106,111 **** 'S_GROUP_OPTIONS' => ($config['allow_mass_pm'] && $auth->acl_get('u_masspm')) ? $group_options : '', 'U_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=searchuser&form=postform&field=username_list&select_single=$select_single"), ! 'UA_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=searchuser&form=postform&field=username_list&select_single=$select_single", false)) ! ); } --- 106,110 ---- 'S_GROUP_OPTIONS' => ($config['allow_mass_pm'] && $auth->acl_get('u_masspm')) ? $group_options : '', 'U_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=searchuser&form=postform&field=username_list&select_single=$select_single"), ! )); } *************** *** 970,976 **** 'S_CLOSE_PROGRESS_WINDOW' => isset($_POST['add_file']), 'U_PROGRESS_BAR' => append_sid("{$phpbb_root_path}posting.$phpEx", 'f=0&mode=popup'), ! 'UA_PROGRESS_BAR' => append_sid("{$phpbb_root_path}posting.$phpEx", 'f=0&mode=popup', false), ! ) ! ); // Build custom bbcodes array --- 969,974 ---- 'S_CLOSE_PROGRESS_WINDOW' => isset($_POST['add_file']), 'U_PROGRESS_BAR' => append_sid("{$phpbb_root_path}posting.$phpEx", 'f=0&mode=popup'), ! 'UA_PROGRESS_BAR' => addslashes(append_sid("{$phpbb_root_path}posting.$phpEx", 'f=0&mode=popup')), ! )); // Build custom bbcodes array |