X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=UpdateDatabase.php;h=ee26b73a391db4c35f3e92bd8f50aaca9c958b41;hb=cd0367f0b1c72b3bf7140f594c7e54ef2ed94c9e;hp=d934ed384817fac083ba10e4123cc968903bf445;hpb=c7c63c51f32786d9630877ccdb41bf31beeac058;p=Pman.Core

diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index d934ed38..ee26b73a 100644
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -201,6 +201,7 @@ class Pman_Core_UpdateDatabase extends Pman
          
     }
     function output() {
+        echo "\nUpdate Completed SUCCESS\n";
         return '';
     }
      /**
@@ -688,7 +689,8 @@ class Pman_Core_UpdateDatabase extends Pman
     
     function updateDataEnums()
     {
-        
+        HTML_FlexyFramework::get()->generateDataobjectsCache(true);
+
         $enum = DB_DataObject::Factory('core_enum');
         //DB_DAtaObject::debugLevel(1);
         $enum->initEnums(
@@ -815,16 +817,17 @@ class Pman_Core_UpdateDatabase extends Pman
     }
     
     
-    function initEmails($templateDir, $emails, $active = 1, $to_group = -1)
+    function initEmails($templateDir, $emails, $mapping = false)
     {
-      
+        HTML_FlexyFramework::get()->generateDataobjectsCache(true);
+
         $pg = HTML_FlexyFramework::get()->page;
         foreach($emails as $name=>$data) {
             $cm = DB_DataObject::factory('core_email');
             $update = $cm->get('name', $name);
             $old = clone($cm);
             
-            if (empty($cm->bcc_group)) {
+            if (empty($cm->bcc_group_id)) {
                 if (empty($data['bcc_group'])) {
                     $this->jerr("missing bcc_group for template $name");
                 }
@@ -838,7 +841,7 @@ class Pman_Core_UpdateDatabase extends Pman
                     $this->jerr("bcc_group {$data['bcc_group']} does not have any members");
                 }
                 
-                $cm->bcc_group = $g->id;
+                $cm->bcc_group_id = $g->id;
             }
             // initEmails will always have the latest location of the test class - in theory the user should not be changign the value of this...
             //if (empty($cm->test_class)) {
@@ -847,19 +850,27 @@ class Pman_Core_UpdateDatabase extends Pman
                 }
                 $cm->test_class = $data['test_class'];
             //}
+            if(isset($cm->to_group_id)) {
+                print_r('isset');
+            }
             
-            if ($to_group != -1) {
+            if (
+                !empty($data['to_group']) &&
+                (!isset($cm->to_group_id) || !empty($cm->to_group_id)) 
+            ) {
                 $gp = DB_DataObject::Factory('core_group')->lookup('name',$data['to_group']);
                 
                 if (empty($gp->id)) {
                     $this->jerr("to_group {$data['to_group']} does not exist when importing template $name");
                 }
                 
-                $cm->in_group = $gp->id;
+                $cm->to_group_id = $gp->id;
             }
             
-            if($active != 1) {
-                $cm->active = 0;
+            if(
+                isset($data['active']) && !isset($cm->active)
+            ) {
+                $cm->active = $data['active'];
             }
             
             require_once $cm->test_class . '.php';
@@ -897,7 +908,8 @@ class Pman_Core_UpdateDatabase extends Pman
             }
             require_once 'Pman/Core/Import/Core_email.php';
             $x = new Pman_Core_Import_Core_email();
-            $x->updateOrCreateEmail('', $opts, $cm);
+            
+            $x->updateOrCreateEmail('', $opts, $cm, $mapping);
             
             echo "email: {$name} - CREATED\n";
         }