joomla / statistics-server

src/Repositories/StatisticsRepository.php

Indentation +39 added lines, -39 removed lines

@@ -140,45 +140,45 @@
 	}
 
 
-    /**
-     * Loads the recently updated statistics data from the database.
-     *
-     * Updated within a timeframe, submit a pull request for a different behavior.
-     *
-     * @return  array  An array containing the response data
-     */
-    public function getTimeframeUpdatedItems(int $timeframe = 0, string $showColumn = ''): array
-    {
-        $return  = [];
-        $columns = self::ALLOWED_SOURCES;
-        if ($showColumn !== '') {
-            // The column should exist in the table and be part of the API
-            if (!\in_array($showColumn, self::ALLOWED_SOURCES)) {
-                throw new \InvalidArgumentException('An invalid data source was requested.', 404);
-            }
-
-            $columns = [$showColumn];
-        }
-
-        foreach ($columns as $column) {
-            if (\in_array($column, ['cms_php_version', 'db_type_version'])) {
-                throw new \InvalidArgumentException('An invalid data source was requested.', 404);
-            }
-            $return[$column] = $this->db->setQuery(
-              $this->db->getQuery(true)
-                       ->select($column)
-                       ->select('COUNT(' . $column . ') AS count')
-                       ->from('(SELECT * FROM ' . $this->db->quoteName('#__jstats') . ' WHERE modified > DATE_SUB(NOW(), INTERVAL ' . $this->db->quote($timeframe) .' DAY)) AS tmptable')
-                       ->group($column)
-            )->loadAssocList();
-        }
-
-        if ($showColumn !== '') {
-            return $return[$showColumn];
-        }
-
-        return $return;
-    }
+	/**
+	 * Loads the recently updated statistics data from the database.
+	 *
+	 * Updated within a timeframe, submit a pull request for a different behavior.
+	 *
+	 * @return  array  An array containing the response data
+	 */
+	public function getTimeframeUpdatedItems(int $timeframe = 0, string $showColumn = ''): array
+	{
+		$return  = [];
+		$columns = self::ALLOWED_SOURCES;
+		if ($showColumn !== '') {
+			// The column should exist in the table and be part of the API
+			if (!\in_array($showColumn, self::ALLOWED_SOURCES)) {
+				throw new \InvalidArgumentException('An invalid data source was requested.', 404);
+			}
+
+			$columns = [$showColumn];
+		}
+
+		foreach ($columns as $column) {
+			if (\in_array($column, ['cms_php_version', 'db_type_version'])) {
+				throw new \InvalidArgumentException('An invalid data source was requested.', 404);
+			}
+			$return[$column] = $this->db->setQuery(
+			  $this->db->getQuery(true)
+					   ->select($column)
+					   ->select('COUNT(' . $column . ') AS count')
+					   ->from('(SELECT * FROM ' . $this->db->quoteName('#__jstats') . ' WHERE modified > DATE_SUB(NOW(), INTERVAL ' . $this->db->quote($timeframe) .' DAY)) AS tmptable')
+					   ->group($column)
+			)->loadAssocList();
+		}
+
+		if ($showColumn !== '') {
+			return $return[$showColumn];
+		}
+
+		return $return;
+	}
 	/**
 	 * Saves the given data.
 	 *

Spacing +9 added lines, -9 removed lines

@@ -64,7 +64,7 @@ 
 			return $this->db->setQuery(
 				$this->db->getQuery(true)
 					->select('*')
-					->from($this->db->quoteName('#__jstats_counter_' . $column))
+					->from($this->db->quoteName('#__jstats_counter_'.$column))
 			)->loadAssocList();
 		}
 
@@ -75,7 +75,7 @@ 
 			$return[$column] = $this->db->setQuery(
 				$this->db->getQuery(true)
 					->select('*')
-					->from($this->db->quoteName('#__jstats_counter_' . $column))
+					->from($this->db->quoteName('#__jstats_counter_'.$column))
 			)->loadAssocList();
 		}
 
@@ -101,7 +101,7 @@ 
 				$return[$column] = $this->db->setQuery(
 					$this->db->getQuery(true)
 						->select($column)
-						->select('COUNT(' . $column . ') AS count')
+						->select('COUNT('.$column.') AS count')
 						->from($this->db->quoteName('#__jstats'))
 						->where('modified BETWEEN DATE_SUB(NOW(), INTERVAL 90 DAY) AND NOW()')
 						->group($column)
@@ -113,11 +113,11 @@ 
 			{
 				$return['cms_php_version'] = $this->db->setQuery(
 					$this->db->getQuery(true)
-						->select('CONCAT(' . $db->qn('cms_version') . ', ' . $db->q(' - ') . ', ' . $db->qn('php_version') . ') AS cms_php_version')
+						->select('CONCAT('.$db->qn('cms_version').', '.$db->q(' - ').', '.$db->qn('php_version').') AS cms_php_version')
 						->select('COUNT(*) AS count')
 						->from($this->db->quoteName('#__jstats'))
 						->where('modified BETWEEN DATE_SUB(NOW(), INTERVAL 90 DAY) AND NOW()')
-						->group('CONCAT(' . $db->qn('cms_version') . ', ' . $db->q(' - ') . ', ' . $db->qn('php_version') . ')')
+						->group('CONCAT('.$db->qn('cms_version').', '.$db->q(' - ').', '.$db->qn('php_version').')')
 				)->loadAssocList();
 				continue;
 			}
@@ -126,11 +126,11 @@ 
 			{
 				$return['db_type_version'] = $this->db->setQuery(
 					$this->db->getQuery(true)
-						->select('CONCAT(' . $db->qn('db_type') . ', ' . $db->q(' - ') . ', ' . $db->qn('db_version') . ') AS db_type_version')
+						->select('CONCAT('.$db->qn('db_type').', '.$db->q(' - ').', '.$db->qn('db_version').') AS db_type_version')
 						->select('COUNT(*) AS count')
 						->from($this->db->quoteName('#__jstats'))
 						->where('modified BETWEEN DATE_SUB(NOW(), INTERVAL 90 DAY) AND NOW()')
-						->group('CONCAT(' . $db->qn('db_type') . ', ' . $db->q(' - ') . ', ' . $db->qn('db_version') . ')')
+						->group('CONCAT('.$db->qn('db_type').', '.$db->q(' - ').', '.$db->qn('db_version').')')
 				)->loadAssocList();
 				continue;
 			}
@@ -167,8 +167,8 @@ 
             $return[$column] = $this->db->setQuery(
               $this->db->getQuery(true)
                        ->select($column)
-                       ->select('COUNT(' . $column . ') AS count')
-                       ->from('(SELECT * FROM ' . $this->db->quoteName('#__jstats') . ' WHERE modified > DATE_SUB(NOW(), INTERVAL ' . $this->db->quote($timeframe) .' DAY)) AS tmptable')
+                       ->select('COUNT('.$column.') AS count')
+                       ->from('(SELECT * FROM '.$this->db->quoteName('#__jstats').' WHERE modified > DATE_SUB(NOW(), INTERVAL '.$this->db->quote($timeframe).' DAY)) AS tmptable')
                        ->group($column)
             )->loadAssocList();
         }