X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_setting.php;h=303423c7d6e3a5d0355c8a1b1f67e5b20af64733;hb=37e4c2616763c5bacc9c39636d259d9c7989f27a;hp=d3949602c7b2a2e15130a76d807eb7dfa6e3f402;hpb=2fb6fa663f923f0af7536efbe884574864faa6c1;p=Pman.Core diff --git a/DataObjects/Core_setting.php b/DataObjects/Core_setting.php index d3949602..303423c7 100644 --- a/DataObjects/Core_setting.php +++ b/DataObjects/Core_setting.php @@ -78,17 +78,11 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject $this->initKeys(); - $val = $a['val']; - if(!isset($a['is_encrypt']) || $a['is_encrypt'] == 1) { - $val = $this->encrypt($val); - } - $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 )); @@ -97,7 +91,7 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject function encrypt($v) { - $pub_key = file_get_contents("{$this->getkeyDirectory()}/pub.key"); + $pub_key = file_get_contents("{$this->getkeyDirectory()}/pub.key"); if(!$pub_key) { return; }