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

diff --git a/DataObjects/Core_setting.php b/DataObjects/Core_setting.php
index 1a69da3a..e1eea761 100644
--- a/DataObjects/Core_setting.php
+++ b/DataObjects/Core_setting.php
@@ -55,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()
@@ -89,11 +93,9 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
         
         $c = $this->lookup($a['module'], $a['name']);
         
-        $o = empty($c) ? false : clone($c);
+        $o = $c ? clone($c) : false;
         
-        if(empty($c)) {
-            $c = DB_DataObject::factory('core_setting');
-        }
+        $c = $c ? $c : DB_DataObject::factory('core_setting');
         
         $c->setFrom(array(
             'module'        =>     $a['module'],
@@ -105,7 +107,7 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
             'is_valid' => 1
         ));
         
-        empty($o) ? $c->insert() : $c->update($o);
+        $o ?  $c->update($o) : $c->insert();
     }
     
     //one key for encrypting all the settings
@@ -114,49 +116,48 @@ 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();
+        $key_dir = "{$this->getKeyDirectory()}/pri.key";
         
-        if(!$dir) {
+        if(!file_exists($key_dir)) {
             return false;
         }
         
-        if(empty($this->val)) {
+        $pri_key = file_get_contents($key_dir);
+        
+        if(!$pri_key) {
             return false;
         }
         
-        if(empty($this->is_encrypt)) {
-            return $this->val;
-        }
+        openssl_private_decrypt($v, $plaintext, $pri_key);
         
-        $key_dir = "{$dir}/pri.key";
+        return $plaintext;
+    }
+    
+    function getDecryptVal()
+    {
         
-        if(!file_exists($key_dir)) {
+        if(empty($this->val)) {
             return false;
         }
         
-        $pri_key = file_get_contents($key_dir);
-        
-        if(!$pri_key) {
-            return false;
+        if(empty($this->is_encrypt)) {
+            return $this->val;
         }
         
-        openssl_private_decrypt($this->val, $plaintext, $pri_key);
-        
-        return $plaintext;
+        return $this->decrypt($this->val);
     }
     
 }