X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_setting.php;h=90b58057263533fd951e32deddf886bb249e3dce;hb=adc763ad1e0c40b13a92fed1241b2973141c1921;hp=13cbc896010c298c5f0924255877fd70e7dee6a7;hpb=b82783276116db4dea622e79760ff4738bca21a7;p=Pman.Core

diff --git a/DataObjects/Core_setting.php b/DataObjects/Core_setting.php
index 13cbc896..90b58057 100644
--- 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,7 +61,6 @@ 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);
@@ -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;
         }