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

diff --git a/DataObjects/Core_setting.php b/DataObjects/Core_setting.php
index 1509aa4a..bbe5eb7e 100644
--- a/DataObjects/Core_setting.php
+++ b/DataObjects/Core_setting.php
@@ -6,11 +6,11 @@ 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")
         ){
@@ -35,8 +35,8 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
     {
         $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,34 +46,61 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
     
     function beforeInsert($q, $roo)
     {
+        exit;
+        
         return;
     }
     
-    function initSetting($a, $dir)
+    function keyDir()
     {
-        if(empty($a) || empty($dir)) {
+        $d = HTML_FlexyFramework::get()->Pman['storedir'].'/key';
+        if(!file_exists($d)) {
+            $oldumask = umask(0);
+            mkdir($d, 0775, true);
+            umask($oldumask);  
+        }
+        return $d;
+    }
+    
+    
+    function initSetting($a)
+    {
+        if(empty($a)) {
             return;
         }
         
-        //check setting exist
         $c = $this->getSetting($a['module'], $a['name']);
         if($c) {
             return;
         }
+         
         
-        $this->initKeys($dir);
+        $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->keyDir()}/pub.key");
+        if(!$pub_key) {
+            return;
+        }
+        openssl_public_encrypt($v, $cipher, $pub_key);
+        return $cipher;
+    }
 }