[mxbb-commits] mx_profilecp/profilcp functions_profile.php,1.6,1.7 profilcp_activate.php,1.2,1.3 profilcp_email.php,1.3,1.4

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

Update of /cvsroot/mxbb/mx_profilecp/profilcp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8623/modules/mx_profilecp/profilcp

Modified Files:
	functions_profile.php profilcp_activate.php profilcp_email.php 
Log Message:
updating

Index: profilcp_email.php
===================================================================
RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_email.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** profilcp_email.php	16 Sep 2004 20:05:09 -0000	1.3
--- profilcp_email.php	22 Sep 2005 10:11:46 -0000	1.4
***************
*** 54,62 ****
  if ( !$userdata['session_logged_in'] )
  {
  	$redirect = str_replace("?", "&", this_profile_mxurl("mode=email&" . POST_USERS_URL . "=$user_id") );
  	mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=". $redirect, true));
- //	mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=".this_profile_mxurl("mode=email&" . POST_USERS_URL . "=$user_id"), true));
- //	redirect(append_sid("login.$phpEx?redirect=profile.$phpEx&mode=email&" . POST_USERS_URL . "=$user_id", true));
- //	redirect(append_sid("login.$phpEx?redirect=" . ( $is_block ? "index.$phpEx&page=$page_id&mode=" : "profile.$phpEx&mode=" ) . "email&" . POST_USERS_URL . "=$user_id", true));
  }
  
--- 54,61 ----
  if ( !$userdata['session_logged_in'] )
  {
+ 	//redirect(append_sid("login.$phpEx?redirect=profile.$phpEx&mode=email&" . POST_USERS_URL . "=$user_id", true));
+ 	
  	$redirect = str_replace("?", "&", this_profile_mxurl("mode=email&" . POST_USERS_URL . "=$user_id") );
  	mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=". $redirect, true));
  }
  
***************
*** 82,91 ****
  		if ( isset($HTTP_POST_VARS['submit']) )
  		{
- 			// session id check
- 			if ( ($sid == '' || $sid != $userdata['session_id']) && !defined('NO_SID') )
- 			{
- 				message_die(GENERAL_ERROR, 'Invalid_session');
- 			}
- 
  			$error = FALSE;
  
--- 81,84 ----
***************
*** 123,139 ****
  					$emailer = new emailer($board_config['smtp_delivery']);
  
! //-- mod : profilcp --------------------------------------------------------------------------------
! 					$email_headers = '';
! 					switch ( $board_config['version'] )
! 					{
! 						case '.0.4':
! 							$email_headers = 'Return-Path: ' . $userdata['user_email'] . "\nFrom: " . $userdata['user_email'] . "\n";
! 							break;
! 						default:
! 							$emailer->from($userdata['user_email']);
! 							$emailer->replyto($userdata['user_email']);
! 							break;
! 					}
! //-- fin mod : profilcp ----------------------------------------------------------------------------
  
  					$email_headers .= 'X-AntiAbuse: Board servername - ' . $server_name . "\n";
--- 116,121 ----
  					$emailer = new emailer($board_config['smtp_delivery']);
  
! 					$emailer->from($userdata['user_email']);
! 					$emailer->replyto($userdata['user_email']);
  
  					$email_headers .= 'X-AntiAbuse: Board servername - ' . $server_name . "\n";
***************
*** 172,175 ****
--- 154,158 ----
  						}
  //-- fin mod : profilcp ----------------------------------------------------------------------------
+ 
  						$emailer->use_template('profile_send_email');
  						$emailer->email_address($userdata['user_email']);
***************
*** 177,180 ****
--- 160,164 ----
  						$emailer->extra_headers($email_headers);
  
+ 
  						$emailer->assign_vars(array(
  							'SITENAME' => $board_config['sitename'], 

Index: profilcp_activate.php
===================================================================
RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_activate.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** profilcp_activate.php	29 Jun 2004 22:27:47 -0000	1.2
--- profilcp_activate.php	22 Sep 2005 10:11:46 -0000	1.3
***************
*** 57,60 ****
--- 57,65 ----
  	else if ((trim($row['user_actkey']) == trim($HTTP_GET_VARS['act_key'])) && (trim($row['user_actkey']) != ''))
  	{
+ 		if (intval($board_config['require_activation']) == USER_ACTIVATION_ADMIN && $userdata['user_level'] != ADMIN)
+ 		{
+ 			message_die(GENERAL_MESSAGE, $lang['Not_Authorised']);
+ 		}
+ 		
  		$sql_update_pass = ( $row['user_newpasswd'] != '' ) ? ", user_password = '" . str_replace("\'", "''", $row['user_newpasswd']) . "', user_newpasswd = ''" : '';
  

Index: functions_profile.php
===================================================================
RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/functions_profile.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** functions_profile.php	1 Feb 2005 20:59:39 -0000	1.6
--- functions_profile.php	22 Sep 2005 10:11:46 -0000	1.7
***************
*** 262,266 ****
  }
  
! function check_image_type(&$type, &$error, &$error_msg)
  {
  	global $lang;
--- 262,266 ----
  }
  
! function pcp_check_image_type(&$type, &$error, &$error_msg)
  {
  	global $lang;
***************
*** 427,431 ****
  	}
  
! 	if ( !($imgtype = check_image_type($avatar_filetype, $error, $error_msg)) )
  	{
  		return;
--- 427,431 ----
  	}
  
! 	if ( !($imgtype = pcp_check_image_type($avatar_filetype, $error, $error_msg)) )
  	{
  		return;