beenull/AntCMS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix header regex (again)

Browse source
This commit is contained in:
Belle Aerni 2023-01-13 01:18:43 -08:00
parent 4f96f5c496
commit 44de365946
3 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/AntCMS/AntCMS.php
View file

@ -106,7 +106,7 @@ class AntCMS
$pageContent = file_get_contents($pagePath);
$pageHeaders = AntCMS::getPageHeaders($pageContent);
// Remove the AntCMS section from the content
$pageContent = preg_replace('/\A--AntCMS--[^-]*--AntCMS--/sm', '', $pageContent);
$pageContent = preg_replace('/\A--AntCMS--.*?--AntCMS--/sm', '', $pageContent);
$result = ['content' => $pageContent, 'title' => $pageHeaders['title'], 'author' => $pageHeaders['author'], 'description' => $pageHeaders['description'], 'keywords' => $pageHeaders['keywords']];
return $result;
} catch (\Exception) {
@ -177,16 +177,20 @@ class AntCMS
public static function getPageHeaders(string $pageContent)
{
$AntKeywords = new AntKeywords();
$pageHeaders = [
'title' => 'AntCMS',
'author' => 'AntCMS',
'description' => 'AntCMS',
'keywords' => trim($AntKeywords->generateKeywords($pageContent)),
];
// First get the AntCMS header and store it in the matches varible
preg_match('/\A--AntCMS--[^-]*--AntCMS--/sm', $pageContent, $matches);
preg_match('/\A--AntCMS--.*?--AntCMS--/sm', $pageContent, $matches);
// Then remove it from the page content so it doesn't cause issues if we try to generate the keywords
$pageContent = str_replace($pageContent, '', $matches[0]);
$pageHeaders = [];
if ($matches) {
if (isset($matches[0])) {
$header = $matches[0];
// Then remove it from the page content so it doesn't cause issues if we try to generate the keywords
$pageContent = str_replace($header, '', $pageContent);
preg_match('/Title: (.*)/', $header, $matches);
$pageHeaders['title'] = trim($matches[1] ?? 'AntCMS');
@ -198,15 +202,10 @@ class AntCMS
$pageHeaders['description'] = trim($matches[1] ?? 'AntCMS');
preg_match('/Keywords: (.*)/', $header, $matches);
$pageHeaders['keywords'] = trim($matches[1] ?? $AntKeywords->generateKeywords($pageContent));
} else {
$pageHeaders = [
'title' => 'AntCMS',
'author' => 'AntCMS',
'description' => 'AntCMS',
'keywords' => trim($AntKeywords->generateKeywords($pageContent)),
];
$keywods = $matches[1] ?? $AntKeywords->generateKeywords($pageContent);
$pageHeaders['keywords'] = trim($keywods);
}
return $pageHeaders;
}

2
src/Themes/Bootstrap/Templates/markdown_edit_layout.html.twig
View file

@ -18,7 +18,7 @@
const output = document.getElementById("markdown-output");
function parseMarkdown() {
const inputValue = input.value.replace(/\A--AntCMS--[^-]*--AntCMS--/sm, "");
const inputValue = input.value.replace(/\A--AntCMS--.*?--AntCMS--/sm, "");
output.innerHTML = marked.parse(inputValue);
}

2
src/Themes/Default/Templates/markdown_edit_layout.html.twig
View file

@ -18,7 +18,7 @@
const output = document.getElementById("markdown-output");
function parseMarkdown() {
const inputValue = input.value.replace(/\A--AntCMS--[^-]*--AntCMS--/sm, "");
const inputValue = input.value.replace(/\A--AntCMS--.*?--AntCMS--/sm, "");
output.innerHTML = marked.parse(inputValue);
}