DataObjects/Core_setting.php

[Pman.Core] / DataObjects / Core_setting.php

diff --git a/DataObjects/Core_setting.php b/DataObjects/Core_setting.php
index b7be2a8..cab7b95 100644 (file)
--- a/DataObjects/Core_setting.php
+++ b/DataObjects/Core_setting.php
@@ -6,11 +6,13 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
 {
     public $__table = 'core_setting';
     
-    function initKeys($dir)
+    function initKeys()
     {
+        $d = HTML_FlexyFramework::get()->Pman['storedir'].'/key';
+        
         if(
-            file_exists("{$dir}/pub.key") ||
-            file_exists("{$dir}/pri.key")
+            file_exists("{$d}/pub.key") ||
+            file_exists("{$d}/pri.key")
         ){
             return;
         }
@@ -25,16 +27,16 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
         $pub_key = openssl_pkey_get_details($ssl);
         $pub_key = $pub_key["key"];
         
-        file_put_contents("{$dir}/pub.key",$pub_key);
-        file_put_contents("{$dir}/pri.key",$pri_key);
+        file_put_contents("{$d}/pub.key",$pub_key);
+        file_put_contents("{$d}/pri.key",$pri_key);
     }
     
     function getSetting($m,$n)
     {
         $s = DB_DataObject::factory('core_setting');
         $s->setFrom(array(
-            'module' => $q['module'],
-            'name' => $q['name']
+            'module' => $m,
+            'name' => $n
         ));
         if($s->find(true)) {
             return $s;
@@ -49,9 +51,9 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
         return;
     }
     
-    function initSetting($a, $dir)
+    function initSetting($a)
     {
-        if(empty($a) || empty($dir)) {
+        if(empty($a)) {
             return;
         }
         
@@ -60,14 +62,15 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
             return;
         }
         
-        //$ff->pman['storedir']/key generic for all projects?
+        $d = HTML_FlexyFramework::get()->Pman['storedir'].'/key';
+        
         $this->setStoreDir($dir);
         
         $this->initKeys();
         
         $val = $a['val'];
         if(!isset($a['is_encrypt']) || $a['is_encrypt'] == 1) {
-            $val = encrypt($val);
+            $val = $this->encrypt($val);
         }
         
         $s = DB_DataObject::factory('core_setting');
@@ -91,12 +94,4 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
         openssl_public_encrypt($v, $cipher, $pub_key);
         return $cipher;
     }
-    
-    function setStoreDir($dir)
-    {
-        if(!file_exists($dir)) {
-            mkdir($dir);
-        }
-        $this->storedir = $dir;
-    }
 }