Merge pull request xibosignage#540 from PeterMis/bugfix/1.8.13-pack3

Bugfix/1.8.13 pack3
dasgarner · Apr 15, 2019 · 805eb71 · 805eb71
2 parents 23c854f + c71a978
commit 805eb71
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/lib/Controller/Fault.php b/lib/Controller/Fault.php
@@ -199,9 +199,6 @@ public function collect()
 
     public function debugOn()
     {
-        if ($this->getUser()->userTypeId != 1)
-            throw new AccessDeniedException();
-
         $this->getConfig()->ChangeSetting('audit', 'DEBUG');
         $this->getConfig()->ChangeSetting('ELEVATE_LOG_UNTIL', $this->getDate()->parse()->addMinutes(30)->format('U'));
 
@@ -213,9 +210,6 @@ public function debugOn()
 
     public function debugOff()
     {
-        if ($this->getUser()->userTypeId != 1)
-            throw new AccessDeniedException();
-
         $this->getConfig()->ChangeSetting('audit', $this->getConfig()->GetSetting('RESTING_LOG_LEVEL'));
         $this->getConfig()->ChangeSetting('ELEVATE_LOG_UNTIL', '');
 

diff --git a/lib/Entity/Display.php b/lib/Entity/Display.php
@@ -644,8 +644,8 @@ public function delete()
     private function add()
     {
         $this->displayId = $this->getStore()->insert('
-            INSERT INTO display (display, auditingUntil, defaultlayoutid, license, licensed, inc_schedule, email_alert, alert_timeout, xmrChannel, xmrPubKey, lastCommandSuccess, macAddress)
-              VALUES (:display, :auditingUntil, :defaultlayoutid, :license, :licensed, :inc_schedule, :email_alert, :alert_timeout, :xmrChannel, :xmrPubKey, :lastCommandSuccess, :macAddress)
+            INSERT INTO display (display, auditingUntil, defaultlayoutid, license, licensed, inc_schedule, email_alert, alert_timeout, xmrChannel, xmrPubKey, lastCommandSuccess, macAddress, client_type, client_version, client_code)
+              VALUES (:display, :auditingUntil, :defaultlayoutid, :license, :licensed, :inc_schedule, :email_alert, :alert_timeout, :xmrChannel, :xmrPubKey, :lastCommandSuccess, :macAddress, :clientType, :clientVersion, :clientCode)
         ', [
             'display' => $this->display,
             'auditingUntil' => 0,
@@ -658,7 +658,10 @@ private function add()
             'xmrChannel' => $this->xmrChannel,
             'xmrPubKey' => $this->xmrPubKey,
             'lastCommandSuccess' => $this->lastCommandSuccess,
-            'macAddress' => $this->macAddress
+            'macAddress' => $this->macAddress,
+            'clientType' => $this->clientType,
+            'clientVersion' => $this->clientVersion,
+            'clientCode' => $this->clientCode,
         ]);
 
         $displayGroup = $this->displayGroupFactory->createEmpty();

diff --git a/lib/Factory/AuditLogFactory.php b/lib/Factory/AuditLogFactory.php
@@ -83,7 +83,7 @@ public function query($sortOrder = null, $filterBy = [])
         }
 
         if ($this->getSanitizer()->getString('userName', $filterBy) != null) {
-            $body .= ' AND `auditlog`.userName LIKE :userName ';
+            $body .= ' AND `user`.userName LIKE :userName ';
             $params['userName'] = '%' . $this->getSanitizer()->getString('userName', $filterBy) . '%';
         }
 

diff --git a/views/base.twig b/views/base.twig
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="{{ translate.jsShortLocale }}">
     <head>
         <title>{{ theme.getThemeConfig("theme_title") }}</title>
         <meta charset="utf-8">