DataObjects/Core_setting.php

[Pman.Core] / DataObjects / Core_setting.php

diff --git a/DataObjects/Core_setting.php b/DataObjects/Core_setting.php
index 17c125c..90b5805 100644 (file)
--- a/DataObjects/Core_setting.php
+++ b/DataObjects/Core_setting.php
@@ -8,11 +8,9 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
     
     function initKeys()
     {
-        $d = HTML_FlexyFramework::get()->Pman['storedir'].'/key';
-        
         if(
-            file_exists("{$d}/pub.key") ||
-            file_exists("{$d}/pri.key")
+            file_exists("{$this->dir}/pub.key") ||
+            file_exists("{$this->dir}/pri.key")
         ){
             return;
         }
@@ -63,13 +61,12 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
         }
         
         $d = HTML_FlexyFramework::get()->Pman['storedir'].'/key';
-        
         if(!file_exists($d)) {
             $oldumask = umask(0);
             mkdir($d, 0775, true);
             umask($oldumask);  
         }
-        $this->storedir = $d;
+        $this->dir = $d;
         
         $this->initKeys();
         
@@ -92,7 +89,7 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
     
     function encrypt($v)
     {
-        $pub_key = file_get_contents("{$this->storedir}/pub.key");
+        $pub_key = file_get_contents("{$this->dir}/pub.key");
         if(!$pub_key) {
             return;
         }