commit

[Pman.Core] / DataObjects / Core_setting.php

diff --git a/DataObjects/Core_setting.php b/DataObjects/Core_setting.php
index a6752d4..05816c4 100644 (file)
--- a/DataObjects/Core_setting.php
+++ b/DataObjects/Core_setting.php
@@ -6,8 +6,6 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
 {
     public $__table = 'core_setting';
     
-    // gitlive test...
-    
     function initKeys()
     {
         // return false when fail
@@ -74,7 +72,7 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
             return false;
         }
         
-        exec("mkdir -m775 {$key_dir}");
+        mkdir($key_dir, 0755, true);
         
         return $key_dir;
     }
@@ -87,25 +85,25 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
             return;
         }
         
+        $this->initKeys();
+        
         $c = $this->lookup($a['module'], $a['name']);
-        if($c) {
-            return;
-        }
         
-        $this->initKeys();
+        $o = $c ? clone($c) : false;
         
-        $s = DB_DataObject::factory('core_setting');
+        $c = $c ? $c : DB_DataObject::factory('core_setting');
         
-        $s->setFrom(array(
+        $c->setFrom(array(
             'module'        =>     $a['module'],
             'name'          =>       $a['name'],
             'description'   => $a['description'],
             'val' => (!isset($a['is_encrypt']) || $a['is_encrypt'] == 1) ?
                 $this->encrypt($a['val']) : $a['val'],
-            'is_encrypt' => isset($a['is_encrypt']) ? $a['is_encrypt'] : 1
+            'is_encrypt' => isset($a['is_encrypt']) ? $a['is_encrypt'] : 1,
+            'is_valid' => 1
         ));
         
-        $s->insert();
+        $o ?  $c->update($o) : $c->insert();
     }
     
     //one key for encrypting all the settings
@@ -138,6 +136,10 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
             return false;
         }
         
+        if(empty($this->is_encrypt)) {
+            return $this->val;
+        }
+        
         $key_dir = "{$dir}/pri.key";
         
         if(!file_exists($key_dir)) {