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
9afdef4
..
6692081
100644
(file)
--- a/
DataObjects/Core_setting.php
+++ b/
DataObjects/Core_setting.php
@@
-8,11
+8,10
@@
class Pman_Core_DataObjects_Core_setting extends DB_DataObject
function initKeys()
{
function initKeys()
{
- $d = HTML_FlexyFramework::get()->Pman['storedir'].'/key';
-
+ $dir = $this->keyDir();
if(
if(
- file_exists("{$d}/pub.key") ||
- file_exists("{$d}/pri.key")
+ file_exists("{$d
ir
}/pub.key") ||
+ file_exists("{$d
ir
}/pri.key")
){
return;
}
){
return;
}
@@
-27,10
+26,12
@@
class Pman_Core_DataObjects_Core_setting extends DB_DataObject
$pub_key = openssl_pkey_get_details($ssl);
$pub_key = $pub_key["key"];
$pub_key = openssl_pkey_get_details($ssl);
$pub_key = $pub_key["key"];
- file_put_contents("{$d}/pub.key",$pub_key);
- file_put_contents("{$d}/pri.key",$pri_key);
+ file_put_contents("{$d
ir
}/pub.key",$pub_key);
+ file_put_contents("{$d
ir
}/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,11
+52,22
@@
class Pman_Core_DataObjects_Core_setting extends DB_DataObject
return;
}
return;
}
- function
initSetting($a
)
+ function
getkeyDirectory(
)
{
$d = HTML_FlexyFramework::get()->Pman['storedir'].'/key';
{
$d = HTML_FlexyFramework::get()->Pman['storedir'].'/key';
-
- if(empty($a) || empty($d)) {
+ if(!file_exists($d)) {
+ $oldumask = umask(0);
+ mkdir($d, 0775, true);
+ umask($oldumask);
+ }
+ return $d;
+ }
+
+ // FIXME - this needs to go in beforeInsert/beforeUpdate
+ // should not be sending this the values..
+ function initSetting($a)
+ {
+ if(empty($a)) {
return;
}
return;
}
@@
-64,10
+76,6
@@
class Pman_Core_DataObjects_Core_setting extends DB_DataObject
return;
}
return;
}
- //$ff->pman['storedir']/key generic for all projects?
-
- $this->setStoreDir($dir);
-
$this->initKeys();
$val = $a['val'];
$this->initKeys();
$val = $a['val'];
@@
-77,9
+85,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
));
@@
-89,21
+97,11
@@
class Pman_Core_DataObjects_Core_setting extends DB_DataObject
function encrypt($v)
{
function encrypt($v)
{
- $pub_key = file_get_contents("{$this->
storedir
}/pub.key");
+ $pub_key = file_get_contents("{$this->
getkeyDirectory()
}/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;
- }
}
}