Changeset 686

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.

Location:

trunk/phpbms/modules

Files:

• api/push_record_ajax.php (deleted)
• base/cron.php (modified) (1 diff)
• base/include/scheduler.php (modified) (1 diff)
• mailchimp/adminsettings.php (modified) (4 diffs)
• mailchimp/install/settings.sql (modified) (1 diff)
• mailchimp/manual_list_sync_ajax.php (modified) (1 diff)
• mailchimp/scheduler_list_sync.php (modified) (3 diffs)
• mailchimp/version.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)
         ";
 

trunk/phpbms/modules/base/include/scheduler.php

@@ -151 +151 @@
                                 $variables["enddatetime"] = NULL;
 
+                        
+                        if(!isset($variables["scripttype"]))
+                                $variables["scripttype"] = "job";
+                                
                         switch($variables["scripttype"]){
                                 

trunk/phpbms/modules/mailchimp/adminsettings.php

@@ -113 +113 @@
                                                         "field_type"=>"text"
                                                 );
-                                                $api->listMergeVarAdd($variables["mailchimp_list_id"], "UUID", "phpbms unique user id", $req);
+                                                $api->listMergeVarAdd($variables["mailchimp_list_id"], "UUID", "phpBMS unique user id", $req);
                                                 if($api->errorCode){
                                                         unset($variables["mailchimp_list_id"]);
@@ -184 +184 @@
                         global $db;
 
-                        $theinput = new inputField("mailchimp_apikey",$therecord["mailchimp_apikey"],"MailChimp Apikey", false, NULL, 48);
-                        $fields[] = $theinput;
-                        
-                        $theinput = new inputCheckbox("mailchimp_secure", $therecord["mailchimp_secure"], "Use SSL Connection");
-                        $fields[] = $theinput;
-                        
-                        $theinput = new inputField("mailchimp_batch_limit", $therecord["mailchimp_batch_limit"], "Batch Limit");
-                        $fields[] = $theinput;
-                        
-                        $theinput = new inputField("mailchimp_list_id", $therecord["mailchimp_list_id"], "List Id");
-                        $fields[] = $theinput;
-                        
-                        $theinput = new inputField("mailchimp_last_sync_date", $therecord["mailchimp_last_sync_date"], "Last Sync Date");
+                        $theinput = new inputField("mailchimp_apikey",$therecord["mailchimp_apikey"],"mailchimp apikey", false, NULL, 48);
+                        $fields[] = $theinput;
+                        
+                        $theinput = new inputCheckbox("mailchimp_secure", $therecord["mailchimp_secure"], "use ssl connection");
+                        $fields[] = $theinput;
+                        
+                        $theinput = new inputField("mailchimp_list_id", $therecord["mailchimp_list_id"], "list id");
+                        $fields[] = $theinput;
+                        
+                        $theinput = new inputField("mailchimp_last_sync_date", $therecord["mailchimp_last_sync_date"], "last sync date");
                         $theinput->setAttribute("class", "uneditable");
                         $theinput->setAttribute("readonly", "readonly");
@@ -212 +209 @@
         
         <input type="hidden" id="apikey_changed" name="apikey_changed" value="0" />
+        
+        <p>
+                <span class="notes">
+                        To use this module, you need to create an account with MailChimp
+                        (<a href="http://mailchimp.com">http://mailchimp.com</a>).
+                </span>
+        </p>
+        
     <p>
                 <?php echo $theform->showField("mailchimp_apikey");?>
@@ -234 +239 @@
         </p>
         <p><?php echo $theform->showField("mailchimp_secure");?></p>
-        <?php /*echo $theform->showField("mailchimp_batch_limit");*/?>
         <p><?php echo $theform->showField("mailchimp_last_sync_date");?></p>
 

trunk/phpbms/modules/mailchimp/install/settings.sql

@@ -1 +1 @@
 INSERT INTO `settings` (`name`, `value`) VALUES ('mailchimp_apikey','');
 INSERT INTO `settings` (`name`, `value`) VALUES ('mailchimp_secure','0');
-INSERT INTO `settings` (`name`, `value`) VALUES ('mailchimp_batch_limit','500');
 INSERT INTO `settings` (`name`, `value`) VALUES ('mailchimp_list_id','');
 INSERT INTO `settings` (`name`, `value`) VALUES ('mailchimp_last_sync_date','');

trunk/phpbms/modules/mailchimp/manual_list_sync_ajax.php

@@ -10 +10 @@
                          MAILCHIMP_LIST_ID,
                          MAILCHIMP_LAST_SYNC_DATE,
-                         MAILCHIMP_BATCH_LIMIT,
+                         NULL,
                          MAILCHIMP_SECURE
                          );

trunk/phpbms/modules/mailchimp/scheduler_list_sync.php

@@ -1 +1 @@
 <?php
 //uncomment if need debug
-//if(!class_exists("appError"))
-//      include_once("../../include/session.php");
+if(!class_exists("appError"))
+        include_once("../../include/session.php");
+        
 include("include/MCAPI.class.php");//for MCAPI CLASS (listSync class uses it)
 include("include/list_sync.php");//for listSync class
@@ -12 +13 @@
                          MAILCHIMP_LIST_ID,
                          MAILCHIMP_LAST_SYNC_DATE,
-                         MAILCHIMP_BATCH_LIMIT,
+                         NULL,
                          MAILCHIMP_SECURE
                          );
@@ -20 +21 @@
 if(isset($response["type"])){
     
-    if($response["type"] == "error")
+    if($response["type"] != "success")
        foreach($response["details"] AS $errorArray){
             
-            $message = "MailChimp sync failure: ".$errorArray["message"]." (".$errorArray["code"].")";
+            $message = "MailChimp sync ".$response["type"].": ".$errorArray["message"]." (".$errorArray["code"].")";
             $log = new phpbmsLog($message, "SCHEDULER", NULL, $db);
             

trunk/phpbms/modules/mailchimp/version.php

@@ -9 +9 @@
         
         $modules["mailchimp"]["requirements"] = 
-        "phpBMS Core v0.98 or greater; BMS module v0.98 or greater.";
+        "phpBMS Core v0.98 or greater; BMS module v0.98 or greater; A MailChimp account (http://www.mailchimp.com/).";
 
 ?>