Merge branch 'master' into 'optimization'optimization

6 files changed, 0 insertions, 159 deletions

diff --git a/template/admin/html/user/delete.php b/template/admin/html/user/delete.php
deleted file mode 100644
index 01927b2..0000000
--- a/template/admin/html/user/delete.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<h1><i class="fa fa-trash-o"></i><?=$Language->text('delete_user')?></h1>
-<p><?=$Language->text('delete_user_desc')?></p>
-
-<p class="red"><?=$Language->text('delete_user_warning')?></p>
-
-<?=$HTML?>
\ No newline at end of file
diff --git a/template/admin/html/user/form.php b/template/admin/html/user/form.php
deleted file mode 100644
index 50f79be..0000000
--- a/template/admin/html/user/form.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<form action="" method="POST">
-	<input type="hidden" name="token" value="<?=$FORM['TOKEN']?>" />
-
-	<?php if($FORM['INFO']): ?>
-		<div class="flex flex-direction-column">
-			<ul id="message-list">
-				<?php foreach($FORM['INFO'] as $message): ?>
-					<li><?=$message?></li>
-				<?php endforeach; ?>
-			</ul>
-		</div>
-	<?php endif; ?>
-
-<?php if($FORM['TYPE'] !== 'DELETE'): ?>
-	<div class="flex flex-responsive">
-		<div class="flex-item">
-			<div class="form-icon-flex"><i class="fa fa-database"></i></div>
-			<div class="form-label-flex"><label for="form_id">ID</label></div>
-			<div class="form-field-flex"><input<?=($FORM['TYPE'] === 'UPDATE') ? ' disabled="disabled"' : '';?> id="form_id" name="id" type="number" placeholder="[AUTO_INCREMENT]" value="<?=escapeHTML($FORM['DATA']['ID'])?>" /></div>
-		</div>
-		<div class="flex-item">
-			<div class="form-icon-flex"><i class="fa fa-key"></i></div>
-			<div class="form-label-flex"><label for="form_password"><?=$Language->text('label_password')?></label></div>
-			<div class="form-field-flex"><input id="form_password" name="password" placeholder="[NO CHANGE]" type="password" /></div>
-		</div>
-	</div>
-	<div class="flex flex-responsive">
-		<div class="flex-item">
-			<div class="form-icon-flex"><i class="fa fa-user"></i></div>
-			<div class="form-label-flex"><label for="form_fullname"><?=$Language->text('label_fullname')?></label></div>
-			<div class="form-field-flex"><input id="form_fullname" name="fullname" value="<?=escapeHTML($FORM['DATA']['FULLNAME'])?>" /></div>
-		</div>
-		<div class="flex-item">
-			<div class="form-icon-flex"><i class="fa fa-envelope-o"></i></div>
-			<div class="form-label-flex"><label for="form_mailaddr"><?=$Language->text('label_mailaddr')?></label></div>
-			<div class="form-field-flex"><input id="form_mailaddr" name="mailaddr" value="<?=escapeHTML($FORM['DATA']['MAILADDR'])?>" /></div>
-		</div>
-	</div>
-	<div class="flex flex-responsive">
-		<div class="flex-item">
-			<div class="form-icon-flex"><i class="fa fa-user-secret"></i></div>
-			<div class="form-label-flex"><label for="form_username"><?=$Language->text('label_username')?></label></div>
-			<div class="form-field-flex"><input id="form_username" name="username" value="<?=escapeHTML($FORM['DATA']['USERNAME'])?>" /></div>
-		</div>
-		<div class="flex-item">
-			<div class="form-icon-flex"><i class="fa fa-link"></i></div>
-			<div class="form-label-flex"><label for="form_slug"><?=$Language->text('label_slug')?></label></div>
-			<div class="form-field-flex"><input id="form_slug" name="slug" value="<?=escapeHTML($FORM['DATA']['SLUG'])?>" /></div>
-		</div>
-	</div>
-	<div class="flex flex-responsive">
-		<div class="flex-item">
-			<div class="form-icon-flex"><i class="fa fa-clock-o"></i></div>
-			<div class="form-label-flex"><label for="form_time_insert"><?=$Language->text('label_insert')?></label></div>
-			<div class="form-field-flex"><input id="form_time_insert" name="time_insert" placeholder="[YYYY-MM-DD HH:II:SS]" value="<?=escapeHTML($FORM['DATA']['TIME_INSERT'])?>" /></div>
-		</div>
-		<div class="flex-item">
-			<div class="form-icon-flex"><i class="fa fa-clock-o"></i></div>
-			<div class="form-label-flex"><label for="form_time_update"><?=$Language->text('label_update')?></label></div>
-			<div class="form-field-flex"><input id="form_time_update" name="time_update" placeholder="<?=escapeHTML($FORM['DATA']['TIME_UPDATE'] ? $FORM['DATA']['TIME_UPDATE'] : '[CURRENT_TIMESTAMP]')?>" value="" /></div>
-		</div>
-	</div>
-	<div class="flex flex-direction-column">
-		<div id="button-list-wrapper">
-			<ul id="markdown-list" class="button-list markdown">
-				<li data-markdown="bold" class="fa fa-bold" title="<?=$Language->text('markdown_bold')?>"></li>
-				<li data-markdown="italic" class="fa fa-italic" title="<?=$Language->text('markdown_italic')?>"></li>
-				<li data-markdown="heading" class="fa fa-header" title="<?=$Language->text('markdown_heading')?>"></li>
-				<li data-markdown="link" class="fa fa-link" title="<?=$Language->text('markdown_link')?>"></li>
-				<li data-markdown="image" class="fa fa-picture-o" title="<?=$Language->text('markdown_image')?>"></li>
-				<li data-markdown="code" class="fa fa-code" title="<?=$Language->text('markdown_code')?>"></li>
-				<li data-markdown="quote" class="fa fa-quote-right" title="<?=$Language->text('markdown_quote')?>"></li>
-				<li data-markdown="list_ul" class="fa fa-list-ul" title="<?=$Language->text('markdown_list_ul')?>"></li>
-				<li data-markdown="list_ol" class="fa fa-list-ol" title="<?=$Language->text('markdown_list_ol')?>"></li>
-			</ul>
-		</div>
-		<textarea id="content-editor" name="body" placeholder="[…]"><?=escapeHTML($FORM['DATA']['BODY'])?></textarea>
-	</div>
-	<div class="flex flex-padding background flex-emoticons">
-		<ul id="emoticon-list" class="button-list emoticons">
-			<?php foreach(getEmoticons() as $emoticon => $data):?>
-				<li data-emoticon="<?=$emoticon?>" title="<?=$data[1]?>"><?=$data[0]?></li>
-			<?php endforeach; ?>
-		</ul>
-	</div>
-	<div class="flex flex-padding background">
-		<input id="form_argv" name="argv" maxlength="250" placeholder="[ARGUMENT_ONE=foo|ARGUMENT_TWO=bar …]" value="<?=escapeHTML($FORM['DATA']['ARGV'])?>" />
-	</div>
-<?php else: ?>
-	<div class="flex flex-padding background flex-direction-column">
-		<?=$HTML?>
-	</div>
-<?php endif; ?>
-
-	<div class="flex flex-padding background">
-		<?php if($FORM['TYPE'] === 'INSERT'): ?>
-			<input id="insert-button" type="submit" name="insert" value="<?=$Language->text('insert')?>" />
-		<?php elseif($FORM['TYPE'] === 'UPDATE'): ?>
-			<input id="update-button" type="submit" name="update" value="<?=$Language->text('update')?>" />
-		<?php elseif($FORM['TYPE'] === 'DELETE'): ?>
-			<input id="delete-button" type="submit" name="delete" value="<?=$Language->text('delete')?>" data-text="<?=$Language->text('sure')?>" />
-		<?php endif; ?>
-	</div>
-</form>
\ No newline at end of file
diff --git a/template/admin/html/user/index.php b/template/admin/html/user/index.php
deleted file mode 100644
index aae8ee8..0000000
--- a/template/admin/html/user/index.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<h1><i class="fa fa-user"></i><?=$Language->text('user_overview')?></h1>
-<p class="actions-before"><?=$Language->text('overview_user_desc')?></p>
-<ul class="actions">
-	<li><a href="<?=Application::getAdminURL('user/insert.php')?>" title="<?=$Language->text('insert_user')?>"><i class="fa fa-pencil-square-o"></i><?=$Language->text('insert')?></a></li>
-</ul>
-
-<div class="item-container user">
-	<?php foreach($LIST['USERS'] as $user): ?>
-		<?php echo $user; ?>
-	<?php endforeach; ?>
-</div>
-
-<?=$PAGINATION['HTML']?>
\ No newline at end of file
diff --git a/template/admin/html/user/insert.php b/template/admin/html/user/insert.php
deleted file mode 100644
index 5cbdd06..0000000
--- a/template/admin/html/user/insert.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<h1><i class="fa fa-pencil-square-o"></i><?=$Language->text('insert_user')?></h1>
-<p><?=$Language->text('insert_user_desc')?></p>
-
-<?=$HTML?>
\ No newline at end of file
diff --git a/template/admin/html/user/item.php b/template/admin/html/user/item.php
deleted file mode 100644
index d8e43cf..0000000
--- a/template/admin/html/user/item.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<article class="item">
-	<header>
-		<h2><i class="fa fa-user"></i><?=escapeHTML($USER['ATTR']['FULLNAME'])?></h2>
-		<div>
-			<span class="brackets item-id">#<?=$USER['ATTR']['ID']?></span>
-			<time class="brackets" datetime="<?=$USER['ATTR']['TIME_INSERT']?>"><?=parseDatetime($USER['ATTR']['TIME_INSERT'], $Language->text('date_format'))?></time>
-		</div>
-	</header>
-	<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><?=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><span class="hidden"><?=$Language->text('select_user')?></span></a></li>
-			<li><a href="<?=Application::getAdminURL("user/update.php?id={$USER['ATTR']['ID']}")?>" title="<?=$Language->text('update_user')?>"><i class="fa fa-pencil-square-o"></i><span class="hidden"><?=$Language->text('update_user')?></span></a></li>
-			<li><a href="<?=Application::getAdminURL("user/delete.php?id={$USER['ATTR']['ID']}")?>" title="<?=$Language->text('delete_user')?>"><i class="fa fa-trash-o"></i><span class="hidden"><?=$Language->text('delete_user')?></span></a></li>
-		</ul>
-	</footer>
-</article>
\ No newline at end of file
diff --git a/template/admin/html/user/update.php b/template/admin/html/user/update.php
deleted file mode 100644
index e023925..0000000
--- a/template/admin/html/user/update.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<h1><i class="fa fa-pencil-square-o"></i><?=$Language->text('update_user')?></h1>
-<p><?=$Language->text('update_user_desc')?></p>
-
-<?=$HTML?>
\ No newline at end of file