Changeset 686 for trunk/phpbms/modules/base/cron.php

Timestamp:

12/21/09 16:58:44 (2 years ago)

Author:

nate

Message:

• Removed unneeded setting from the MailChimp? module.
• Added additional instructions to the MailChimp? adminsettings.php.
• Update MailChimp? version information.
• Fixed error reporting in scheduler_list_sync.php.
• Fixed sql statement in cron.php and a variable reference in scheduler.php that would break without the installation of the api module.
• Removed the redundant push_record_ajax.php.

Files:

• trunk/phpbms/modules/base/cron.php (modified) (1 diff)

trunk/phpbms/modules/base/cron.php

@@ -30 +30 @@
                         `scheduler`.`pushrecordid`,
                         `scheduler`.startdatetime,
-                        `scheduler`.enddatetime,
+                        `scheduler`.enddatetime
+                        ";
+                
+        if(moduleExists("mod:b2d42220-443b-fe74-dbdb-ed2c0968c38c", $phpbms->modules)){
+                $querystatement .= "
+                        ,
                         `tabledefs`.`maintable`,
                         `modules`.`name` AS `modulename`
                 FROM
+                ";
+                $querystatement .= "
                         (((scheduler LEFT JOIN `pushrecords` ON `scheduler`.`pushrecordid` = `pushrecords`.`uuid`) LEFT JOIN `tabledefs` ON `pushrecords`.`originuuid` = `tabledefs`.`uuid`) LEFT JOIN `modules` ON `tabledefs`.`moduleid` = `modules`.`uuid`)
-                WHERE
-                        inactive = 0
-                        AND startdatetime < NOW()
-                        AND (enddatetime > NOW() OR enddatetime IS NULL)
+                ";
+        }else{
+                $querystatement .= "
+                FROM
+                ";
+                $querystatement .= "
+                        `scheduler`
+                ";
+        }//end if
+        
+        $querystatement .= " WHERE
+                        `scheduler`.inactive = '0'
+                        AND `scheduler`.startdatetime < NOW()
+                        AND (`scheduler`.enddatetime > NOW() OR `scheduler`.enddatetime IS NULL)
         ";