Changeset 684

Timestamp:

12/16/09 15:09:06 (2 years ago)

Author:

nate

Message:

• Removed / commented out active debug code in some files.
• Changed some error messages to be more relevant.
• Fixed error message reporting in manual_list_sync.js

Location:

trunk/phpbms/modules

Files:

• base/javascript/adminsettings.js (modified) (1 diff)
• mailchimp/include/list_sync.php (modified) (3 diffs)
• mailchimp/javascript/manual_list_sync.js (modified) (2 diffs)
• mailchimp/scheduler_list_sync.php (modified) (2 diffs)

trunk/phpbms/modules/base/javascript/adminsettings.js

@@ -359 +359 @@
 
         processSpan.style.display = "none";
-console.log(updateResponse.checked);
         if(updateResponse.checked == true){
             date.value = updateResponse.date;

trunk/phpbms/modules/mailchimp/include/list_sync.php

@@ -118 +118 @@
         $tempArray["code"] = $errorCode;
         
-        if($stopScript){
+        if($fatal){
             $this->stopScript = true;
             $tempArray["errorType"] = "error";
@@ -418 +418 @@
         if($this->lastSyncDate)
             $querystatement .= " AND `modifieddate` > '".$this->lastSyncDate."'";
+            
         
         $queryresult = $this->db->query($querystatement);
@@ -452 +453 @@
                 foreach($return['errors'] as $val){
                     
-                    $this->_addError("Subscribing or updating email '".$val["row"]["EMAIL"]."' failed: ".$val["message"], $val["code"]);
+                    $this->_addError("Subscribing or updating uuid '".$val["row"]["UUID"]."' failed: ".$val["message"], $val["code"]);
                     
                     $memberInfo = $this->api->listMemberInfo($this->listId, $val["row"]["EMAIL"]);

trunk/phpbms/modules/mailchimp/javascript/manual_list_sync.js

@@ -40 +40 @@
             }else{
                 resultText.innerHTML = "The following errors were found:";
-                for(var error in response.details){
-                    
-                    result.innerHTML += "\n";
-                    result.innerHTML += capitalize(error.type)+": "+error.message+"( "+error.code+" )"
+                                
+                for(var i = 0; i < response.details.length; i++){
+                
+                                        resultText.innerHTML += "\n";
+                    resultText.innerHTML += capitalize(response.details[i].errorType)+": "+response.details[i].message+"( "+response.details[i].code+" )"
                     
                 }//end for
@@ -88 +89 @@
     
 }
-function capitalize(string){
+function capitalize(theString){
         
-        var theReturn = string.substring(0,1).toUpperCase();
-        theReturn += string.substring(1, string.length);
+        var theReturn = theString.substring(0,1).toUpperCase();
+        theReturn += theString.substring(1, theString.length);
         return theReturn;
         

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
@@ -17 +17 @@
 
 $response = $listSync->process();
-var_dump($response);
-exit;
 
 if(isset($response["type"])){