L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mnet MDL-19239 changed all instances of fetching config from db to use get_config

Browse Source
This commit is contained in:
Penny Leach
2010-01-11 22:53:11 +00:00
parent 62bb387c30
commit bac44e6dc9
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mnet/environment.php
+3 -3
View File
@@ -70,7 +70,7 @@ class mnet_environment {
if (!empty($this->keypair)) return true;
$this->keypair = array();
$keypair = $DB->get_field('config_plugins', 'value', array('plugin'=>'mnet', 'name'=>'openssl'));
$keypair = get_config('mnet', 'openssl');
if (!empty($keypair)) {
// Explode/Implode is faster than Unserialize/Serialize
@@ -84,7 +84,7 @@ class mnet_environment {
// Key generation/rotation
// 1. Archive the current key (if there is one).
$result = $DB->get_field('config_plugins', 'value', array('plugin'=>'mnet', 'name'=>'openssl_history'));
$result = get_config('mnet', 'openssl_history');
if(empty($result)) {
set_config('openssl_history', serialize(array()), 'mnet');
$openssl_history = array();
@@ -99,7 +99,7 @@ class mnet_environment {
// 2. How many old keys do we want to keep? Use array_slice to get
// rid of any we don't want
$openssl_generations = $DB->get_field('config_plugins', 'value', array('plugin'=>'mnet', 'name'=>'openssl_generations'));
$openssl_generations = get_config('mnet', 'openssl_generations');
if(empty($openssl_generations)) {
set_config('openssl_generations', 3, 'mnet');
$openssl_generations = 3;
mnet/lib.php
+1 -1
View File
@@ -314,7 +314,7 @@ function mnet_get_keypair() {
global $CFG, $DB;;
static $keypair = null;
if (!is_null($keypair)) return $keypair;
if ($result = $DB->get_field('config_plugins', 'value', array('plugin'=>'mnet', 'name'=>'openssl'))) {
if ($result = get_config('mnet', 'openssl')) {
list($keypair['certificate'], $keypair['keypair_PEM']) = explode('@@@@@@@@', $result);
$keypair['privatekey'] = openssl_pkey_get_private($keypair['keypair_PEM']);
$keypair['publickey'] = openssl_pkey_get_public($keypair['certificate']);