mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-02-25 03:34:10 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3084 from acs-ferreira/patch-24

Browse Source 
Clean DynamicConfig lib
This commit is contained in:
Lucas Bartholemy 2018-03-08 09:39:55 +01:00 committed by GitHub
commit 6386941f79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
protected/humhub/libs/DynamicConfig.php
View File

@ -44,13 +44,14 @@ class DynamicConfig extends BaseObject
self::save([]);
}
// Load config file with file_get_contents and eval, cause require don't reload
// the file when it's changed on runtime
// Load config file with 'file_get_contents' and 'eval'
// because 'require' don't reload the file when it's changed on runtime
$configContent = str_replace(['<' . '?php', '<' . '?', '?' . '>'], '', file_get_contents($configFile));
$config = eval($configContent);
if (!is_array($config))
if (!is_array($config)) {
return [];
}
return $config;
}
@ -121,7 +122,7 @@ class DynamicConfig extends BaseObject
} elseif ($cacheClass === \yii\redis\Cache::class) {
$config['components']['cache'] = [
'class' => \yii\redis\Cache::class,
'keyPrefix' => Yii::$app->id,
'keyPrefix' => Yii::$app->id
];
}
@ -143,7 +144,7 @@ class DynamicConfig extends BaseObject
if (Yii::$app->settings->get('mailer.username')) {
$mail['transport']['username'] = Yii::$app->settings->get('mailer.username');
} else if (!Yii::$app->settings->get('mailer.password')) {
} elseif (!Yii::$app->settings->get('mailer.password')) {
$mail['transport']['authMode'] = 'null';
}
@ -158,13 +159,6 @@ class DynamicConfig extends BaseObject
if (Yii::$app->settings->get('mailer.port')) {
$mail['transport']['port'] = Yii::$app->settings->get('mailer.port');
}
/*
if (Yii::$app->settings->get('mailer.allowSelfSignedCerts')) {
$mail['transport']['ssl']['allow_self_signed'] = true;
$mail['transport']['ssl']['verify_peer'] = false;
}
*/
} elseif (Yii::$app->settings->get('mailer.transportType') == 'php') {
$mail['transport']['class'] = 'Swift_MailTransport';
} else {