projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e804a10
)
DataObjects/Core_setting.php
author
Alan Knowles
<alan@roojs.com>
Fri, 13 Apr 2018 04:11:16 +0000
(12:11 +0800)
committer
Alan Knowles
<alan@roojs.com>
Fri, 13 Apr 2018 04:11:16 +0000
(12:11 +0800)
DataObjects/Core_setting.php
patch
|
blob
|
history
diff --git
a/DataObjects/Core_setting.php
b/DataObjects/Core_setting.php
index
90b5805
..
0dd2847
100644
(file)
--- a/
DataObjects/Core_setting.php
+++ b/
DataObjects/Core_setting.php
@@
-8,9
+8,11
@@
class Pman_Core_DataObjects_Core_setting extends DB_DataObject
function initKeys()
{
function initKeys()
{
+
+ $dir = $this->keyDir();
if(
if(
- file_exists("{$
this->
dir}/pub.key") ||
- file_exists("{$
this->
dir}/pri.key")
+ file_exists("{$dir}/pub.key") ||
+ file_exists("{$dir}/pri.key")
){
return;
}
){
return;
}
@@
-49,6
+51,18
@@
class Pman_Core_DataObjects_Core_setting extends DB_DataObject
return;
}
return;
}
+ function keyDir()
+ {
+ $d = HTML_FlexyFramework::get()->Pman['storedir'].'/key';
+ if(!file_exists($d)) {
+ $oldumask = umask(0);
+ mkdir($d, 0775, true);
+ umask($oldumask);
+ }
+ return $d;
+ }
+
+
function initSetting($a)
{
if(empty($a)) {
function initSetting($a)
{
if(empty($a)) {
@@
-59,14
+73,7
@@
class Pman_Core_DataObjects_Core_setting extends DB_DataObject
if($c) {
return;
}
if($c) {
return;
}
-
- $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();
@@
-89,7
+96,8
@@
class Pman_Core_DataObjects_Core_setting extends DB_DataObject
function encrypt($v)
{
function encrypt($v)
{
- $pub_key = file_get_contents("{$this->dir}/pub.key");
+ $dir = $this->keyDir();
+ $pub_key = file_get_contents("{$dir}/pub.key");
if(!$pub_key) {
return;
}
if(!$pub_key) {
return;
}