This commit is contained in:
Roman Hergenreder 2020-06-25 21:53:33 +02:00
parent 37ef65fd2f
commit 1896351a9b
4 changed files with 5 additions and 4 deletions

@ -156,6 +156,7 @@ namespace Api\Routes {
// INSERT new routes // INSERT new routes
if ($this->success) { if ($this->success) {
$stmt = $sql->insert("Route", array("request", "action", "target", "extra", "active")); $stmt = $sql->insert("Route", array("request", "action", "target", "extra", "active"));
foreach($this->routes as $route) { foreach($this->routes as $route) {
$stmt->addRow($route["request"], $route["action"], $route["target"], $route["extra"], $route["active"]); $stmt->addRow($route["request"], $route["action"], $route["target"], $route["extra"], $route["active"]);
} }

@ -142,7 +142,7 @@ namespace Documents\Install {
$this->errorString = $req->getLastError(); $this->errorString = $req->getLastError();
} else { } else {
$req = new \Api\Notifications\Create($user); $req = new \Api\Notifications\Create($user);
$success = $req->execute(array( $req->execute(array(
"title" => "Welcome", "title" => "Welcome",
"message" => "Your Web-base was successfully installed. Check out the admin dashboard. Have fun!", "message" => "Your Web-base was successfully installed. Check out the admin dashboard. Have fun!",
"groupId" => USER_GROUP_ADMIN "groupId" => USER_GROUP_ADMIN
@ -732,7 +732,6 @@ namespace Documents\Install {
return $html; return $html;
} }
function getCode() { function getCode() {
$html = parent::getCode(); $html = parent::getCode();
@ -779,6 +778,7 @@ namespace Documents\Install {
$progressSidebar = $this->createProgressSidebar(); $progressSidebar = $this->createProgressSidebar();
$progressMainview = $this->createProgessMainview(); $progressMainview = $this->createProgessMainview();
$errorStyle = ($this->errorString ? '' : ' style="display:none"'); $errorStyle = ($this->errorString ? '' : ' style="display:none"');
$errorClass = ($this->errorString ? ' alert-danger' : ''); $errorClass = ($this->errorString ? ' alert-danger' : '');

@ -74,7 +74,7 @@ class PostgreSQL extends SQL {
public function getLastError() { public function getLastError() {
$lastError = parent::getLastError(); $lastError = parent::getLastError();
if (empty($lastError)) { if (empty($lastError)) {
$lastError = pg_last_error($this->connection) . " " . pg_last_error($this->connection); $lastError = trim(pg_last_error($this->connection) . " " . pg_last_error($this->connection));
} }
return $lastError; return $lastError;

@ -395,6 +395,6 @@ abstract class SQL {
public abstract function getStatus(); public abstract function getStatus();
public function parseBool($val) : bool { public function parseBool($val) : bool {
return in_array($val, array(true, 1, '1', 't', 'true', 'TRUE')); return in_array($val, array(true, 1, '1', 't', 'true', 'TRUE'), true);
} }
} }