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
9222153
..
13cbc89
100644
(file)
--- a/
DataObjects/Core_setting.php
+++ b/
DataObjects/Core_setting.php
@@
-6,16
+6,13
@@
class Pman_Core_DataObjects_Core_setting extends DB_DataObject
{
public $__table = 'core_setting';
{
public $__table = 'core_setting';
- function initKeys(
$dir
)
+ function initKeys()
{
{
- if(!file_exists($dir)) {
- mkdir($dir);
- }
+ $d = HTML_FlexyFramework::get()->Pman['storedir'].'/key';
- //return when keys exist
if(
if(
- file_exists("{$d
ir
}/pub.key") ||
- file_exists("{$d
ir
}/pri.key")
+ file_exists("{$d}/pub.key") ||
+ file_exists("{$d}/pri.key")
){
return;
}
){
return;
}
@@
-30,16
+27,16
@@
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
ir
}/pub.key",$pub_key);
- file_put_contents("{$d
ir
}/pri.key",$pri_key);
+ file_put_contents("{$d}/pub.key",$pub_key);
+ file_put_contents("{$d}/pri.key",$pri_key);
}
function getSetting($m,$n)
{
$s = DB_DataObject::factory('core_setting');
$s->setFrom(array(
}
function getSetting($m,$n)
{
$s = DB_DataObject::factory('core_setting');
$s->setFrom(array(
- 'module' => $
q['module']
,
- 'name' => $
q['name']
+ 'module' => $
m
,
+ 'name' => $
n
));
if($s->find(true)) {
return $s;
));
if($s->find(true)) {
return $s;
@@
-49,34
+46,57
@@
class Pman_Core_DataObjects_Core_setting extends DB_DataObject
function beforeInsert($q, $roo)
{
function beforeInsert($q, $roo)
{
+ exit;
+
return;
}
return;
}
- function initSetting($a
, $dir
)
+ function initSetting($a)
{
{
- if(empty($a)
|| empty($dir)
) {
+ if(empty($a)) {
return;
}
return;
}
- //check setting exist
$c = $this->getSetting($a['module'], $a['name']);
if($c) {
return;
}
$c = $this->getSetting($a['module'], $a['name']);
if($c) {
return;
}
- $this->initKeys($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();
$val = $a['val'];
if(!isset($a['is_encrypt']) || $a['is_encrypt'] == 1) {
$val = $a['val'];
if(!isset($a['is_encrypt']) || $a['is_encrypt'] == 1) {
- $val = encrypt($val);
+ $val =
$this->
encrypt($val);
}
}
- return;
- }
-
- function encrypt($v) {
+ $s = DB_DataObject::factory('core_setting');
+ $s->setFrom(array(
+ 'module' => $a['module'],
+ 'name' => $a['name'],
+ 'description' => $a['description'],
+ 'val' =>$val,
+ 'is_encrypt' => isset($a['is_encrypt']) ? $a['is_encrypt'] : 1
+ ));
+ $s->insert();
}
}
-
+ function encrypt($v)
+ {
+ $pub_key = file_get_contents("{$this->storedir}/pub.key");
+ if(!$pub_key) {
+ return;
+ }
+ openssl_public_encrypt($v, $cipher, $pub_key);
+ return $cipher;
+ }
}
}