From: Alan Knowles <alan@roojs.com>
Date: Wed, 3 Aug 2016 09:13:44 +0000 (+0800)
Subject: sync
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=10595831609870f6eb2c3cb510c901f781c25db5

sync
---

diff --git a/DataObjects/Companies.php b/DataObjects/Companies.php
index 7aebca3f..a7830f6f 100644
--- a/DataObjects/Companies.php
+++ b/DataObjects/Companies.php
@@ -108,7 +108,7 @@ class Pman_Core_DataObjects_Companies extends DB_DataObject
                 {$tn}.name LIKE '%$s%'
             ");
         }
-          if(!empty($q['search']['name_starts'])){
+        if(!empty($q['search']['name_starts'])){
             $s = $this->escape($q['search']['name_starts']);
             $this->whereAdd("
                 {$tn}.name LIKE '$s%'
diff --git a/Import/Core_email.php b/Import/Core_email.php
index 3dfb3e87..d40b7eb9 100644
--- a/Import/Core_email.php
+++ b/Import/Core_email.php
@@ -42,8 +42,12 @@ class Pman_Core_Import_Core_email extends Pman
         }
         
     }
+    
+    function get($part = '', $opts) {
+        $this->updateOrCreateEmail($part, $opts, false);
+    }
 
-    function get($part='', $opts){
+    function updateOrCreateEmail($part='', $opts, $cm = false){
         
        // DB_DataObject::debugLevel(1);
         
@@ -59,11 +63,12 @@ class Pman_Core_Import_Core_email extends Pman
         }
         
         
-         
-        $c = DB_dataObject::factory('core_email');
-        $ret = $c->get('name',$template_name);
-        if($ret && empty($opts['update'])) {
-            $this->jerr("use --update 1 to update the template..");
+        if (empty($cm)) {
+            $cm = DB_dataObject::factory('core_email');
+            $ret = $cm->get('name',$template_name);
+            if($ret && empty($opts['update'])) {
+                $this->jerr("use --update 1 to update the template..");
+            }
         }
         
         $mailtext = file_get_contents($opts['file']);
@@ -95,28 +100,30 @@ class Pman_Core_Import_Core_email extends Pman
      
         
         
-        if ($c->id) {
-            $cc =clone($c);
-            $c->setFrom(array(
+        if ($cm->id) {
+            
+            $cc =clone($cm);
+            $cm->setFrom(array(
                'bodytext'      => $parts[2],
                'updated_dt'     => date('Y-m-d H:i:s'),   
             ));
             
-            $c->update($cc);
+            $cm->update($cc);
         } else {
             
-              $c->setFrom(array(
+            $cm->setFrom(array(
                 'from_name'     => $from_name,
                 'from_email'    => $from_email,
-                'subject'       => $parts[1]['Subject'],
+                'subject'       => $headers['Subject'],
                 'name'          => $template_name,
                 'bodytext'      => $parts[2],
                 'updated_dt'     => date('Y-m-d H:i:s'),
                 'created_dt'     => date('Y-m-d H:i:s'),
             ));
             
-            $c->insert();
+            $cm->insert();
         }
+        return $cm;
     }
     function output() {
         die("done\n");
diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index 47019aed..8a9fe5e6 100644
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -821,7 +821,8 @@ class Pman_Core_UpdateDatabase extends Pman
                 echo "email: {$name} - checked\n";
                 continue; /// we do not import the body content of templates that exist...
             } else {
-                $cm->insert();
+                
+                //$cm->insert();
             }
             
             
@@ -837,7 +838,7 @@ class Pman_Core_UpdateDatabase extends Pman
             }
             require_once 'Pman/Core/Import/Core_email.php';
             $x = new Pman_Core_Import_Core_email();
-            $x->get('', $opts);
+            $x->updateOrCreateEmail('', $opts, $cm);
             
             echo "email: {$name} - CREATED\n";
         }