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

diff --git a/DataObjects/Core_setting.php b/DataObjects/Core_setting.php
index 5e3b6a9a..cf576e69 100644
--- a/DataObjects/Core_setting.php
+++ b/DataObjects/Core_setting.php
@@ -6,11 +6,10 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
 {
     public $__table = 'core_setting';
     
-    function initKeys($dir)
+    function initKeys()
     {
-        //reject when keys exist
+        $dir = $this->keyDir();
         if(
-            !file_exists($dir) ||
             file_exists("{$dir}/pub.key") ||
             file_exists("{$dir}/pri.key")
         ){
@@ -31,12 +30,14 @@ 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');
         $s->setFrom(array(
-            'module' => $q['module'],
-            'name' => $q['name']
+            'module' => $m,
+            'name' => $n
         ));
         if($s->find(true)) {
             return $s;
@@ -46,26 +47,62 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
     
     function beforeInsert($q, $roo)
     {
+        exit;
+        
         return;
     }
     
+    function getkeyDirectory()
+    {
+        $d = HTML_FlexyFramework::get()->Pman['storedir'].'/key';
+        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;
         }
         
+        $c = $this->getSetting($a['module'], $a['name']);
+        if($c) {
+            return;
+        }
+         
+        
+        $this->initKeys();
+        
         $val = $a['val'];
         if(!isset($a['is_encrypt']) || $a['is_encrypt'] == 1) {
-            $val = encrypt($val);
+            $val = $this->encrypt($val);
         }
         
-        return;
-    }
-    
-    function encrypt($v) {
+        $s = DB_DataObject::factory('core_setting');
+        $s->setFrom(array(
+            'module'        =>     $a['module'],
+            'name'          =>       $a['name'],
+            'description'   => $a['description'],
+            'val' =>$val,
+            'is_encrypt' => isset($a['is_encrypt']) ? $a['is_encrypt'] : 1
+        ));
         
+        $s->insert();
     }
     
-    
+    function encrypt($v)
+    {
+         $pub_key = file_get_contents("{$this->getkeyDirectory()}/pub.key");
+        if(!$pub_key) {
+            return;
+        }
+        openssl_public_encrypt($v, $cipher, $pub_key);
+        return $cipher;
+    }
 }