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
78a01f1
..
cf576e6
100644
(file)
--- a/
DataObjects/Core_setting.php
+++ b/
DataObjects/Core_setting.php
@@
-8,7
+8,6
@@
class Pman_Core_DataObjects_Core_setting extends DB_DataObject
function initKeys()
{
function initKeys()
{
-
$dir = $this->keyDir();
if(
file_exists("{$dir}/pub.key") ||
$dir = $this->keyDir();
if(
file_exists("{$dir}/pub.key") ||
@@
-31,6
+30,8
@@
class Pman_Core_DataObjects_Core_setting extends DB_DataObject
file_put_contents("{$dir}/pri.key",$pri_key);
}
file_put_contents("{$dir}/pri.key",$pri_key);
}
+ //FIXME - rename to lookup
+
function getSetting($m,$n)
{
$s = DB_DataObject::factory('core_setting');
function getSetting($m,$n)
{
$s = DB_DataObject::factory('core_setting');
@@
-51,7
+52,7
@@
class Pman_Core_DataObjects_Core_setting extends DB_DataObject
return;
}
return;
}
- function
keyDir
()
+ function
getkeyDirectory
()
{
$d = HTML_FlexyFramework::get()->Pman['storedir'].'/key';
if(!file_exists($d)) {
{
$d = HTML_FlexyFramework::get()->Pman['storedir'].'/key';
if(!file_exists($d)) {
@@
-62,7
+63,8
@@
class Pman_Core_DataObjects_Core_setting extends DB_DataObject
return $d;
}
return $d;
}
-
+ // FIXME - this needs to go in beforeInsert/beforeUpdate
+ // should not be sending this the values..
function initSetting($a)
{
if(empty($a)) {
function initSetting($a)
{
if(empty($a)) {
@@
-84,9
+86,9
@@
class Pman_Core_DataObjects_Core_setting extends DB_DataObject
$s = DB_DataObject::factory('core_setting');
$s->setFrom(array(
$s = DB_DataObject::factory('core_setting');
$s->setFrom(array(
- 'module'
=>
$a['module'],
- 'name'
=>
$a['name'],
- 'description' => $a['description'],
+ 'module'
=>
$a['module'],
+ 'name'
=>
$a['name'],
+ 'description'
=> $a['description'],
'val' =>$val,
'is_encrypt' => isset($a['is_encrypt']) ? $a['is_encrypt'] : 1
));
'val' =>$val,
'is_encrypt' => isset($a['is_encrypt']) ? $a['is_encrypt'] : 1
));
@@
-96,8
+98,7
@@
class Pman_Core_DataObjects_Core_setting extends DB_DataObject
function encrypt($v)
{
function encrypt($v)
{
- $dir = $this->keyDir();
- $pub_key = file_get_contents("{$dir}/pub.key");
+ $pub_key = file_get_contents("{$this->getkeyDirectory()}/pub.key");
if(!$pub_key) {
return;
}
if(!$pub_key) {
return;
}