Version 3.4.5
This commit is contained in:
1 parent
fb6b5baabc
commit
e4478369d8
1360 files changed
+228921
-179445
No files matched your search
@@ -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: AndyMillne $
|
||||
* @since -
|
||||
* $LastChangedDate: 2011-02-08 17:20:18 -0500 (Tue, 08 Feb 2011) $
|
||||
* @version v3.3.4
|
||||
* $Revision: 7750 $
|
||||
* $LastChangedDate: 2012-10-31 14:08:48 -0400 (Wed, 31 Oct 2012) $
|
||||
* @version v3.4.5
|
||||
* $Revision: 11536 $
|
||||
*/
|
||||
|
||||
if ( ! defined( 'IN_IPB' ) )
|
||||
@@ -76,6 +76,8 @@ class task_item
|
||||
|
||||
define( 'IN_ACP', 1 );
|
||||
|
||||
require_once IPSLib::getAppDir('members') . '/sources/classes/bulkMailFilter.php';
|
||||
|
||||
$classToLoad = IPSLib::loadActionOverloader( IPSLib::getAppDir( 'members' ) . '/modules_admin/bulkmail/bulkmail.php', 'admin_members_bulkmail_bulkmail' );
|
||||
$bulkmail = new $classToLoad();
|
||||
$bulkmail->makeRegistryShortcuts( $this->registry );
|
||||
|
||||
@@ -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: bfarber $
|
||||
* $Author: ips_terabyte $
|
||||
* @since -
|
||||
* $LastChangedDate: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
|
||||
* @version v3.3.4
|
||||
* $Revision: 10914 $
|
||||
* $LastChangedDate: 2012-05-12 18:45:30 -0400 (Sat, 12 May 2012) $
|
||||
* @version v3.4.5
|
||||
* $Revision: 10739 $
|
||||
*/
|
||||
|
||||
if ( ! defined( 'IN_IPB' ) )
|
||||
@@ -88,7 +88,7 @@ class task_item
|
||||
$licenseKey = ipsRegistry::$settings['ipb_reg_number'];
|
||||
$forum = urlencode( $this->settings['board_name'] );
|
||||
$domain = urlencode( ipsRegistry::$settings['board_url'] );
|
||||
$apiBaseURL = "http://apn-server.invisionpower.com/index.php?api=addMessageToQueue&key=12345&forum=Forum&domain=;)";
|
||||
$apiBaseURL = "http://apn-server.invisionpower.com/index.php?api=addMessageToQueue&key={$licenseKey}&forum={$forum}&domain={$domain}";
|
||||
|
||||
/* Get the file managemnet class */
|
||||
$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classFileManagement.php', 'classFileManagement' );
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
* $Author: ips_terabyte $ - Matt Mecham
|
||||
* @since -
|
||||
* $LastChangedDate: 2011-02-08 22:20:18 +0000 (Tue, 08 Feb 2011) $
|
||||
* @version v3.3.4
|
||||
* @version v3.4.5
|
||||
* $Revision: 7750 $
|
||||
*/
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
* $Author: ips_terabyte $
|
||||
* @since -
|
||||
* $LastChangedDate: 2011-02-08 17:20:18 -0500 (Tue, 08 Feb 2011) $
|
||||
* @version v3.3.4
|
||||
* @version v3.4.5
|
||||
* $Revision: 7750 $
|
||||
*/
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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: bfarber $
|
||||
* $Author: mark $
|
||||
* @since -
|
||||
* $LastChangedDate: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
|
||||
* @version v3.3.4
|
||||
* $Revision: 10914 $
|
||||
* $LastChangedDate: 2013-02-06 10:51:28 -0500 (Wed, 06 Feb 2013) $
|
||||
* @version v3.4.5
|
||||
* $Revision: 11945 $
|
||||
*/
|
||||
|
||||
if ( ! defined( 'IN_IPB' ) )
|
||||
@@ -97,7 +97,7 @@ class task_item
|
||||
|
||||
$this->DB->build( array( 'select' => 'm.member_id',
|
||||
'from' => array( 'members' => 'm' ),
|
||||
'where' => '( (m.twitter_id != \'\' AND m.tc_lastsync < ' . $_sync .') OR (m.fb_uid > 0 AND m.fb_lastsync < ' . $_sync . ') ) AND p.partial_id ' . $this->DB->buildIsNull(true) . ' AND m.last_visit > ' . $_active,
|
||||
'where' => '( (m.twitter_id != \'\' AND m.tc_lastsync < ' . $_sync .') OR (m.fb_uid > 0 AND m.fb_lastsync < ' . $_sync . ') ) AND p.partial_id ' . $this->DB->buildIsNull(true) . ' AND m.last_activity > ' . $_active,
|
||||
'order' => 'm.last_visit DESC',
|
||||
'limit' => array( 0, 30 ),
|
||||
'add_join' => array(
|
||||
@@ -161,7 +161,7 @@ class task_item
|
||||
//-----------------------------------------
|
||||
// Twitter Sync
|
||||
//-----------------------------------------
|
||||
|
||||
|
||||
if ( IPSLib::twitter_enabled() === TRUE )
|
||||
{
|
||||
if ( ! empty( $member['twitter_id'] ) and ! empty( $member['tc_bwoptions'] ) )
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
* $Author: ips_terabyte $
|
||||
* @since -
|
||||
* $LastChangedDate: 2011-02-08 17:20:18 -0500 (Tue, 08 Feb 2011) $
|
||||
* @version v3.3.4
|
||||
* @version v3.4.5
|
||||
* $Revision: 7750 $
|
||||
*/
|
||||
|
||||
|
||||
@@ -5,9 +5,9 @@
|
||||
* $License: http://www.invisionpower.com/company/standards.php#license$
|
||||
* $Author: mark $
|
||||
* @since -
|
||||
* $LastChangedDate: 2011-11-18 06:19:03 -0500 (Fri, 18 Nov 2011) $
|
||||
* @version v3.3.4
|
||||
* $Revision: 9838 $
|
||||
* $LastChangedDate: 2012-09-17 11:58:03 -0400 (Mon, 17 Sep 2012) $
|
||||
* @version v3.4.5
|
||||
* $Revision: 11341 $
|
||||
*/
|
||||
|
||||
if ( ! defined( 'IN_IPB' ) )
|
||||
@@ -82,9 +82,9 @@ class task_item
|
||||
$this->DB->build( array(
|
||||
'select' => '*',
|
||||
'from' => 'members_warn_logs',
|
||||
'where' => 'wl_expire>0 AND wl_expire_date>0 AND wl_expire_date<' . time(),
|
||||
'where' => 'wl_expire>0 AND wl_expire_date>0 AND wl_expire_date<=' . time(),
|
||||
'order' => 'wl_date ASC',
|
||||
'limit' => array( 0, 25 )
|
||||
'limit' => array( 0, 250 )
|
||||
) );
|
||||
$e = $this->DB->execute();
|
||||
while ( $r = $this->DB->fetch( $e ) )
|
||||
@@ -93,6 +93,12 @@ class task_item
|
||||
$this->DB->update( 'members_warn_logs', array( 'wl_expire_date' => 0 ), "wl_id={$r['wl_id']}" );
|
||||
}
|
||||
|
||||
//-----------------------------------------
|
||||
// Check we haven't done anything silly
|
||||
//-----------------------------------------
|
||||
|
||||
$this->DB->update( 'members', array( 'warn_level' => 0 ), "warn_level<0" );
|
||||
|
||||
//-----------------------------------------
|
||||
// Finish
|
||||
//-----------------------------------------
|
||||
|
||||
Reference in new issue
Block a user