UpdateDatabase.php

[Pman.Core] / UpdateDatabase.php

diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index c0a153a..0d65780 100644 (file)
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -129,10 +129,12 @@ class Pman_Core_UpdateDatabase extends Pman
     
     var $emailTemplates = array(
         'EVENT_ERRORS_REPORT' => array(
+            'bcc_group' => 'Empty Group',
             'test_class' => 'Pman/Admin/Report/SendEventErrors',
             'to_group' => 'Administrators',
             'active' => 1,
-            'description' => '9. System Error Messages'
+            'description' => '9. System Error Messages',
+            'template_dir' => '/Pman/Admin/templates/mail/'
         )
     );
     
@@ -793,16 +795,23 @@ class Pman_Core_UpdateDatabase extends Pman
             array(
                 'name' => 'bcc-email', // group who are bcc'ed on all requests.
                 'type' => 0, // system
+                'display_name' => 'Standard BCC Group'
             ),
             array(
                 'name' => 'system-email-from',
                 'type' => 0, // system
+                'display_name' => 'Standard System Email From Group'
             ),
             array(
                 'name' => 'core-person-signup-bcc',
                 'type' => 0, // system
+                'display_name' => 'Standard Person Signup BCC Group'
             ),
-        
+            array(
+                'name' => 'Empty Group', // use for no bcc emails.
+                'type' => 0,
+                'display_name' => 'Standard Empty Group'
+            )
 
         ));
         
@@ -849,18 +858,14 @@ class Pman_Core_UpdateDatabase extends Pman
     
     function updateDataEmails()
     {
-        print_r($this->rootDir);exit;
         foreach ($this->emailTemplates as $k => $mail) {
-            $mail_dir = $this->client_path.'/mail/';
-
-            if (!file_exists($mail_dir."{$k}.html")) {
-                $mail_dir = $ff->page->rootDir. '/Coba/Clients/default/mail/';
-            }
+            
+            $mail_dir = "{$this->rootDir}{$mail['template_dir']}";
 
             $this->initEmails(
                 $mail_dir,
                 array($k => $mail),
-                $mapping
+                false
             );
         }
     }
@@ -879,6 +884,7 @@ class Pman_Core_UpdateDatabase extends Pman
                 if (empty($data['bcc_group'])) {
                     $this->jerr("missing bcc_group for template $name");
                 }
+                
                 $g = DB_DataObject::Factory('core_group')->lookup('name',$data['bcc_group']);
                 
                 if (empty($g->id)) {
@@ -922,7 +928,11 @@ class Pman_Core_UpdateDatabase extends Pman
                 $cm->active = $data['active'];
             }
             
-            if(!empty($data['description'])){
+            /*
+             * Set description to email.
+             * However we do not update if it is been set.
+             */
+            if(empty($cm->description) && !empty($data['description'])){
                 $cm->description = $cm->escape($data['description']);
             }