X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_setting.php;h=bbe5eb7e5465736841827409dbe116cd64409368;hb=22c577fafa02b5433bc418856d0d7e424bb6028c;hp=c18dbec6b3393708ed26017c03beeff5c03da468;hpb=949ef8513c62b4cabae3f36926f610385dce2032;p=Pman.Core

diff --git a/DataObjects/Core_setting.php b/DataObjects/Core_setting.php
index c18dbec6..bbe5eb7e 100644
--- a/DataObjects/Core_setting.php
+++ b/DataObjects/Core_setting.php
@@ -8,11 +8,11 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
     
     function initKeys()
     {
-        $d = HTML_FlexyFramework::get()->Pman['storedir'].'/key';
         
+        $dir = $this->keyDir();
         if(
-            file_exists("{$d}/pub.key") ||
-            file_exists("{$d}/pri.key")
+            file_exists("{$dir}/pub.key") ||
+            file_exists("{$dir}/pri.key")
         ){
             return;
         }
@@ -27,8 +27,8 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
         $pub_key = openssl_pkey_get_details($ssl);
         $pub_key = $pub_key["key"];
         
-        file_put_contents("{$d}/pub.key",$pub_key);
-        file_put_contents("{$d}/pri.key",$pri_key);
+        file_put_contents("{$dir}/pub.key",$pub_key);
+        file_put_contents("{$dir}/pri.key",$pri_key);
     }
     
     function getSetting($m,$n)
@@ -51,9 +51,21 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
         return;
     }
     
-    function initSetting($a, $dir)
+    function keyDir()
+    {
+        $d = HTML_FlexyFramework::get()->Pman['storedir'].'/key';
+        if(!file_exists($d)) {
+            $oldumask = umask(0);
+            mkdir($d, 0775, true);
+            umask($oldumask);  
+        }
+        return $d;
+    }
+    
+    
+    function initSetting($a)
     {
-        if(empty($a) || empty($dir)) {
+        if(empty($a)) {
             return;
         }
         
@@ -61,10 +73,7 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
         if($c) {
             return;
         }
-        
-        //$ff->pman['storedir']/key generic for all projects?
-        
-        $this->setStoreDir($dir);
+         
         
         $this->initKeys();
         
@@ -87,21 +96,11 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
     
     function encrypt($v)
     {
-        $pub_key = file_get_contents("{$this->storedir}/pub.key");
+         $pub_key = file_get_contents("{$this->keyDir()}/pub.key");
         if(!$pub_key) {
             return;
         }
         openssl_public_encrypt($v, $cipher, $pub_key);
         return $cipher;
     }
-    
-    function setStoreDir($dir)
-    {
-        if(!file_exists($dir)) {
-            $oldumask = umask(0);
-            mkdir($dir, 0775, true);
-            umask($oldumask);  
-        }
-        $this->storedir = $dir;
-    }
 }