Changeset 731 for trunk

Timestamp:

01/08/10 10:43:14 (2 years ago)

Author:

brieb

Message:

• updated mailchimp export report to conform to new standards

Location:

trunk/phpbms/modules/mailchimp/report

Files:

• basic_mc.php (deleted)
• client_mailchimp_export.php (modified) (5 diffs)

trunk/phpbms/modules/mailchimp/report/client_mailchimp_export.php

@@ -37 +37 @@
  +-------------------------------------------------------------------------+
 */
-
-require("../../../include/session.php");
-
-class MCReport{
+if(!class_exists("phpbmsReport"))
+    include("../../../report/report_class.php");
+
+class MCReport extends phpbmsReport{
 
         var $selectcolumns;
@@ -47 +47 @@
         var $reportOutput = "";
 
-        function MCReport($db,$variables = NULL){
-                $this->db = $db;
+        function MCReport($db, $reportUUID, $tabledefUUID, $variables = NULL){
+
+            parent::phpbmsReport($db, $reportUUID, $tabledefUUID);
 
                 //next we do the columns
@@ -61 +62 @@
 
 
-                if($variables){
-                        //$tempArray = explode("::", $variables["columns"]);
-                        $tempArray = json_decode($variables["columns"], true);
-
-                        foreach($tempArray as $id)
-                                $this->selectcolumns[] = $this->columns[$id];
-                        $this->selectcolumns = array_reverse($this->selectcolumns);
-
-                        $this->selecttable = "`clients`";
-
-                        $this->whereclause = $_SESSION["printing"]["whereclause"];
-                        if($this->whereclause=="") $this->whereclause="WHERE clients.id != -1";
-
-                        if($this->whereclause!="") $this->whereclause=" WHERE (".substr($this->whereclause,6).") ";
-                }// endif
+            $this->selecttable = "`clients`";
 
         }//end method
 
+
+        function processFromPost($variables){
+
+            $tempArray = json_decode($variables["columns"], true);
+
+            foreach($tempArray as $id)
+                    $this->selectcolumns[] = $this->columns[$id];
+            $this->selectcolumns = array_reverse($this->selectcolumns);
+
+
+        }//end function processFromPost
+
+
+        function processFromSettings(){
+
+            foreach($this->settings as $key=>$value)
+                if(strpos($key, "column") === 0)
+                    $this->selectcolumns[substr($key,6)-1] = $this->columns[$value];
+
+            ksort($this->selectcolumns);
+            $this->selectcolumns = array_reverse($this->selectcolumns);
+
+        }//end function processFromSettings
 
         function addColumn($name, $field, $format = NULL){
@@ -91 +101 @@
 
         function generate(){
+
+            $this->whereClause = $_SESSION["printing"]["whereclause"];
+            if($this->whereClause=="")
+                $this->whereclause="WHERE clients.id != -1";
+
+            if($this->whereClause!="")
+                $this->whereClause = " WHERE (".substr($this->whereClause,6).") ";
 
                 $querystatement = "SELECT ";
@@ -234 +251 @@
 }//endclass
 
-// Processing ===================================================================================================================
-if(!isset($dontProcess)){
+
+/**
+ * PROCESSING
+ * =============================================================================
+ */
+if(!isset($noOutput)){
+
+    require("../../../include/session.php");
+
+        checkForReportArguments();
+
+        $report = new MCReport($db, $_GET["rid"], $_GET["tid"]);
+
         if(isset($_POST["columns"])){
-                $myreport= new MCReport($db,$_POST);
-                $myreport->generate();
-                $myreport->output();
+
+            $report->processFromPost($_POST);
+            $report->generate();
+            $report->output();
+
+        } elseif(isset($report->settings["column1"])) {
+
+            $report->processFromSettings();
+            $report->generate();
+            $report->output();
+
         } else {
-                //$myreport = new MCReport($db);
-                //$myreport->showSelectScreen();
-        }
-}?>
+
+            $report->showSelectScreen();
+
+        }//endif
+
+}//endif
+
+/**
+ * When adding a new report record, the add/edit needs to know what the class
+ * name is so that it can instantiate it, and grab it's default settings.
+ */
+if(isset($addingReportRecord))
+    $reportClass = "MCReport";
+?>