DataObjects/Core_setting.php

[Pman.Core] / DataObjects / Core_setting.php

diff --git a/DataObjects/Core_setting.php b/DataObjects/Core_setting.php
index b09acb2..44d1528 100644 (file)
--- a/DataObjects/Core_setting.php
+++ b/DataObjects/Core_setting.php
@@ -8,13 +8,15 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
     
     function initKeys()
     {
+        // return false when fail
+        
         $dir = $this->getKeyDirectory();
         
         if(
             file_exists("{$dir}/pub.key") ||
             file_exists("{$dir}/pri.key")
         ){
-            return;
+            return true;
         }
         
         $ssl = openssl_pkey_new(array(
@@ -29,6 +31,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;
     }
     
     function lookup($m,$n)
@@ -55,7 +58,7 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
         $key_dir = $client_dir.'/keys';
         if(!file_exists($key_dir)) {
             $this->checkWritable(get_class($this),__FUNCTION__,$client_dir);
-            exec("mkdir -m775 {$key_dir}");
+            mkdir($key_dir, 0775);
         }
         return $key_dir;
     }
@@ -107,7 +110,7 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
         return $ciphertext;
     }
     
-    function decrypt($v)
+    function getDecryptVal()
     {
         $key_dir = "{$this->getKeyDirectory()}/pri.key";
         
@@ -121,7 +124,7 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
             return;
         }
         
-        openssl_private_decrypt($v, $plaintext, $pri_key);
+        openssl_private_decrypt($this->val, $plaintext, $pri_key);
         return $plaintext;
     }