sync
authorjohn <john@roojs.com>
Mon, 13 Aug 2018 05:20:17 +0000 (13:20 +0800)
committerjohn <john@roojs.com>
Mon, 13 Aug 2018 05:20:17 +0000 (13:20 +0800)
DataObjects/Core_setting.php

index d27007b..4a79b8b 100644 (file)
@@ -72,7 +72,7 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
             return false;
         }
         
             return false;
         }
         
-        exec("mkdir -m775 {$key_dir}");
+        mkdir($key_dir, 0755, true);
         
         return $key_dir;
     }
         
         return $key_dir;
     }
@@ -136,6 +136,10 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
             return false;
         }
         
             return false;
         }
         
+        if(empty($this->is_encrypt)) {
+            return $this->val;
+        }
+        
         $key_dir = "{$dir}/pri.key";
         
         if(!file_exists($key_dir)) {
         $key_dir = "{$dir}/pri.key";
         
         if(!file_exists($key_dir)) {