Updated Composer packages; empty field fix
Composer dependencies were pretty old, so they needed to be upgraded to the latest. There was also a minor bug that was triggered when a new page was saved with empty tags and no images or documents, so that's been patched as well.
This commit is contained in:
parent
f1850ce7f7
commit
4876c1336e
5 changed files with 280 additions and 245 deletions
|
@ -120,9 +120,14 @@ class DashControl
|
|||
} else {
|
||||
$views = (new Themes())->getCustomViews();
|
||||
}
|
||||
|
||||
$imageList = explode(',', $page['feature']);
|
||||
$fileList = explode(',', $page['files']);
|
||||
$imageList = [];
|
||||
$fileList = [];
|
||||
if (isset($page['feature'])) {
|
||||
$imageList = explode(',', $page['feature']);
|
||||
}
|
||||
if (isset($page['files'])) {
|
||||
$fileList = explode(',', $page['files']);
|
||||
}
|
||||
|
||||
$images = [];
|
||||
$files = [];
|
||||
|
|
|
@ -108,10 +108,14 @@ class Contents
|
|||
];
|
||||
|
||||
$sanitizer = $builder->build($detergent);
|
||||
$scrubbed = $sanitizer->sanitize($result->getContent());
|
||||
if (isset($meta['feature'])) {
|
||||
$featureList = explode(',', $meta['feature']);
|
||||
} else {
|
||||
$featureList = "";
|
||||
}
|
||||
|
||||
$scrubbed = $sanitizer->sanitize($result->getContent());
|
||||
$featureList = explode(',', $meta['feature']);
|
||||
$docs = '';
|
||||
$docs = '';
|
||||
if (isset($meta['files'])) {
|
||||
$fileList = explode(',', $meta['files']);
|
||||
$docs = $meta['files'];
|
||||
|
@ -122,19 +126,23 @@ class Contents
|
|||
|
||||
$media = [];
|
||||
$files = [];
|
||||
foreach ($featureList as $file) {
|
||||
$item = trim($file);
|
||||
$ext = pathinfo($item, PATHINFO_EXTENSION);
|
||||
if ($item != null || $item != '') {
|
||||
array_push($media, ['file' => $item, 'type' => trim($ext)]);
|
||||
if ($featureList != '') {
|
||||
foreach ($featureList as $file) {
|
||||
$item = trim($file);
|
||||
$ext = pathinfo($item, PATHINFO_EXTENSION);
|
||||
if ($item != null || $item != '') {
|
||||
array_push($media, ['file' => $item, 'type' => trim($ext)]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
foreach ($fileList as $file) {
|
||||
$item = trim($file);
|
||||
$ext = pathinfo($item, PATHINFO_EXTENSION);
|
||||
if ($item != null || $item != '') {
|
||||
array_push($files, ['file' => $item, 'type' => trim($ext)]);
|
||||
if ($fileList != "") {
|
||||
foreach ($fileList as $file) {
|
||||
$item = trim($file);
|
||||
$ext = pathinfo($item, PATHINFO_EXTENSION);
|
||||
if ($item != null || $item != '') {
|
||||
array_push($files, ['file' => $item, 'type' => trim($ext)]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -23,15 +23,17 @@ class Sorting
|
|||
$pages = (new Book('../content/pages'))->getContents();
|
||||
foreach ($pages as $page) {
|
||||
$temp = [];
|
||||
$temp = explode(',', $page['tags']);
|
||||
foreach ($temp as $tag) {
|
||||
$label = trim($tag);
|
||||
if (!find(self::$p_tags, ['tag_name' => $label])) {
|
||||
array_push(self::$p_tags, [
|
||||
'tag_name' => $label,
|
||||
'slug' => StringTools::safeString($label),
|
||||
'pages' => self::tagPages($label, $pages),
|
||||
]);
|
||||
if (isset($page['tags'])) {
|
||||
$temp = explode(',', $page['tags']);
|
||||
foreach ($temp as $tag) {
|
||||
$label = trim($tag);
|
||||
if (!find(self::$p_tags, ['tag_name' => $label])) {
|
||||
array_push(self::$p_tags, [
|
||||
'tag_name' => $label,
|
||||
'slug' => StringTools::safeString($label),
|
||||
'pages' => self::tagPages($label, $pages),
|
||||
]);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -43,13 +45,15 @@ class Sorting
|
|||
{
|
||||
$tagged = [];
|
||||
foreach ($pages as $page) {
|
||||
if (strpos($page['tags'], $tag) !== false) {
|
||||
array_push($tagged, [
|
||||
'title' => $page['title'],
|
||||
'slug' => $page['slug'],
|
||||
'path' => $page['path'],
|
||||
'feature' => $page['feature'],
|
||||
]);
|
||||
if (isset($page['tags'])) {
|
||||
if (strpos($page['tags'], $tag) !== false) {
|
||||
array_push($tagged, [
|
||||
'title' => $page['title'],
|
||||
'slug' => $page['slug'],
|
||||
'path' => $page['path'],
|
||||
'feature' => $page['feature'],
|
||||
]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -124,15 +128,16 @@ class Sorting
|
|||
'image' => $settings['global']['base_url'] . $settings['global']['background'],
|
||||
'baseURL' => $settings['global']['base_url'],
|
||||
];
|
||||
|
||||
$taglist = explode(',', $page['tags']);
|
||||
$tags = [];
|
||||
foreach ($taglist as $tag) {
|
||||
$label = trim($tag);
|
||||
array_push($tags, [
|
||||
'label' => $label . ' ',
|
||||
'slug' => StringTools::safeString($label),
|
||||
]);
|
||||
$tags = [];
|
||||
if (isset($page['tags'])) {
|
||||
$taglist = explode(',', $page['tags']);
|
||||
foreach ($taglist as $tag) {
|
||||
$label = trim($tag);
|
||||
array_push($tags, [
|
||||
'label' => $label . ' ',
|
||||
'slug' => StringTools::safeString($label),
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
$meta = [
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "are0h/fipamo",
|
||||
"descriptions": "The most chill no database blog framework ever.",
|
||||
"version": "2.5.1-beta",
|
||||
"version": "2.6.0-beta",
|
||||
"homepage": "https://fipamo.blog",
|
||||
"authors": [
|
||||
{
|
||||
|
@ -10,9 +10,9 @@
|
|||
}
|
||||
],
|
||||
"support": {
|
||||
"source": "https://code.playvicio.us/Are0h/Fipamo",
|
||||
"wiki": "https://code.playvicio.us/Are0h/Fipamo/wiki/_pages",
|
||||
"issues": "https://code.playvicio.us/Are0h/Fipamo/issues"
|
||||
"source": "https://koodu.ubiqueros.com/are0h/Fipamo",
|
||||
"wiki": "https://koodu.ubiqueros.com/are0h/Fipamo/wiki/?action=_pages",
|
||||
"issues": "https://koodu.ubiqueros.com/are0h/Fipamo/issues"
|
||||
},
|
||||
"require": {
|
||||
"slim/slim": "4.*",
|
||||
|
@ -28,5 +28,10 @@
|
|||
"symfony/yaml": "^5.4",
|
||||
"olegatro/html-sanitizer-relative": "^1.0",
|
||||
"nesbot/carbon": "^2.62"
|
||||
}
|
||||
},
|
||||
"scripts": {
|
||||
"start": [
|
||||
"@php -S localhost:8000 -t public/"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
410
composer.lock
generated
410
composer.lock
generated
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue