mirror/php-typemill
1
0
Fork 0
mirror of https://github.com/typemill/typemill.git synced 2025-03-14 17:19:39 +01:00
Code Issues Releases Wiki Activity

Version 1.4.9: Fixed file upload errors, erased duplicate span in navigation

Browse Source
This commit is contained in:
trendschau 2021-08-31 21:33:03 +02:00
parent 88c0e3c8e4
commit b722b639fc
5 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
system/Controllers/MediaApiController.php
View File

@ -125,9 +125,6 @@ class MediaApiController extends ContentController
$this->params = $request->getParams();
$this->uri = $request->getUri()->withUserInfo('');
# make sure only allowed filetypes are uploaded
if (!isset($this->params['file']))
{
return $response->withJson(['errors' => 'No file found.'],404);
@ -150,6 +147,7 @@ class MediaApiController extends ContentController
return $response->withJson(['errors' => 'File is bigger than 20MB.'],422);
}
# make sure only allowed filetypes are uploaded
$allowedMimes = $this->getAllowedMtypes();
if(!isset($allowedMimes[$mtype]))
@ -158,7 +156,7 @@ class MediaApiController extends ContentController
}
if(
(is_array($allowedMimes[$mtype]) && !in_array($allowedMimes[$mtype],$extension)) OR
(is_array($allowedMimes[$mtype]) && !in_array($extension, $allowedMimes[$mtype])) OR
(!is_array($allowedMimes[$mtype]) && $allowedMimes[$mtype] != $extension )
)
{
@ -409,7 +407,7 @@ class MediaApiController extends ContentController
'application/x-excel' => ['xla','xlb','xlc','xld','xlk','xll','xlm','xls','xlt','xlv','xlw'],
'application/x-msexcel' => ['xls', 'xla','xlw'],
'application/vnd.ms-excel' => ['xlb','xlc','xll','xlm','xls','xlw'],
'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet ' => 'xlsx',
'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' => 'xlsx',
'application/mshelp' => ['hlp','chm'],
'application/msword' => ['doc','dot'],

13
system/author/css/style.css
View File

@ -487,7 +487,7 @@ li.menu-item{
.navi-item .movewrapper {
position: absolute;
right: 4px;
top: 4px;
top: 8px;
color: #f9f8f6;
color: #444;
background: transparent;
@ -616,6 +616,7 @@ footer{
.math{
white-space: pre;
}
/********************
* SETUP FORM *
********************/
@ -2311,6 +2312,10 @@ button.format-item.close:hover{
overflow-x: auto;
border-left: 4px solid #e0474c;
}
.blox code.language-pagebreak::after{
content: '---pagebreak with the eBook plugin---';
}
.blox table{
width: 100%;
border-collapse: collapse;
@ -2856,6 +2861,10 @@ footer a:focus, footer a:hover, footer a:active
display: inline-block;
vertical-align: top;
}
article a{
text-decoration: none;
color: #e0474c;
}
aside.sidebar{
width: 19%;
display: inline-block;
@ -3006,4 +3015,4 @@ footer a:focus, footer a:hover, footer a:active
.editor button, .editor a{
border-radius: 3px;
}
}
}

2
system/author/js/vue-blox.js
View File

@ -1772,7 +1772,7 @@ const fileComponent = Vue.component('file-component', {
'</div></div>',
data: function(){
return {
maxsize: 5, // megabyte
maxsize: 20, // megabyte
showmedialib: false,
load: false,
filemeta: false,

2
system/author/js/vue-shared.js
View File

@ -535,7 +535,7 @@ Vue.component('component-image', {
'</div>',
data: function(){
return {
maxsize: 5, // megabyte
maxsize: 10, // megabyte
imgpreview: false,
showmedialib: false,
load: false,

2
system/author/partials/editorNavi.twig
View File

@ -60,7 +60,7 @@
<li class="navi-item" :class="elementtype">
<div v-if="folder" class="foldertoggle" @click="toggleCollapse(name)"><svg v-if="isCollapsed(name)" class="icon icon-shrink2"><use xlink:href="#icon-shrink2"></use></svg><svg v-else class="icon icon-enlarge2"><use xlink:href="#icon-enlarge2"></use></svg></div>
<div class="status" :class="status"></div>
<a v-bind:href="getUrl(root, url)" :class="checkActive(active,parent)"><span class="iconwrapper"><svg class="icon" :class="getIconClass(elementtype, filetype, hide)"><use :xlink:href="getIcon(elementtype, filetype, hide)"></use></svg></span><span :class="getLevel(level)">{{ name }}</span><span class="movewrapper"><span class="movewrapper"><svg class="icon icon-arrows-v"><use xlink:href="#icon-arrows-v"></use></svg></span></a>
<a v-bind:href="getUrl(root, url)" :class="checkActive(active,parent)"><span class="iconwrapper"><svg class="icon" :class="getIconClass(elementtype, filetype, hide)"><use :xlink:href="getIcon(elementtype, filetype, hide)"></use></svg></span><span :class="getLevel(level)">{{ name }}</span><span class="movewrapper"><svg class="icon icon-arrows-v"><use xlink:href="#icon-arrows-v"></use></svg></span></a>
<draggable v-if="folder" v-show="!isCollapsed(name)" class="navi-list" tag="ul"
@start="onStart"
@end="onEnd"