Version 3.4.5

upload/admin/applications/members/tasks/removevalidating.php

@@ -4,11 +4,11 @@
  *~TERABYTE_DOC_READY~
  * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
  * $License: http://www.invisionpower.com/company/standards.php#license$
- * $Author: ips_terabyte $
+ * $Author: mark $
  * @since		-
- * $LastChangedDate: 2011-02-08 17:20:18 -0500 (Tue, 08 Feb 2011) $
- * @version		v3.3.4
- * $Revision: 7750 $
+ * $LastChangedDate: 2012-09-21 10:15:19 -0400 (Fri, 21 Sep 2012) $
+ * @version		v3.4.5
+ * $Revision: 11360 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -82,13 +82,17 @@ class task_item
 		// If enabled, remove validating new_reg members & entries from members table
 		if ( intval($this->settings['validate_day_prune']) > 0 )
 		{
-			/* Init vars */
+			//-----------------------------------------
+			// Init
+			//-----------------------------------------
+			
 			$mids	= array();
-			$vids	= array();
-			$emails	= array();
 			$less_than = time() - $this->settings['validate_day_prune'] * 86400;
 			
-			/* Get members from DB */
+			//-----------------------------------------
+			// Remove Validating
+			//-----------------------------------------
+
 			$this->DB->build( array( 'select'	=> 'v.vid, v.member_id',
 									 'from'		=> array( 'validating' => 'v' ),
 									 'where'	=> 'v.new_reg=1 AND v.coppa_user<>1 AND v.entry_date < '.$less_than.' AND v.lost_pass<>1 AND v.user_verified=0',
@@ -104,23 +108,43 @@ class task_item
 				if( $i['member_group_id'] != $this->settings['auth_group'] )
 				{
 					// No longer validating?
-					
 					$this->DB->delete( 'validating', "vid='{$i['vid']}'" );
 					continue;
 				}
 				
 				if ( intval($i['posts']) < 1 )
 				{
-					$mids[] 					= $i['member_id'];
+					$mids[] = $i['member_id'];
 				}
 			}
 			
-			// Remove non-posted validating members
+			//-----------------------------------------
+			// Remove incomplete Facebook/Twitter
+			//-----------------------------------------
+
+			$this->DB->build( array(
+				'select'	=> 'p.*',
+				'from'		=> array( 'members_partial' => 'p' ),
+				'add_join'	=> array( array(
+					'from'		=> array( 'members' => 'm' ),
+					'where'		=> 'm.member_id=p.partial_member_id'
+					) ),
+				'where'		=> "p.partial_date<{$less_than} AND ( m.twitter_id<>'' OR m.fb_uid<>0 )"
+				) );				
+			$this->DB->execute();
+			while ( $row = $this->DB->fetch() )
+			{
+				$mids[] = $row['partial_member_id'];
+			}
+			
+			//-----------------------------------------
+			// Do it
+			//-----------------------------------------
 			
 			if ( count($mids) > 0 )
 			{
 				IPSMember::remove( $mids );
-			}		
+			}	
 		
 			//-----------------------------------------
 			// Log to log table - modify but dont delete