Changeset 2023

Timestamp:

11/01/2015 06:33:25 PM (10 years ago)

Author:

nacin

Message:

Trac Notifications: Fewer cross dependencies.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/trac-notifications

Files:

• trac-components.php (modified) (1 diff)
• trac-notifications-api.php (added)
• trac-notifications-db.php (modified) (2 diffs)
• trac-notifications.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/trac-notifications/trac-components.php

@@ -392 +392 @@
         }
 
-        $history = $this->api->get_component_history( $component );
+        $history = $this->api->get_component_history( $component, self::last_x_days );
         $direction = '';
         if ( $history['change'] > 0 ) {

sites/trunk/wordpress.org/public_html/wp-content/plugins/trac-notifications/trac-notifications-db.php

@@ -2 +2 @@
 /**
  * This class must execute queries valid for both MySQL and SQLite3.
+ * The DB driver must be wpdb or Trac_Notifications_SQLite_Driver.
+ * It must work without any other dependencies, such as WordPress.
  */
-class Trac_Notifications_DB {
+class Trac_Notifications_DB implements Trac_Notifications_API {
     function __construct( $db ) {
         $this->db = $db;
@@ -60 +62 @@
     }
 
-    function get_component_history( $component ) {
-        $days_ago = ( time() - ( 86400 * Make_Core_Trac_Components::last_x_days ) ) * 1000000;
+    function get_component_history( $component, $last_x_days = 7 ) {
+        $days_ago = ( time() - ( 86400 * $last_x_days ) ) * 1000000;
         $closed_reopened = $this->db->get_results( $this->db->prepare( "SELECT newvalue, COUNT(DISTINCT ticket) as count
             FROM ticket_change tc INNER JOIN ticket t ON tc.ticket = t.id

sites/trunk/wordpress.org/public_html/wp-content/plugins/trac-notifications/trac-notifications.php

@@ -24 +24 @@
         }
 
-        require __DIR__ . '/trac-notifications-db.php';
+        spl_autoload_register( array( $this, 'autoload' ) );
 
         if ( function_exists( 'add_db_table' ) ) {
@@ -44 +44 @@
         add_action( 'template_redirect', array( $this, 'action_template_redirect' ) );
         add_shortcode( 'trac-notifications', array( $this, 'notification_settings_page' ) );
+    }
+
+    function autoload( $class ) {
+        $class = strtolower( $class );
+        if ( 0 === strpos( $class, 'trac_notifications_' ) ) {
+            require __DIR__ . '/' . str_replace( '_', '-', $class ) . '.php';
+        }
     }