Dataset Advanced Filter: Text based display tag is not replaced at ru…

…ntime on the player (#3463)

relates to xibosignage/xibo#3463

- Addressed phpcs warnings.

lib/Entity/DataSet.php

@@ -119,7 +119,8 @@ class DataSet implements \JsonSerializable
     public $isRealTime = 0;
 
     /**
-     * @SWG\Property(description="Indicates the source of the data connector. Requires the Real time flag. Can be null, user-defined, or a connector.")
+     * @SWG\Property(description="Indicates the source of the data connector. Requires the Real time flag. Can be null,
+     * user-defined, or a connector.")
      * @var string
      */
     public $dataConnectorSource;
@@ -504,7 +505,6 @@ public function getData($filterBy = [], $options = [], $extraParams = [])
 
         // Fetch display tag value/s
         if ($filter != '' && $displayId != 0) {
-
             // Define the regular expression to match [Tag:...]
             $pattern = '/\[Tag:[^]]+\]/';
 
@@ -544,9 +544,11 @@ public function getData($filterBy = [], $options = [], $extraParams = [])
 
                     $query = 'SELECT `lktagdisplaygroup`.`value` AS tagValue
                                 FROM `lkdisplaydg`
-                                INNER JOIN `displaygroup` ON `displaygroup`.displayGroupId = `lkdisplaydg`.displayGroupId 
+                                INNER JOIN `displaygroup` 
+                                    ON `displaygroup`.displayGroupId = `lkdisplaydg`.displayGroupId 
                                     AND `displaygroup`.isDisplaySpecific = 1
-                                INNER JOIN `lktagdisplaygroup` ON `lktagdisplaygroup`.displayGroupId = `lkdisplaydg`.displayGroupId
+                                INNER JOIN `lktagdisplaygroup` 
+                                    ON `lktagdisplaygroup`.displayGroupId = `lkdisplaydg`.displayGroupId
                                 INNER JOIN `tag` ON `lktagdisplaygroup`.tagId = `tag`.tagId
                                 WHERE `lkdisplaydg`.displayId = :displayId
                                     AND `tag`.`tag` = :tagName
@@ -1099,8 +1101,8 @@ public function deleteData()
      */
     private function add()
     {
-        $columns = 'DataSet, Description, UserID, `code`, `isLookup`, `isRemote`,';
-        $columns .= '`lastDataEdit`, `lastClear`, `folderId`, `permissionsFolderId`, `isRealTime`, `dataConnectorSource`';
+        $columns = 'DataSet, Description, UserID, `code`, `isLookup`, `isRemote`, `lastDataEdit`,';
+        $columns .= '`lastClear`, `folderId`, `permissionsFolderId`, `isRealTime`, `dataConnectorSource`';
         $values = ':dataSet, :description, :userId, :code, :isLookup, :isRemote,';
         $values .= ':lastDataEdit, :lastClear, :folderId, :permissionsFolderId, :isRealTime, :dataConnectorSource';