From f3bf006b9038e23dfe174a0d941481d8453b53a8 Mon Sep 17 00:00:00 2001
From: dignajar <dignajar@gmail.com>
Date: Sun, 15 Nov 2015 18:37:34 -0300
Subject: [PATCH] Support for PHP Built-in in web server

---
 admin/README.md                               |   7 --
 install.php                                   |   2 +-
 {admin => kernel/admin}/controllers/about.php |   0
 .../admin}/controllers/add-user.php           |   0
 .../admin}/controllers/configure-plugin.php   |   0
 .../admin}/controllers/dashboard.php          |   0
 .../admin}/controllers/edit-page.php          |   0
 .../admin}/controllers/edit-post.php          |   0
 .../admin}/controllers/edit-user.php          |   0
 .../admin}/controllers/install-plugin.php     |   0
 .../admin}/controllers/install-theme.php      |   0
 .../admin}/controllers/login-email.php        |   0
 {admin => kernel/admin}/controllers/login.php |   0
 .../admin}/controllers/logout.php             |   0
 .../admin}/controllers/new-page.php           |   0
 .../admin}/controllers/new-post.php           |   0
 .../admin}/controllers/plugins.php            |   0
 .../admin}/controllers/settings-advanced.php  |   0
 .../admin}/controllers/settings-general.php   |   0
 .../admin}/controllers/settings-regional.php  |   0
 .../admin}/controllers/settings.php           |   0
 .../admin}/controllers/themes.php             |   0
 .../admin}/controllers/uninstall-plugin.php   |   0
 .../admin}/controllers/user-password.php      |   0
 {admin => kernel/admin}/controllers/users.php |   0
 .../admin}/themes/default/css/default.css     |   4 ++
 .../themes/default/css/form-file.min.css      |   0
 .../admin}/themes/default/css/installer.css   |   0
 .../default/css/jquery.datetimepicker.css     |   0
 .../admin}/themes/default/css/login.css       |   0
 .../themes/default/css/placeholder.min.css    |   0
 .../themes/default/css/progress.min.css       |   0
 .../default/css/uikit.almost-flat.min.css     |   0
 .../admin}/themes/default/css/upload.min.css  |   0
 .../themes/default/fonts/FontAwesome.otf      | Bin
 .../default/fonts/fontawesome-webfont.eot     | Bin
 .../default/fonts/fontawesome-webfont.ttf     | Bin
 .../default/fonts/fontawesome-webfont.woff    | Bin
 .../default/fonts/fontawesome-webfont.woff2   | Bin
 .../admin}/themes/default/img/favicon.png     | Bin
 .../admin}/themes/default/index.php           |   0
 .../admin}/themes/default/init.php            |  60 ++++++++++++++++++
 .../default/js/jquery.datetimepicker.js       |   0
 .../admin}/themes/default/js/jquery.min.js    |   0
 .../admin}/themes/default/js/uikit.min.js     |   0
 .../admin}/themes/default/js/upload.min.js    |   0
 .../admin}/themes/default/login.php           |   0
 {admin => kernel/admin}/views/about.php       |   0
 {admin => kernel/admin}/views/add-user.php    |   0
 .../admin}/views/configure-plugin.php         |   0
 {admin => kernel/admin}/views/dashboard.php   |   0
 {admin => kernel/admin}/views/edit-page.php   |   0
 {admin => kernel/admin}/views/edit-post.php   |   0
 {admin => kernel/admin}/views/edit-user.php   |  10 +++
 {admin => kernel/admin}/views/login-email.php |   2 +-
 {admin => kernel/admin}/views/login.php       |   2 +-
 .../admin}/views/manage-pages.php             |   0
 .../admin}/views/manage-posts.php             |   0
 {admin => kernel/admin}/views/new-page.php    |   0
 {admin => kernel/admin}/views/new-post.php    |   0
 {admin => kernel/admin}/views/plugins.php     |   0
 .../admin}/views/settings-advanced.php        |   0
 .../admin}/views/settings-general.php         |   0
 .../admin}/views/settings-regional.php        |   0
 {admin => kernel/admin}/views/themes.php      |   0
 .../admin}/views/user-password.php            |   0
 {admin => kernel/admin}/views/users.php       |   0
 kernel/ajax/uploader.php                      |  20 ++++--
 kernel/boot/init.php                          |  10 ++-
 69 files changed, 100 insertions(+), 17 deletions(-)
 delete mode 100644 admin/README.md
 rename {admin => kernel/admin}/controllers/about.php (100%)
 rename {admin => kernel/admin}/controllers/add-user.php (100%)
 rename {admin => kernel/admin}/controllers/configure-plugin.php (100%)
 rename {admin => kernel/admin}/controllers/dashboard.php (100%)
 rename {admin => kernel/admin}/controllers/edit-page.php (100%)
 rename {admin => kernel/admin}/controllers/edit-post.php (100%)
 rename {admin => kernel/admin}/controllers/edit-user.php (100%)
 rename {admin => kernel/admin}/controllers/install-plugin.php (100%)
 rename {admin => kernel/admin}/controllers/install-theme.php (100%)
 rename {admin => kernel/admin}/controllers/login-email.php (100%)
 rename {admin => kernel/admin}/controllers/login.php (100%)
 rename {admin => kernel/admin}/controllers/logout.php (100%)
 rename {admin => kernel/admin}/controllers/new-page.php (100%)
 rename {admin => kernel/admin}/controllers/new-post.php (100%)
 rename {admin => kernel/admin}/controllers/plugins.php (100%)
 rename {admin => kernel/admin}/controllers/settings-advanced.php (100%)
 rename {admin => kernel/admin}/controllers/settings-general.php (100%)
 rename {admin => kernel/admin}/controllers/settings-regional.php (100%)
 rename {admin => kernel/admin}/controllers/settings.php (100%)
 rename {admin => kernel/admin}/controllers/themes.php (100%)
 rename {admin => kernel/admin}/controllers/uninstall-plugin.php (100%)
 rename {admin => kernel/admin}/controllers/user-password.php (100%)
 rename {admin => kernel/admin}/controllers/users.php (100%)
 rename {admin => kernel/admin}/themes/default/css/default.css (98%)
 rename {admin => kernel/admin}/themes/default/css/form-file.min.css (100%)
 rename {admin => kernel/admin}/themes/default/css/installer.css (100%)
 rename {admin => kernel/admin}/themes/default/css/jquery.datetimepicker.css (100%)
 rename {admin => kernel/admin}/themes/default/css/login.css (100%)
 rename {admin => kernel/admin}/themes/default/css/placeholder.min.css (100%)
 rename {admin => kernel/admin}/themes/default/css/progress.min.css (100%)
 rename {admin => kernel/admin}/themes/default/css/uikit.almost-flat.min.css (100%)
 rename {admin => kernel/admin}/themes/default/css/upload.min.css (100%)
 rename {admin => kernel/admin}/themes/default/fonts/FontAwesome.otf (100%)
 rename {admin => kernel/admin}/themes/default/fonts/fontawesome-webfont.eot (100%)
 rename {admin => kernel/admin}/themes/default/fonts/fontawesome-webfont.ttf (100%)
 rename {admin => kernel/admin}/themes/default/fonts/fontawesome-webfont.woff (100%)
 rename {admin => kernel/admin}/themes/default/fonts/fontawesome-webfont.woff2 (100%)
 rename {admin => kernel/admin}/themes/default/img/favicon.png (100%)
 rename {admin => kernel/admin}/themes/default/index.php (100%)
 rename {admin => kernel/admin}/themes/default/init.php (78%)
 rename {admin => kernel/admin}/themes/default/js/jquery.datetimepicker.js (100%)
 rename {admin => kernel/admin}/themes/default/js/jquery.min.js (100%)
 rename {admin => kernel/admin}/themes/default/js/uikit.min.js (100%)
 rename {admin => kernel/admin}/themes/default/js/upload.min.js (100%)
 rename {admin => kernel/admin}/themes/default/login.php (100%)
 rename {admin => kernel/admin}/views/about.php (100%)
 rename {admin => kernel/admin}/views/add-user.php (100%)
 rename {admin => kernel/admin}/views/configure-plugin.php (100%)
 rename {admin => kernel/admin}/views/dashboard.php (100%)
 rename {admin => kernel/admin}/views/edit-page.php (100%)
 rename {admin => kernel/admin}/views/edit-post.php (100%)
 rename {admin => kernel/admin}/views/edit-user.php (88%)
 rename {admin => kernel/admin}/views/login-email.php (81%)
 rename {admin => kernel/admin}/views/login.php (83%)
 rename {admin => kernel/admin}/views/manage-pages.php (100%)
 rename {admin => kernel/admin}/views/manage-posts.php (100%)
 rename {admin => kernel/admin}/views/new-page.php (100%)
 rename {admin => kernel/admin}/views/new-post.php (100%)
 rename {admin => kernel/admin}/views/plugins.php (100%)
 rename {admin => kernel/admin}/views/settings-advanced.php (100%)
 rename {admin => kernel/admin}/views/settings-general.php (100%)
 rename {admin => kernel/admin}/views/settings-regional.php (100%)
 rename {admin => kernel/admin}/views/themes.php (100%)
 rename {admin => kernel/admin}/views/user-password.php (100%)
 rename {admin => kernel/admin}/views/users.php (100%)

diff --git a/admin/README.md b/admin/README.md
deleted file mode 100644
index 46ec6cbf..00000000
--- a/admin/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Bludit
-
-If you are reading this, you must enable rewrite module.
-
-Documentation:
-- http://docs.bludit.com/en/getting-started/requirements
-- http://docs.bludit.com/en/troubleshooting/browser-returns-not-found
\ No newline at end of file
diff --git a/install.php b/install.php
index f2bc046d..b08d9e3d 100644
--- a/install.php
+++ b/install.php
@@ -469,7 +469,7 @@ if( $_SERVER['REQUEST_METHOD'] == 'POST' )
 <!DOCTYPE HTML>
 <html class="uk-height-1-1 uk-notouch">
 <head>
-	<base href="admin/themes/default/">
+	<base href="kernel/admin/themes/default/">
 	<meta charset="<?php echo CHARSET ?>">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 
diff --git a/admin/controllers/about.php b/kernel/admin/controllers/about.php
similarity index 100%
rename from admin/controllers/about.php
rename to kernel/admin/controllers/about.php
diff --git a/admin/controllers/add-user.php b/kernel/admin/controllers/add-user.php
similarity index 100%
rename from admin/controllers/add-user.php
rename to kernel/admin/controllers/add-user.php
diff --git a/admin/controllers/configure-plugin.php b/kernel/admin/controllers/configure-plugin.php
similarity index 100%
rename from admin/controllers/configure-plugin.php
rename to kernel/admin/controllers/configure-plugin.php
diff --git a/admin/controllers/dashboard.php b/kernel/admin/controllers/dashboard.php
similarity index 100%
rename from admin/controllers/dashboard.php
rename to kernel/admin/controllers/dashboard.php
diff --git a/admin/controllers/edit-page.php b/kernel/admin/controllers/edit-page.php
similarity index 100%
rename from admin/controllers/edit-page.php
rename to kernel/admin/controllers/edit-page.php
diff --git a/admin/controllers/edit-post.php b/kernel/admin/controllers/edit-post.php
similarity index 100%
rename from admin/controllers/edit-post.php
rename to kernel/admin/controllers/edit-post.php
diff --git a/admin/controllers/edit-user.php b/kernel/admin/controllers/edit-user.php
similarity index 100%
rename from admin/controllers/edit-user.php
rename to kernel/admin/controllers/edit-user.php
diff --git a/admin/controllers/install-plugin.php b/kernel/admin/controllers/install-plugin.php
similarity index 100%
rename from admin/controllers/install-plugin.php
rename to kernel/admin/controllers/install-plugin.php
diff --git a/admin/controllers/install-theme.php b/kernel/admin/controllers/install-theme.php
similarity index 100%
rename from admin/controllers/install-theme.php
rename to kernel/admin/controllers/install-theme.php
diff --git a/admin/controllers/login-email.php b/kernel/admin/controllers/login-email.php
similarity index 100%
rename from admin/controllers/login-email.php
rename to kernel/admin/controllers/login-email.php
diff --git a/admin/controllers/login.php b/kernel/admin/controllers/login.php
similarity index 100%
rename from admin/controllers/login.php
rename to kernel/admin/controllers/login.php
diff --git a/admin/controllers/logout.php b/kernel/admin/controllers/logout.php
similarity index 100%
rename from admin/controllers/logout.php
rename to kernel/admin/controllers/logout.php
diff --git a/admin/controllers/new-page.php b/kernel/admin/controllers/new-page.php
similarity index 100%
rename from admin/controllers/new-page.php
rename to kernel/admin/controllers/new-page.php
diff --git a/admin/controllers/new-post.php b/kernel/admin/controllers/new-post.php
similarity index 100%
rename from admin/controllers/new-post.php
rename to kernel/admin/controllers/new-post.php
diff --git a/admin/controllers/plugins.php b/kernel/admin/controllers/plugins.php
similarity index 100%
rename from admin/controllers/plugins.php
rename to kernel/admin/controllers/plugins.php
diff --git a/admin/controllers/settings-advanced.php b/kernel/admin/controllers/settings-advanced.php
similarity index 100%
rename from admin/controllers/settings-advanced.php
rename to kernel/admin/controllers/settings-advanced.php
diff --git a/admin/controllers/settings-general.php b/kernel/admin/controllers/settings-general.php
similarity index 100%
rename from admin/controllers/settings-general.php
rename to kernel/admin/controllers/settings-general.php
diff --git a/admin/controllers/settings-regional.php b/kernel/admin/controllers/settings-regional.php
similarity index 100%
rename from admin/controllers/settings-regional.php
rename to kernel/admin/controllers/settings-regional.php
diff --git a/admin/controllers/settings.php b/kernel/admin/controllers/settings.php
similarity index 100%
rename from admin/controllers/settings.php
rename to kernel/admin/controllers/settings.php
diff --git a/admin/controllers/themes.php b/kernel/admin/controllers/themes.php
similarity index 100%
rename from admin/controllers/themes.php
rename to kernel/admin/controllers/themes.php
diff --git a/admin/controllers/uninstall-plugin.php b/kernel/admin/controllers/uninstall-plugin.php
similarity index 100%
rename from admin/controllers/uninstall-plugin.php
rename to kernel/admin/controllers/uninstall-plugin.php
diff --git a/admin/controllers/user-password.php b/kernel/admin/controllers/user-password.php
similarity index 100%
rename from admin/controllers/user-password.php
rename to kernel/admin/controllers/user-password.php
diff --git a/admin/controllers/users.php b/kernel/admin/controllers/users.php
similarity index 100%
rename from admin/controllers/users.php
rename to kernel/admin/controllers/users.php
diff --git a/admin/themes/default/css/default.css b/kernel/admin/themes/default/css/default.css
similarity index 98%
rename from admin/themes/default/css/default.css
rename to kernel/admin/themes/default/css/default.css
index 4c58ae51..6bf90eff 100644
--- a/admin/themes/default/css/default.css
+++ b/kernel/admin/themes/default/css/default.css
@@ -26,6 +26,10 @@
 	background: #1F5FC4;
 }
 
+.uk-form legend {
+	width: 70% !important;
+}
+
 .uk-navbar-nav > li > a {
 	border: none;
 	height: 70px;
diff --git a/admin/themes/default/css/form-file.min.css b/kernel/admin/themes/default/css/form-file.min.css
similarity index 100%
rename from admin/themes/default/css/form-file.min.css
rename to kernel/admin/themes/default/css/form-file.min.css
diff --git a/admin/themes/default/css/installer.css b/kernel/admin/themes/default/css/installer.css
similarity index 100%
rename from admin/themes/default/css/installer.css
rename to kernel/admin/themes/default/css/installer.css
diff --git a/admin/themes/default/css/jquery.datetimepicker.css b/kernel/admin/themes/default/css/jquery.datetimepicker.css
similarity index 100%
rename from admin/themes/default/css/jquery.datetimepicker.css
rename to kernel/admin/themes/default/css/jquery.datetimepicker.css
diff --git a/admin/themes/default/css/login.css b/kernel/admin/themes/default/css/login.css
similarity index 100%
rename from admin/themes/default/css/login.css
rename to kernel/admin/themes/default/css/login.css
diff --git a/admin/themes/default/css/placeholder.min.css b/kernel/admin/themes/default/css/placeholder.min.css
similarity index 100%
rename from admin/themes/default/css/placeholder.min.css
rename to kernel/admin/themes/default/css/placeholder.min.css
diff --git a/admin/themes/default/css/progress.min.css b/kernel/admin/themes/default/css/progress.min.css
similarity index 100%
rename from admin/themes/default/css/progress.min.css
rename to kernel/admin/themes/default/css/progress.min.css
diff --git a/admin/themes/default/css/uikit.almost-flat.min.css b/kernel/admin/themes/default/css/uikit.almost-flat.min.css
similarity index 100%
rename from admin/themes/default/css/uikit.almost-flat.min.css
rename to kernel/admin/themes/default/css/uikit.almost-flat.min.css
diff --git a/admin/themes/default/css/upload.min.css b/kernel/admin/themes/default/css/upload.min.css
similarity index 100%
rename from admin/themes/default/css/upload.min.css
rename to kernel/admin/themes/default/css/upload.min.css
diff --git a/admin/themes/default/fonts/FontAwesome.otf b/kernel/admin/themes/default/fonts/FontAwesome.otf
similarity index 100%
rename from admin/themes/default/fonts/FontAwesome.otf
rename to kernel/admin/themes/default/fonts/FontAwesome.otf
diff --git a/admin/themes/default/fonts/fontawesome-webfont.eot b/kernel/admin/themes/default/fonts/fontawesome-webfont.eot
similarity index 100%
rename from admin/themes/default/fonts/fontawesome-webfont.eot
rename to kernel/admin/themes/default/fonts/fontawesome-webfont.eot
diff --git a/admin/themes/default/fonts/fontawesome-webfont.ttf b/kernel/admin/themes/default/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from admin/themes/default/fonts/fontawesome-webfont.ttf
rename to kernel/admin/themes/default/fonts/fontawesome-webfont.ttf
diff --git a/admin/themes/default/fonts/fontawesome-webfont.woff b/kernel/admin/themes/default/fonts/fontawesome-webfont.woff
similarity index 100%
rename from admin/themes/default/fonts/fontawesome-webfont.woff
rename to kernel/admin/themes/default/fonts/fontawesome-webfont.woff
diff --git a/admin/themes/default/fonts/fontawesome-webfont.woff2 b/kernel/admin/themes/default/fonts/fontawesome-webfont.woff2
similarity index 100%
rename from admin/themes/default/fonts/fontawesome-webfont.woff2
rename to kernel/admin/themes/default/fonts/fontawesome-webfont.woff2
diff --git a/admin/themes/default/img/favicon.png b/kernel/admin/themes/default/img/favicon.png
similarity index 100%
rename from admin/themes/default/img/favicon.png
rename to kernel/admin/themes/default/img/favicon.png
diff --git a/admin/themes/default/index.php b/kernel/admin/themes/default/index.php
similarity index 100%
rename from admin/themes/default/index.php
rename to kernel/admin/themes/default/index.php
diff --git a/admin/themes/default/init.php b/kernel/admin/themes/default/init.php
similarity index 78%
rename from admin/themes/default/init.php
rename to kernel/admin/themes/default/init.php
index 1f3db143..af9bff04 100644
--- a/admin/themes/default/init.php
+++ b/kernel/admin/themes/default/init.php
@@ -207,4 +207,64 @@ class HTML {
 		echo $html;
 	}
 
+	public static function profileUploader($username)
+	{
+		global $L;
+
+		$html = '
+		<div id="jsprogressBar" class="uk-progress uk-hidden">
+		<div class="uk-progress-bar" style="width: 0%;">0%</div>
+		</div>
+
+		<div id="upload-drop" class="uk-placeholder uk-text-center">
+		<a class="uk-form-file"><i class="uk-icon-cloud-upload uk-margin-small-right"></i>'.$L->g('Upload Image').'<input id="upload-select" type="file"></a>
+		</div>
+		';
+
+		$html .= '
+		<script>
+		$(document).ready(function() {
+
+			$(function()
+			{
+				var progressbar = $("#jsprogressBar");
+				var bar = progressbar.find(".uk-progress-bar");
+				var settings =
+				{
+					type: "json",
+					action: "'.HTML_PATH_ADMIN_ROOT.'ajax/uploader",
+					allow : "*.(jpg|jpeg|gif|png)",
+					params: {"type":"profilePicture", "username":"'.$username.'"},
+
+					loadstart: function() {
+						bar.css("width", "0%").text("0%");
+						progressbar.removeClass("uk-hidden");
+					},
+
+					progress: function(percent) {
+						percent = Math.ceil(percent);
+						bar.css("width", percent+"%").text(percent+"%");
+					},
+
+					allcomplete: function(response) {
+						bar.css("width", "100%").text("100%");
+						setTimeout(function() { progressbar.addClass("uk-hidden"); }, 250);
+						$("#jsimageList").prepend("<option value=\'"+response.filename+"\' selected=\'selected\'>"+response.filename+"</option>");
+					},
+
+					notallowed: function(file, settings) {
+						alert("'.$L->g('Supported image file types').' "+settings.allow);
+					}
+				};
+
+				var select = UIkit.uploadSelect($("#upload-select"), settings);
+				var drop = UIkit.uploadDrop($("#upload-drop"), settings);
+			});
+
+		});
+		</script>';
+
+		echo $html;
+	}
+
 }
\ No newline at end of file
diff --git a/admin/themes/default/js/jquery.datetimepicker.js b/kernel/admin/themes/default/js/jquery.datetimepicker.js
similarity index 100%
rename from admin/themes/default/js/jquery.datetimepicker.js
rename to kernel/admin/themes/default/js/jquery.datetimepicker.js
diff --git a/admin/themes/default/js/jquery.min.js b/kernel/admin/themes/default/js/jquery.min.js
similarity index 100%
rename from admin/themes/default/js/jquery.min.js
rename to kernel/admin/themes/default/js/jquery.min.js
diff --git a/admin/themes/default/js/uikit.min.js b/kernel/admin/themes/default/js/uikit.min.js
similarity index 100%
rename from admin/themes/default/js/uikit.min.js
rename to kernel/admin/themes/default/js/uikit.min.js
diff --git a/admin/themes/default/js/upload.min.js b/kernel/admin/themes/default/js/upload.min.js
similarity index 100%
rename from admin/themes/default/js/upload.min.js
rename to kernel/admin/themes/default/js/upload.min.js
diff --git a/admin/themes/default/login.php b/kernel/admin/themes/default/login.php
similarity index 100%
rename from admin/themes/default/login.php
rename to kernel/admin/themes/default/login.php
diff --git a/admin/views/about.php b/kernel/admin/views/about.php
similarity index 100%
rename from admin/views/about.php
rename to kernel/admin/views/about.php
diff --git a/admin/views/add-user.php b/kernel/admin/views/add-user.php
similarity index 100%
rename from admin/views/add-user.php
rename to kernel/admin/views/add-user.php
diff --git a/admin/views/configure-plugin.php b/kernel/admin/views/configure-plugin.php
similarity index 100%
rename from admin/views/configure-plugin.php
rename to kernel/admin/views/configure-plugin.php
diff --git a/admin/views/dashboard.php b/kernel/admin/views/dashboard.php
similarity index 100%
rename from admin/views/dashboard.php
rename to kernel/admin/views/dashboard.php
diff --git a/admin/views/edit-page.php b/kernel/admin/views/edit-page.php
similarity index 100%
rename from admin/views/edit-page.php
rename to kernel/admin/views/edit-page.php
diff --git a/admin/views/edit-post.php b/kernel/admin/views/edit-post.php
similarity index 100%
rename from admin/views/edit-post.php
rename to kernel/admin/views/edit-post.php
diff --git a/admin/views/edit-user.php b/kernel/admin/views/edit-user.php
similarity index 88%
rename from admin/views/edit-user.php
rename to kernel/admin/views/edit-user.php
index bb336c46..1b9f4f07 100644
--- a/admin/views/edit-user.php
+++ b/kernel/admin/views/edit-user.php
@@ -2,6 +2,9 @@
 
 HTML::title(array('title'=>$L->g('Edit user'), 'icon'=>'user'));
 
+echo '<div class="uk-grid">';
+echo '<div class="uk-width-8-10">';
+
 HTML::formOpen(array('id'=>'edit-user-profile-form','class'=>'uk-form-horizontal'));
 
 	// Security token
@@ -92,6 +95,13 @@ if( ($Login->role()==='admin') && ($_user['username']!='admin') ) {
 
 HTML::formClose();
 
+echo '</div>';
+echo '<div class="uk-width-2-10" style="margin-top: 50px;">';
+echo '<img id="jsprofilePicture" class="uk-border-rounded" src="'.HTML_PATH_UPLOADS_PROFILES.$_user['username'].'.jpg" alt="profile picture">';
+HTML::profileUploader($_user['username']);
+echo '</div>';
+echo '</div>';
+
 ?>
 
 <script>
diff --git a/admin/views/login-email.php b/kernel/admin/views/login-email.php
similarity index 81%
rename from admin/views/login-email.php
rename to kernel/admin/views/login-email.php
index 0af999e9..97647fb5 100644
--- a/admin/views/login-email.php
+++ b/kernel/admin/views/login-email.php
@@ -1,6 +1,6 @@
 <div class="login-form">
 
-<form method="post" action="<?php echo HTML_PATH_ADMIN_ROOT.'login-email' ?>" class="uk-form" autocomplete="off">
+<form method="post" action="" class="uk-form" autocomplete="off">
 
 	<input type="hidden" id="jstoken" name="tokenCSRF" value="<?php $Security->printToken() ?>">
 
diff --git a/admin/views/login.php b/kernel/admin/views/login.php
similarity index 83%
rename from admin/views/login.php
rename to kernel/admin/views/login.php
index 5c4abb87..e716d09c 100644
--- a/admin/views/login.php
+++ b/kernel/admin/views/login.php
@@ -1,6 +1,6 @@
 <div class="login-form">
 
-<form method="post" action="<?php echo HTML_PATH_ADMIN_ROOT.'login' ?>" class="uk-form" autocomplete="off">
+<form method="post" action="" class="uk-form" autocomplete="off">
 
 	<input type="hidden" id="jstoken" name="tokenCSRF" value="<?php $Security->printToken() ?>">
 
diff --git a/admin/views/manage-pages.php b/kernel/admin/views/manage-pages.php
similarity index 100%
rename from admin/views/manage-pages.php
rename to kernel/admin/views/manage-pages.php
diff --git a/admin/views/manage-posts.php b/kernel/admin/views/manage-posts.php
similarity index 100%
rename from admin/views/manage-posts.php
rename to kernel/admin/views/manage-posts.php
diff --git a/admin/views/new-page.php b/kernel/admin/views/new-page.php
similarity index 100%
rename from admin/views/new-page.php
rename to kernel/admin/views/new-page.php
diff --git a/admin/views/new-post.php b/kernel/admin/views/new-post.php
similarity index 100%
rename from admin/views/new-post.php
rename to kernel/admin/views/new-post.php
diff --git a/admin/views/plugins.php b/kernel/admin/views/plugins.php
similarity index 100%
rename from admin/views/plugins.php
rename to kernel/admin/views/plugins.php
diff --git a/admin/views/settings-advanced.php b/kernel/admin/views/settings-advanced.php
similarity index 100%
rename from admin/views/settings-advanced.php
rename to kernel/admin/views/settings-advanced.php
diff --git a/admin/views/settings-general.php b/kernel/admin/views/settings-general.php
similarity index 100%
rename from admin/views/settings-general.php
rename to kernel/admin/views/settings-general.php
diff --git a/admin/views/settings-regional.php b/kernel/admin/views/settings-regional.php
similarity index 100%
rename from admin/views/settings-regional.php
rename to kernel/admin/views/settings-regional.php
diff --git a/admin/views/themes.php b/kernel/admin/views/themes.php
similarity index 100%
rename from admin/views/themes.php
rename to kernel/admin/views/themes.php
diff --git a/admin/views/user-password.php b/kernel/admin/views/user-password.php
similarity index 100%
rename from admin/views/user-password.php
rename to kernel/admin/views/user-password.php
diff --git a/admin/views/users.php b/kernel/admin/views/users.php
similarity index 100%
rename from admin/views/users.php
rename to kernel/admin/views/users.php
diff --git a/kernel/ajax/uploader.php b/kernel/ajax/uploader.php
index 312c2d56..d1956fb5 100644
--- a/kernel/ajax/uploader.php
+++ b/kernel/ajax/uploader.php
@@ -1,4 +1,9 @@
-<?php header('Content-Type: application/json');
+<?php defined('BLUDIT') or die('Bludit CMS.');
+
+header('Content-Type: application/json');
+
+// Type
+$type = Sanitize::html($_POST['type']);
 
 // Source
 $source = $_FILES['files']['tmp_name'][0];
@@ -24,12 +29,19 @@ if(empty($tmpName)) {
 	$tmpName = $filename.'.'.$fileExtension;
 }
 
-move_uploaded_file($source, PATH_UPLOADS.$tmpName);
+if($type=='profilePicture') {
+	$username = Sanitize::html($_POST['username']);
+	$tmpName = $username.'.jpg';
+
+	move_uploaded_file($source, PATH_UPLOADS_PROFILES.$tmpName);
+}
+else {
+	move_uploaded_file($source, PATH_UPLOADS.$tmpName);
+}
 
 exit(json_encode(array(
 	'status'=>0,
-	'filename'=>$tmpName,
-	'date'=>date("F d Y H:i:s.", filemtime(PATH_UPLOADS.$tmpName))
+	'filename'=>$tmpName
 )));
 
 ?>
\ No newline at end of file
diff --git a/kernel/boot/init.php b/kernel/boot/init.php
index 291acba0..4e8a3410 100644
--- a/kernel/boot/init.php
+++ b/kernel/boot/init.php
@@ -35,7 +35,8 @@ define('PATH_PAGES',			PATH_CONTENT.'pages'.DS);
 define('PATH_DATABASES',		PATH_CONTENT.'databases'.DS);
 define('PATH_PLUGINS_DATABASES',	PATH_CONTENT.'databases'.DS.'plugins'.DS);
 define('PATH_UPLOADS',			PATH_CONTENT.'uploads'.DS);
-define('PATH_ADMIN',			PATH_ROOT.'admin'.DS);
+define('PATH_UPLOADS_PROFILES',		PATH_UPLOADS.'profiles'.DS);
+define('PATH_ADMIN',			PATH_KERNEL.'admin'.DS);
 define('PATH_ADMIN_THEMES',		PATH_ADMIN.'themes'.DS);
 define('PATH_ADMIN_CONTROLLERS',	PATH_ADMIN.'controllers'.DS);
 define('PATH_ADMIN_VIEWS',		PATH_ADMIN.'views'.DS);
@@ -168,10 +169,13 @@ define('HTML_PATH_THEME_CSS',		HTML_PATH_THEME.'css/');
 define('HTML_PATH_THEME_JS',		HTML_PATH_THEME.'js/');
 define('HTML_PATH_THEME_IMG',		HTML_PATH_THEME.'img/');
 
-define('HTML_PATH_ADMIN_THEME',		HTML_PATH_ROOT.'admin/themes/'.$Site->adminTheme().'/');
-define('HTML_PATH_ADMIN_THEME_JS',	HTML_PATH_ADMIN_THEME.'js/');
 define('HTML_PATH_ADMIN_ROOT',		HTML_PATH_ROOT.'admin/');
+define('HTML_PATH_ADMIN_THEME',		HTML_PATH_ROOT.'kernel/admin/themes/'.$Site->adminTheme().'/');
+define('HTML_PATH_ADMIN_THEME_JS',	HTML_PATH_ADMIN_THEME.'js/');
+define('HTML_PATH_ADMIN_THEME_CSS',	HTML_PATH_ADMIN_THEME.'css/');
+
 define('HTML_PATH_UPLOADS',		HTML_PATH_ROOT.'content/uploads/');
+define('HTML_PATH_UPLOADS_PROFILES',	HTML_PATH_UPLOADS.'profiles/');
 define('HTML_PATH_PLUGINS',		HTML_PATH_ROOT.'plugins/');
 
 define('JQUERY',			HTML_PATH_ADMIN_THEME_JS.'jquery.min.js');