From cd0367f0b1c72b3bf7140f594c7e54ef2ed94c9e Mon Sep 17 00:00:00 2001
From: john <john@roojs.com>
Date: Mon, 21 May 2018 13:16:10 +0800
Subject: [PATCH] sync

---
 DataObjects/Core_setting.php | 24 ++++++++++++++++++++----
 Import/Core_email.php        |  8 +++++++-
 UpdateDatabase.php           |  4 ++--
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/DataObjects/Core_setting.php b/DataObjects/Core_setting.php
index 5dd671ee..b09acb20 100644
--- a/DataObjects/Core_setting.php
+++ b/DataObjects/Core_setting.php
@@ -64,8 +64,6 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
     // should not be sending this the values..
     function initSetting($a)
     {
-        $dir = $this->getKeyDirectory();
-        
         if(empty($a)) {
             return;
         }
@@ -105,8 +103,26 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
         if(!$pub_key) {
             return;
         }
-        openssl_public_encrypt($v, $cipher, $pub_key);
-        return $cipher;
+        openssl_public_encrypt($v, $ciphertext, $pub_key);
+        return $ciphertext;
+    }
+    
+    function decrypt($v)
+    {
+        $key_dir = "{$this->getKeyDirectory()}/pri.key";
+        
+        if(!file_exists($key_dir)) {
+            print_r("Cannot find {$key_dir}");
+            exit;
+        }
+        
+        $pri_key = file_get_contents($key_dir);
+        if(!$pri_key) {
+            return;
+        }
+        
+        openssl_private_decrypt($v, $plaintext, $pri_key);
+        return $plaintext;
     }
     
     function checkWritable($cls_name,$func_name,$dir)
diff --git a/Import/Core_email.php b/Import/Core_email.php
index 7cb31219..db526e76 100644
--- a/Import/Core_email.php
+++ b/Import/Core_email.php
@@ -53,7 +53,7 @@ class Pman_Core_Import_Core_email extends Pman
         $this->updateOrCreateEmail($part, $opts, false);
     }
 
-    function updateOrCreateEmail($part='', $opts, $cm = false){
+    function updateOrCreateEmail($part='', $opts, $cm = false, $mapping = false){
         
        // DB_DataObject::debugLevel(1);
         
@@ -84,6 +84,12 @@ class Pman_Core_Import_Core_email extends Pman
             $mailtext = str_replace('{outputBody():h}', $body, $mailtext);
         }
         
+        if($mapping) {
+            foreach ($mapping as $k => $v) {
+                $mailtext = str_replace($k, $v, $mailtext);
+            }
+        }
+        
         require_once 'Mail/mimeDecode.php';
         require_once 'Mail/RFC822.php';
         
diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index 6f7e14fc..ee26b73a 100644
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -817,7 +817,7 @@ class Pman_Core_UpdateDatabase extends Pman
     }
     
     
-    function initEmails($templateDir, $emails)
+    function initEmails($templateDir, $emails, $mapping = false)
     {
         HTML_FlexyFramework::get()->generateDataobjectsCache(true);
 
@@ -909,7 +909,7 @@ 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";
         }
-- 
2.39.2