X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_setting.php;h=05816c4e578f50c9626c7678f136cd001943be19;hb=f5aa5d161bc0428db89f56aa318dbf03ddff22bc;hp=cfd559adcee02ba3785efc6c1bf7db91ff4e1060;hpb=9371c7a636e0c9f2c667dec90c0e8472dca4912c;p=Pman.Core

diff --git a/DataObjects/Core_setting.php b/DataObjects/Core_setting.php
index cfd559ad..05816c4e 100644
--- a/DataObjects/Core_setting.php
+++ b/DataObjects/Core_setting.php
@@ -9,9 +9,12 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
     function initKeys()
     {
         // return false when fail
-        
         $dir = $this->getKeyDirectory();
         
+        if(!$dir) {
+            return false; // only fail case?
+        }
+        
         if(
             file_exists("{$dir}/pub.key") ||
             file_exists("{$dir}/pri.key")
@@ -31,6 +34,7 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
         
         file_put_contents("{$dir}/pub.key",$pub_key);
         file_put_contents("{$dir}/pri.key",$pri_key);
+        
         return true;
     }
     
@@ -41,9 +45,11 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
             'module' => $m,
             'name' => $n
         ));
+        
         if($s->find(true)) {
             return $s;
         }
+        
         return false;
     }
     
@@ -55,11 +61,19 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
     function getKeyDirectory()
     {
         $client_dir = HTML_FlexyFramework::get()->Pman['storedir'];
+        
         $key_dir = $client_dir.'/keys';
-        if(!file_exists($key_dir)) {
-            $this->checkWritable(get_class($this),__FUNCTION__,$client_dir);
-            mkdir($key_dir, 0775);
+        
+        if(file_exists($key_dir)) {
+            return $key_dir;
+        }
+        
+        if(!is_writable($key_dir)) {
+            return false;
         }
+        
+        mkdir($key_dir, 0755, true);
+        
         return $key_dir;
     }
     
@@ -71,25 +85,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
@@ -110,32 +124,37 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
         return $ciphertext;
     }
     
-    function decrypt($v)
+    function getDecryptVal()
     {
-        $key_dir = "{$this->getKeyDirectory()}/pri.key";
+        $dir = $this->getKeyDirectory();
+        
+        if(!$dir) {
+            return false;
+        }
+        
+        if(empty($this->val)) {
+            return false;
+        }
+        
+        if(empty($this->is_encrypt)) {
+            return $this->val;
+        }
+        
+        $key_dir = "{$dir}/pri.key";
         
         if(!file_exists($key_dir)) {
-            print_r("Cannot find {$key_dir}");
-            exit;
+            return false;
         }
         
         $pri_key = file_get_contents($key_dir);
+        
         if(!$pri_key) {
-            return;
+            return false;
         }
         
-        openssl_private_decrypt($v, $plaintext, $pri_key);
+        openssl_private_decrypt($this->val, $plaintext, $pri_key);
+        
         return $plaintext;
     }
     
-    function checkWritable($cls_name,$func_name,$dir)
-    {
-        if(!is_writable($dir)) {
-            print_r("Cannot run {$cls_name} :: {$func_name}\n");
-            print_r("Directory: {$dir} is not writable by current user\n");
-            exit;
-        }
-        
-        return true;
-    }
 }