New plugin loader, page features, API0.2b, Bugfixes

2016-11-19 16:13:37 +01:00
parent 6d1eef25ca
commit b97faf21fd
230 changed files with 36532 additions and 36346 deletions
--- a/.htaccess
+++ b/.htaccess
@@ -0,0 +1,13 @@
+RewriteEngine On
+
+RewriteBase /
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteCond %{REQUEST_FILENAME} !-l
+RewriteRule ^(.*) index.php?pathsec=$1 [QSA]
+
+php_value display_errors On
+
+Options -Indexes
+
+Redirect 301 /sitemap.xml /plugins/sitemap-xml/sitemap.php
--- a/api.php
+++ b/api.php
@@ -4,7 +4,7 @@ require_once 'core.php';

 header('Content-type: application/json');

-$blog = new blog();
+$blog = new blog(false, 0, true, (isset($_GET['no']) ? $_GET['no'] : fasle));
 $entries = array();

 if ($blog->entries)
--- a/core.php
+++ b/core.php
@@ -4,16 +4,21 @@
 session_start();

 // REALLY NICE ERROR PAGE KINDA THING
-function nice_error($err, $errstr = false)
+function nice_error($err, $errstr = false, $file, $line)
 {
 	if ($errstr) { $errno = $err; $err = $errstr; }
 	if (($errstr && $errno != 2048) || !$errstr)
-		die('<!doctype html><html><head><title>Insanely</title><meta charset="utf-8" /></head><body><h1>So bad...</h1><p><img style="width: 260px" src="/data/imgs/coding_in_progress.jpg" alt=""/></p><p>'.$err.(isset($errno) ? ' ('.$errno.')' : '').'</p></body></html>');
+	{
+		ob_end_clean();
+		header('Content-type: text/plain');
+		die($err.(isset($errno) ? ' ('.$errno.')' : '')." [$file] <$line>");
+	}
 }
 set_error_handler('nice_error');

 // LOAD CONFIG
-require_once 'config.php';
+define('_FS_PATH', dirname(__FILE__).'/');
+require_once _FS_PATH.'config.php';

 // FEEDBACK
 $info = array();
@@ -34,7 +39,7 @@ $_sql->query("SET NAMES ".DBCHAR);
 $_sql->query("SET CHARACTER SET ".DBCHAR);

 // LANGUAGE
-$_locale = (array)json_decode(file_get_contents('includes/locale/hu_HU.lng'));
+$_locale = (array)json_decode(file_get_contents(_FS_PATH.'includes/locale/hu_HU.lng'));

 // OTHER CLEVER STUFFS
 function clear_cache() { header("Cache-Control: no-cache, must-revalidate"); header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); }
@@ -45,17 +50,17 @@ function sqlprot($in) { global $_sql; return $_sql->real_escape_string($in); }

 function trimlink($in, $length = 140) { $in = html_entity_decode(strip_tags($in)); if (strlen($in) > $length) return substr($in, 0, $length-3).'...'; return $in; }

-$set = $_sql->query("SELECT * FROM settings");
-while ($data = $set->fetch_assoc())
-	$_set[$data['variable']] = $data['value'];
+// SETTINGS
+require_once _FS_PATH.'includes/settings.class.php';
+$_set = settings::getdata();


 // CLASSES
-require_once 'includes/user.class.php';
-require_once 'includes/blog.class.php';
-require_once 'includes/page.class.php';
-require_once 'includes/check.class.php';
-require_once 'includes/comment.class.php';
+require_once _FS_PATH.'includes/user.class.php';
+require_once _FS_PATH.'includes/blog.class.php';
+require_once _FS_PATH.'includes/page.class.php';
+require_once _FS_PATH.'includes/check.class.php';
+require_once _FS_PATH.'includes/comment.class.php';


 // FUNCTIONS
@@ -65,26 +70,29 @@ function get_profile_link($slug = false, $p = false)		{ global $_set; $prefix =
 function get_profile_picture($userData = false, $p = false)	{ global $_set; $prefix = ($p ? $_set['url'] : ''); if (!$userData) if (LOGGEDIN) { global $user; $userData = $user;} else $userData = array('userPic'=>0); return $prefix.($userData['userPic'] ? "/data/profile_pics/$userData[userId].jpg" : '/data/imgs/'.$_set['defaultProfilePic']); }
 function get_current_link($p = false)						{ global $_set, $seo; $prefix = ($p ? $_set['url'] : ''); $link = ''; for ($i = 0; $i < sizeof($seo); $i++) $link .= '/'.$seo[$i]; return $prefix.($_set['seo'] ? $link : '/?pathsec='.$link); }

-function get_theme_lib() { global $_set; if (file_exists('themes/'.$_set['mainTheme'])) return 'themes/'.$_set['mainTheme']; return false; }
+function get_theme_lib() { global $_set; if (file_exists(_FS_PATH.'themes/'.$_set['mainTheme'])) return 'themes/'.$_set['mainTheme']; return false; }
 function get_theme()
 {
 	global $_set;
-	if (file_exists('themes/'.$_set['mainTheme'].'/template.php'))
-		return 'themes/'.$_set['mainTheme'].'/template.php';
+	if (file_exists(_FS_PATH.'themes/'.$_set['mainTheme'].'/template.php'))
+		return _FS_PATH.'themes/'.$_set['mainTheme'].'/template.php';
 	return false;
 }
 function get_site_link() { global $_set; return $_set['url']; }
 function get_site_body() { global $output; return output_replacer($output); }

-function get_navigation($append = '')
+function get_navigation($append = '', $returnarray = false)
 {
 	global $_locale, $_sql, $seo, $_title;
 	$navLinks = array();
 	if ($seo[0] && isset($_title[0])) array_push($navLinks, array('link' => '/', 'title' => $_locale['home']));
-	$navQuery = $_sql->query("SELECT pageSlug, pageTitle FROM pages ORDER BY pageTitle ASC");
+	$navQuery = $_sql->query("SELECT pageSlug, pageTitle FROM pages WHERE pageDeleted IS NULL ORDER BY pageTitle ASC");
 	while ($navData = $navQuery->fetch_assoc())
 		array_push($navLinks, array('link' => get_page_link($navData['pageSlug']), 'title' => $navData['pageTitle']));

+	if ($returnarray)
+		return $navLinks;
+
 	for ($i = 0; $i < sizeof($navLinks); $i++)
 	{
 		$link = explode('/', $navLinks[$i]['link']);
@@ -223,7 +231,7 @@ function entry_replacer($in)
 	$replace[] = '<iframe style="width: 100%; height: 10em; border: 0; padding: 0; margin: 0;" class="music" src="http://music.sandros.hu/shared/$1?volume=50"></iframe>';

 	$pattern[] = '#\[youtube=(.*?)\]#';
-	$replace[] = '<iframe style="width: 100%; height: 600px; border: 0; padding: 0; margin: 0;" class="youtube" src="http://www.youtube-nocookie.com/embed/$1"></iframe>';
+	$replace[] = '<iframe style="width: 100%; height: 600px; border: 0; padding: 0; margin: 0;" class="youtube" src="http://www.youtube.com/embed/$1"></iframe>';

 	$pattern[] = '#\[spoiler\](.*?)\[/spoiler\]#';
 	$replace[] = '<div class="spoiler"><div class="spoiler_b"><button onclick="spoilerToggle($(this))">'.$_locale['show_hidden_content'].'</button><div style="display:none" class="spoiler_c">$1</div></div>';
@@ -273,7 +281,7 @@ function output_replacer($in)
 /* LOGIN SYSTEM */
 if (isset($_COOKIE['filtr_token']))
 {
-	require_once 'includes/filtr.class.php';
+	require_once _FS_PATH.'includes/filtr.class.php';

 	$filtr = new filtrLogin();
 	$filtr->cache = '/tmp/';
--- a/includes/admin/dashboard.php
+++ b/includes/admin/dashboard.php
@@ -4,4 +4,5 @@
 	<li><a href='/admin/entry'>{locale:entry_editor}</a></li>
 	<li><a href='/admin/plugins'>{locale:plugin_manager}</a></li>
 	<li><a href='/admin/page'>{locale:page_editor}</a></li>
+	<li><a href='/admin/settings'>{locale:site_settings}</a></li>
 </ul>
--- a/includes/admin/entry.php
+++ b/includes/admin/entry.php
@@ -82,20 +82,20 @@ if (isset($seo[2]) && $user['userLevel'] > 2)
 	if ($timedQuery->num_rows)
 	{
 		echo "<h1>{locale:timed_entries}</h1>";
-		echo "<table class='designed timed'><tr><td>{locale:entry_title}</td><td>{locale:created_on}</td><td>{locale:timed_pub_date}</td></tr>";
+		echo "<table class='designed timed'><thead><tr><th>{locale:entry_title}</th><th>{locale:created_on}</th><th>{locale:timed_pub_date}</th></tr></thead><tbody>";
 		while ($data = $timedQuery->fetch_assoc())
 			echo "<tr><td><a href='".get_entry_link($data['entrySlug'])."'>$data[entryTitle]</a></td><td>".show_date($data['entryCreated'])."</td><td>".show_date($data['entryPublished'])."</td></tr>";
-		echo "</table>";
+		echo "</tbody></table>";
 	}

 	$hiddenQuery = $_sql->query("SELECT entrySlug, entryTitle, entryCreated, entryPublished FROM entries WHERE entryHidden IS NOT NULL");
 	if ($hiddenQuery->num_rows)
 	{
 		echo "<h1>{locale:hidden_entries}</h1>";
-		echo "<table class='designed timed'><tr><td>{locale:entry_title}</td><td>{locale:created_on}</td><td>{locale:timed_pub_date}</td></tr>";
+		echo "<table class='designed timed'><thead><tr><th>{locale:entry_title}</th><th>{locale:created_on}</th><th>{locale:timed_pub_date}</th></tr></thead><tbody>";
 		while ($data = $hiddenQuery->fetch_assoc())
 			echo "<tr><td><a href='".get_entry_link($data['entrySlug'], null, true)."'>$data[entryTitle]</a></td><td>".show_date($data['entryCreated'])."</td><td>".show_date($data['entryPublished'])."</td></tr>";
-		echo "</table>";
+		echo "</tbody></table>";
 	}
 }
 ?>
@@ -132,7 +132,7 @@ if (isset($entryData))
 	if ($tags->num_rows)
 	{
 		echo "<h3>{locale:tags}</h3>";
-		echo "<table class='designed'><tr><td>{locale:tag_name}</td><td>{locale:add}</td></tr>"
+		echo "<table class='designed'><thead><tr><th>{locale:tag_name}</th><th>{locale:add}</th></tr></thead><tbody>"
 				."<form action='".get_current_link()."' method='post' name='tagentry'>"
 				."<input type='hidden' name='entryId' value='$entryData[entryId]' />"
 				."<input type='hidden' name='entryTag' value='true' />";
@@ -141,7 +141,7 @@ if (isset($entryData))
 			echo "<tr><td>$tag[tagName]</td><td>".($_sql->query("SELECT taggedId FROM tagged WHERE taggedEntry = $entryData[entryId] AND taggedTag = $tag[tagId]")->num_rows ? "<button type='submit' name='tagIdRemove' value='$tag[tagId]'>{locale:remove}</button>":"<button type='submit' name='tagId' value='$tag[tagId]'>{locale:add}</button>")."</td></tr>";

 		echo "</form>"
-			."</table>";
+			."</tbody></table>";
 	}
 }
 ?>
--- a/includes/admin/main.php
+++ b/includes/admin/main.php
@@ -12,6 +12,12 @@ switch ($seo[1])
 		exit;
 	break;

+	case 'settings':
+		if ($user['userLevel'] < 3) redirect();
+		addTitle($_locale['site_settings']);
+		include 'includes/admin/settings.php';
+	break;
+
 	case 'plugins':
 		if ($user['userLevel'] < 3) redirect();
 		addTitle($_locale['plugin_manager']);
--- a/includes/admin/page.php
+++ b/includes/admin/page.php
@@ -19,18 +19,27 @@ if (isset($_POST['pageContent']) && isset($_POST['pageSlug']) && $user['userLeve

 }

+if (isset($_POST['page_delete']))
+{
+	$page = new page($_POST['page_delete']);
+	if ($page -> delete())	array_push($info, $_locale['page_deleted']);
+	else					array_push($error, $_locale['page_delete_failed']);
+}
+
 if (isset($seo[2]))
 	$page = new page($seo[2]);
 else
 {
-	$pagesQuery = $_sql->query("SELECT pageSlug, pageTitle FROM pages");
+	$pagesQuery = $_sql->query("SELECT pageSlug, pageTitle, pageCreated, pageModified, pageDeleted FROM pages ORDER BY pageDeleted ASC, pageTitle ASC");
 	if ($pagesQuery->num_rows)
 	{
 		echo "<h1>{locale:pages}</h1>";
-		echo "<table class='designed pages'><tr><td>{locale:page_title}</td></tr>";
+		echo "<form action='".get_current_link()."' method='post' name='page-delete'>";
+		echo "<table class='designed pages'><thead><tr><th>{locale:page_title}</th><th>{locale:page_modified}</th><th>{locale:page_delete}</th></tr></thead><tbody>";
 		while ($data = $pagesQuery->fetch_assoc())
-			echo "<tr><td><a href='/admin/page/$data[pageSlug]'>$data[pageTitle]</a></td></tr>";
-		echo "</table>";
+			echo "<tr><td><a href='/admin/page/$data[pageSlug]'>$data[pageTitle]</a></td><td>".date($_set['dateformat'], $data['pageModified'] > $data['pageCreated'] ? $data['pageModified'] : $data['pageCreated'])."</td><td>".($data['pageDeleted'] ? date($_set['dateformat'], $data['pageDeleted']) : "<button type='submit' name='page_delete' value='$data[pageSlug]'>{locale:delete}</button>")."</td></tr>";
+		echo "</tbody></table>";
+		echo "</form>";
 	}
 }
 ?>
--- a/includes/admin/plugins.php
+++ b/includes/admin/plugins.php
@@ -1,6 +1,6 @@
 <?php

-if (isset($_POST['pluginId']) && isnum($_POST['pluginId']))
+if (isset($_POST['pluginId']) && is_numeric($_POST['pluginId']))
 {
 	if ($_sql->query("UPDATE plugins SET pluginStatus = ".(isset($_POST['pluginEnable']) ? 1 : 0)." WHERE pluginId = $_POST[pluginId]"))
 		redirect(get_current_link());
@@ -15,7 +15,7 @@ $plugins = array();
 if ($pluginsQuery->num_rows)
 {
 	echo "<table class='designed plugins'>";
-	echo "<tr><td>{locale:plugin_name}</td><td>{locale:description}</td><td>{locale:scope}</td><td>{locale:status}</td></tr>";
+	echo "<thead><tr><th>{locale:plugin_name}</th><th>{locale:description}</th><th>{locale:scope}</th><th>{locale:status}</th></tr></thead><tbody>";
 	while ($data = $pluginsQuery->fetch_assoc())
 	{
 		$pinfo = './plugins/'.$data['pluginLib'].'/info.json';
@@ -23,15 +23,16 @@ if ($pluginsQuery->num_rows)
 		{
 			$pinfo = (array)json_decode(file_get_contents($pinfo));

-			if ($data['pluginStatus'])
-				$button = "<button name='pluginDisable' class='orange'>{locale:disable}</button>";
-			else $button = "<button name='pluginEnable'>{locale:enable}</button>";
+			if (!isset($pinfo['enabler']) || (isset($pinfo['enabler']) && in_array($pinfo['enabler'], ['true', '1', 'yes', 'y'])))
+				if ($data['pluginStatus'])	$button = "<button name='pluginDisable' class='orange'>{locale:disable}</button>";
+				else						$button = "<button name='pluginEnable'>{locale:enable}</button>";
+			else							$button = "{locale:plugin_noenable}";

 			echo "<tr><td>$pinfo[name]</td><td>$pinfo[description]<td>$pinfo[paths]</td><td><form action='".get_current_link()."' method='post'><input type='hidden' name='pluginId' value='$data[pluginId]'/>$button</form></td></tr>";
 		}
 		array_push($plugins, $data['pluginLib']);
 	}
-	echo "</table>";
+	echo "</tbody></table>";
 } else
 	echo "<p>$_locale[plugins_empty]</p>";

--- a/includes/admin/settings.php
+++ b/includes/admin/settings.php
@@ -0,0 +1,47 @@
+<?php
+	if (isset($_POST['save_settings']))
+	{
+		$fail = false;
+		$settings = new settings();
+
+		foreach ($_POST AS $var => $val)
+			if (substr($var, 0, 13) == 'settings_var_')
+			{
+				$var = substr($var, 13, strlen($var) - 13);
+				if (isset($_set[$var]) && $_set[$var] != $val)
+					if (!$settings -> update($var, $val))
+						$fail = true;
+			}
+
+		if ($fail)	array_push($error, $_locale['settings_update_failed']);
+		else		array_push($info, $_locale['settings_updated']);
+
+		unset($fail);
+		unset($var);
+		unset($settings);
+
+	}
+	$_set_settings = settings::getdata();
+?>
+<h1>{locale:site_settings}</h1>
+<form action="<?=get_current_link()?>" method="post" name="entry-edit">
+<table class="designed settings">
+	<thead>
+		<tr>
+			<th>{locale:settings_variable}</th>
+			<th>{locale:settings_value}</th>
+		</tr>
+	</thead>
+	<tbody>
+	<?php foreach ($_set_settings AS $var => $val): ?>
+		<tr>
+			<td>{locale:settings_var_<?=$var?>}</td>
+			<td><input type="text" name="settings_var_<?=$var?>" value="<?=htmlentities($val)?>" /></td>
+		</tr>
+	<?php endforeach; unset($_set_settings); ?>
+	</tbody>
+</table>
+
+<button type="submit" name="save_settings" value="1">{locale:settings_save}</button>
+
+</form>
--- a/includes/blog.class.php
+++ b/includes/blog.class.php
@@ -9,21 +9,28 @@ class blog
 	public $perpage = 10;
 	public $entries = 0;

-	public function __construct($entry = false, $page = 1)
+	public function __construct($entry = false, $page = 1, $getall = false, $limit = false)
 	{
 		global $_set, $_sql;

-		$this->perpage = $_set['entriesPerPage'];
-		if ($entry)
-		{
-			$this->query = $_sql->query("SELECT entries.*, users.userName AS userName, users.userPublicName AS publicName FROM entries INNER JOIN users ON userId = entryBy WHERE entrySlug = '".sqlprot($entry)."' LIMIT 1");
-			if ($this->query->num_rows)
+ 		if (!$getall)
+ 		{
+			$this->perpage = $_set['entriesPerPage'];
+			if ($entry)
 			{
-				$this->entries = 1;
+				$this->query = $_sql->query("SELECT entries.*, users.userId AS userId, users.userName AS userName, users.userPublicName AS publicName FROM entries INNER JOIN users ON userId = entryBy WHERE entrySlug = '".sqlprot($entry)."' LIMIT 1");
+				if ($this->query->num_rows)
+				{
+					$this->entries = 1;
+				}
+			} else
+			{
+				$this->query = $_sql->query("SELECT entries.*, users.userId AS userId, users.userName AS userName, users.userPublicName AS publicName FROM entries INNER JOIN users ON userId = entryBy WHERE entryHidden IS NULL AND entryPublished <= ".time()." ORDER BY entryPinned DESC, entryPublished DESC, entryId DESC LIMIT ".$this->perpage." OFFSET ".(($page-1) * $this->perpage)."");
+				$this->entries = $this->query->num_rows;
 			}
 		} else
 		{
-			$this->query = $_sql->query("SELECT entries.*, users.userName AS userName, users.userPublicName AS publicName FROM entries INNER JOIN users ON userId = entryBy WHERE entryHidden IS NULL AND entryPublished <= ".time()." ORDER BY entryPinned DESC, entryPublished DESC, entryId DESC LIMIT ".$this->perpage." OFFSET ".(($page-1) * $this->perpage)."");
+			$this->query = $_sql->query("SELECT * FROM entries ORDER BY entryPublished DESC".($limit && is_numeric($limit) ? ' LIMIT '.$limit : null));
 			$this->entries = $this->query->num_rows;
 		}
 	}
--- a/includes/locale/hu_HU.lng
+++ b/includes/locale/hu_HU.lng
@@ -84,6 +84,10 @@

 	"pages": "Oldalak",
 	"page_editor": "Oldal szerkesztése",
+	"page_delete":	"Oldal törlése",
+	"page_delete_failed":	"Az oldal törlése sikertelen.",
+	"page_deleted":	"Az oldal sikeresen törölve.",
+	"page_modified":	"Módosítva",
 	"page_title": "Az oldal címe",
 	"page_slug":	"Az oldal linkje (example.org/page/ez-itt)",
 	"page_added":	"Az oldal mentése sikeresen megtörtént.",
@@ -116,11 +120,39 @@
 	"plugins":					"Bővítmények",
 	"plugin_name":				"Név",
 	"scope":					"Hatáskör",
+	"plugin_noenable":			"Static",
 	"plugins_empty":			"Nincsenek elérhető bővítmények.",
 	"plugin_added":				"Bővítmény sikeresen hozzáadva.",
 	"plugin_not_added":			"A bővítmény nem lett hozzáadva.",
 	"plugin_not_updated":		"A beállítást nem lehet elvégezni.",

+	"site_settings":					"Oldal beállításai",
+	"settings":							"Beállítások",
+	"settings_save":					"Beállítások mentése",
+	"settings_update_failed":			"Nem sikerült minden beállítást frissíteni.",
+	"settings_updated":					"A beállítások frissítése sikeresen megtörtént.",
+	"settings_variable":				"Beállítás",
+	"settings_value":					"Érték",
+	"settings_var_allowedPicTypes":		"Engedélyezett képek (mime)",
+	"settings_var_dateformat":			"Dátum formátum",
+	"settings_var_dateformatShort":		"Rövid dátum formátum",
+	"settings_var_defaultProfilePic":	"Alap profilkép",
+	"settings_var_description":			"Oldal leírása (meta)",
+	"settings_var_entriesPerPage":		"Bejegyzések oldalanként",
+	"settings_var_filtr_appid":			"Filtr. App ID",
+	"settings_var_filtr_apptoken":		"Filtr. App Token",
+	"settings_var_keywords":			"Oldal kulcsszavai (meta)",
+	"settings_var_mainTheme":			"Megjelenés könyvtára",
+	"settings_var_seo":					"SEO linkek",
+	"settings_var_subEntry":			"Bejegyzések aloldala",
+	"settings_var_subPage":				"Oldalak aloldala",
+	"settings_var_subProfile":			"Porfilok aloldala",
+	"settings_var_tagline":				"Megjelenítendő leírás",
+	"settings_var_title":				"Oldal címe",
+	"settings_var_titleFormat":			"Oldal címének formátuma",
+	"settings_var_twitter_site":		"Twitter felhasználó",
+	"settings_var_url":					"Oldal URL-je",
+
 	"comments": "Hozzászólások",
 	"post_reply": "Válasz",
 	"share_impressions": "Oszd meg a véleményed...",
--- a/includes/main/entries.php
+++ b/includes/main/entries.php
@@ -16,11 +16,11 @@ else
 	{
 		while ($data = $blog->entries())
 			echo "<article>
-					<header>
-						<h2><a href='".get_entry_link($data['entrySlug'])."'>".htmlspecialchars($data['entryTitle'])."</a></h2>
-						<p class='meta'><time class='date' title='{locale:published_on}'>".show_date($data['entryPublished'])."</time><a href='".get_profile_link($data['userName'])."' class='by' title='{locale:entry_by}'>$data[publicName]</a>".get_entry_admin($data)."</p>
+					<header itemscope itemtype='http://schema.org/Article'>
+						<h2><a href='".get_entry_link($data['entrySlug'])."' itemprop='name'>".htmlspecialchars($data['entryTitle'])."</a></h2>
+						<p class='meta'><time class='date' title='{locale:published_on}' itemprop='datePublished' content='".date('Y-m-d', $data['entryPublished'])."'>".show_date($data['entryPublished'])."</time><span itemprop='author' itemscope itemtype='http://schema.org/Person'><a href='".get_profile_link($data['userName'])."' class='by' title='{locale:entry_by}' itemprop='url'><span itemprop='name'>$data[publicName]</span></a></span>".get_entry_admin($data)."</p>
 					</header>
-					<div class='content'>".entry_show_init($data['entryContent'], $data['entrySlug'])."</div>
+					<div class='content' itemprop='articleBody'>".entry_show_init($data['entryContent'], $data['entrySlug'])."</div>
 				</article>\n";
 		echo "<p class='paginator'>".(isset($seo[1]) && isnum($seo[1]) ? "<a href='/p/".($seo[1]+1)."'>{locale:next_page}</a><a href='/p/".($seo[1]-1)."'>{locale:prev_page}</a>" : "<a href='/p/2'>{locale:next_page}</a>")."</p>";
 	} else
--- a/includes/main/entry.php
+++ b/includes/main/entry.php
@@ -23,12 +23,14 @@ else
 			else
 			{
 				addDescription(entry_show_init($data['entryContent'], $data['entrySlug']));
-				addImage((preg_match('/< *img[^>]*src *= *["\']?([^"\']*)/i', $data['entryContent'], $images) ? $images[1] : 0));
+				addImage($data['entryHeader']);
 				headerImage($data['entryHeader']);
-				echo "<article class='full'>
-						<h2>".htmlspecialchars($data['entryTitle'])."</h2>
-						<div class='content'>".entry_show_all($data['entryContent'])."</div>
-						<p class='meta'><time class='date' title='{locale:published_on}'>".show_date($data['entryPublished'])."</time><a href='".get_profile_link($data['userName'])."' class='by' title='{locale:entry_by}'>$data[publicName]</a>".get_entry_admin($data)."</p>
+				echo "<article class='full' itemscope itemtype='http://schema.org/Article'>
+						<h2 itemprop='name'>".htmlspecialchars($data['entryTitle'])."</h2>
+						<div class='hidden' itemprop='headline'>".htmlspecialchars($data['entryTitle'])."</div>
+						".($data['entryHeader'] ? "<img class='hidden' itemprop='image' src='$data[entryHeader]' alt='Header image'/>" : null)."
+						<div class='content' itemprop='articleBody'>".entry_show_all($data['entryContent'])."</div>
+						<p class='meta'><time class='date' title='{locale:published_on}' itemprop='datePublished' content='".date('Y-m-d', $data['entryPublished'])."'>".show_date($data['entryPublished'])."</time><span itemprop='author' itemscope itemtype='http://schema.org/Person'><a href='".get_profile_link($data['userName'])."' class='by' title='{locale:entry_by}' itemprop='url'><span itemprop='name'>$data[publicName]</span></a></span>".get_entry_admin($data)."</p>
 					</article>\n";
 			}
 		}
--- a/includes/page.class.php
+++ b/includes/page.class.php
@@ -61,7 +61,7 @@ class page
 		$content = sqlprot($content);

 		if (Check::title($title) && $this->data)
-			if ($_sql->query("UPDATE pages SET pageTitle = '$title', pageContent = '$content' WHERE pageSlug = '".$this->data['pageSlug']."'"))
+			if ($_sql->query("UPDATE pages SET pageTitle = '$title', pageContent = '$content', pageModified = ".time()." WHERE pageSlug = '".$this->data['pageSlug']."' AND pageDeleted IS NULL"))
 				return true;
 		return false;
 	}
@@ -75,7 +75,7 @@ class page
 		$content = sqlprot($content);

 		if (Check::title($title) && Check::slug($slug) && !$this->data)
-			if ($_sql->query("INSERT INTO pages (pageSlug, pageTitle, pageContent) VALUES ('$slug', '$title', '$content')"))
+			if ($_sql->query("INSERT INTO pages (pageSlug, pageTitle, pageContent, pageCreated) VALUES ('$slug', '$title', '$content', ".time().")"))
 				return true;
 		return false;
 	}
@@ -85,7 +85,7 @@ class page
 		global $_sql;

 		if ($this->data)
-			if ($_sql->query("UPDATE pages SET pageDeleted = 1 WHERE pageSlug = '".$this->data['pageSlug']."'"))
+			if ($_sql->query("UPDATE pages SET pageDeleted = ".time()." WHERE pageSlug = '".$this->data['pageSlug']."'"))
 				return true;
 		return false;
 	}
--- a/includes/settings.class.php
+++ b/includes/settings.class.php
@@ -0,0 +1,32 @@
+<?php
+
+class settings
+{
+
+
+	public function __construct() {}
+
+	public static function getdata()
+	{
+		global $_sql;
+
+		$_set = array();
+		$set = $_sql->query("SELECT * FROM settings");
+		while ($data = $set->fetch_assoc())
+			$_set[$data['variable']] = $data['value'];
+
+		return $_set;
+	}
+
+	public function update($var, $val)
+	{
+		global $_sql, $_set;
+
+		if (isset($_set[$var]) && $_sql->query("UPDATE `settings` SET `value` = '".sqlprot($val)."' WHERE `variable` = '".$var."'"))
+			return true;
+
+		return false;
+	}
+
+
+}
--- a/includes/sidebar/sidebar.php
+++ b/includes/sidebar/sidebar.php
@@ -10,13 +10,8 @@ else :
 ?>
 <li>
 	<h2><?=$_locale['login']?></h2>
-	<form action="<?=get_current_link()?>" method="post" name="login-form">
-
-		<input type="text" name="login_name" value="" placeholder="<?=$_locale['username']?>" />
-		<input type="password" name="login_pass" value="" placeholder="<?=$_locale['password']?>" />
-
-		<button type="submit"><?=$_locale['login']?></button>
-
+	<form action="//filtr.sandros.hu/app_login/<?=$_set['filtr_appid']?>&amp;ret" method="get" name="login-form" id="footer-account">
+		<input type="submit" name="login" value="<?=$_locale['login']?>" />
 	</form>
 </li>
 <?php endif;
--- a/index.php
+++ b/index.php
@@ -68,28 +68,19 @@ while ($data = $pluginsQuery->fetch_assoc())
 	$pexec = 'plugins/'.$data['pluginLib'].'/_plugin.php';
 	if (file_exists($pinfo) && file_exists($pexec))
 	{
+		
 		$pinfo = (array)json_decode(file_get_contents($pinfo));
-		$cpath = explode(',', $pinfo['paths']);
-		for ($a = 0; $a < sizeof($cpath); $a++)
-		{
-			$ppath = explode('/', ltrim($cpath[$a], '/'));
-			$load = true;
-			for ($i = 0; $i < sizeof($ppath); $i++)
-				if (isset($seo[$i]) && $seo[$i] == $ppath[$i] && $load)
-					$load = true;
-				else
-					$load = false;
-			if ($load)
+		$paths = explode(',', $pinfo['paths']);
+
+		foreach ($paths AS $index => $path)
+			if (fnmatch($path, get_current_link()))
+			{
 				include $pexec;
-		}
-		unset($i);
-		unset($a);
-		unset($pinfo);
-		unset($load);
-		unset($pexec);
-		unset($ppath);
-		unset($cpath);
+				break;
+			}
 	}
+	unset($pinfo);
+	unset($pexec);
 }

 // LOAD THEME
--- a/plugins/ckeditor/info.json
+++ b/plugins/ckeditor/info.json
@@ -1,5 +1,5 @@
 {
 	"name":			"CKeditor",
 	"description":	"A really good text editor.",
-	"paths":		"/admin/entry,/admin/page"
+	"paths":		"/admin/entry*,/admin/page*"
 }
--- a/plugins/ckeditor_simple/info.json
+++ b/plugins/ckeditor_simple/info.json
@@ -1,5 +1,5 @@
 {
 	"name":			"CKeditor Simple",
 	"description":	"Easy to use rich text editor.",
-	"paths":		"/admin/entry"
+	"paths":		"/admin/entry*,/admin/page*"
 }
--- a/plugins/disqus/info.json
+++ b/plugins/disqus/info.json
@@ -1,5 +1,5 @@
 {
 	"name":			"Disqus",
 	"description":	"Disqus comment system for you site. Edit the plugin info before enabling this plugin.",
-	"paths":		"/entry"
+	"paths":		"/entry*"
 }
--- a/plugins/facebook-comments/info.json
+++ b/plugins/facebook-comments/info.json
@@ -1,5 +1,5 @@
 {
 	"name":			"Facebook Comments",
 	"description":	"Facebook comment system under entries.",
-	"paths":		"/entry"
+	"paths":		"/entry*"
 }
--- a/plugins/facebook-root/info.json
+++ b/plugins/facebook-root/info.json
@@ -1,5 +1,5 @@
 {
 	"name":			"Facebook Root",
 	"description":	"Loads the facebook script. Required for every facebook plugins.",
-	"paths":		"/entry"
+	"paths":		"*"
 }
--- a/plugins/facebook-share/info.json
+++ b/plugins/facebook-share/info.json
@@ -1,5 +1,5 @@
 {
 	"name":			"Facebook Share",
 	"description":	"Button to share the article on Facebook.",
-	"paths":		"/entry"
+	"paths":		"/entry*"
 }
--- a/plugins/filtr_stat/info.json
+++ b/plugins/filtr_stat/info.json
@@ -1,5 +1,5 @@
 {
 	"name":			"Filtr. Stat",
-	"description":	"Count visitors, etc.",
-	"paths":		"/,/entry,/page,/p,/user"
+	"description":	"Track visitors, log actions to better understand how others use your site.",
+	"paths":		"*"
 }
--- a/plugins/galleria-io/_plugin.php
+++ b/plugins/galleria-io/_plugin.php
@@ -1,4 +1,4 @@
 <?php

-addHead('<script src="/plugins/galleria-io/galleria.min.js"></script>');
-addBody('<script>if($(".gallery[data-gid]").length){Galleria.loadTheme("/plugins/galleria-io/themes/classic/galleria.classic.min.js");$(".gallery[data-gid]").each(function(){$(this).css("width","100%").css("min-height","500px");Galleria.run(".gallery[data-gid="+$(this).attr("data-gid")+"]");});}</script>');
+addHead('<script src="/plugins/galleria-io/galleria.min.js"></script>', 'galleria-io');
+addBody('<script>if($(".gallery[data-gid]").length){Galleria.loadTheme("/plugins/galleria-io/themes/classic/galleria.classic.min.js");$(".gallery[data-gid]").each(function(){$(this).css("width","100%").css("min-height","500px");Galleria.run(".gallery[data-gid="+$(this).attr("data-gid")+"]");});}</script>', 'galleria-io-js');
--- a/plugins/galleria-io/info.json
+++ b/plugins/galleria-io/info.json
@@ -1,5 +1,5 @@
 {
 	"name":			"Galleria.io",
 	"description":	"Transform your shit into a nice gallery.",
-	"paths":		"/,/p,/entry,/entries"
+	"paths":		"/,/p/*,/page*,/entry*,/entries*"
 }
--- a/plugins/sitemap-xml/_plugin.php
+++ b/plugins/sitemap-xml/_plugin.php
@@ -0,0 +1,2 @@
+<?php
+	addHead('<link rel="sitemap" type="application/xml" title="Sitemap" href="/plugins/sitemap-xml/sitemap.php" />', 'sitemap-xml');
--- a/plugins/sitemap-xml/info.json
+++ b/plugins/sitemap-xml/info.json
@@ -0,0 +1,6 @@
+{
+	"name":			"Sitemap XML",
+	"description":	"Generates an XML file with the pages and posts all included.",
+	"paths":		"/page/*",
+	"enabler":		"yes"
+}
--- a/plugins/sitemap-xml/sitemap.php
+++ b/plugins/sitemap-xml/sitemap.php
@@ -0,0 +1,21 @@
+<?php
+	header('Content-type: application/xml');
+
+	require_once "../../core.php";
+?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
+	<url>
+		<loc>https://sandros.hu/</loc>
+		<changefreq>monthly</changefreq>
+	</url>
+<?php
+	$blog = new blog(null, null, true);
+	if ($blog->entries)
+		while ($data = $blog->entries())
+			echo "\t<url>\n\t\t<loc>".$_set['url'].get_entry_link($data['entrySlug'])."</loc>\n\t\t<changefreq>monthly</changefreq>\n\t</url>";
+
+	$nav = get_navigation(null, true);
+	foreach ($nav AS $index => $n)
+		echo "\t<url>\n\t\t<loc>".$_set['url'].$n['link']."</loc>\n\t\t<changefreq>monthly</changefreq>\n\t</url>";
+?>
+</urlset>
--- a/robots.txt
+++ b/robots.txt
@@ -0,0 +1,3 @@
+User-Agent: *
+Disallow: 
+Allow: /
--- a/themes/murkyhellyeah/components/entries.php
+++ b/themes/murkyhellyeah/components/entries.php
@@ -4,16 +4,18 @@ if ($blog->entries)
 	while ($data = $blog->entries())
 	{
 		$entry_init = entry_show_init($data['entryContent'], $data['entrySlug']);
-		echo "<article".($data['entryPinned'] ? ' class="pinned"' : null).(strlen(strip_tags($entry_init)) <= 210 ? ' class="tweet"' : null)." title='".show_date($data['entryPublished'])."'>
+		echo "<article".($data['entryPinned'] ? ' class="pinned"' : null).(strlen(strip_tags($entry_init)) <= 210 ? ' class="tweet"' : null)." title='".show_date($data['entryPublished'])."' itemscope itemtype='http://schema.org/Article'>
 				<a href='".get_entry_link($data['entrySlug'])."'><header".($data['entryHeader'] ? " style='background-image:url($data[entryHeader])'" : null).">
 					<div>
-						<h2>".htmlspecialchars($data['entryTitle'])."</h2>
+						<h2 itemprop='name'>".htmlspecialchars($data['entryTitle'])."</h2>
 					</div>
 				</header></a>
-				<div class='content'>".$entry_init."</div>
+				<div class='content' itemprop='articleBody'>".$entry_init."</div>
 				<p class='meta'>
-					<a href='".get_entry_link($data['entrySlug'])."' class='date' title='{locale:published_on}'>".show_date($data['entryPublished'])."</a>
-					<a href='".get_profile_link($data['userName'])."' class='by' title='{locale:entry_by}'>$data[publicName]</a>
+					<a href='".get_entry_link($data['entrySlug'])."' class='date' title='{locale:published_on}' itemprop='datePublished' content='".date('Y-m-d', $data['entryPublished'])."'>".show_date($data['entryPublished'])."</a>
+					<span itemprop='author' itemscope itemtype='http://schema.org/Person'>
+						<a href='".get_profile_link($data['userName'])."' class='by' title='{locale:entry_by}' itemprop='url'><span itemprop='name'>$data[publicName]</span></a>
+					</span>
 				</p>
 			</article>\n";
 		unset($entry_init);
--- a/themes/murkyhellyeah/components/entry.php
+++ b/themes/murkyhellyeah/components/entry.php
@@ -18,14 +18,17 @@ if ($blog->entries)
 			addDescription(entry_show_init($data['entryContent'], $data['entrySlug']));
 			addImage((preg_match('/< *img[^>]*src *= *["\']?([^"\']*)/i', $data['entryContent'], $images) ? $images[1] : 0));
 			headerImage($data['entryHeader']);
-			echo "<article class='full'>";
-					if (strlen($data['entryTitle']) > 50)
-						echo "<header><div><h2>".htmlspecialchars($data['entryTitle'])."</h2></div></header>";
+			echo "<article class='full' itemscope itemtype='http://schema.org/Article'>";
+				echo "<header".(strlen($data['entryTitle']) < 50 ? " class='hidden'" : null)."><div><h2 itemprop='name'>".htmlspecialchars($data['entryTitle'])."</h2></div></header>";
+				echo "<div class='hidden' itemprop='headline'>".htmlspecialchars($data['entryTitle'])."</div>";
+				if ($data['entryHeader']) echo "<img class='hidden' itemprop='image' src='$data[entryHeader]' alt='Header image'/>";

-				echo "<div class='content'>".entry_show_all($data['entryContent'])."</div>
+				echo "<div class='content' itemprop='articleBody'>".entry_show_all($data['entryContent'])."</div>
 					<p class='meta'>
-						<a href='".get_entry_link($data['entrySlug'])."' class='date' title='{locale:published_on}'>".show_date($data['entryPublished'])."</a>
-						<a href='".get_profile_link($data['userName'])."' class='by' title='{locale:entry_by}'>$data[publicName]</a>
+						<a href='".get_entry_link($data['entrySlug'])."' class='date' title='{locale:published_on}' itemprop='datePublished' content='".date('Y-m-d', $data['entryPublished'])."'>".show_date($data['entryPublished'])."</a>
+						<span itemprop='author' itemscope itemtype='http://schema.org/Person'>
+							<a href='".get_profile_link($data['userName'])."' class='by' title='{locale:entry_by}' itemprop='url'><span itemprop='name'>$data[publicName]</span></a>
+						</span>
 						".get_entry_admin($data)."
 				</article>\n";
 		}
--- a/themes/murkyhellyeah/style.css
+++ b/themes/murkyhellyeah/style.css
@@ -477,7 +477,7 @@ div.box.introduction { border-left-color: #dd823b; width: 100%; }
 table.designed,
 table.pro {
 	width: 100%;
-	margin: 0;
+	margin: 0 0 2em 0;
 	padding: 0;
 	background-color: #FFF;
 	border: 1px solid #f2f2f2;
@@ -489,7 +489,6 @@ table button { padding: 0.2em; margin: 0; width: 120px; }

 table.designed td { padding: 0.4em; }
 table.designed tr:nth-child(2n+0) { background: #eaeaea; }
-table.designed tr:first-child { background: #202434; color: #FFF; font-weight: bold; }
 table.designed tr td:first-child { font-weight: bold; }

 table.pro td { padding: 0.4em; }
@@ -497,6 +496,11 @@ table.pro tr:nth-child(2n+0) { background: #eaeaea; }

 table.pro tr td:last-child { text-align: right; }

+table.designed thead th { padding: 0.6em 0.2em; background: #202434; color: #FFF; font-weight: bold; text-align: left; }
+
+table.pages td:last-child { width: 1%; }
+table.settings td:first-child { width: 25%; }
+

 /* Infobars */
 p.phantom {
@@ -532,6 +536,8 @@ p.paginator a:before { font-size: 1.2em; }
 p.paginator a.prev:before { content: '\e047'; }
 p.paginator a.next:before { content: '\e048'; }

+.hidden { display: none; }
+

 /* EXTRA Stuff */
 body.tinyscreen { width: 100%; }
--- a/themes/murkyhellyeah/template.php
+++ b/themes/murkyhellyeah/template.php
@@ -7,11 +7,10 @@
 	<meta name="viewport"	content="width=device-width, initial-scale=1.0, user-scalable=no" />
 	<meta name="generator"	content="Insanely 0.9b" />

-	<link href="/includes/css/ui-lightness/jquery-ui.custom.min.css" rel="stylesheet" />
-	<link href="/<?=get_theme_lib()?>/font/typicons.min.css" rel="stylesheet" />
+	<link href="/includes/css/ui-lightness/jquery-ui.custom.min.css" rel="preload" onload="this.rel='stylesheet'" />
+	<link href="/<?=get_theme_lib()?>/font/typicons.min.css" rel="preload" onload="this.rel='stylesheet'" />
 	<link href="/<?=get_theme_lib()?>/style.css" rel="stylesheet" />
-	<link href="//fonts.googleapis.com/css?family=Archivo+Narrow:400,700%7COpen+Sans:400,300&amp;subset=latin,latin-ext" rel="stylesheet" />
-	<link href="<?=$_set['url']?>/rss" rel="alternate" type="application/rss+xml" title="<?=$_set['title']?>" />
+	<link href="//fonts.googleapis.com/css?family=Archivo+Narrow:400,700%7COpen+Sans:400,300&amp;subset=latin,latin-ext" rel="preload" onload="this.rel='stylesheet'" />

 	<script src="/includes/js/jquery.js"></script>
 	<script src="/includes/js/jquery-ui.custom.min.js"></script>