projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DataObjects/Core_setting.php
[Pman.Core]
/
DataObjects
/
Core_setting.php
diff --git
a/DataObjects/Core_setting.php
b/DataObjects/Core_setting.php
index
8a489c5
..
cab7b95
100644
(file)
--- a/
DataObjects/Core_setting.php
+++ b/
DataObjects/Core_setting.php
@@
-8,6
+8,8
@@
class Pman_Core_DataObjects_Core_setting extends DB_DataObject
function initKeys()
{
function initKeys()
{
+ $d = HTML_FlexyFramework::get()->Pman['storedir'].'/key';
+
if(
file_exists("{$d}/pub.key") ||
file_exists("{$d}/pri.key")
if(
file_exists("{$d}/pub.key") ||
file_exists("{$d}/pri.key")
@@
-60,7
+62,7
@@
class Pman_Core_DataObjects_Core_setting extends DB_DataObject
return;
}
return;
}
- //$ff->pman['storedir']/key generic for all projects?
+ $d = HTML_FlexyFramework::get()->Pman['storedir'].'/key';
$this->setStoreDir($dir);
$this->setStoreDir($dir);
@@
-92,14
+94,4
@@
class Pman_Core_DataObjects_Core_setting extends DB_DataObject
openssl_public_encrypt($v, $cipher, $pub_key);
return $cipher;
}
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;
- }
}
}