mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-17 22:28:51 +01:00
Code Issues Projects Releases Wiki Activity

Small cleanup

Browse Source
This commit is contained in:
buddh4 2019-10-10 19:19:24 +02:00
parent 04e113bc08
commit 91a5efc729
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
protected/humhub/modules/admin/controllers/SettingController.php
View File

@ -9,11 +9,16 @@
namespace humhub\modules\admin\controllers;
use humhub\libs\LogoImage;
use humhub\modules\admin\models\forms\BasicSettingsForm;
use humhub\modules\admin\models\forms\CacheSettingsForm;
use humhub\modules\admin\models\forms\DesignSettingsForm;
use humhub\modules\admin\models\forms\FileSettingsForm;
use humhub\modules\admin\models\forms\LogsSettingsForm;
use humhub\modules\admin\models\forms\MailingSettingsForm;
use humhub\modules\admin\models\forms\OEmbedProviderForm;
use humhub\modules\admin\models\forms\ProxySettingsForm;
use humhub\modules\admin\models\forms\StatisticSettingsForm;
use humhub\modules\admin\permissions\ManageSettings;
use humhub\modules\web\pwa\widgets\SiteIcon;
use Yii;
use humhub\libs\Helpers;
@ -66,7 +71,7 @@ class SettingController extends Controller
public function getAccessRules()
{
return [
['permissions' => \humhub\modules\admin\permissions\ManageSettings::class]
['permissions' => ManageSettings::class]
];
}
@ -80,7 +85,7 @@ class SettingController extends Controller
*/
public function actionBasic()
{
$form = new \humhub\modules\admin\models\forms\BasicSettingsForm();
$form = new BasicSettingsForm();
if ($form->load(Yii::$app->request->post()) && $form->validate() && $form->save()) {
$this->view->saved();
return $this->redirect(['/admin/setting/basic']);
@ -122,7 +127,7 @@ class SettingController extends Controller
*/
public function actionCaching()
{
$form = new \humhub\modules\admin\models\forms\CacheSettingsForm;
$form = new CacheSettingsForm;
if ($form->load(Yii::$app->request->post()) && $form->validate() && $form->save()) {
Yii::$app->cache->flush();
Yii::$app->assetManager->clear();
@ -142,7 +147,7 @@ class SettingController extends Controller
*/
public function actionStatistic()
{
$form = new \humhub\modules\admin\models\forms\StatisticSettingsForm;
$form = new StatisticSettingsForm;
if ($form->load(Yii::$app->request->post()) && $form->validate() && $form->save()) {
$this->view->saved();
return $this->redirect([
@ -175,7 +180,7 @@ class SettingController extends Controller
*/
public function actionMailingServer()
{
$form = new \humhub\modules\admin\models\forms\MailingSettingsForm;
$form = new MailingSettingsForm;
if ($form->load(Yii::$app->request->post()) && $form->validate() && $form->save()) {
$this->view->saved();
return $this->redirect([

2
protected/humhub/modules/admin/widgets/AdvancedSettingMenu.php
View File

@ -74,7 +74,7 @@ class AdvancedSettingMenu extends SubTabMenu
'url' => Url::toRoute('/admin/setting/oembed'),
'icon' => 'cloud',
'sortOrder' => 500,
'isActive' => MenuLink::isActiveState('admin', 'setting', 'oembed-edit'),
'isActive' => MenuLink::isActiveState('admin', 'setting', 'oembed'),
'isVisible' => Yii::$app->user->isAdmin(),
]));

2
protected/humhub/modules/space/behaviors/SpaceModelMembership.php
View File

@ -396,6 +396,8 @@ class SpaceModelMembership extends Behavior
* @param integer $canLeave 0: user cannot cancel membership | 1: can cancel membership | 2: depending on space flag members_can_leave
* @param bool $silent add member without any notifications
* @return bool
* @throws \Throwable
* @throws \yii\base\InvalidConfigException
*/
public function addMember($userId, $canLeave = 1, $silent = false)
{