diff --git a/hosts/localhost/content/special/nav.md b/hosts/localhost/content/special/nav.md index 1a03d07..a0d381b 100644 --- a/hosts/localhost/content/special/nav.md +++ b/hosts/localhost/content/special/nav.md @@ -1,3 +1,3 @@ [Home](/index.md) -[Sitemap](:SITEMAP) -[Glossary](:GLOSSAIRE) +[Sitemap](/:SITEMAP) +[Glossary](/:GLOSSAIRE) diff --git a/index.php b/index.php index dd75fba..e9ca9c1 100644 --- a/index.php +++ b/index.php @@ -85,7 +85,7 @@ else if (isset($_POST['action'])) print('{ "id" : "id1", "icon" : "fas fa-atlas", "parent" : "#", "text" : "'.$_SERVER["SERVER_NAME"].'" }'); exit; default: - $content=specialurl(":ADMIN",true); + $content=specialurl("/:ADMIN",true); } } switch ($_POST['action']) @@ -98,7 +98,7 @@ else if (isset($_POST['action'])) exit; case 'open': $file=urldecode($_POST['file']); - if (substr($file,0,1)==":") + if (substr($file,0,2)=="/:") specialurl($file,true); else { @@ -128,9 +128,9 @@ else if (isset($_POST['action'])) } else if (ACCESS_PRIVATE && !isset($_SESSION['md_admin'])) { - $content=specialurl(":ADMIN",false); + $content=specialurl("/:ADMIN",false); } -else if (substr($file,0,1)==":") +else if (substr($file,0,2)=="/:") { $content=specialurl($file,false); } @@ -195,11 +195,11 @@ else print(($_SESSION['md_admin'] == true)?'':''); + ':''); ?> diff --git a/js/functions.js b/js/functions.js index eb3ca1f..d30a487 100644 --- a/js/functions.js +++ b/js/functions.js @@ -10,6 +10,7 @@ var external = RegExp('^((f|ht)tps?:)?//'); var javascript = RegExp('^javascript:'); var textual = RegExp('\.md$'); +var internal = RegExp('^\/:'); var emoji; var LANG; $(function(){ @@ -126,7 +127,7 @@ function majlink(context) { $('#'+context+' a').click(function(e) { dest=$(this).attr('href'); - if (!external.test(dest) && !javascript.test(dest) && textual.test(dest)) + if (!external.test(dest) && !javascript.test(dest) && (textual.test(dest) || internal.test(dest))) { e.preventDefault(); openlink(dest,true); diff --git a/lib/functions.php b/lib/functions.php index c860a61..af097e0 100644 --- a/lib/functions.php +++ b/lib/functions.php @@ -55,22 +55,22 @@ function specialurl($url,$quit) global $LANG; switch ($url) { - case ':APROPOS': + case '/:APROPOS': $extra = new ParsedownExtraplus(); $content=$extra->text($LANG['ABOUTMARKDOC']); break; - case ':ADMIN': + case '/:ADMIN': if (isset($_SESSION['md_admin']) === false || $_SESSION['md_admin'] !== true) $content = '

' . (isset($error) ? '

' . $error . '

' : null) . '

'; else $content = '

'.$LANG['ALREADYLOG'].'

'; break; - case ':SITEMAP': + case '/:SITEMAP': $content='

'.$LANG['SITEMAP'].'

'; foreach(plan(CONTENT_DIR) as $file) $content.='

'.$file.'

' ; break; - case ':GLOSSAIRE': + case '/:GLOSSAIRE': $content='

'.$LANG['GLOSSARY'].'

'; foreach(glossary(CONTENT_DIR) as $letter => $files) {