mirror/php-typemill
1
0
Fork 0
mirror of https://github.com/typemill/typemill.git synced 2025-08-05 21:57:31 +02:00
Code Issues Releases Wiki Activity

Version 1.3.1: Improved Meta-Tabs and Translations

Browse Source
This commit is contained in:
trendschau
2020-01-06 17:23:30 +01:00
parent e09487e668
commit 0d09fe60b1
18 changed files with 471 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
system/Controllers/MetaApiController.php
View File

@@ -30,10 +30,13 @@ class MetaApiController extends ContentController
# loop through all plugins
foreach($this->settings['plugins'] as $name => $plugin)
{
$pluginSettings = \Typemill\Settings::getObjectSettings('plugins', $name);
if($pluginSettings && isset($pluginSettings['metatabs']))
if($plugin['active'])
{
$metatabs = array_merge_recursive($metatabs, $pluginSettings['metatabs']);
$pluginSettings = \Typemill\Settings::getObjectSettings('plugins', $name);
if($pluginSettings && isset($pluginSettings['metatabs']))
{
$metatabs = array_merge_recursive($metatabs, $pluginSettings['metatabs']);
}
}
}
@@ -155,4 +158,6 @@ class MetaApiController extends ContentController
# return with the new metadata
return $response->withJson(array('metadata' => $metaData, 'errors' => false));
}
}
}
# check models -> writeYaml for getPageMeta and getPageMetaDefaults.

4
system/Controllers/SettingsController.php
View File

@@ -463,7 +463,7 @@ class SettingsController extends Controller
if($validate->newUser($params, $userroles))
{
$userdata = array('username' => $params['username'], 'email' => $params['email'], 'userrole' => $params['userrole'], 'password' => $params['password']);
$userdata = array('username' => $params['username'], 'firstname' => $params['firstname'], 'lastname' => $params['lastname'], 'email' => $params['email'], 'userrole' => $params['userrole'], 'password' => $params['password']);
$user->createUser($userdata);
@@ -511,7 +511,7 @@ class SettingsController extends Controller
if($validate->existingUser($params, $userroles))
{
$userdata = array('username' => $params['username'], 'email' => $params['email'], 'userrole' => $params['userrole']);
$userdata = array('username' => $params['username'], 'firstname' => $params['firstname'], 'lastname' => $params['lastname'], 'email' => $params['email'], 'userrole' => $params['userrole']);
if(empty($params['password']) AND empty($params['newpassword']))
{