DataObjects/core.sql

[Pman.Core] / UpdateDatabase.php

diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index cc79993..d956b81 100644 (file)
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -731,6 +731,7 @@ class Pman_Core_UpdateDatabase extends Pman
         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($data['bcc_group'])) {
@@ -740,6 +741,11 @@ class Pman_Core_UpdateDatabase extends Pman
                 if (!$g) {
                     $this->jerr("bcc_group {$data['bcc_group']} does not exist when importing template $name");
                 }
+                if (!$g->members('email')) {
+                      $this->jerr("bcc_group {$data['bcc_group']} does not have any members");
+                }
+                
+                
                 $cm->bcc_group = $g->id;
             }
             if (empty($cm->test_class)) {
@@ -754,18 +760,24 @@ class Pman_Core_UpdateDatabase extends Pman
             if (!$method->isStatic()) {
                 $this->jerr("template {$name} does not have a test method {$clsname}::test_{$name}");
             }
-            
+            if ($up) {
+                $cm->update($old);
+                continue; /// we do not import the body content of templates that exist...
+            } else {
+                $cm->insert();
+            }
             
             
     //        $basedir = $this->bootLoader->rootDir . $mail_template_dir;
             
-            $opts = array();
+            $opts = array(
+                'update' => 1,
+                'file' => $mail_template_dir. $name .'.html'
+            );
             
-            $opts['file'] = $mail_template_dir. $name .'.html';
-            if (!empty($master)) {
+            if (!empty($data['master'])) {
                 $opts['master'] = $mail_template_dir . $master .'.html';
             }
-            print_r($opts);
             require_once 'Pman/Core/Import/Core_email.php';
             $x = new Pman_Core_Import_Core_email();
             $x->get('', $opts);