mirror/php-typemill
1
0
Fork 0
mirror of https://github.com/typemill/typemill.git synced 2025-07-30 19:00:32 +02:00
Code Issues Releases Wiki Activity

Version 1.4.6: Small fixes and additions

Browse Source
This commit is contained in:
trendschau
2021-05-18 21:28:55 +02:00
parent 812e4b1c26
commit 84bf68f690
49 changed files with 390 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
system/Controllers/AuthController.php
View File

@@ -133,7 +133,7 @@ class AuthController extends Controller
}
# if user is allowed to view content-area
if($this->c->acl->isAllowed($userdata['userrole'], 'content', 'view'))
if($this->c->acl->hasRole($userdata['userrole']) && $this->c->acl->isAllowed($userdata['userrole'], 'content', 'view'))
{
$settings = $this->c->get('settings');
$editor = (isset($settings['editor']) && $settings['editor'] == 'visual') ? 'visual' : 'raw';

43
system/Controllers/SettingsController.php
View File

@@ -11,6 +11,7 @@ use Typemill\Models\ProcessFile;
use Typemill\Models\ProcessImage;
use Typemill\Events\OnUserfieldsLoaded;
use Typemill\Events\OnSystemnaviLoaded;
use Typemill\Events\OnUserDeleted;
class SettingsController extends Controller
{
@@ -479,8 +480,24 @@ class SettingsController extends Controller
}
else
{
# fetch the original settings from the folder to get the field definitions
$originalSettings = \Typemill\Settings::getObjectSettings('plugins', $pluginName);
# check if the plugin has dependencies
if(isset($userInput[$pluginName]['active']) && isset($originalSettings['dependencies']))
{
foreach($originalSettings['dependencies'] as $dependency)
{
if(!isset($userInput[$dependency]['active']) OR !$userInput[$dependency]['active'])
{
$this->c->flash->addMessage('error', 'Activate the plugin ' . $dependency . ' before you activate the plugin ' . $pluginName);
return $response->withRedirect($this->c->router->pathFor('plugins.show'));
}
}
}
/* validate the user-input */
$imageFields = $this->validateInput('plugins', $pluginName, $userInput[$pluginName], $validate);
$imageFields = $this->validateInput('plugins', $pluginName, $userInput[$pluginName], $validate, $originalSettings);
/* use the input data */
$pluginSettings[$pluginName] = $userInput[$pluginName];
@@ -615,6 +632,11 @@ class SettingsController extends Controller
# set navigation active
$navigation['Users']['active'] = true;
if(isset($userdata['lastlogin']))
{
$userdata['lastlogin'] = date("d.m.Y H:i:s", $userdata['lastlogin']);
}
return $this->render($response, 'settings/user.twig', array(
'settings' => $settings,
@@ -876,13 +898,22 @@ class SettingsController extends Controller
if($_SESSION['user'] !== $params['username'])
{
return $response->withRedirect($this->c->router->pathFor('user.account'));
}
}
}
if($validate->username($params['username']))
{
$userdata = $user->getSecureUser($params['username']);
if(!$userdata)
{
$this->c->flash->addMessage('error', 'Ups, we did not find that user');
return $response->withRedirect($this->c->router->pathFor('user.show', ['username' => $params['username']]));
}
$user->deleteUser($params['username']);
$this->c->dispatcher->dispatch('onUserDeleted', new OnUserDeleted($userdata));
# if user deleted his own account
if($_SESSION['user'] == $params['username'])
{
@@ -894,7 +925,7 @@ class SettingsController extends Controller
return $response->withRedirect($this->c->router->pathFor('user.list'));
}
$this->c->flash->addMessage('error', 'Ups, we did not find that user');
$this->c->flash->addMessage('error', 'Ups, it is not a valid username');
return $response->withRedirect($this->c->router->pathFor('user.show', ['username' => $params['username']]));
}
}
@@ -937,6 +968,12 @@ class SettingsController extends Controller
private function getUserFields($role)
{
# if a plugin with a role has been deactivated, then users with the role throw an error, so set them back to member...
if(!$this->c->acl->hasRole($role))
{
$role = 'member';
}
$fields = [];
$fields['username'] = ['label' => 'Username (read only)', 'type' => 'text', 'readonly' => true];
$fields['firstname'] = ['label' => 'First Name', 'type' => 'text'];