0ct0pu5/typemill
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Hotfix 1.3.7.1 for notice component

Browse source
This commit is contained in:
trendschau 2020-06-24 21:52:08 +02:00
parent 33643a73d1
commit 543c7869df
3 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
system/Controllers/SetupController.php
View file

@ -32,8 +32,9 @@ class SetupController extends Controller
# check php-version
if (version_compare(phpversion(), '7.0.0', '<')) {
$systemcheck['error'][] = 'The PHP-version of your server is ' . phpversion() . ' and Typemill needs at least 7.0.0';
if (version_compare(phpversion(), '7.0.0', '<'))
{
$systemcheck['error'][] = 'The PHP-version of your server is ' . phpversion() . ' and Typemill needs at least 7.0.0';
}
/* check if mod rewrite is enabled, does not work with PHP-fpm or NGINX
@ -44,18 +45,19 @@ class SetupController extends Controller
}
*/
# check if GD extension is enabled
if(!extension_loaded('gd')){
$systemcheck['error'][] = 'The php-extension GD for image manipulation is not enabled.';
}
# check if extensions are loaded
if(!extension_loaded('gd')){ $systemcheck['error'][] = 'The php-extension GD for image manipulation is not enabled.'; }
if(!extension_loaded('mbstring')){ $systemcheck['error'][] = 'The php-extension mbstring is not enabled.'; }
if(!extension_loaded('fileinfo')){ $systemcheck['error'][] = 'The php-extension fileinfo is not enabled.'; }
if(!extension_loaded('session')){ $systemcheck['error'][] = 'The php-extension session is not enabled.'; }
if(!extension_loaded('iconv')){ $systemcheck['error'][] = 'The php-extension iconv is not enabled.'; }
$setuperrors = empty($systemcheck) ? false : 'Some system requirements for Typemill are missing.';
$systemcheck = empty($systemcheck) ? false : $systemcheck;
return $this->render($response, 'auth/setup.twig', array( 'messages' => $setuperrors, 'systemcheck' => $systemcheck ));
return $this->render($response, 'auth/setup.twig', array( 'messages' => $setuperrors, 'systemcheck' => $systemcheck ));
}
public function create($request, $response, $args)
{
if($request->isPost())

14
system/author/js/vue-blox.js
View file

@ -780,7 +780,7 @@ const noticeComponent = Vue.component('notice-component', {
'</div>',
data: function(){
return {
prefix: '! ',
prefix: '!',
notice: '',
noteclass: 'note1'
}
@ -807,12 +807,12 @@ const noticeComponent = Vue.component('notice-component', {
noticedown: function()
{
this.prefix = this.getNoticePrefix(this.compmarkdown);
this.prefix += "! ";
if(this.prefix.length > 4)
this.prefix = this.prefix + '!';
if(this.prefix.length > 3)
{
this.prefix = "! ";
this.prefix = '!';
}
this.noteclass = 'note' + (this.prefix.length-1);
this.noteclass = 'note' + (this.prefix.length);
this.updatemarkdown(this.notice);
},
getNoticePrefix: function(str)
@ -822,7 +822,7 @@ const noticeComponent = Vue.component('notice-component', {
if(str[i] != '!'){ return prefix }
prefix += '!';
}
return prefix+' ';
return prefix;
},
updatemarkdown: function(value)
{
@ -830,7 +830,7 @@ const noticeComponent = Vue.component('notice-component', {
var lines = value.match(/^.*([\n\r]|$)/gm);
var notice = this.prefix + lines.join(this.prefix);
var notice = this.prefix + ' ' + lines.join(this.prefix+' ');
this.$emit('updatedMarkdown', notice);
},

1
system/system.php
View file

@ -109,7 +109,6 @@ $dispatcher->dispatch('onPluginsLoaded', new OnPluginsLoaded($pluginNames));
# dispatch settings event and get all setting-updates from plugins
$dispatcher->dispatch('onSettingsLoaded', new OnSettingsLoaded($settings))->getData();
/******************************
* ADD DISPATCHER TO CONTAINER *
******************************/