sync

diff --git a/DataObjects/Core_setting.php b/DataObjects/Core_setting.php
index a051679..d27007b 100644 (file)
--- a/DataObjects/Core_setting.php
+++ b/DataObjects/Core_setting.php
@@ -6,14 +6,15 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
 {
     public $__table = 'core_setting';
     
-    // fixme - put the properies here...
-    
     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")
@@ -33,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;
     }
     
@@ -43,9 +45,11 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
             'module' => $m,
             'name' => $n
         ));
+        
         if($s->find(true)) {
             return $s;
         }
+        
         return false;
     }
     
@@ -57,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;
         }
+        
+        exec("mkdir -m775 {$key_dir}");
+        
         return $key_dir;
     }
     
@@ -114,34 +126,31 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
     
     function getDecryptVal()
     {
-        if (!$this->is_encrypt) {
-            return $this->val;
+        $dir = $this->getKeyDirectory();
+        
+        if(!$dir) {
+            return false;
+        }
+        
+        if(empty($this->val)) {
+            return false;
         }
         
-        $key_dir = "{$this->getKeyDirectory()}/pri.key";
+        $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($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;
-    }
 }