From 9626fb5c6a4d7451e88aa7bd7fa91306d3f3f1ea Mon Sep 17 00:00:00 2001
From: Thomas Lange <code@nerdmind.de>
Date: Sat, 29 Apr 2017 01:09:30 +0200
Subject: Two changes have been made in this commit: + The method
 "Item::getArguments" has been optimized and checks now the syntax of the
 argument names (only A-Z, a-z, 0-9 and underscores are allowed). + The admin
 template has been changed and displays now the used arguments of an item
 within the list.

---
 core/namespace/Item.php           | 9 ++++++---
 template/admin/html/page/item.php | 9 +++++++++
 template/admin/html/post/item.php | 9 +++++++++
 template/admin/html/user/item.php | 9 +++++++++
 template/admin/rsrc/main.css      | 8 ++++++++
 5 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/core/namespace/Item.php b/core/namespace/Item.php
index 426dd2a..f1a0988 100644
--- a/core/namespace/Item.php
+++ b/core/namespace/Item.php
@@ -106,11 +106,14 @@ abstract class Item implements ItemInterface {
 	#===============================================================================
 	public function getArguments(): array {
 		if($argv = $this->Attribute->get('argv')) {
-			foreach(explode('|', rtrim($argv, '|')) as $delimeter) {
+			foreach(explode('|', $argv) as $delimeter) {
 				$part = explode('=', $delimeter);
 
-				if(!empty($part[0])) {
-					$arguments[strtoupper($part[0])] = $part[1] ?? TRUE;
+				$argumentK = $part[0] ?? NULL;
+				$argumentV = $part[1] ?? TRUE;
+
+				if(preg_match('#^[[:word:]]+$#', $argumentK)) {
+					$arguments[strtoupper($argumentK)] = $argumentV;
 				}
 			}
 		}
diff --git a/template/admin/html/page/item.php b/template/admin/html/page/item.php
index 584a539..1a382bd 100644
--- a/template/admin/html/page/item.php
+++ b/template/admin/html/page/item.php
@@ -6,6 +6,15 @@
 	<blockquote cite="<?=$PAGE['URL']?>">
 		<p><?=excerpt($PAGE['BODY']['HTML'])?></p>
 	</blockquote>
+
+	<?php if($PAGE['ARGV']): ?>
+		<ul class="arguments">
+			<?php foreach($PAGE['ARGV'] as $argument => $value): ?>
+				<li><strong><?=$argument?></strong>: <span class="blue"><?=escapeHTML($value)?></span></li>
+			<?php endforeach; ?>
+		</ul>
+	<?php endif; ?>
+
 	<footer>
 		<ul>
 			<li><a href="<?=$PAGE['URL']?>" target="_blank" title="<?=$Language->text('select_page')?>"><i class="fa fa-external-link"></i></a></li>
diff --git a/template/admin/html/post/item.php b/template/admin/html/post/item.php
index 1808a6b..f84a2e2 100644
--- a/template/admin/html/post/item.php
+++ b/template/admin/html/post/item.php
@@ -6,6 +6,15 @@
 	<blockquote cite="<?=$POST['URL']?>">
 		<p><?=excerpt($POST['BODY']['HTML'])?></p>
 	</blockquote>
+
+	<?php if($POST['ARGV']): ?>
+		<ul class="arguments">
+			<?php foreach($POST['ARGV'] as $argument => $value): ?>
+				<li><strong><?=$argument?></strong>: <span class="blue"><?=escapeHTML($value)?></span></li>
+			<?php endforeach; ?>
+		</ul>
+	<?php endif; ?>
+
 	<footer>
 		<ul>
 			<li><a href="<?=$POST['URL']?>" target="_blank" title="<?=$Language->text('select_post')?>"><i class="fa fa-external-link"></i></a></li>
diff --git a/template/admin/html/user/item.php b/template/admin/html/user/item.php
index 8f0cba1..13ba4ae 100644
--- a/template/admin/html/user/item.php
+++ b/template/admin/html/user/item.php
@@ -5,6 +5,15 @@
 	<blockquote cite="<?=$USER['URL']?>">
 		<p><?=excerpt($USER['BODY']['HTML'])?></p>
 	</blockquote>
+
+	<?php if($USER['ARGV']): ?>
+		<ul class="arguments">
+			<?php foreach($USER['ARGV'] as $argument => $value): ?>
+				<li><strong><?=$argument?></strong>: <span class="blue"><?=escapeHTML($value)?></span></li>
+			<?php endforeach; ?>
+		</ul>
+	<?php endif; ?>
+
 	<footer>
 		<ul>
 			<li><a href="<?=$USER['URL']?>" target="_blank" title="<?=$Language->text('select_user')?>"><i class="fa fa-external-link"></i></a></li>
diff --git a/template/admin/rsrc/main.css b/template/admin/rsrc/main.css
index cd2493e..a064425 100644
--- a/template/admin/rsrc/main.css
+++ b/template/admin/rsrc/main.css
@@ -145,6 +145,14 @@ a.brackets:before,a.brackets:after{color:#222;}
 .item-list-li > footer > ul > li > a:active{background:#DDD;}
 .item-list-li h2 > span{float:right;}
 
+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
+/* Argument list
+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
+.arguments{list-style:none;margin:0;padding:0.25rem 1rem;background:#EEE;font-size:0.6rem;text-align:center;border-top:0.05rem solid #AAA;}
+.arguments > li{display:inline;}
+.arguments > li:before{content:"[";font-weight:700;margin-right:0.1rem;}
+.arguments > li:after{content:"]";font-weight:700;margin-left:0.1rem;}
+
 /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
 /* Form flex-box
 /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-- 
cgit v1.2.3