sync

[Pman.Core] / UpdateDatabase.php

diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index 68cc81f..ee26b73 100644 (file)
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -150,7 +150,7 @@ class Pman_Core_UpdateDatabase extends Pman
         $ff = HTML_FlexyFramework::get();
         
         if(!isset($ff->Pman) || !isset($ff->Pman['local_base_url'])){
-            die("Please setup local_base_url");
+            die("Please setup Pman[local_base_url]\n");
         }
         
         $this->local_base_url = $ff->Pman['local_base_url'];
@@ -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(
@@ -744,7 +746,8 @@ class Pman_Core_UpdateDatabase extends Pman
                             
                         
                     )
-                ),
+                )
+               
             )
         ); 
         
@@ -768,6 +771,8 @@ class Pman_Core_UpdateDatabase extends Pman
                 'name' => 'core-person-signup-bcc',
                 'type' => 0, // system
             ),
+        
+
         ));
         
     }
@@ -812,16 +817,17 @@ class Pman_Core_UpdateDatabase extends Pman
     }
     
     
-    function initEmails($templateDir, $emails)
+    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");
                 }
@@ -831,19 +837,42 @@ class Pman_Core_UpdateDatabase extends Pman
                     $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;
+                $cm->bcc_group_id = $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_id)) {
+                print_r('isset');
             }
+            
+            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->to_group_id = $gp->id;
+            }
+            
+            if(
+                isset($data['active']) && !isset($cm->active)
+            ) {
+                $cm->active = $data['active'];
+            }
+            
             require_once $cm->test_class . '.php';
             
             $clsname = str_replace('/','_', $cm->test_class);
@@ -879,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";
         }
@@ -912,7 +942,9 @@ class Pman_Core_UpdateDatabase extends Pman
         if ($done_check) {
             return;
         }
-        if (!empty($this->opts['skip-mysql-check'])) {
+        
+        
+        if (!empty($this->opts['skip-mysql-checks'])) {
             return;
         }
         // innodb in single files is far more efficient that MYD or one big innodb file.
@@ -921,7 +953,7 @@ class Pman_Core_UpdateDatabase extends Pman
         $db->query("show variables like 'innodb_file_per_table'");
         $db->fetch();
         if ($db->Value == 'OFF') {
-            die("Error: set innodb_file_per_table = 1 in my.cnf\n\n");
+            die("Error: set innodb_file_per_table = 1 in my.cnf (or run with --skip-mysql-checks\n\n");
         }
         
         $db = DB_DataObject::factory('core_enum');
@@ -1078,25 +1110,26 @@ class Pman_Core_UpdateDatabase extends Pman
     }
     
     
-    function checkSystem()
+    function checkSystem($req = false, $pref = false)
     {
         // most of these are from File_Convert...
         
         // these are required - and have simple dependancies.
         require_once 'System.php';
-        $req = array( 
+        $req = $req !== false ? $req : array( 
             'convert',
             'grep',
             'pdfinfo',
             'pdftoppm',
             'rsvg-convert',  //librsvg2-bin
             'strings',
+            'oathtool'
         );
          
          
          
         // these are prefered - but may have complicated depenacies
-        $pref= array(
+        $pref = $pref !== false ? $pref :  array(
             'abiword',
             'faad',
             'ffmpeg',
@@ -1179,4 +1212,4 @@ class Pman_Core_UpdateDatabase extends Pman
     
     
     
-}
\ No newline at end of file
+}