mirror/php-typemill
1
0
Fork 0
mirror of https://github.com/typemill/typemill.git synced 2025-08-01 11:50:28 +02:00
Code Issues Releases Wiki Activity

Merge branch 'v2.x' into v2.18

Browse Source
This commit is contained in:
trendschau
2025-06-16 22:20:06 +02:00
parent b708c46a78 349159f58d
commit 437b9caced
8 changed files with 106 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Dockerfile
View File

@@ -23,21 +23,22 @@ RUN chmod +x /var/www/html/docker-utils/install-composer && \
./composer.phar update && \
chmod +x /var/www/html/docker-utils/init-server
# Create a default copy of content and theme in case of empty directories binding
RUN mkdir -p /var/www/html/content.default/ && \
cp -R /var/www/html/content/* /var/www/html/content.default/ && \
mkdir -p /var/www/html/themes.default/ && \
cp -R /var/www/html/themes/* /var/www/html/themes.default/ && \
mkdir -p /var/www/html/media.default/ && \
cp -R /var/www/html/media/* /var/www/html/media.default/
# Expose useful volumes (see documentation)
VOLUME /var/www/html/settings
VOLUME /var/www/html/media
VOLUME /var/www/html/cache
VOLUME /var/www/html/plugins
VOLUME /var/www/html/data
# Create a default copy of content and theme in case of empty directories binding
RUN mkdir -p /var/www/html/content.default/ && \
cp -R /var/www/html/content/* /var/www/html/content.default/ && \
mkdir -p /var/www/html/themes.default/ && \
cp -R /var/www/html/themes/* /var/www/html/themes.default/
VOLUME /var/www/html/content
VOLUME /var/www/html/themes
# Inject default values if content and themes are mounted with empty directories, adjust rights and start the server
# Inject default values for persistant data and start the server
CMD ["/var/www/html/docker-utils/init-server"]

9
docker-utils/init-server
View File

@@ -1,5 +1,12 @@
#!/bin/sh
# mount data from persistant storage if not empty
find /var/www/html/content -type d -empty -exec cp -R /var/www/html/content.default/* /var/www/html/content \;
find /var/www/html/themes -type d -empty -exec cp -R /var/www/html/themes.default/* /var/www/html/themes \;
find /var/www/html/media -type d -empty -exec cp -R /var/www/html/media.default/* /var/www/html/media \;
# Fix ownership (in case of new folders)
chown -R www-data:www-data /var/www/html/
apache2-foreground
# Start Apache in foreground
exec apache2-foreground

42
system/typemill/Middleware/OldInputMiddleware.php
View File

@@ -16,22 +16,38 @@ class OldInputMiddleware
}
public function __invoke(Request $request, RequestHandler $handler)
{
{
if(isset($_SESSION) && isset($_SESSION['old']))
{
$this->view->getEnvironment()->addGlobal('old', $_SESSION['old']);
}
$response = $handler->handle($request);
# unset old values after the request is processed. This keeps old values also if there is a redirect to another page and before the page is rendered but removes the values on page refresh.
if(isset($_SESSION))
{
if(isset($_SESSION['old']))
{
$this->view->getEnvironment()->addGlobal('old', $_SESSION['old']);
unset($_SESSION['old']);
}
if(!empty($request->getParsedBody()))
{
$_SESSION['old'] = $request->getParsedBody();
}
unset($_SESSION['old']);
if(!empty($request->getParsedBody()))
{
$oldinput = $request->getParsedBody();
if(is_array($oldinput))
{
foreach($oldinput as $key => $value)
{
if (stripos($key, 'pass') !== false)
{
unset($oldinput[$key]);
}
}
}
$_SESSION['old'] = $oldinput;
}
}
$response = $handler->handle($request);
return $response;
}
}

60
system/typemill/Models/Storage.php
View File

@@ -667,20 +667,24 @@ class Storage
public function getImageList()
{
$thumbs = array_diff(scandir($this->thumbsFolder), array('..', '.'));
$imagelist = array();
$imagelist = [];
foreach ($thumbs as $key => $name)
if(is_dir($this->thumbsFolder))
{
$imagelist[] = [
'name' => $name,
'timestamp' => filemtime($this->thumbsFolder . $name),
'src_thumb' => 'media/thumbs/' . $name,
'src_live' => 'media/live/' . $name,
];
$thumbs = array_diff(scandir($this->thumbsFolder), array('..', '.'));
foreach ($thumbs as $key => $name)
{
$imagelist[] = [
'name' => $name,
'timestamp' => filemtime($this->thumbsFolder . $name),
'src_thumb' => 'media/thumbs/' . $name,
'src_live' => 'media/live/' . $name,
];
}
$imagelist = Helpers::array_sort($imagelist, 'timestamp', SORT_DESC);
}
$imagelist = Helpers::array_sort($imagelist, 'timestamp', SORT_DESC);
return $imagelist;
}
@@ -895,24 +899,28 @@ class Storage
public function getFileList()
{
$files = scandir($this->fileFolder);
$filelist = array();
$filelist = [];
foreach ($files as $key => $name)
if(is_dir($this->fileFolder))
{
if (!in_array($name, array(".","..","filerestrictions.yaml")) && file_exists($this->fileFolder . $name))
{
$filelist[] = [
'name' => $name,
'timestamp' => filemtime($this->fileFolder . $name),
'bytes' => filesize($this->fileFolder . $name),
'info' => pathinfo($this->fileFolder . $name),
'url' => 'media/files/' . $name,
];
}
}
$files = scandir($this->fileFolder);
$filelist = Helpers::array_sort($filelist, 'timestamp', SORT_DESC);
foreach ($files as $key => $name)
{
if (!in_array($name, array(".","..","filerestrictions.yaml")) && file_exists($this->fileFolder . $name))
{
$filelist[] = [
'name' => $name,
'timestamp' => filemtime($this->fileFolder . $name),
'bytes' => filesize($this->fileFolder . $name),
'info' => pathinfo($this->fileFolder . $name),
'url' => 'media/files/' . $name,
];
}
}
$filelist = Helpers::array_sort($filelist, 'timestamp', SORT_DESC);
}
return $filelist;
}

18
system/typemill/author/js/vue-medialib.js
View File

@@ -603,7 +603,7 @@ const medialib = {
{
this.deleteFile(media);
}
},
},
loadFiles(filetype)
{
var fileself = this;
@@ -615,7 +615,12 @@ const medialib = {
})
.then(function (response)
{
fileself.filedata = response.data.files;
fileself.filedata = [];
const files = response.data.files;
if(files && Array.isArray(files))
{
fileself.filedata = files;
}
fileself.showFiles(filetype);
})
.catch(function (error)
@@ -704,8 +709,13 @@ const medialib = {
})
.then(function (response)
{
imageself.imagedata = response.data.images;
imageself.showImages()
imageself.imagedata = [];
const images = response.data.images;
if (images && Array.isArray(images))
{
imageself.imagedata = images;
}
imageself.showImages();
})
.catch(function (error)
{

8
system/typemill/author/partials/fields.twig
View File

@@ -39,9 +39,13 @@
<textarea id="{{ itemName }}[{{ field.name }}]" name="{{ itemName }}[{{ field.name }}]"{{field.getAttributeValues() }}{{ field.getAttributes() }}>{{ field.getContent() }}</textarea>
{% elseif (field.type == 'paragraph') and (field.getContent() != '') %}
{% elseif (field.type == 'paragraph') %}
{% if (field.getContent() != '') %}
{{ markdown(field.getContent()) }}
{{ markdown(field.getContent()) }}
{% endif %}
{% elseif field.type == 'checkbox' %}

2
system/typemill/settings/defaults.yaml
View File

@@ -1,4 +1,4 @@
version: '2.17.1'
version: '2.17.4'
title: 'Typemill'
author: 'Unknown'
copyright: false

12
system/typemill/system.php
View File

@@ -263,20 +263,18 @@ $timer['permissions'] = microtime(true);
* SEGMENTS WITH SESSION *
****************************/
$session_segments = ['setup', 'tm/', 'api/'];
# if website is restricted to registered user
if( ( isset($settings['access']) && $settings['access'] ) || ( isset($settings['pageaccess']) && $settings['pageaccess'] ) )
{
# activate session for all routes
$session_segments = [$urlinfo['route']];
}
else
{
$session_segments = ['setup', 'tm/', 'api/'];
# let plugins add own segments for session, eg. to enable csrf for forms
$client_segments = $dispatcher->dispatch(new OnSessionSegmentsLoaded([]), 'onSessionSegmentsLoaded')->getData();
$session_segments = array_merge($session_segments, $client_segments);
}
# let plugins add own segments for session, eg. to enable csrf for forms
$client_segments = $dispatcher->dispatch(new OnSessionSegmentsLoaded([]), 'onSessionSegmentsLoaded')->getData();
$session_segments = array_merge($session_segments, $client_segments);
# start session
# Session::startSessionForSegments($session_segments, $urlinfo['route']);