[phpbbreloaded-checkins] SF.net SVN: phpbbreloaded: [270] phpBB Reloaded 2

[<teh...@us...>]

Revision: 270
          http://svn.sourceforge.net/phpbbreloaded/?rev=270&view=rev
Author:   tehphpmaster
Date:     2006-10-24 20:57:06 -0700 (Tue, 24 Oct 2006)

Log Message:
-----------
Fixing a small issue that was causing the Registration IP address feature to return 0.0.0.0 all the time (Bug #2). Thanks to Nox for reporting this issue.

Modified Paths:
--------------
    phpBB Reloaded 2/admin/admin_users.php
    phpBB Reloaded 2/includes/usercp_register.php
    phpBB Reloaded 2/templates/subC1/admin/user_edit_body.tpl

Modified: phpBB Reloaded 2/admin/admin_users.php
===================================================================
--- phpBB Reloaded 2/admin/admin_users.php	2006-10-24 05:04:27 UTC (rev 269)
+++ phpBB Reloaded 2/admin/admin_users.php	2006-10-25 03:57:06 UTC (rev 270)
@@ -321,13 +321,13 @@
 		$allowbbcode = ( isset( $HTTP_POST_VARS['allowbbcode']) ) ? intval( $HTTP_POST_VARS['allowbbcode'] ) : $board_config['allow_bbcode'];
 		$allowsmilies = ( isset( $HTTP_POST_VARS['allowsmilies']) ) ? intval( $HTTP_POST_VARS['allowsmilies'] ) : $board_config['allow_smilies'];
 		$user_style = ( isset( $HTTP_POST_VARS['style'] ) ) ? intval( $HTTP_POST_VARS['style'] ) : $board_config['default_style'];
-		$user_lang = ( $HTTP_POST_VARS['language'] ) ? $HTTP_POST_VARS['language'] : $board_config['default_lang'];
+		$user_lang = ( $HTTP_POST_VARS['language'] ) ? $HTTP_POST_VARS['language'] : $board_config['default_lang'];
 //-- mod : Advanced Group Color Management -------------------------------------
 //-- add
 		$user_group_id = ( $HTTP_POST_VARS['user_group_id'] ) ? intval( $HTTP_POST_VARS['user_group_id'] ) : GROUP_REGISTERED;
 //-- fin mod : Advanced Group Color Management ---------------------------------
 
-		$user_timezone = ( isset( $HTTP_POST_VARS['timezone']) ) ? doubleval( $HTTP_POST_VARS['timezone'] ) : $board_config['board_timezone'];
+		$user_timezone = ( isset( $HTTP_POST_VARS['timezone']) ) ? doubleval( $HTTP_POST_VARS['timezone'] ) : $board_config['board_timezone'];
 		$user_dateformat = ( $HTTP_POST_VARS['dateformat'] ) ? trim( $HTTP_POST_VARS['dateformat'] ) : $board_config['default_dateformat'];
 
 		$user_avatar_local = ( isset( $HTTP_POST_VARS['avatarselect'] ) && !empty($HTTP_POST_VARS['submitavatar'] ) && $board_config['allow_avatar_local'] ) ? $HTTP_POST_VARS['avatarselect'] : ( ( isset( $HTTP_POST_VARS['avatarlocal'] )  ) ? $HTTP_POST_VARS['avatarlocal'] : '' );
@@ -826,17 +826,17 @@
 				}
 //-- fin mod : Advanced Group Color Management ---------------------------------
 
-				// We remove all stored login keys since the password has been updated
-				// and change the current one (if applicable)
-				if ( !empty($passwd_sql) )
-				{
-					session_reset_keys($user_id, $user_ip);
-				}
-				
-				$message .= $lang['Admin_user_updated'];
-			}
-			else
-			{
+				// We remove all stored login keys since the password has been updated
+				// and change the current one (if applicable)
+				if ( !empty($passwd_sql) )
+				{
+					session_reset_keys($user_id, $user_ip);
+				}
+				
+				$message .= $lang['Admin_user_updated'];
+			}
+			else
+			{
 				message_die(GENERAL_ERROR, 'Admin_user_fail', '', __LINE__, __FILE__, $sql);
 			}
 
@@ -907,6 +907,7 @@
 
 		$user_regip = decode_ip($this_userdata['user_regip']);
 		$icq = $this_userdata['user_icq'];
+		$user_regip = decode_ip($this_userdata['user_regip']);
 		$aim = htmlspecialchars(str_replace('+', ' ', $this_userdata['user_aim'] ));
 		$msn = htmlspecialchars($this_userdata['user_msnm']);
 		$yim = htmlspecialchars($this_userdata['user_yim']);

Modified: phpBB Reloaded 2/includes/usercp_register.php
===================================================================
--- phpBB Reloaded 2/includes/usercp_register.php	2006-10-24 05:04:27 UTC (rev 269)
+++ phpBB Reloaded 2/includes/usercp_register.php	2006-10-25 03:57:06 UTC (rev 270)
@@ -740,8 +740,8 @@
 //	, user_qp_settings
 //	, '" . $user_qp_settings . "'
 //-- modify
-			$sql = "INSERT INTO " . USERS_TABLE . "	(user_id, username, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_qp_settings, user_sig_bbcode_uid, user_avatar, user_avatar_type, user_viewemail, user_aim, user_yim, user_msnm, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_viewonline, user_notify, user_notify_pm, user_popup_pm, user_timezone, user_dateformat, user_lang, user_group_id, user_style, user_level, user_allow_pm, user_active, user_actkey)
-				VALUES ($user_id, '" . str_replace("\'", "''", $username) . "', " . time() . ", '" . str_replace("\'", "''", $new_password) . "', '" . str_replace("\'", "''", $email) . "', '" . str_replace("\'", "''", $icq) . "', '" . str_replace("\'", "''", $website) . "', '" . str_replace("\'", "''", $occupation) . "', '" . str_replace("\'", "''", $location) . "', '" . str_replace("\'", "''", $interests) . "', '" . str_replace("\'", "''", $signature) . "', '" . $user_qp_settings . "', '$signature_bbcode_uid', $avatar_sql, $viewemail, '" . str_replace("\'", "''", str_replace(' ', '+', $aim)) . "', '" . str_replace("\'", "''", $yim) . "', '" . str_replace("\'", "''", $msn) . "', $attachsig, $allowsmilies, $allowhtml, $allowbbcode, $allowviewonline, $notifyreply, $notifypm, $popup_pm, $user_timezone, '" . str_replace("\'", "''", $user_dateformat) . "', '" . str_replace("\'", "''", $user_lang) . "', '$user_group_id', $user_style, 0, 1, ";
+			$sql = "INSERT INTO " . USERS_TABLE . "	(user_id, username, user_regdate, user_password, user_email, user_regip, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_qp_settings, user_sig_bbcode_uid, user_avatar, user_avatar_type, user_viewemail, user_aim, user_yim, user_msnm, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_viewonline, user_notify, user_notify_pm, user_popup_pm, user_timezone, user_dateformat, user_lang, user_group_id, user_style, user_level, user_allow_pm, user_active, user_actkey)
+				VALUES ($user_id, '" . str_replace("\'", "''", $username) . "', " . time() . ", '" . str_replace("\'", "''", $new_password) . "', '" . str_replace("\'", "''", $email) . "', '" . $userdata['session_ip'] . "', '" . str_replace("\'", "''", $icq) . "', '" . str_replace("\'", "''", $website) . "', '" . str_replace("\'", "''", $occupation) . "', '" . str_replace("\'", "''", $location) . "', '" . str_replace("\'", "''", $interests) . "', '" . str_replace("\'", "''", $signature) . "', '" . $user_qp_settings . "', '$signature_bbcode_uid', $avatar_sql, $viewemail, '" . str_replace("\'", "''", str_replace(' ', '+', $aim)) . "', '" . str_replace("\'", "''", $yim) . "', '" . str_replace("\'", "''", $msn) . "', $attachsig, $allowsmilies, $allowhtml, $allowbbcode, $allowviewonline, $notifyreply, $notifypm, $popup_pm, $user_timezone, '" . str_replace("\'", "''", $user_dateformat) . "', '" . str_replace("\'", "''", $user_lang) . "', '$user_group_id', $user_style, 0, 1, ";
 //-- fin mod : quick post es ---------------------------------------------------
 //-- fin mod : Advanced Group Color Management ---------------------------------
 			if ( $board_config['require_activation'] == USER_ACTIVATION_SELF || $board_config['require_activation'] == USER_ACTIVATION_ADMIN || $coppa )

Modified: phpBB Reloaded 2/templates/subC1/admin/user_edit_body.tpl
===================================================================
--- phpBB Reloaded 2/templates/subC1/admin/user_edit_body.tpl	2006-10-24 05:04:27 UTC (rev 269)
+++ phpBB Reloaded 2/templates/subC1/admin/user_edit_body.tpl	2006-10-25 03:57:06 UTC (rev 270)
@@ -39,6 +39,11 @@
 	  </td>
 	</tr>
 	<tr> 
+	  <td class="row1"><span class="gen">{L_REGIP}: </span></td>
+	  <td class="row2"><span class="gen">{USER_REGIP}</span></td>
+	  </td>
+	</tr>
+	<tr> 
 	  <td class="catsides" colspan="2">&nbsp;</td>
 	</tr>
 	<tr> 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.