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
c18dbec
..
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()
{
function initKeys()
{
- $d = HTML_FlexyFramework::get()->Pman['storedir'].'/key';
-
if(
if(
- file_exists("{$
d
}/pub.key") ||
- file_exists("{$
d
}/pri.key")
+ file_exists("{$
this->dir
}/pub.key") ||
+ file_exists("{$
this->dir
}/pri.key")
){
return;
}
){
return;
}
@@
-51,9
+49,9
@@
class Pman_Core_DataObjects_Core_setting extends DB_DataObject
return;
}
return;
}
- function initSetting($a
, $dir
)
+ function initSetting($a)
{
{
- if(empty($a)
|| empty($dir)
) {
+ if(empty($a)) {
return;
}
return;
}
@@
-62,9
+60,13
@@
class Pman_Core_DataObjects_Core_setting extends DB_DataObject
return;
}
return;
}
- //$ff->pman['storedir']/key generic for all projects?
-
- $this->setStoreDir($dir);
+ $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();
$this->initKeys();
@@
-87,21
+89,11
@@
class Pman_Core_DataObjects_Core_setting extends DB_DataObject
function encrypt($v)
{
function encrypt($v)
{
- $pub_key = file_get_contents("{$this->
store
dir}/pub.key");
+ $pub_key = file_get_contents("{$this->dir}/pub.key");
if(!$pub_key) {
return;
}
openssl_public_encrypt($v, $cipher, $pub_key);
return $cipher;
}
if(!$pub_key) {
return;
}
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;
- }
}
}