DataObjects/Core_ip_access.php

[Pman.Core] / UpdateDatabase.php

diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index 48ed50c..6aed4de 100644 (file)
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -201,6 +201,7 @@ class Pman_Core_UpdateDatabase extends Pman
          
     }
     function output() {
+        echo "\nUpdate Completed SUCCESS\n";
         return '';
     }
      /**
@@ -839,14 +840,35 @@ class Pman_Core_UpdateDatabase extends Pman
                 
                 $cm->bcc_group = $g->id;
             }
-            
-            if (empty($cm->test_class)) {
+            // 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)) {
                 if (empty($data['test_class'])) {
                     $this->jerr("missing test_class for template $name");
                 }
                 $cm->test_class = $data['test_class'];
+            //}
+            if(isset($cm->to_group)) {
+                print_r('isset');
+            }
+            
+            if (
+                !empty($data['to_group']) &&
+                (!isset($cm->to_group) || !empty($cm->to_group)) 
+            ) {
+                $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->to_group = $gp->id;
             }
             
+            if(
+                isset($data['active']) && !isset($cm->active)
+            ) {
+                $cm->active = $data['active'];
+            }
             
             require_once $cm->test_class . '.php';
             
@@ -858,13 +880,9 @@ class Pman_Core_UpdateDatabase extends Pman
                 $got_it = false;
                 
             }
-
             if (!$got_it) {
                 $this->jerr("template {$name} does not have a test method {$clsname}::test_{$name}");
             }
-            
-            
-            
             if ($update) {
                 $cm->update($old);
                 echo "email: {$name} - checked\n";
@@ -882,14 +900,12 @@ class Pman_Core_UpdateDatabase extends Pman
                 'file' => $templateDir. $name .'.html'
             );
             
-            print_r($got_it);exit;
-            
-            
             if (!empty($data['master'])) {
                 $opts['master'] = $templateDir . $master .'.html';
             }
             require_once 'Pman/Core/Import/Core_email.php';
             $x = new Pman_Core_Import_Core_email();
+            
             $x->updateOrCreateEmail('', $opts, $cm);
             
             echo "email: {$name} - CREATED\n";