Changeset 2027

Timestamp:

11/02/2015 05:33:50 AM (9 years ago)

Author:

nacin

Message:

Prepare Trac subscriptions to be enabled on meta.trac. see #291.

Location:

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

Files:

• trac-notifications-http-client.php (modified) (1 diff, 1 prop)
• trac-notifications-http-server.php (modified) (1 prop)
• trac-notifications-sqlite-driver.php (modified) (1 diff)
• trac-notifications.php (modified) (4 diffs)

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

@@ -12 +12 @@
         }
 
-        $url = add_query_arg( array(
-            'call'   => $method,
-            'secret' => $this->secret,
-        ), $this->target );
+        $url = add_query_arg( 'call', $method, $this->target );
 
         $args = array(
-            'body' => array( 'arguments' => json_encode( $arguments ) ),
+            'body' => array(
+                'arguments' => json_encode( $arguments ),
+                'secret'    => $this->secret,
+            ),
         );
 

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

@@ -37 +37 @@
     public function get_var( $query ) {
         if ( $q = $this->db->query( $query ) ) {
-            return $q->fetchColumn();
+            $var = $q->fetchColumn();
+            if ( $var !== false ) {
+                return $var;
+            }
         }
+        return null;
     }
 

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

@@ -13 +13 @@
     protected $components;
 
-    protected $tracs_supported = array( 'core', 'meta', 'themes', 'plugins' );
-    protected $tracs_supported_extra = array( 'bbpress', 'buddypress', 'gsoc', 'glotpress' );
+    protected $tracs_supported = array( 'core', 'meta', /* 'themes', 'plugins' */ );
+    protected $tracs_supported_extra = array( /* 'bbpress', 'buddypress', 'gsoc', 'glotpress' */ );
 
     function __construct() {
@@ -26 +26 @@
         }
 
-        if ( function_exists( 'add_db_table' ) ) {
+        $this->trac = $trac;
+
+        if ( 'core' === $trac && function_exists( 'add_db_table' ) ) {
             $tables = array( 'ticket', '_ticket_subs', '_notifications', 'ticket_change', 'component', 'milestone', 'ticket_custom' );
             foreach ( $tables as $table ) {
@@ -32 +34 @@
             }
         }
-        $this->api = new Trac_Notifications_DB( $GLOBALS['wpdb'] );
+
+        if ( 'core' === $trac ) {
+            $this->api = new Trac_Notifications_DB( $GLOBALS['wpdb'] );
+        } else {
+            $this->api = new Trac_Notifications_HTTP_Client( $this->trac_url() . '/wpapi', TRAC_NOTIFICATIONS_API_KEY );
+        }
 
         if ( 'core' === $trac ) {
@@ -38 +45 @@
             $this->components = new Make_Core_Trac_Components( $this->api );
         }
-
-        $this->trac = $trac;
 
         add_filter( 'allowed_http_origins', array( $this, 'filter_allowed_http_origins' ) );