[mxbb-commits] mx_profilecp profile.php, 1.11, 1.12 profile_pic.php, 1.7, 1.8

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_profilecp
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29066

Modified Files:
	profile.php profile_pic.php 
Log Message:
for 2.9.x

Index: profile.php
===================================================================
RCS file: /cvsroot/mxbb/mx_profilecp/profile.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** profile.php	17 Jun 2006 20:49:53 -0000	1.11
--- profile.php	9 Sep 2007 20:33:07 -0000	1.12
***************
*** 169,182 ****
  		{
  			$redirect = str_replace("?", "&", this_profile_mxurl() );
! 			mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=". $redirect, true));
  //			mx_message_die(GENERAL_MESSAGE, $lang['Not_allowed_to']);
! //			mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=".this_profile_mxurl(), true));
  		}
  		else if ($mode != 'activate')
  		{
  			$redirect = str_replace("?", "&", this_profile_mxurl("mode=viewprofile&" . POST_USERS_URL . "=$view_user_id") );
! 			mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=". $redirect, true));
  //			mx_message_die(GENERAL_MESSAGE, $lang['Not_allowed_to']);
! //			redirect(append_sid("login.$phpEx?redirect=profile.$phpEx&mode=viewprofile&" . POST_USERS_URL . "=$view_user_id", true));
  			$mode = 'viewprofile';
  		}
--- 169,182 ----
  		{
  			$redirect = str_replace("?", "&", this_profile_mxurl() );
! 			mx_redirect(mx_append_sid($mx_root_path . "login.$phpEx?redirect=". $redirect, true));
  //			mx_message_die(GENERAL_MESSAGE, $lang['Not_allowed_to']);
! //			mx_redirect(mx_append_sid($mx_root_path . "login.$phpEx?redirect=".this_profile_mxurl(), true));
  		}
  		else if ($mode != 'activate')
  		{
  			$redirect = str_replace("?", "&", this_profile_mxurl("mode=viewprofile&" . POST_USERS_URL . "=$view_user_id") );
! 			mx_redirect(mx_append_sid($mx_root_path . "login.$phpEx?redirect=". $redirect, true));
  //			mx_message_die(GENERAL_MESSAGE, $lang['Not_allowed_to']);
! //			mx_redirect(mx_append_sid("login.$phpEx?redirect=profile.$phpEx&mode=viewprofile&" . POST_USERS_URL . "=$view_user_id", true));
  			$mode = 'viewprofile';
  		}
***************
*** 282,287 ****
  	if (!$error && !$no_header)
  	{
! 		$ret_link = append_sid(this_profile_mxurl("mode=$mode") . (($cur_subopt < 0) ? '' : "&sub=$sub") . "&" . POST_USERS_URL . "=$view_user_id");
! //		$ret_link = append_sid( ($is_block ? "index.$phpEx?page=$page_id&amp;mode=" : "profile.$phpEx?mode=" ) . (($cur_subopt < 0) ? '' : "&sub=$sub") . "&" . POST_USERS_URL . "=$view_user_id" );
  		$template->assign_vars(array(
  			'META' => '<meta http-equiv="refresh" content="3;url=' . $ret_link . '">')
--- 282,287 ----
  	if (!$error && !$no_header)
  	{
! 		$ret_link = mx_append_sid(this_profile_mxurl("mode=$mode") . (($cur_subopt < 0) ? '' : "&sub=$sub") . "&" . POST_USERS_URL . "=$view_user_id");
! //		$ret_link = mx_append_sid( ($is_block ? "index.$phpEx?page=$page_id&amp;mode=" : "profile.$phpEx?mode=" ) . (($cur_subopt < 0) ? '' : "&sub=$sub") . "&" . POST_USERS_URL . "=$view_user_id" );
  		$template->assign_vars(array(
  			'META' => '<meta http-equiv="refresh" content="3;url=' . $ret_link . '">')
***************
*** 293,302 ****
  else if ($cancel)
  {
! //		$msg = sprintf($lang['Click_return_inbox'], '<a href="' . append_sid(this_profile_mxurl("mode=privmsg&sub=$folder")) . '">', '</a> ') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid(this_profile_mxurl()) . '">', '</a>');
  //		mx_message_die(GENERAL_MESSAGE, $msg);
  		$redirect = str_replace("?", "&", this_profile_mxurl("mode=$mode&sub=$sub&debugg=on") );
! 		mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=". $redirect, true));
! //		mx_redirect(append_sid( this_profile_mxurl("mode=$mode&sub=$sub&debugg=on"), true));
! //		redirect(append_sid( ($is_block ? "index.$phpEx?page=$page_id&amp;mode=" : "profile.$phpEx?mode=" ) . "$mode&sub=$sub"));
  }
  else
--- 293,302 ----
  else if ($cancel)
  {
! //		$msg = sprintf($lang['Click_return_inbox'], '<a href="' . mx_append_sid(this_profile_mxurl("mode=privmsg&sub=$folder")) . '">', '</a> ') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . mx_append_sid(this_profile_mxurl()) . '">', '</a>');
  //		mx_message_die(GENERAL_MESSAGE, $msg);
  		$redirect = str_replace("?", "&", this_profile_mxurl("mode=$mode&sub=$sub&debugg=on") );
! 		mx_redirect(mx_append_sid($mx_root_path . "login.$phpEx?redirect=". $redirect, true));
! //		mx_redirect(mx_append_sid( this_profile_mxurl("mode=$mode&sub=$sub&debugg=on"), true));
! //		redirect(mx_append_sid( ($is_block ? "index.$phpEx?page=$page_id&amp;mode=" : "profile.$phpEx?mode=" ) . "$mode&sub=$sub"));
  }
  else
***************
*** 318,324 ****
  		$template->assign_vars(array(
  	 		"BORDER_COLOR" 		=> "#bdbdbd",
! 	 		"U_INDEX" 		=> append_sid($mx_root_path),
       		"L_INDEX" 		=> '<<',
! 			'U_MODULE_HOME' => append_sid(this_profile_mxurl("mode=home" ) . ( ($view_userdata['user_id'] != ANONYMOUS) ? '&' . POST_USERS_URL . '=' . $view_userdata['user_id'] : '') ),
  			'L_MODULE_HOME' => $lang['ProfileCP_title']
  			));
--- 318,324 ----
  		$template->assign_vars(array(
  	 		"BORDER_COLOR" 		=> "#bdbdbd",
! 	 		"U_INDEX" 		=> mx_append_sid($mx_root_path),
       		"L_INDEX" 		=> '<<',
! 			'U_MODULE_HOME' => mx_append_sid(this_profile_mxurl("mode=home" ) . ( ($view_userdata['user_id'] != ANONYMOUS) ? '&' . POST_USERS_URL . '=' . $view_userdata['user_id'] : '') ),
  			'L_MODULE_HOME' => $lang['ProfileCP_title']
  			));
***************
*** 349,357 ****
  		$switch = ($curopt==$i) ? 'curopt' : ( ($userdata['session_logged_in'] && ( ($userdata['user_id'] == $view_user_id) || (is_admin($userdata) && ($level_prior[get_user_level($userdata)] > $level_prior[get_user_level($view_userdata)])))) ? 'otheropt' : 'inactopt' );
  		$template->assign_block_vars('opt', array());
! 		$link = append_sid(this_profile_mxurl("mode=" . $module['mode'][$i]) . ( ($view_userdata['user_id'] != ANONYMOUS) ? '&' . POST_USERS_URL . '=' . $view_userdata['user_id'] : '') );
  		if ( count($module['sub'][$i]['mode']) == 1 )
  		{
  			// only one sub-module
! 			$link = append_sid(this_profile_mxurl("mode=" . $module['mode'][$i] . "&sub=" . $module['sub'][$i]['mode'][0] ). ( ($view_userdata['user_id'] != ANONYMOUS) ? '&' . POST_USERS_URL . '=' . $view_userdata['user_id'] : '') );
  		}
  		$template->assign_block_vars('opt.' . $switch, array(
--- 349,357 ----
  		$switch = ($curopt==$i) ? 'curopt' : ( ($userdata['session_logged_in'] && ( ($userdata['user_id'] == $view_user_id) || (is_admin($userdata) && ($level_prior[get_user_level($userdata)] > $level_prior[get_user_level($view_userdata)])))) ? 'otheropt' : 'inactopt' );
  		$template->assign_block_vars('opt', array());
! 		$link = mx_append_sid(this_profile_mxurl("mode=" . $module['mode'][$i]) . ( ($view_userdata['user_id'] != ANONYMOUS) ? '&' . POST_USERS_URL . '=' . $view_userdata['user_id'] : '') );
  		if ( count($module['sub'][$i]['mode']) == 1 )
  		{
  			// only one sub-module
! 			$link = mx_append_sid(this_profile_mxurl("mode=" . $module['mode'][$i] . "&sub=" . $module['sub'][$i]['mode'][0] ). ( ($view_userdata['user_id'] != ANONYMOUS) ? '&' . POST_USERS_URL . '=' . $view_userdata['user_id'] : '') );
  		}
  		$template->assign_block_vars('opt.' . $switch, array(
***************
*** 373,378 ****
  
  		$template->assign_block_vars('sub_menu', array(
! 			'U_MODULE' => append_sid(this_profile_mxurl("mode=" . $module['mode'][$curopt]  . "&sub=$sub" ) . ( ($view_userdata['user_id'] != ANONYMOUS) ? '&' . POST_USERS_URL . '=' . $view_userdata['user_id'] : '') ),
! //			'U_MODULE' => append_sid( ($is_block ? "index.$phpEx?page=$page_id&amp;mode=" : "profile.$phpEx?mode=" ) . $module['mode'][$curopt] . "&sub=$sub" . ( ($view_userdata['user_id'] != ANONYMOUS) ? '&' . POST_USERS_URL . '=' . $view_userdata['user_id'] : '') ),
  			'L_MODULE' => $module['sub'][$curopt]['page_title'][$cur_subopt],
  			'NBOPT' => $nb_opt,
--- 373,378 ----
  
  		$template->assign_block_vars('sub_menu', array(
! 			'U_MODULE' => mx_append_sid(this_profile_mxurl("mode=" . $module['mode'][$curopt]  . "&sub=$sub" ) . ( ($view_userdata['user_id'] != ANONYMOUS) ? '&' . POST_USERS_URL . '=' . $view_userdata['user_id'] : '') ),
! //			'U_MODULE' => mx_append_sid( ($is_block ? "index.$phpEx?page=$page_id&amp;mode=" : "profile.$phpEx?mode=" ) . $module['mode'][$curopt] . "&sub=$sub" . ( ($view_userdata['user_id'] != ANONYMOUS) ? '&' . POST_USERS_URL . '=' . $view_userdata['user_id'] : '') ),
  			'L_MODULE' => $module['sub'][$curopt]['page_title'][$cur_subopt],
  			'NBOPT' => $nb_opt,
***************
*** 395,400 ****
  				$template->assign_block_vars('sub_menu.opt.' . $switch, array(
  					'SHORTCUT' => $module['sub'][$curopt]['shortcut'][$i],
! 					'U_SHORTCUT' => append_sid(this_profile_mxurl("mode=" . $module['mode'][$curopt] . "&sub=" . $module['sub'][$curopt]['mode'][$i]) . ( ($view_userdata['user_id'] != ANONYMOUS) ? '&' . POST_USERS_URL . '=' . $view_userdata['user_id'] : '') ),
! //					'U_SHORTCUT' => append_sid( ($is_block ? "index.$phpEx?page=$page_id&amp;mode=" : "profile.$phpEx?mode=" ) . $module['mode'][$curopt] . "&sub=" . $module['sub'][$curopt]['mode'][$i] . ( ($view_userdata['user_id'] != ANONYMOUS) ? '&' . POST_USERS_URL . '=' . $view_userdata['user_id'] : '') ),
  					)
  				);
--- 395,400 ----
  				$template->assign_block_vars('sub_menu.opt.' . $switch, array(
  					'SHORTCUT' => $module['sub'][$curopt]['shortcut'][$i],
! 					'U_SHORTCUT' => mx_append_sid(this_profile_mxurl("mode=" . $module['mode'][$curopt] . "&sub=" . $module['sub'][$curopt]['mode'][$i]) . ( ($view_userdata['user_id'] != ANONYMOUS) ? '&' . POST_USERS_URL . '=' . $view_userdata['user_id'] : '') ),
! //					'U_SHORTCUT' => mx_append_sid( ($is_block ? "index.$phpEx?page=$page_id&amp;mode=" : "profile.$phpEx?mode=" ) . $module['mode'][$curopt] . "&sub=" . $module['sub'][$curopt]['mode'][$i] . ( ($view_userdata['user_id'] != ANONYMOUS) ? '&' . POST_USERS_URL . '=' . $view_userdata['user_id'] : '') ),
  					)
  				);
***************
*** 426,430 ****
  		'NAV_SEPARATOR' => $nav_separator,
  		'L_MODULE' => ( ($view_userdata['user_id'] != ANONYMOUS) ? $view_userdata['username'] : $lang['Guest']),
! 		'U_MODULE' => append_sid(this_profile_mxurl("mode=" . $module['mode'][$curopt] ) . ( ($view_userdata['user_id'] != ANONYMOUS) ? '&' . POST_USERS_URL . '=' . $view_userdata['user_id'] : '') ),
  		'L_TITLE' => $title,
  		)
--- 426,430 ----
  		'NAV_SEPARATOR' => $nav_separator,
  		'L_MODULE' => ( ($view_userdata['user_id'] != ANONYMOUS) ? $view_userdata['username'] : $lang['Guest']),
! 		'U_MODULE' => mx_append_sid(this_profile_mxurl("mode=" . $module['mode'][$curopt] ) . ( ($view_userdata['user_id'] != ANONYMOUS) ? '&' . POST_USERS_URL . '=' . $view_userdata['user_id'] : '') ),
  		'L_TITLE' => $title,
  		)

Index: profile_pic.php
===================================================================
RCS file: /cvsroot/mxbb/mx_profilecp/profile_pic.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** profile_pic.php	18 Jun 2006 10:47:14 -0000	1.7
--- profile_pic.php	9 Sep 2007 20:33:07 -0000	1.8
***************
*** 23,27 ****
  // 	init_userprefs($userdata);
  //  $userdata = session_pagestart($user_ip, PAGE_INDEX);
! //  mx_init_userprefs($userdata);
  $mx_user->init($user_ip, PAGE_INDEX);
  
--- 23,27 ----
  // 	init_userprefs($userdata);
  //  $userdata = session_pagestart($user_ip, PAGE_INDEX);
! //  init_userprefs($userdata);
  $mx_user->init($user_ip, PAGE_INDEX);