DataObjects/Core_setting.php

[Pman.Core] / DataObjects / Core_setting.php

diff --git a/DataObjects/Core_setting.php b/DataObjects/Core_setting.php
index 9344675..cab7b95 100644 (file)
--- a/DataObjects/Core_setting.php
+++ b/DataObjects/Core_setting.php
@@ -8,7 +8,7 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
     
     function initKeys()
     {
-        $d = $this->storedir;
+        $d = HTML_FlexyFramework::get()->Pman['storedir'].'/key';
         
         if(
             file_exists("{$d}/pub.key") ||
@@ -51,9 +51,9 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
         return;
     }
     
-    function initSetting($a, $dir)
+    function initSetting($a)
     {
-        if(empty($a) || empty($dir)) {
+        if(empty($a)) {
             return;
         }
         
@@ -62,7 +62,7 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
             return;
         }
         
-        //$ff->pman['storedir']/key generic for all projects?
+        $d = HTML_FlexyFramework::get()->Pman['storedir'].'/key';
         
         $this->setStoreDir($dir);
         
@@ -94,14 +94,4 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
         openssl_public_encrypt($v, $cipher, $pub_key);
         return $cipher;
     }
-    
-    function setStoreDir($dir)
-    {
-        if(!file_exists($dir)) {
-            $oldumask = umask(0);
-            mkdir($dir, 0775, true);
-            umask($oldumask);  
-        }
-        $this->storedir = $dir;
-    }
 }