Changeset 682 for trunk/phpbms/modules

Timestamp:

12/16/09 14:18:55 (2 years ago)

Author:

nate

Message:

• Removed extraneous code from clients_addedit.php
• Modified massEmail function in clients.php to support new MailChimp? module
• Changed the tableoption record relating to massEmail to be installed from the MailChimp? module and not the BMS.
• Fixed another possible looping bug in list_sync.php
• Moved some image files from the main install directory to the common/image/ directory.
• Modified a file name to be spelled correctly.
• Expanded the feedback in list_sync.php: It will distinguish between non-fatal errors (warnings) and those that stop the script.
• manual_list_sync.php and manual_list_sync.js have been modified to handle this.
• Removed unneeded commented information from push_records_addedit.php

Location:

trunk/phpbms/modules

Files:

• api/push_records_addedit.php (modified) (1 diff)
• bms/include/clients.php (modified) (1 diff)
• bms/install/tableoptions.sql (modified) (1 diff)
• bms/install/updatev0.98.sql (modified) (1 diff)
• mailchimp/include/list_sync.php (modified) (6 diffs)
• mailchimp/install/install.php (modified) (1 diff)
• mailchimp/install/tableoptions.sql (added)
• mailchimp/javascript/manual_list_sync.js (modified) (4 diffs)
• mailchimp/manual_list_sync.php (added)

trunk/phpbms/modules/api/push_records_addedit.php

@@ -38 +38 @@
 */
 
-//CREATE TABLE `pushrecords`(
-//  `id` int(11) NOT NULL auto_increment,
-//  `uuid` varchar(64) NOT NULL,
-//  `originuuid` varchar(64) NOT NULL default '',
-//  `destuuid` varchar(64) NOT NULL default '',
-//  `command` varchar(128) NOT NULL default 'insert',
-//  `whereclause` varchar(256) NOT NULL default '',
-//  `name` varchar(128) NOT NULL default '',
-//  `server` varchar(256) NOT NULL DEFAULT ''
-//  `destscript` varchar(256) NOT NULL default '',
-//  `port` int(11) DEFAULT NULL,
-//  `apiusername` varchar(128) NOT NULL default '',
-//  `apipassword` varchar(128) NOT NULL default '',
-//  `ssl` tinyint(4) NOT NULL DEFAULT '0',
-//  `httpformat` varchar(64) NOT NULL default 'POST',
-//  `dataformat` varchar(64) NOT NULL default 'json',
-//  createdby int(11) NOT NULL default '0',
-//  creationdate datetime NOT NULL default '0000-00-00 00:00:00',
-//  modifiedby int(11) default '0',
-//  modifieddate timestamp NOT NULL,
-//  PRIMARY KEY  (id),
-//  UNIQUE KEY (`uuid`)
-//) ENGINE=INNODB;
         include("../../include/session.php");
         include("include/fields.php");

trunk/phpbms/modules/bms/include/clients.php

@@ -686 +686 @@
                         if(DEMO_ENABLED != "true"){
                                 $_SESSION["emailids"]= $this->idsArray;
-                                goURL("modules/bms/clients_email.php");
+                                goURL("modules/mailchimp/manual_list_sync.php");
                         } else {
                                 return "mass e-mail feature disabled in demo";

trunk/phpbms/modules/bms/install/tableoptions.sql

@@ -52 +52 @@
 INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`, `displayorder`) VALUES ('tbld:6d290174-8b73-e199-fe6c-bcf3d4b61083', 'edit', '1', '1', '0', '', '0');
 INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`, `displayorder`) VALUES ('tbld:6d290174-8b73-e199-fe6c-bcf3d4b61083', 'select', '1', '1', '0', '', '0');
-INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`, `displayorder`) VALUES ('tbld:6d290174-8b73-e199-fe6c-bcf3d4b61083', 'massEmail', 'send mass e-mail', '0', '1', '', '100');
 INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`, `displayorder`) VALUES ('tbld:6d290174-8b73-e199-fe6c-bcf3d4b61083', 'mark_asclient', 'convert to client', '1', '1', '', '50');
 INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`, `displayorder`) VALUES ('tbld:6d290174-8b73-e199-fe6c-bcf3d4b61083', 'stamp_infosent', 'info packet sent', '1', '1', '', '0');

trunk/phpbms/modules/bms/install/updatev0.98.sql

@@ -599 +599 @@
 UPDATE `tablegroupings` SET `name` = 'concat(invoices.type ,\"s\",IF(`invoices`.`iscreditmemo`, \" - Credit Memo\", \"\"))' WHERE `name` = 'concat(invoices.type,"s")';
 --end tablegroupings UPDATE--
+--tableoptions DELETE--
+DELETE FROM `tableoptions WHERE `name`='massEmail';
+--end tableoptions DELETe
 --tableoptions INSERT--
 INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`, `displayorder`) VALUES ('tbld:157b7707-5503-4161-4dcf-6811f8b0322f', 'import', '0', '0', '0', 'Admin', '0');

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

@@ -109 +109 @@
       *   @param string $message Text of error message
       *   @param int $errorCode Error number
-      *   @param bool $stopScript Whether or not to stop the process function
-      */
-    
-    function _addError($message, $errorCode = NULL, $stopScript = false){
+      *   @param bool $fatal Whether or not the error is fatal, and if the process
+      *   function needs to be stopped.
+      */
+    
+    function _addError($message, $errorCode = NULL, $fatal = false){
         
         $tempArray["message"] = $message;
         $tempArray["code"] = $errorCode;
         
+        if($stopScript){
+            $this->stopScript = true;
+            $tempArray["errorType"] = "error";
+        }else{
+            $tempArray["errorType"] = "warning";
+        }//end if
+        
         $this->errors[] = $tempArray;
-        
-        if($stopScript)
-            $this->stopScript = true;
         
     }//end function
@@ -142 +147 @@
         if(count($this->errors)){
             
-            $return["type"] = "error";
+            if($this->stopScript)
+                $return["type"] = "error";
+            else
+                $return["type"] = "warning";
+            
             $return["details"] = $this->errors;
             
@@ -171 +180 @@
           */
         $unsubscribed = array();
+        $start = 0;
         do{
             
-            $members = $this->api->listMembers($this->listId, 'unsubscribed', $this->lastSyncDate, 0, $this->batchLimit);
+            $members = $this->api->listMembers($this->listId, 'unsubscribed', $this->lastSyncDate, $start, $this->batchLimit);
             if($this->api->errorCode){
                 $this->_addError("Unable to load listMembers(): ".$this->api->errorMessage, $this->api->errorCode, true);
@@ -191 +201 @@
             }//end foreach
             
+            $start++;
         }while(count($members) == $this->batchLimit);
         
@@ -196 +207 @@
           *  pull all the cleaned 
           */
+        $start = 0;
         do{
             
-            $members = $this->api->listMembers($this->listId, 'cleaned', $this->lastSyncDate, 0, $this->batchLimit);
+            $members = $this->api->listMembers($this->listId, 'cleaned', $this->lastSyncDate, $start, $this->batchLimit);
             if($this->api->errorCode){
                 $this->_addError("Unable to load listMembers(): ".$this->api->errorMessage, $this->api->errorCode, true);
@@ -215 +227 @@
             }//end foreach
             
+            $start++;
         }while(count($members) == $this->batchLimit);
         

trunk/phpbms/modules/mailchimp/install/install.php

@@ -41 +41 @@
                         "modules",
                         "settings",
+            "tableoptions"
                         );

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

@@ -18 +18 @@
             resultPic.className = "success";
             resultPic.innerHTML = "Success";
+        }else if(JSONresponse.type == "warning"){
+            resultPic.className = "warning";
+            resultPic.innerHTML = "Minor Errors (see results)";
         }else{
-            resultPic.className = "error";
-            resultPic.innerHTML = "Error (see debug)";
-        }//end if
+                        resultPic.className = "fail";
+            resultPic.innerHTML = "Fatal Error";
+                }//endif
         
         list.reportResult(JSONresponse);
@@ -30 +33 @@
         
         var resultText = getObjectFromID("resultText");
-console.log(response);
+
         if(response.type && response.details){
             
@@ -36 +39 @@
                 resultText.innerHTML = "Success";
             }else{
-                resultText.innerHTML = "Errror:";
+                resultText.innerHTML = "The following errors were found:";
                 for(var error in response.details){
                     
                     result.innerHTML += "\n";
-                    result.innerHTML += error.message+"( "+error.code+" )"
+                    result.innerHTML += capitalize(error.type)+": "+error.message+"( "+error.code+" )"
                     
                 }//end for
@@ -52 +55 @@
         }//end if
         
-    }//end function
+    },//end function
+    
+    loadOptionAccordion:function(){
+                
+                var optionsDivs = new Array();
+                optionsDivs[optionsDivs.length]=getObjectFromID("resultDiv");
+        
+                var optionsLinks = new Array();
+                optionsLinks[optionsLinks.length]=getObjectFromID("showResults");
+        
+                var optionsAccordion = new fx.Accordion(optionsLinks, optionsDivs, {opacity: true, duration:250, onComplete:function(){list.expandResultText()}});
+                
+        },//end function
+    
+    expandResultText:function(){
+        
+        var switchButton=getObjectFromID("showResults");
+        
+                if(switchButton.className=="graphicButtons buttonDown"){
+                        switchButton.className="graphicButtons buttonUp"
+                        switchButton.firstChild.innerHTML="hide results";
+                } else {
+                        switchButton.className="graphicButtons buttonDown"
+                        switchButton.firstChild.innerHTML="show results";
+                }//end if
+        
+    },//end function
+        
+        goToSearchPage:function(){
+                document.location = "../../search.php?id=tbld%3A6d290174-8b73-e199-fe6c-bcf3d4b61083"
+        }//end function
     
 }
+function capitalize(string){
+        
+        var theReturn = string.substring(0,1).toUpperCase();
+        theReturn += string.substring(1, string.length);
+        return theReturn;
+        
+}//end function
 
 connect(window, "onload", function(){
    
-   var sync = getObjectFromID("sync")
+   list.loadOptionAccordion();
+   
+   var sync = getObjectFromID("sync");
    connect(sync, "onclick", list.sync);
    
+   var cancelButton = getObjectFromID("cancelButton");
+   connect(cancelButton, "onclick", list.goToSearchPage);
     
 });