From: Alan Knowles <alan@roojs.com>
Date: Wed, 3 Mar 2021 08:43:25 +0000 (+0800)
Subject: Changed Import/Core_email.phpUpdateDatabase.php
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=5200d02661c09c2248d3aa7b63c87ab481d3d34b

Changed Import/Core_email.phpUpdateDatabase.php
---

diff --git a/Import/Core_email.php b/Import/Core_email.php
index db526e76..e38089f2 100644
--- a/Import/Core_email.php
+++ b/Import/Core_email.php
@@ -38,6 +38,14 @@ class Pman_Core_Import_Core_email extends Pman
             'min' => 0,
             'max' => 0,  
         ),
+        'raw_contents' => array(
+            'desc' => 'Raw contents of email (used by API) - not by Command line',
+            'short' => 'R',
+            'default' => '',
+            'min' => 0,
+            'max' => 0,  
+        )
+         
     );
     
     function getAuth()
@@ -49,7 +57,8 @@ class Pman_Core_Import_Core_email extends Pman
         }
     }
     
-    function get($part = '', $opts=array()) {
+    function get($part = '', $opts=array())
+    {
         $this->updateOrCreateEmail($part, $opts, false);
     }
 
@@ -59,24 +68,29 @@ class Pman_Core_Import_Core_email extends Pman
         
         $template_name = preg_replace('/\.[a-z]+$/i', '', basename($opts['file']));
         
-        if (!file_exists($opts['file'])) {
-            $this->jerr("file does not exist : " . $opts['file']);
-        }
-        
-        
-        if (!empty($opts['master']) && !file_exists($opts['master'])) {
-            $this->jerr("master file does not exist : " . $opts['master']);
-        }
-        
-        
-        if (empty($cm)) {
-            $cm = DB_dataObject::factory('core_email');
-            $ret = $cm->get('name',$template_name);
-            if($ret && empty($opts['update'])) {
-                $this->jerr("use --update   to update the template..");
+        if (empty($opts['raw_contents'])) {
+            
+            if (!file_exists($opts['file'])) {
+                $this->jerr("file does not exist : " . $opts['file']);
+            }
+            
+            
+            if (!empty($opts['master']) && !file_exists($opts['master'])) {
+                $this->jerr("master file does not exist : " . $opts['master']);
             }
+            
+            
+            if (empty($cm)) {
+                $cm = DB_dataObject::factory('core_email');
+                $ret = $cm->get('name',$template_name);
+                if($ret && empty($opts['update'])) {
+                    $this->jerr("use --update   to update the template..");
+                }
+            }
+            $mailtext = file_get_contents($opts['file']);
+        } else {
+            $mailtext =  $opts['raw_contents'];
         }
-        $mailtext = file_get_contents($opts['file']);
         
         if (!empty($opts['master'])) {
             $body = $mailtext;
diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index f2f1663b..614efeb8 100644
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -921,10 +921,8 @@ class Pman_Core_UpdateDatabase extends Pman
         }
         foreach ($this->emailTemplates as $k => $mail) {
             
-            $mail_dir = "{$this->rootDir}{$mail['template_dir']}";
-
             $this->initEmails(
-                $mail_dir,
+                !empty($mail['template_dir']) ? "{$this->rootDir}{$mail['template_dir']}" : '',
                 array($k => $mail),
                 false
             );
@@ -1024,8 +1022,10 @@ class Pman_Core_UpdateDatabase extends Pman
             
             $opts = array(
                 'update' => 1,
-                'file' => $templateDir. $name .'.html'
             );
+            if (!empty($templateDir)) {
+                $opts['file'] = $templateDir. $name .'.html';
+            }
             
             if (!empty($data['master'])) {
                 $opts['master'] = $templateDir . $master .'.html';