[Phpbb-checkins] phpBB2/includes functions.php,1.623,1.624

[Meik S. <acy...@us...>]

Update of /cvsroot/phpbb/phpBB2/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9449

Modified Files:
	functions.php 
Log Message:
#i62 - #i65
gone through every javascript invocation and making sure we adhere to our coding guidelines.

Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.623
retrieving revision 1.624
diff -C2 -d -r1.623 -r1.624
*** functions.php	22 Sep 2007 18:21:58 -0000	1.623
--- functions.php	22 Sep 2007 18:29:39 -0000	1.624
***************
*** 1531,1541 ****
  
  	$template->assign_vars(array(
! 		$tpl_prefix . 'BASE_URL'	=> $base_url,
! 		$tpl_prefix . 'PER_PAGE'	=> $per_page,
  
  		$tpl_prefix . 'PREVIOUS_PAGE'	=> ($on_page == 1) ? '' : $base_url . "{$url_delim}start=" . (($on_page - 2) * $per_page),
  		$tpl_prefix . 'NEXT_PAGE'		=> ($on_page == $total_pages) ? '' : $base_url . "{$url_delim}start=" . ($on_page * $per_page),
! 		$tpl_prefix . 'TOTAL_PAGES'		=> $total_pages)
! 	);
  
  	return $page_string;
--- 1531,1542 ----
  
  	$template->assign_vars(array(
! 		$tpl_prefix . 'BASE_URL'		=> $base_url,
! 		'A_' . $tpl_prefix . 'BASE_URL'	=> addslashes($base_url),
! 		$tpl_prefix . 'PER_PAGE'		=> $per_page,
  
  		$tpl_prefix . 'PREVIOUS_PAGE'	=> ($on_page == 1) ? '' : $base_url . "{$url_delim}start=" . (($on_page - 2) * $per_page),
  		$tpl_prefix . 'NEXT_PAGE'		=> ($on_page == $total_pages) ? '' : $base_url . "{$url_delim}start=" . ($on_page * $per_page),
! 		$tpl_prefix . 'TOTAL_PAGES'		=> $total_pages,
! 	));
  
  	return $page_string;
***************
*** 4153,4159 ****
  		'U_PRIVATEMSGS'			=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&folder=inbox'),
  		'U_RETURN_INBOX'		=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&folder=inbox'),
- 		'UA_RETURN_INBOX'		=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&folder=inbox', false),
  		'U_POPUP_PM'			=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=popup'),
! 		'UA_POPUP_PM'			=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=popup', false),
  		'U_MEMBERLIST'			=> append_sid("{$phpbb_root_path}memberlist.$phpEx"),
  		'U_MEMBERSLIST'			=> append_sid("{$phpbb_root_path}memberlist.$phpEx"),
--- 4154,4159 ----
  		'U_PRIVATEMSGS'			=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&folder=inbox'),
  		'U_RETURN_INBOX'		=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&folder=inbox'),
  		'U_POPUP_PM'			=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=popup'),
! 		'UA_POPUP_PM'			=> addslashes(append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=popup')),
  		'U_MEMBERLIST'			=> append_sid("{$phpbb_root_path}memberlist.$phpEx"),
  		'U_MEMBERSLIST'			=> append_sid("{$phpbb_root_path}memberlist.$phpEx"),