From: Alan Knowles <alan@roojs.com>
Date: Fri, 13 Apr 2018 04:11:16 +0000 (+0800)
Subject: DataObjects/Core_setting.php
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=be68efac2bfd67c3822e562daaa78868dca9ff97

DataObjects/Core_setting.php
---

diff --git a/DataObjects/Core_setting.php b/DataObjects/Core_setting.php
index 90b58057..0dd28470 100644
--- a/DataObjects/Core_setting.php
+++ b/DataObjects/Core_setting.php
@@ -8,9 +8,11 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
     
     function initKeys()
     {
+        
+        $dir = $this->keyDir();
         if(
-            file_exists("{$this->dir}/pub.key") ||
-            file_exists("{$this->dir}/pri.key")
+            file_exists("{$dir}/pub.key") ||
+            file_exists("{$dir}/pri.key")
         ){
             return;
         }
@@ -49,6 +51,18 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
         return;
     }
     
+    function keyDir()
+    {
+        $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)) {
@@ -59,14 +73,7 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
         if($c) {
             return;
         }
-        
-        $d = HTML_FlexyFramework::get()->Pman['storedir'].'/key';
-        if(!file_exists($d)) {
-            $oldumask = umask(0);
-            mkdir($d, 0775, true);
-            umask($oldumask);  
-        }
-        $this->dir = $d;
+         
         
         $this->initKeys();
         
@@ -89,7 +96,8 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
     
     function encrypt($v)
     {
-        $pub_key = file_get_contents("{$this->dir}/pub.key");
+        $dir = $this->keyDir();
+        $pub_key = file_get_contents("{$dir}/pub.key");
         if(!$pub_key) {
             return;
         }