Add SQLite compatibility and fix SQL Full Group By issues (> MySQL 5.5 and MariaDB)

composer.json

@@ -24,7 +24,7 @@
 		"codeception/module-cli": "^1.0",
 		"codeception/util-universalframework": "^1.0",
 		"rector/rector": "^0.17.0",
-		"wp-cli/wp-cli-bundle": "2.8.1",
+		"wp-cli/wp-cli-bundle": "^2.9",
 		"phpstan/phpstan": "^1.10.0",
 		"szepeviktor/phpstan-wordpress": "dev-master",
 		"phpstan/extension-installer": "^1.3.1",

css/styles.css

@@ -277,7 +277,12 @@ Style different log levels.
 	color: rgb(137, 143, 156);
 	margin-top: 0.4em;
 	line-height: 1;
-	max-height: 1em;
+	/* max-height: 1em; */
+}
+
+.SimpleHistoryLogitem__occasionsAddOnsText {
+	margin: 0.4em 0 0 0;
+	line-height: 1;
 }
 
 .SimpleHistoryLogitem__details {

docker-compose.yml

@@ -32,8 +32,6 @@ services:
 
   db:
     image: "${DB_IMAGE:-mariadb:10.5}"
-    #image: "${DB_IMAGE:-biarms/mysql:5.5}"
-    #image: "${DB_IMAGE:-biarms/mysql:5.7}"
     container_name: simple-history-database
     restart: "${DOCKER_RESTART_POLICY:-unless-stopped}"
     environment:
@@ -46,8 +44,6 @@ services:
       - "${DB_EXPOSE_PORT:-127.0.0.1:}:3306"
     volumes:
       - "${DB_DATA_DIR:-./data/mysql}:/var/lib/mysql"
-      #- "${DB_DATA_DIR:-./data/mysql-5.5}:/var/lib/mysql"
-      #- "${DB_DATA_DIR:-./data/mysql-5.7}:/var/lib/mysql"
 
   chrome:
     image: seleniarm/standalone-chromium:117.0

dropins/class-new-rows-notifier-dropin.php

@@ -90,7 +90,6 @@ public function ajax() {
 			);
 		}
 
-		// $since_id = isset( $_GET["since_id"] ) ? absint($_GET["since_id"]) : null;
 		$logQueryArgs = $apiArgs;
 
 		$logQuery = new Log_Query();

dropins/class-quick-stats.php

@@ -57,7 +57,7 @@ public function output_quick_stats() {
 		);
 
 		$cache_key = 'quick_stats_users_today_' . md5( serialize( $sql_loggers_in ) );
-		$cache_group = 'simple-history-' . Helpers::get_cache_incrementor();
+		$cache_group = Helpers::get_cache_group();
 		$results_users_today = wp_cache_get( $cache_key, $cache_group );
 
 		if ( false === $results_users_today ) {

dropins/class-sidebar-add-ons-dropin.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace Simple_History\Dropins;
+
+use Simple_History\Simple_History;
+
+/**
+ * Dropin that displays information about add-ons in the sidebar.
+ */
+class Sidebar_Add_Ons_Dropin extends Dropin {
+	/**
+	 * Add actions when dropin is loaded.
+	 */
+	public function loaded() {
+		add_action( 'simple_history/dropin/sidebar/sidebar_html', [ $this, 'on_sidebar_html' ], 5 );
+	}
+
+	/**
+	 * Output HTML.
+	 */
+	public function on_sidebar_html() {
+		?>
+		<div class="postbox">
+
+			<h3 class="hndle">
+				<?php esc_html_e( 'Add-ons', 'simple-history' ); ?>
+				<em class="sh-PageHeader-settingsLinkIcon-new">New</em>
+			</h3>
+
+			<div class="inside">
+				<p>
+					<?php esc_html_e( 'Now you can enhance and extend Simple History with add-ons.', 'simple-history' ); ?>
+				</p>
+
+				<?php
+				/*
+				<ul>
+					<li>
+						<strong><?php esc_html_e( 'Extended Settings:', 'simple-history' ); ?></strong>
+						<?php esc_html_e( 'Control number of days to keep the log, limit number of login attempts logged, store full IP-addresses, and a bonus JSON feed!', 'simple-history' ); ?>
+					</li>
+
+					<li>
+						<strong><?php esc_html_e( 'WooCommerce Logger:', 'simple-history' ); ?></strong>
+						<?php esc_html_e( 'Detailed WooCommerce activity logs. (Coming soon.)', 'simple-history' ); ?>
+					</li>
+
+					<li>
+						<strong><?php esc_html_e( 'Developer Tools:', 'simple-history' ); ?></strong>
+						<?php esc_html_e( 'Email, HTTP request, wp-cron job monitoring. (Coming soon.)', 'simple-history' ); ?>
+					</li>
+				</ul>
+				*/
+				?>
+
+				<p>
+					<a href="https://simple-history.com/add-ons/?utm_source=wpadmin" class="sh-ExternalLink" target="_blank">
+						<?php esc_html_e( 'View add-ons.', 'simple-history' ); ?>
+					</a>
+				</p>
+			</div>
+		</div>
+		<?php
+	}
+}

dropins/class-sidebar-settings-dropin.php

@@ -14,7 +14,7 @@ class Sidebar_Settings_Dropin extends Dropin {
 	 * Init
 	 */
 	public function loaded() {
-		add_action( 'simple_history/dropin/sidebar/sidebar_html', array( $this, 'on_sidebar_html' ), 5 );
+		add_action( 'simple_history/dropin/sidebar/sidebar_html', array( $this, 'on_sidebar_html' ), 7 );
 	}
 
 	/**

inc/class-helpers.php

@@ -297,6 +297,25 @@ public static function get_cache_incrementor( $refresh = false ) {
 		return $incrementor_value;
 	}
 
+	/**
+	 * Get the cache group for the cache.
+	 * Used by all function that use cache, so they use the
+	 * same cache group, meaning if we invalidate the cache group
+	 * all caches will be cleared/flushed.
+	 *
+	 * @return string
+	 */
+	public static function get_cache_group() {
+		return 'simple-history-' . self::get_cache_incrementor();
+	}
+
+	/**
+	 * Clears the cache.
+	 */
+	public static function clear_cache() {
+		self::get_cache_incrementor( true );
+	}
+
 	/**
 	 * Return a name for a callable.
 	 *
@@ -881,7 +900,7 @@ public static function clear_log() {
 		// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
 		$wpdb->query( $sql );
 
-		self::get_cache_incrementor( true );
+		self::clear_cache();
 
 		return $num_rows;
 	}
@@ -1127,31 +1146,55 @@ public static function get_num_events_last_n_days( $period_days = 28 ) {
 	 */
 	public static function get_num_events_per_day_last_n_days( $period_days = 28 ) {
 		$simple_history = Simple_History::get_instance();
-		$transient_key = 'sh_' . md5( __METHOD__ . $period_days . '_2' );
+		$transient_key = 'sh_' . md5( __METHOD__ . $period_days . '_3' );
 		$dates = get_transient( $transient_key );
 
 		if ( false === $dates ) {
+			/** @var \wpdb $wpdb */
 			global $wpdb;
 
 			$sqlStringLoggersUserCanRead = $simple_history->get_loggers_that_user_can_read( null, 'sql' );
 
-			$sql = sprintf(
-				'
-                    SELECT
-                        date_format(date, "%%Y-%%m-%%d") AS yearDate,
-                        count(date) AS count
-                    FROM
-                        %1$s
-                    WHERE
-                        UNIX_TIMESTAMP(date) >= %2$d
-                        AND logger IN (%3$d)
-                    GROUP BY yearDate
-                    ORDER BY yearDate ASC
-                ',
-				$simple_history->get_events_table_name(),
-				strtotime( "-$period_days days" ),
-				$sqlStringLoggersUserCanRead
-			);
+			$db_engine = Log_Query::get_db_engine();
+
+			if ( $db_engine === 'mysql' ) {
+				$sql = sprintf(
+					'
+						SELECT
+							date_format(date, "%%Y-%%m-%%d") AS yearDate,
+							count(date) AS count
+						FROM
+							%1$s
+						WHERE
+							UNIX_TIMESTAMP(date) >= %2$d
+							AND logger IN %3$s
+						GROUP BY yearDate
+						ORDER BY yearDate ASC
+					',
+					$simple_history->get_events_table_name(),
+					strtotime( "-$period_days days" ),
+					$sqlStringLoggersUserCanRead
+				);
+			} elseif ( $db_engine === 'sqlite' ) {
+				// SQLite does not support date_format() or UNIX_TIMESTAMP so we need to use strftime().
+				$sql = sprintf(
+					'
+						SELECT
+							strftime("%%Y-%%m-%%d", date) AS yearDate,
+							count(date) AS count
+						FROM
+							%1$s
+						WHERE
+							unixepoch(date) >= %2$d
+							AND logger IN %3$s
+						GROUP BY yearDate
+						ORDER BY yearDate ASC
+					',
+					$simple_history->get_events_table_name(),
+					strtotime( "-$period_days days" ),
+					$sqlStringLoggersUserCanRead
+				);
+			}
 
 			$dates = $wpdb->get_results( $sql ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared