X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_setting.php;h=97ec8bd3742a1f88bc0646132f2a02af0931bb29;hp=a6752d4f67541bbcb04404006965c67b3da51db1;hb=HEAD;hpb=386a53305c9a48b99f2074338ae94c2ea7dce1da

diff --git a/DataObjects/Core_setting.php b/DataObjects/Core_setting.php
index a6752d4f..e1eea761 100644
--- a/DataObjects/Core_setting.php
+++ b/DataObjects/Core_setting.php
@@ -6,8 +6,6 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
 {
     public $__table = 'core_setting';
     
-    // gitlive test...
-    
     function initKeys()
     {
         // return false when fail
@@ -57,7 +55,11 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
     
     function beforeInsert($q, $roo)
     {
-        exit;
+        if (isset($q['is_encrypt'])) {
+            $roo->jerr("no direct access for setting encrypted data at present?");
+        }
+        // we store column data in here now - so it has to be insertable.
+        //exit;
     }
     
     function getKeyDirectory()
@@ -74,7 +76,7 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
             return false;
         }
         
-        exec("mkdir -m775 {$key_dir}");
+        mkdir($key_dir, 0755, true);
         
         return $key_dir;
     }
@@ -87,25 +89,25 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
             return;
         }
         
+        $this->initKeys();
+        
         $c = $this->lookup($a['module'], $a['name']);
-        if($c) {
-            return;
-        }
         
-        $this->initKeys();
+        $o = $c ? clone($c) : false;
         
-        $s = DB_DataObject::factory('core_setting');
+        $c = $c ? $c : DB_DataObject::factory('core_setting');
         
-        $s->setFrom(array(
+        $c->setFrom(array(
             'module'        =>     $a['module'],
             'name'          =>       $a['name'],
             'description'   => $a['description'],
             'val' => (!isset($a['is_encrypt']) || $a['is_encrypt'] == 1) ?
                 $this->encrypt($a['val']) : $a['val'],
-            'is_encrypt' => isset($a['is_encrypt']) ? $a['is_encrypt'] : 1
+            'is_encrypt' => isset($a['is_encrypt']) ? $a['is_encrypt'] : 1,
+            'is_valid' => 1
         ));
         
-        $s->insert();
+        $o ?  $c->update($o) : $c->insert();
     }
     
     //one key for encrypting all the settings
@@ -114,31 +116,20 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
         $key_dir = "{$this->getKeyDirectory()}/pub.key";
         
         if(!file_exists($key_dir)) {
-            print_r("Cannot find {$key_dir}");
-            exit;
+            return false;
         }
         
         $pub_key = file_get_contents($key_dir);
         if(!$pub_key) {
-            return;
+            return false;
         }
         openssl_public_encrypt($v, $ciphertext, $pub_key);
         return $ciphertext;
     }
     
-    function getDecryptVal()
+    function decrypt($v)
     {
-        $dir = $this->getKeyDirectory();
-        
-        if(!$dir) {
-            return false;
-        }
-        
-        if(empty($this->val)) {
-            return false;
-        }
-        
-        $key_dir = "{$dir}/pri.key";
+        $key_dir = "{$this->getKeyDirectory()}/pri.key";
         
         if(!file_exists($key_dir)) {
             return false;
@@ -150,9 +141,23 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
             return false;
         }
         
-        openssl_private_decrypt($this->val, $plaintext, $pri_key);
+        openssl_private_decrypt($v, $plaintext, $pri_key);
         
         return $plaintext;
     }
     
+    function getDecryptVal()
+    {
+        
+        if(empty($this->val)) {
+            return false;
+        }
+        
+        if(empty($this->is_encrypt)) {
+            return $this->val;
+        }
+        
+        return $this->decrypt($this->val);
+    }
+    
 }