Version 3.1.4

upload/converge_local/apis/server_functions.php

@@ -1,19 +1,21 @@
 <?php
 
 /**
+ * <pre>
  * Invision Power Services
- * IP.Board v3.0.5
+ * IP.Board v3.1.4
  * Converge Handler
- * Last Updated: $Date: 2009-08-10 17:08:53 -0400 (Mon, 10 Aug 2009) $
+ * Last Updated: $Date: 2010-10-05 09:09:23 -0400 (Tue, 05 Oct 2010) $
+ * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.iinvisionpower.com/community/board/license.html
- * @package		Invision Power Board
+ * @license		http://www.invisionpower.com/community/board/license.html
+ * @package		IP.Board
  * @subpackage	IP.Converge
- * @link		http://www.iinvisionpower.com
+ * @link		http://www.invisionpower.com
  * @since		2.1.0
- * @version		$Revision: 5009 $
+ * @version		$Revision: 6943 $
  *
  */
 
@@ -354,7 +356,7 @@ class Converge_Server
 		{
 			if( $member['member_id'] )
 			{
-				if ( $old_email_address AND $new_email_address AND $member['member_id'] )
+				if ( $old_username AND $new_username AND $member['member_id'] )
 				{
 					$check = IPSMember::load( $new_username, 'core', 'username' );
 	
@@ -868,7 +870,7 @@ class Converge_Server
 			$this->classApiServer->apiSendError( 100, $this->registry->getClass( 'class_localization' )->words['unauthorized_user'] );
 			return FALSE;
 		}
-		else if ( 1 == 0 )// CVG_IP_MATCH AND ( my_getenv('REMOTE_ADDR') != $info['converge_ip_address'] ) )
+		else if ( CVG_IP_MATCH AND ( my_getenv('REMOTE_ADDR') != $info['converge_ip_address'] ) )
 		{
 			$this->classApiServer->apiSendError( 101, $this->registry->getClass( 'class_localization' )->words['bad_ip_address'] );
 			return FALSE;