X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_setting.php;h=b0b0c6d6f31a443fab4249f8096549463b9fa21f;hb=fcbcbde31635a0e7bb9e9aa7f0750de8cec7503f;hp=78a01f192677f9f2c8251677d87825eaade6486f;hpb=4fead06df5cad5c26083f946b12a0a402d99e54f;p=Pman.Core

diff --git a/DataObjects/Core_setting.php b/DataObjects/Core_setting.php
index 78a01f19..b0b0c6d6 100644
--- a/DataObjects/Core_setting.php
+++ b/DataObjects/Core_setting.php
@@ -8,8 +8,7 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
     
     function initKeys()
     {
-        
-        $dir = $this->keyDir();
+        $dir = $this->getkeyDirectory();
         if(
             file_exists("{$dir}/pub.key") ||
             file_exists("{$dir}/pri.key")
@@ -31,6 +30,8 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
         file_put_contents("{$dir}/pri.key",$pri_key);
     }
     
+    //FIXME - rename to lookup
+    
     function getSetting($m,$n)
     {
         $s = DB_DataObject::factory('core_setting');
@@ -46,12 +47,13 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
     
     function beforeInsert($q, $roo)
     {
+        print_r($q);
         exit;
         
         return;
     }
     
-    function keyDir()
+    function getkeyDirectory()
     {
         $d = HTML_FlexyFramework::get()->Pman['storedir'].'/key';
         if(!file_exists($d)) {
@@ -62,7 +64,8 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
         return $d;
     }
     
-    
+    // FIXME  - this needs to go in beforeInsert/beforeUpdate
+    // should not be sending this the values..
     function initSetting($a)
     {
         if(empty($a)) {
@@ -73,31 +76,27 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
         if($c) {
             return;
         }
-         
         
         $this->initKeys();
         
-        $val = $a['val'];
-        if(!isset($a['is_encrypt']) || $a['is_encrypt'] == 1) {
-            $val = $this->encrypt($val);
-        }
-        
         $s = DB_DataObject::factory('core_setting');
         $s->setFrom(array(
-            'module' => $a['module'],
-            'name' => $a['name'],
-            'description' => $a['description'],
-            'val' =>$val,
+            'module'        =>     $a['module'],
+            'name'          =>       $a['name'],
+            'description'   => $a['description'],
+            'val' => (!isset($a['is_encrypt']) || $a['is_encrypt'] == 1) ?
+                $this->encrypt($val) : $val,
             'is_encrypt' => isset($a['is_encrypt']) ? $a['is_encrypt'] : 1
         ));
         
+        $s->beforeInsert();
+        
         $s->insert();
     }
     
     function encrypt($v)
     {
-        $dir = $this->keyDir();
-        $pub_key = file_get_contents("{$dir}/pub.key");
+        $pub_key = file_get_contents("{$this->getkeyDirectory()}/pub.key");
         if(!$pub_key) {
             return;
         }