From 5a6acfdb9a41de038ca044abc75ce674fcc6f219 Mon Sep 17 00:00:00 2001
From: Banana <mail@bananas-playground.net>
Date: Tue, 3 Jan 2023 21:13:38 +0100
Subject: [PATCH] fixed i18n and updated changelog

---
 CHANGELOG                     |  1 +
 webroot/lib/i18n.class.php    |  4 ++--
 webroot/view/_foot.php        |  3 +++
 webroot/view/entry/entry.html | 26 +++++++++++++-------------
 webroot/view/list/list.html   | 13 +++++++------
 5 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 08f75ed..1e70197 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 1.x Atlas -
 	+ i18n. See upgrade-from-1.0.txt for more details.
 	+ PHP 8.1 stuff
+	+ Search
 
 
 1.0 Lykos - 2022-11-12
diff --git a/webroot/lib/i18n.class.php b/webroot/lib/i18n.class.php
index 1bebd80..a7c63e3 100644
--- a/webroot/lib/i18n.class.php
+++ b/webroot/lib/i18n.class.php
@@ -30,9 +30,9 @@ class I18n {
 	 * i18n constructor.
 	 */
 	public function __construct() {
-		$_langFile = ABSOLUTE_PATH.'/lib/i18n/'.$this->_defaultLangToUse.'.ini';
+		$_langFile = PATH_ABSOLUTE.'/lib/i18n/'.$this->_defaultLangToUse.'.ini';
 		if(defined('FRONTEND_LANGUAGE')) {
-			$_langFile = ABSOLUTE_PATH.'/lib/i18n/'.FRONTEND_LANGUAGE.'.ini';
+			$_langFile = PATH_ABSOLUTE.'/lib/i18n/'.FRONTEND_LANGUAGE.'.ini';
 			if(file_exists($_langFile)) {
 				$_langData = parse_ini_file($_langFile);
 				if($_langData !== false) {
diff --git a/webroot/view/_foot.php b/webroot/view/_foot.php
index 308b1d0..45716f3 100644
--- a/webroot/view/_foot.php
+++ b/webroot/view/_foot.php
@@ -1,2 +1,5 @@
+	<footer>
+		<small><a href="https://www.bananas-playground.net/projekt/scientia/" target=_blank>scientia</small>
+	</footer>
 </body>
 </html>
diff --git a/webroot/view/entry/entry.html b/webroot/view/entry/entry.html
index a480212..e8f5c95 100644
--- a/webroot/view/entry/entry.html
+++ b/webroot/view/entry/entry.html
@@ -1,21 +1,21 @@
-<?php if(!empty($TemplateData['data'])) { ?>
-<p>Created: <?php echo Summoner::ifset($TemplateData['data'],'created'); ?>, Updated: <?php echo Summoner::ifset($TemplateData['data'],'modified'); ?></p>
-<?php } ?>
-<form method="post">
-	<textarea rows="25" placeholder="write here" name="fdata[entry]"><?php echo Summoner::ifset($TemplateData['data'],'body'); ?></textarea>
-	<input type="submit" name="submitForm" value="<?php echo $i18n->('form.button.save'); ?>">
-	<input type="checkbox" name="deleteEntry" value="yes" /> <small style="color: indianred"><?php echo $i18n->('form.checkbox.deleteentry'); ?></small>
-</form>
 <p>
-<a href="<?php echo PATH_WEBROOT; ?>"><?php echo $i18n->('text.home'); ?></a>
-<?php if(!empty($TemplateData['data'])) {
+	<a href="<?php echo PATH_WEBROOT; ?>"><?php echo $i18n->t('text.home'); ?></a>
+	<?php if(!empty($TemplateData['data'])) {
 	echo ' | ';
 	$_link = '';
 	foreach($TemplateData['data']['breadcrumb'] as $be) {
 		$_link .= '/'.$be;
 		echo '<a href="'.PATH_WEBROOT.$_link.'">'.$be.'</a> | ';
 	}
-?>
-	<a href="<?php echo PATH_WEBROOT; ?>/new"><?php echo $i18n->('text.new'); ?></a>
-<?php } ?>
+	?>
+	<a href="<?php echo PATH_WEBROOT; ?>/new"><?php echo $i18n->t('text.new'); ?></a>
+	<?php } ?>
 </p>
+<?php if(!empty($TemplateData['data'])) { ?>
+<p>Created: <?php echo Summoner::ifset($TemplateData['data'],'created'); ?>, Updated: <?php echo Summoner::ifset($TemplateData['data'],'modified'); ?></p>
+<?php } ?>
+<form method="post">
+	<textarea rows="25" placeholder="write here" name="fdata[entry]"><?php echo Summoner::ifset($TemplateData['data'],'body'); ?></textarea>
+	<input type="submit" name="submitForm" value="<?php echo $i18n->t('form.button.save'); ?>">
+	<input type="checkbox" name="deleteEntry" value="yes" /> <small style="color: indianred"><?php echo $i18n->t('form.checkbox.deleteentry'); ?></small>
+</form>
diff --git a/webroot/view/list/list.html b/webroot/view/list/list.html
index 5caf839..4c8111b 100644
--- a/webroot/view/list/list.html
+++ b/webroot/view/list/list.html
@@ -1,19 +1,20 @@
 <form method="post">
 	<input type="text" name="searchInput" size="50" />
-	<input type="submit" name="submitForm" value="<?php echo $i18n->('form.button.search'); ?>">
+	<input type="submit" name="submitForm" value="<?php echo $i18n->t('form.button.search'); ?>">
 </form>
-<p>
-	<a href="<?php echo PATH_WEBROOT; ?>/"><?php echo $i18n->('text.home'); ?></a> | <a href="<?php echo PATH_WEBROOT; ?>/new"><?php echo $i18n->('text.new'); ?></a>
-</p>
 <?php if(!empty($TemplateData['entries'])) { ?>
+<p>
+	<a href="<?php echo PATH_WEBROOT; ?>/"><?php echo $i18n->t('text.home'); ?></a> |
 <?php
 	foreach($TemplateData['entries'] as $k=>$v) {
 		$_link = '';
 		foreach($v['breadcrumb'] as $be) {
 			$_link .= '/'.$be;
-			echo '<a href="'.PATH_WEBROOT.$_link.'">'.$be.'</a> ';
+			echo '<a href="'.PATH_WEBROOT.$_link.'">'.$be.'</a> | ';
 		}
 ?>
+	<a href="<?php echo PATH_WEBROOT; ?>/new"><?php echo $i18n->t('text.new'); ?></a>
+<p>
 <ul>
 	<?php foreach($v['e'] as $e) { ?>
 	<li><a href="<?php echo PATH_WEBROOT; ?>/<?php echo $e['link']; ?>"><?php echo $e['ident']; ?></a> <?php echo $e['date']; ?> <?php echo htmlspecialchars($e['body'],ENT_HTML5); ?></li>
@@ -22,5 +23,5 @@
 <?php
 	}
 } else { ?>
-<p><?php echo $i18n->('text.noentries'); ?></p>
+<p><?php echo $i18n->t('text.noentries'); ?></p>
 <?php } ?>
-- 
2.39.5