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

diff --git a/DataObjects/Core_setting.php b/DataObjects/Core_setting.php
index bbe5eb7e..cf576e69 100644
--- a/DataObjects/Core_setting.php
+++ b/DataObjects/Core_setting.php
@@ -8,7 +8,6 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
     
     function initKeys()
     {
-        
         $dir = $this->keyDir();
         if(
             file_exists("{$dir}/pub.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');
@@ -51,7 +52,7 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
         return;
     }
     
-    function keyDir()
+    function getkeyDirectory()
     {
         $d = HTML_FlexyFramework::get()->Pman['storedir'].'/key';
         if(!file_exists($d)) {
@@ -62,7 +63,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)) {
@@ -84,9 +86,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
         ));
@@ -96,7 +98,7 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
     
     function encrypt($v)
     {
-         $pub_key = file_get_contents("{$this->keyDir()}/pub.key");
+         $pub_key = file_get_contents("{$this->getkeyDirectory()}/pub.key");
         if(!$pub_key) {
             return;
         }