code updated - sync from biall

SE/se-lib/Core/Pdo.php

@@ -595,7 +595,6 @@ EOF_STRUCT_MYSQL;
 			DBG::log($sql, 'sql');
 			return $this->exec($sql);
 		}
-
 		$sth = $this->prepare($sql);
 		if (!empty($values)) {
 			$this->bindValues($sth, $values);

SE/se-lib/Request.php

@@ -116,4 +116,18 @@ class Request {
 		return $ip;
 	}
 
+	public static function getRefererRoute() {
+		$referer = self::getRefererUrl();
+		if (!$referer) return null;
+		$urlParsed = parse_url($referer);
+		if (empty($urlParsed['query'])) return null;
+		parse_str($urlParsed['query'], $urlArgs);
+		if (empty($urlArgs)) return null;
+		return V::get('_route', '', $urlArgs);
+	}
+
+	public static function getRefererUrl() {
+		return V::get('HTTP_REFERER', '', $_SERVER);
+	}
+
 }

SE/se-lib/Route/Config.php

@@ -1,29 +1,33 @@
 <?php
 
 Lib::loadClass('RouteBase');
+Lib::loadClass('UI');
 
 class Route_Config extends RouteBase {
 
 	public function handleAuth() {
-		if (!User::logged()) {
-			throw new HttpException('Unauthorized', 401);
-		}
+		if (!User::logged()) throw new HttpException('Unauthorized', 401);
 	}
 
 	public function defaultAction() {
-		SE_Layout::gora();
-		?>
-<div class="container">
-	<h1>Config</h1>
-	...
-</div>
-		<?php
-		SE_Layout::dol();
+		UI::gora();
+		UI::startContainer();
+		echo UI::h('h1', null, "Config");
+		echo '...';
+		// echo UI::h('div', [], [
+		//	UI::h('a', ['style'=>"display:block", 'href'=>$this->getLink('reinstall')], "Config.reinstall"),
+		//	UI::h('a', ['style'=>"display:block", 'href'=>Router::getRoute('Biall_ProduktToDolar')->getLink('reinstall')], "Biall_ProduktToDolar.reinstall"),
+		// ]);
+		UI::endContainer();
+		UI::dol();
 	}
 
 	public function reinstallAction() {
+		UI::gora();
+		echo UI::h('a', ['style'=>"margin:8px 20px", 'class'=>"btn btn-xs btn-default", 'href'=>$this->getLink()], "wróć");
 		$this->reinstall();
-		die('OK');
+		UI::alert('info', 'OK');
+		UI::dol();
 	}
 
 	public function runAction() {
@@ -41,26 +45,17 @@ class Route_Config extends RouteBase {
 	public function reinstall() {
 		$sqlList = array();
 		//$sqlList['RemoveTable'] = "DROP TABLE IF EXISTS `CRM_CONFIG`";
-		$sqlList['InstallTable'] = <<<SQL
-
-CREATE TABLE IF NOT EXISTS `CRM_CONFIG` (
-	`ID` int(11) NOT NULL AUTO_INCREMENT,
-	`CONF_KEY` varchar(64) NOT NULL,
-	`CONF_VAL` text NOT NULL,
-	PRIMARY KEY (`ID`),
-	UNIQUE KEY `CONF_KEY` (`CONF_KEY`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
-
-SQL;
-		$db = DB::getDB();
-		if ($db->has_errors()) {
-			throw new Exception("DB Errors: " . implode("\n<br>", $db->get_errors()));
-		}
+		$sqlList['InstallTable'] = "
+			CREATE TABLE IF NOT EXISTS `CRM_CONFIG` (
+				`ID` int(11) NOT NULL AUTO_INCREMENT,
+				`CONF_KEY` varchar(64) NOT NULL,
+				`CONF_VAL` text NOT NULL,
+				PRIMARY KEY (`ID`),
+				UNIQUE KEY `CONF_KEY` (`CONF_KEY`)
+			) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+		";
 		foreach ($sqlList as $sqlName => $sql) {
-			$res = $db->query($sql);
-			if ($db->has_errors()) {
-				throw new Exception("DB Errors at sql '{$sqlName}': " . implode("\n<br>", $db->get_errors()));
-			}
+			DB::getPDO()->execSql($sql);
 		}
 	}
 

SE/se-lib/UI.php

@@ -419,6 +419,14 @@ class UI {
 	}
 	public static function hAttributes($params = []) {
 		$attr = [];
+		if (null === $params) return '';
+		if (!is_array($params)) {
+			try {
+				throw new Exception("Wrong params type in UI::hAttributes");
+			} catch (Exception $e) {
+				DBG::log($e);
+			}
+		}
 		foreach ($params as $k => $v) {
 			if (is_array($v)) {
 				$attr[] = "{$k}=\"" . implode(" ", $v) . "\"";