UpdateDatabase.php

[Pman.Core] / UpdateDatabase.php

diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index d36da49..46472b3 100644 (file)
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -127,6 +127,15 @@ class Pman_Core_UpdateDatabase extends Pman
     
     var $local_base_url = false;
     
+    var $emailTemplates = array(
+        'EVENT_ERRORS_REPORT' => array(
+            'test_class' => 'Pman/Admin/Report/SendEventErrors',
+            'to_group' => 'Administrators',
+            'active' => 1,
+            'description' => '9. System Error Messages'
+        )
+    );
+    
     function getAuth() {
         
         
@@ -152,6 +161,8 @@ class Pman_Core_UpdateDatabase extends Pman
    
         $this->checkSystem();
         
+        $this->verifyExtensions(array('curl'));
+        
         if (class_exists('PDO_DataObjects_Introspection')) {
             PDO_DataObject_Introspection::$cache = array();
         }
@@ -303,9 +314,10 @@ class Pman_Core_UpdateDatabase extends Pman
             // new -- sql directory..
             // new style will not support migrate ... they have to go into mysql-migrate.... directories..
             // new style will not support pg.sql etc.. naming - that's what the direcotries are for..
+            $dbdir = $dbtype == 'mysqli' ? 'mysql' : $dbtype;
             
             $this->{$dirmethod}($dburl, $this->rootDir. "/Pman/$m/sql");
-            $this->{$dirmethod}($dburl, $this->rootDir. "/Pman/$m/{$dbtype}");
+            $this->{$dirmethod}($dburl, $this->rootDir. "/Pman/$m/{$dbdir}");
             
            
             
@@ -864,10 +876,11 @@ class Pman_Core_UpdateDatabase extends Pman
             }
             // 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 (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');
@@ -892,6 +905,10 @@ class Pman_Core_UpdateDatabase extends Pman
                 $cm->active = $data['active'];
             }
             
+            if(!empty($data['description'])){
+                $cm->description = $cm->escape($data['description']);
+            }
+            
             require_once $cm->test_class . '.php';
             
             $clsname = str_replace('/','_', $cm->test_class);
@@ -948,6 +965,8 @@ class Pman_Core_UpdateDatabase extends Pman
         $this->updateDataGroups();
         $this->updateDataCompanies();
         
+        $this->updateDataEmails();
+        
         $c = DB_DataObject::Factory('I18n');
         $c->buildDB();