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

diff --git a/DataObjects/Core_setting.php b/DataObjects/Core_setting.php
index cf576e69..6ea26aa9 100644
--- a/DataObjects/Core_setting.php
+++ b/DataObjects/Core_setting.php
@@ -47,6 +47,7 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
     
     function beforeInsert($q, $roo)
     {
+        print_r($q);
         exit;
         
         return;
@@ -75,21 +76,16 @@ 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,
+            'val' => (!isset($a['is_encrypt']) || $a['is_encrypt'] == 1) ?
+                $this->encrypt($val) : $val,
             'is_encrypt' => isset($a['is_encrypt']) ? $a['is_encrypt'] : 1
         ));
         
@@ -98,7 +94,7 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
     
     function encrypt($v)
     {
-         $pub_key = file_get_contents("{$this->getkeyDirectory()}/pub.key");
+        $pub_key = file_get_contents("{$this->getkeyDirectory()}/pub.key");
         if(!$pub_key) {
             return;
         }