CK editor + tvorba administrator

kareljuricka · Nov 28, 2013 · a072851 · a072851
1 parent c1e28d5
commit a072851
Show file tree

Hide file tree

Showing 374 changed files with 10,333 additions and 2,154 deletions.
diff --git a/admin/.htaccess b/admin/.htaccess
@@ -1,7 +1,6 @@
 Options +FollowSymLinks
 
 RewriteEngine On
-RewriteCond $2 !^admin
 
 RewriteRule ^([a-zA-Z0-9]/)*([a-zA-Z0-9\-]+)(/site-([a-zA-Z0-9]+))?/?$ index.php?page=$2&site=$4
 RewriteRule ^([a-zA-Z0-9]/)*([a-zA-Z0-9\-]+)/([a-zA-Z0-9]+)/([a-zA-Z0-9]+)(/site-([a-zA-Z0-9]+))?/?$ index.php?page=$2&$3=$4&site=$5

diff --git a/lib/admin.class.php b/lib/admin.class.php
@@ -12,7 +12,9 @@ class Admin extends Web {
 		'admin_login' => '',
 		'content' => '',
 		'menu' => '',
-		'admin_user_status' => ''
+		'admin_user_status' => '',
+		'admin_url' => '',
+		'web_path' => ''
 	);
 
 	private $adminUserData;
@@ -74,7 +76,7 @@ public function __construct($_config) {
 	 */
 	public static function adminUserStatus() {
 
-		$userStatus = "Admin user status <br />";
+		$userStatus = "<h3>Admin user status </h3>";
 
 		$userStatus .= "
 		<div class=\"admin-user-panel\">
@@ -104,7 +106,7 @@ public static function loginForm() {
 
 				$adminLoginData = self::$db->single();
 
-				if ($_POST['password'] != $adminLoginData['password']) {
+				if (hash('sha256', htmlspecialchars($_POST['password'])) != $adminLoginData['password']) {
 					$errors .= "Wrong password";
 				}
 
@@ -140,70 +142,18 @@ public static function loginForm() {
 		return $formOutput;
 	}
 
-
-	/* Generate menu
-	 * @return menu output
-	 */
-
-	/* autoload from DB
-	public static function genMenu()	{
-
-		$menuLi = "";
-
-		self::$db->query("SELECT id, name, title, parent_id, rank FROM ".database::$prefix . "admin_menu ORDER BY rank");
-
-		$data = self::$db->resultset();
-
-		self::$db->query("SELECT id, name, title FROM ".database::$prefix . "plugin WHERE admin != 0");
-
-		$plugindata = self::$db->resultset();
-
-		foreach($data as $key => $value) {
-			// Prvně zobrazí všechny rodiče
-			if (is_null($value['parent_id'])) {
-				$menuLi .= "<li><a href=\"". admin::$adminUrl . "/" . $value['name']."\" title=\"". $value['title']."\">" . $value['title'] . "</a>";
-				$submenuLi = "";
-
-				// Vypis pluginu
-				if ($value['name'] == 'plugins')
-					foreach($plugindata as $key_child => $value_child) {
-						$submenuLi .= "<li><a href=\"". admin::$adminUrl . "/plugins/type/" . $value_child['name']."\" title=\"\">" . $value_child['title'] ."</a></li>";
-					}
-				// Vypis ostatnich submenu
-				else
-					foreach ($data as $key_child => $value_child) {
-						if ($value_child['parent_id'] == $value['id'])
-							$submenuLi .= "<li><a href=\"". admin::$adminUrl . "/" . $value_child['name']."\" title=\"\">" . $value_child['title'] ."</a></li>";
-							
-					}
-				$menuLi .= (!empty($submenuLi)) ? "<ul>" . $submenuLi . "</ul>" : "";
-
-				$menuLi .= "</li>";
-			}
-
-		}
-
-		$menuOutput = "
-			<ul>
-				"
-					. $menuLi .
-				"
-			</ul>";
-
-		return $menuOutput;
-	}
-	*/
-
 	public static function genMenu() {
 		return "
 			<ul>
+
+  				<!--
   				<li class=\"basic-settings-button\">
   					<a href=\"".admin::$adminUrl ."/basic-settings\" title=\"zakladní nastavení\">
   						<img src=\"". theme::$completeThemeAdminDir . "/images/basic_settings_icon.png\" alt=\"basic settings\"/>
 						<span>Základní nastavení</span>
   					</a>
   				</li>
-  				<li class=\"theme-settings-button\">
+  				<!--<li class=\"theme-settings-button\">
   					<a href=\"".admin::$adminUrl ."/template\" title=\"nastavení vzhledu\">
   						<img src=\"". theme::$completeThemeAdminDir . "/images/theme_settings_icon.png\" alt=\"themes settings\"/>
 						<span>Nastavení vzhledu</span>
@@ -215,10 +165,11 @@ public static function genMenu() {
 						<span>Nastavení modulů</span>
   					</a>
   				</li>
+  				-->
   				<li class=\"plugin-settings-button\">
   					<a href=\"".admin::$adminUrl ."/plugins\" title=\"nastavení pluginů\">
   						<img src=\"". theme::$completeThemeAdminDir . "/images/plugins_settings_icon.png\" alt=\"plugin settings\"/>
-						<span>Nastavení pluginů</span>
+						<span>Nastavení eshopu</span>
   					</a>
   				</li>
   			</ul>";
@@ -249,8 +200,7 @@ public static function settingContent()	{
 			<h2 class=\"subtitle\">Základní nastavení</h2>
   			<div class=\"sub-nav\">
   				<ul>
-  					<li><a href=\"\" title=\"Obecné nastavení\">Obecné nastavení</a></li>
-  					<li><a href=\"\" title=\"Obecné nastavení\">Nastavení databáze</a></li>
+  					<li><a href=\"".admin::$adminUrl ."/plugins/type/AdminUser\" title=\"Obecné nastavení\">Správa administrátorů</a></li>
   				</ul>
   			</div>
   			<div class=\"content\">

diff --git a/lib/module.class.php b/lib/module.class.php
@@ -29,12 +29,19 @@ public function __construct($modulename, $page, $admin) {
 				break;
 
 			case 'menu':
-
 				$this->moduleOutput[$modulename] .= (!$admin) ? web::genMenu() : admin::genMenu(); 
 				break;
 
 			case 'admin_user_status':
 				$this->moduleOutput[$modulename] .= admin::adminUserStatus();
+				break;
+
+			case 'admin_url':
+				$this->moduleOutput[$modulename] .= admin::$adminUrl;
+				break;
+			case 'web_path':
+				$this->moduleOutput[$modulename] .= admin::$serverDir;
+				break;
 
 			// others modules -> get plugins	
 			default: