X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_setting.php;h=6692081132d27ab627b5b6cf69a51df2426ff075;hb=85c7a801908261b80b637bdf75d4061c84a930cb;hp=9afdef41393a90dd9d451aa5104034b9e48b8c11;hpb=69c348543f5679494e4209eb5855627df1f0d584;p=Pman.Core

diff --git a/DataObjects/Core_setting.php b/DataObjects/Core_setting.php
index 9afdef41..66920811 100644
--- a/DataObjects/Core_setting.php
+++ b/DataObjects/Core_setting.php
@@ -8,11 +8,10 @@ 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,10 +26,12 @@ 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);
     }
     
+    //FIXME - rename to lookup
+    
     function getSetting($m,$n)
     {
         $s = DB_DataObject::factory('core_setting');
@@ -51,11 +52,22 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
         return;
     }
     
-    function initSetting($a)
+    function getkeyDirectory()
     {
         $d = HTML_FlexyFramework::get()->Pman['storedir'].'/key';
-        
-        if(empty($a) || empty($d)) {
+        if(!file_exists($d)) {
+            $oldumask = umask(0);
+            mkdir($d, 0775, true);
+            umask($oldumask);  
+        }
+        return $d;
+    }
+    
+    // FIXME  - this needs to go in beforeInsert/beforeUpdate
+    // should not be sending this the values..
+    function initSetting($a)
+    {
+        if(empty($a)) {
             return;
         }
         
@@ -64,10 +76,6 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
             return;
         }
         
-        //$ff->pman['storedir']/key generic for all projects?
-        
-        $this->setStoreDir($dir);
-        
         $this->initKeys();
         
         $val = $a['val'];
@@ -77,9 +85,9 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
         
         $s = DB_DataObject::factory('core_setting');
         $s->setFrom(array(
-            'module' => $a['module'],
-            'name' => $a['name'],
-            'description' => $a['description'],
+            'module'        =>     $a['module'],
+            'name'          =>       $a['name'],
+            'description'   => $a['description'],
             'val' =>$val,
             'is_encrypt' => isset($a['is_encrypt']) ? $a['is_encrypt'] : 1
         ));
@@ -89,21 +97,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->getkeyDirectory()}/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;
-    }
 }