projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dd64222
)
DataObjects/Core_setting.php
wip_edward_T5620_hide_adminphp_and_indexphp
author
Edward
<edward@roojs.com>
Mon, 31 Dec 2018 04:31:32 +0000
(12:31 +0800)
committer
Edward
<edward@roojs.com>
Mon, 31 Dec 2018 04:31:32 +0000
(12:31 +0800)
DataObjects/Core_setting.php
patch
|
blob
|
history
diff --git
a/DataObjects/Core_setting.php
b/DataObjects/Core_setting.php
index
1618fe5
..
97ec8bd
100644
(file)
--- a/
DataObjects/Core_setting.php
+++ b/
DataObjects/Core_setting.php
@@
-144,11
+144,6
@@
class Pman_Core_DataObjects_Core_setting extends DB_DataObject
function getDecryptVal()
{
function getDecryptVal()
{
- $dir = $this->getKeyDirectory();
-
- if(!$dir) {
- return false;
- }
if(empty($this->val)) {
return false;
if(empty($this->val)) {
return false;
@@
-158,21
+153,7
@@
class Pman_Core_DataObjects_Core_setting extends DB_DataObject
return $this->val;
}
return $this->val;
}
- $key_dir = "{$dir}/pri.key";
-
- if(!file_exists($key_dir)) {
- return false;
- }
-
- $pri_key = file_get_contents($key_dir);
-
- if(!$pri_key) {
- return false;
- }
-
- openssl_private_decrypt($this->val, $plaintext, $pri_key);
-
- return $plaintext;
+ return $this->decrypt($this->val);
}
}
}
}