Changeset 612743

Timestamp:

10/15/2012 02:09:57 PM (13 years ago)

Author:

mobius5150

Message:

Twitter application support

Location:

globalfeed/trunk

Files:

• admin/pages/style.css (modified) (1 diff)
• event_scheduler_interfaces/wp-schedule-interface.php (modified) (1 diff)
• feeds/mb_facebook/mb_facebook.php (modified) (6 diffs)
• feeds/mb_facebook/pages/setup.php (modified) (2 diffs)
• feeds/mb_twitter/mb_twitter.php (modified) (7 diffs)
• feeds/mb_twitter/pages/js/mb_twitter.js (modified) (1 diff)
• feeds/mb_twitter/pages/setup.php (modified) (9 diffs)
• feeds/mbgf_rss/mbgf_rss.php (modified) (2 diffs)
• mb_globalfeed.php (modified) (2 diffs)

globalfeed/trunk/admin/pages/style.css

@@ -137 +137 @@
     margin: 0px 20px 20px 0px;
     padding: 5px 10px 10px;
+    position:relative;
+}
+
+.optgrp .bottom-button {
+    position: absolute;
+    bottom: 10px;
+    left: 0px;
+    width: 100%;
 }
 

globalfeed/trunk/event_scheduler_interfaces/wp-schedule-interface.php

@@ -81 +81 @@
             } else {
                 $inner = array_shift(array_values($event[$this->hook_name]));
-                if ( $event[$this->hook_name]['args']['caller'] != $caller &&
-                        $event[$this->hook_name]['args']['action'] != $action )
+                if ( !isset($event[$this->hook_name]['args']) || ($event[$this->hook_name]['args']['caller'] != $caller &&
+                        $event[$this->hook_name]['args']['action'] != $action) )
                     $new_schedule[$timestamp] = $event;
             }

globalfeed/trunk/feeds/mb_facebook/mb_facebook.php

@@ -167 +167 @@
         $this->setup_filters();
 
-        // Check for our query vars that tell the feed to take control. (IE communications received from Facebook.)
-//        if ( isset( $_GET['reset_since'] ) )
-//            $this->feed_options['last_feed_update'] = 0;
-        
-//        if ( isset( $_GET[ 'setup_fb' ] ) && $feed_options != false)
-//                $this->get_authorization();
-        
-        // If were in the admin, we need to be using sessions
+        // If we're in the admin, we need to be using sessions
         if ( is_admin() ) {
             if (!isset($_SESSION['state']))
@@ -195 +188 @@
             $this->handle_subscription_call();
         
-        // If we're set to automatically interupt application flow, then exit so WordPress doesn't do its thing.
-//        if ( (isset( $_GET['feed_queryvar'])  || isset( $_POST['feed_queryvar'])) && $this->auto_interupt_flow && false)
-//            exit;
     }
     
@@ -371 +361 @@
         wp_verify_nonce( 'facebook-connect-settings_main' );
         
-        if (!empty($this->feed_options['oauth_user_token']) || (isset($_SERVER['mbgf_app_is_authed']) && $_SERVER['mbgf_app_is_authed'])  || get_transient('mbgf_app_is_authed')) {
-            unset( $_SERVER['mbgf_app_is_authed'] );
+        if (!empty($this->feed_options['oauth_user_token']) || (isset($_SERVER['mbgf_facebook_authed']) && $_SERVER['mbgf_facebook_authed'])  || get_transient('mbgf_facebook_authed')) {
+            unset( $_SERVER['mbgf_facebook_authed'] );
             die( json_encode(true) );
         } else {
@@ -378 +368 @@
             while ( $c <= 2 ) {
                 sleep(2);
-                if ( (isset($_SERVER['mbgf_app_is_authed']) && $_SERVER['mbgf_app_is_authed']) || get_transient('mbgf_app_is_authed') ) {
-                    unset( $_SERVER['mbgf_app_is_authed'] );
+                if ( (isset($_SERVER['mbgf_facebook_authed']) && $_SERVER['mbgf_facebook_authed']) || get_transient('mbgf_facebook_authed') ) {
+                    unset( $_SERVER['mbgf_facebook_authed'] );
                     die(json_encode(true));
                 }
@@ -518 +508 @@
             return new WP_Error ('MB_Facebook_Feed_Activation_Failed', 'Feed registration failed for an unknown reason.');
         
-        // Get Facebook Authorization.
-        //if ( !$this->get_authorization())
-        //    return new WP_Error ('MB_Facebook_Feed_Authorization_Failed', 'Feed authentication with Facebook failed.');
             
     }
@@ -1058 +1045 @@
             $this->register_feed( true );
             
-            $_SERVER['mbgf_app_is_authed'] = true;
-            set_transient('mbgf_app_is_authed', true, 3600);
+            $_SERVER['mbgf_facebook_authed'] = true;
+            set_transient('mbgf_facebook_authed', true, 3600);
             
             if ($this->feed_type == 'callback')

globalfeed/trunk/feeds/mb_facebook/pages/setup.php

@@ -31 +31 @@
                 <th><?php _e('Facebook App ID:',$mb_globalfeed_facebook_connect->get_slug()) ?></th>
                 <td><input type="text" name="app_id" class="auth-form-input" id="app_id" value="<?php echo $feed_options['app_id']; ?>"/></td>
-            </tr>    
+            </tr>
             <tr>
                 <th><?php _e('Facebook App Secret:',$mb_globalfeed_facebook_connect->get_slug()) ?></th>
                 <td><input type="text" name="app_secret" class="auth-form-input" id="app_secret" value="<?php echo $feed_options['app_secret']; ?>" /></td>
-            </tr>    
+            </tr>
             <tr>
                 <th></th>
@@ -102 +102 @@
         jQuery('#authorize_button').attr("disabled", true);
 
-        // In order to get passed popup blockers, we open the AuthWindow now. In the future, this should pop up a temporary loading page, however we aren't that fancy yet.
+        // In order to get past popup blockers, we open the AuthWindow now. In the future, this should pop up a temporary loading page, however we aren't that fancy yet.
         authWindow = window.open('',"fb_activation_window","location=0,status=0,scrollbars=0, width=750,height=500");
 
         // Post the app_id and secret to the server for use in the auth process.
         jQuery.post(ajaxurl, {action:'mbgf_facebook_connect_set_app_info',app_id:app_id,app_secret:app_secret,_wpnonce:jQuery('#_wpnonce').val()}, function(response){
-            //authWindow = window.open(jQuery('#activation_url').val() + '&client_id=' + jQuery('#app_id').val(), );
             authWindow.location.href = jQuery('#activation_url').val() + '&client_id=' + jQuery('#app_id').val();
             setAuthWindowChecker( '#step-1', function(){jQuery('#authorize_button').attr("disabled", false)}, jQuery('#activation_redirection_url').val() );

globalfeed/trunk/feeds/mb_twitter/mb_twitter.php

@@ -89 +89 @@
     private $_apiurl = 'http://api.twitter.com/1/';
     
+    private $tw_endpoints = array(
+        // OAuth endpoints
+        'oauth_request_token' => 'https://api.twitter.com/oauth/request_token',
+        'oauth_authorize' => 'https://api.twitter.com/oauth/authorize',
+        'oauth_access_token' => 'https://api.twitter.com/oauth/access_token',
+        
+        // Content endpoints
+        'get_status' => 'http://api.twitter.com/1/statuses/user_timeline.json',
+        'get_retweet'=> 'http://api.twitter.com/1/statuses/retweeted_by_user.json',
+    ); //['oauth_request_token']
+    
     /**
      * Gets the Twitter REST API url
@@ -124 +135 @@
         'show_welcome_message' => false,
         'geotagging_enabled' => true,
+        'allow_showing_statuses' => true,
         'allow_showing_retweets' => false,
         'override_post_time_on_timezone_discrepency' => false,
+        'alerts' => array(),
     );
     
@@ -158 +171 @@
             return;
         }
+        
+        // If we're in the admin, we need to be using sessions
+        if ( is_admin() ) {
+            if (!isset($_SESSION['state']))
+                $_SESSION['state'] = md5(uniqid(rand(), TRUE)); //CSRF protection for admin.
+        }
+        
         
         $this->feed_slug = !empty($feed_options['feed_slug']) ? $feed_options['feed_slug'] : $this->feed_slug;
@@ -193 +213 @@
         // Setup feed filters
         $this->setup_filters();
+        
+        // Check for url parameters indicating an OAuth orization
+        if ( $this->feed_options['tw_auth_status'] == 'authorizing' && isset($_GET['oauth_token']) && isset($_GET['oauth_verifier']) )
+            $this->complete_oauth_authentication();
     }
     
@@ -220 +244 @@
         // These action are related to the setup while were in admin...
         if (is_admin()) {
-            add_action( 'wp_ajax_mbgf_twitter_connect_set_tw_obj_id', array( &$this, 'set_tw_obj_id' ) );
+            // Authorization hooks
+            add_action( 'wp_ajax_mbgf_twitter_connect_set_app_info', array( &$this, 'set_app_info' ));
+            add_action( 'wp_ajax_mbgf_twitter_connect_is_authed', array( &$this, 'ajax_app_is_authed' ));
+            add_action( 'wp_ajax_mbgf_twitter_connect_set_tw_obj_id', array( &$this, 'ajax_set_tw_obj_id' ));
+            
+            // Ajax hooks
+            add_action( 'wp_ajax_mbgf_twitter_connect_set_tw_obj_id', array( &$this, 'ajax_set_tw_obj_id' ) );
+            add_action( 'wp_ajax_mbgf_twitter_connect_get_tw_obj_id', array( &$this, 'ajax_get_tw_obj_id' ) );
             add_action( 'wp_ajax_mbgf_twitter_connect_redo_initial_setup', array( &$this, 'redo_initial_setup' ) );
             add_action( 'wp_ajax_mbgf_twitter_connect_reset_feed_defaults', array( &$this, 'reset_feed_defaults' ) );
             add_action( 'wp_ajax_mbgf_twitter_connect_manual_feed_update', array( &$this, 'ajax_do_update' ) );
+            
+            // General Hooks
+            add_action( 'admin_notices', array( &$this, 'show_alerts' ) );
+            
+            // Unregister feed hook
             add_action( 'mbgf_unregister_feed-' . $this->get_slug(), array( &$this, 'unregister_feed') );
         }
@@ -410 +446 @@
             die(json_encode(array('status' => 'failure', 'error' => $res)));
     }
+    
+    /**
+     * When the user attempts to authorize the twitter app with API parameters, 
+     * this function is called to set an app_id and app_secret.
+     * 
+     */
+    public function set_app_info() {
+        check_admin_referer( 'twitter-connect-admin' );
+        wp_verify_nonce( 'twitter-connect-admin' );
+        
+        $consumer_key = $_POST['consumer_key'];
+        $consumer_secret = $_POST['consumer_secret'];
+        
+        // Validate the values we've received
+        if (preg_match('/^[a-zA-Z0-9]+$/', $consumer_secret) == 0 || preg_match('/^[a-zA-Z0-9]+$/', $consumer_key) == 0 )
+            die('Invalid');
+        
+        // Save these values and mark us as unauthorized
+        $this->feed_options['tw_auth_status'] = 'authorizing';
+        $this->feed_options['consumer_key'] = $consumer_key;
+        $this->feed_options['consumer_secret'] = $consumer_secret;
+        
+        // Clear any previous tokens
+        $this->feed_options['oauth_token'] = '';
+        $this->feed_options['oauth_token_secret'] = '';
+        $this->feed_options['oauth_access_token'] = '';
+        $this->feed_options['oauth_access_token_secret'] = '';
+        
+        $this->globalfeed->print_debug_info("OAuth Key Generation");
+        $this->get_oauth_key_request(); // will call register_feed
+        
+        $this->register_feed(true);
+        
+        // This should return the Twitter URL to direct the user to so that the confirm authorization for the app
+        die(json_encode(
+                array(
+                    'consumer_key' => $this->feed_options['consumer_key'], 
+                    'consumer_secret' => $this->feed_options['consumer_secret'],
+                    'oauth_url' => $this->tw_endpoints['oauth_authorize'] . "?oauth_token={$this->feed_options['oauth_token']}&force_login=true" ,
+                    'callback_url' => get_bloginfo('wpurl').'/',
+                )));
+        
+    }
+    
+    /**
+     * When the user attempts to authorize the twitter app with API parameters, 
+     * this function is called to see if the feed now has an app_id and app_secret
+     * 
+     */
+    public function ajax_app_is_authed() {
+        check_admin_referer( 'twitter-connect-admin' );
+        wp_verify_nonce( 'twitter-connect-admin' );
+        
+        if (!empty($this->feed_options['oauth_user_token']) || (isset($_SERVER['mbgf_twitter_authed']) && $_SERVER['mbgf_twitter_authed'])  || get_transient('mbgf_twitter_authed')) {
+            unset( $_SERVER['mbgf_twitter_authed'] );
+            die( json_encode(true) );
+        } else {
+            $c = 1;
+            while ( $c <= 2 ) {
+                sleep(2);
+                if ( (isset($_SERVER['mbgf_twitter_authed']) && $_SERVER['mbgf_twitter_authed']) || get_transient('mbgf_twitter_authed') ) {
+                    unset( $_SERVER['mbgf_twitter_authed'] );
+                    die(json_encode(true));
+                }
+                    
+                $c++;
+            }
+            
+            die( json_encode(false) );
+        }
+    }
+    
+    public function ajax_get_tw_obj_id() {
+        check_admin_referer( 'twitter-connect-admin' );
+        wp_verify_nonce( 'twitter-connect-admin' );
+        
+        die(json_encode(array('object' => $this->feed_options['object_to_subscribe'])));
+    }
+
+    /**
+     * When the user attempts to authorize the facebook app, this function is called to
+     * see if the feed now has an app_id and app_secret
+     * 
+     */
+    public function ajax_set_tw_obj_id() {
+        check_admin_referer( 'twitter-connect-admin' );
+        wp_verify_nonce( 'twitter-connect-admin' );
+        
+        $obj_id = $_POST['tw_object_id'] ;
+        
+        // Validate the values we've received
+        if (preg_match('/^[0-9]+$/', $obj_id) == 0){
+            die(json_encode('Input arguments are not of the right format'));
+        }
+        
+        // If we're receveing a new ID, kill the last update time
+        foreach ($this->feed_options['last_feed_update'] as $key => $value)
+            $this->feed_options['last_feed_update'][$key] = 0;
+        
+        // The object ID appears valid. Save.
+        $this->feed_options['object_to_subscribe'] =  $obj_id;
+        
+        // If this var is set, then mark the initial setup complete.
+        if (isset($_POST['mb_twitter_finish_setup']) && ((bool) $_POST['mb_twitter_finish_setup']) == true ) {
+            $this->feed_options['initial_setup_done'] = true;
+            $this->feed_options['show_welcome_message'] = true;
+        }
+        
+        // Unset any auth info if we arent authorized
+        if ($this->feed_options['tw_auth_status'] != 'authorized')
+            $this->feed_options['tw_auth_status'] = 'not_initiated';
+        
+        $result = $this->update_feed(null);
+        
+        if ( $result === false ) {
+            $this->feed_options['object_to_subscribe'] = $this->feed_defaults['object_to_subscribe'];
+            $this->feed_options['initial_setup_done'] = false;
+            $this->feed_options['show_welcome_message'] = false;
+            
+            // Save changes
+            $this->register_feed(true);
+            
+            die(json_encode('Error: A network error occured while requesting data from twitter.'));
+        }
+        
+        // Update and return the feed items retrieved.
+        die(json_encode(
+                array( 'num_feed_items_retrieved' => $result )
+        ));
+    }
+    
+    private function get_oauth_key_request() {
+        if ( empty($this->feed_options['consumer_key']) || empty($this->feed_options['consumer_secret']) )
+            return new WP_Error ('not_setup', "You must set a Twitter consumer Key and Secret to get a request token");
+        
+        // Do the request
+        $request = $this->do_twitter_remote_post( $this->tw_endpoints['oauth_request_token'] );
+        
+        // Check if a request error occured
+        if ( is_wp_error($request) )
+            return $request;
+        
+        // Check if the twitter endpoint didn't say everythings alright
+        if ( $request['response']['code'] !== 200 ) {
+            $this->globalfeed->print_debug_info("req error: ");
+            $this->globalfeed->print_debug_info($request);
+            return new WP_Error('bad_response', "The response code from the Twitter API while requesting an authorization token was: {$request['response']['code']}", $request['response']['code']);
+        }
+        
+        // Parse the OAuth token and secret from the response string
+        $vals = array();
+        parse_str($request['body'], $vals);
+        
+        // Store the settings
+        $this->feed_options['oauth_token'] = $vals['oauth_token'];
+        $this->feed_options['oauth_token_secret'] = $vals['oauth_token_secret'];
+        
+        $this->register_feed();
+        return true;
+    }
+    
+    /**
+     * Called when the application is still authorizing with Twitter, and the user arrives
+     * at the callback url. 
+     */
+    private function complete_oauth_authentication() {
+        $this->globalfeed->print_debug_info("Completeing Oauth...");
+        $oauth_token = $_GET['oauth_token'];
+        $oauth_verifier = $_GET['oauth_verifier'];
+        
+        // Check that the approved OAuth token matches the one we're attempting to verify.
+        if ( $oauth_token !== $this->feed_options['oauth_token'] ) {
+            $this->globalfeed->print_debug_info("Oauth failed...");
+            $this->feed_options['tw_auth_status'] = 'failed';
+            return;
+        }
+        
+        // Get the actual access token for the application
+        $request = $this->do_twitter_remote_post($this->tw_endpoints['oauth_access_token'], array('oauth_verifier' => $oauth_verifier, 'oauth_token' => $oauth_token));
+        
+        // Check for errors...
+        if (is_wp_error($request) ) {
+            $this->globalfeed->print_debug_info("OAuth failed...");
+            $this->globalfeed->print_debug_info($request);
+            $this->feed_options['tw_auth_status'] = 'failed';
+            return;
+        }
+        
+        // Check that the request succeeded
+        if ( $request['response']['code'] !== 200 ){
+            $this->globalfeed->print_debug_info("Error completeing oauth authentication");
+            $this->globalfeed->print_debug_info($request);
+            $this->feed_options['tw_auth_status'] = 'failed';
+            return;
+        }
+        
+        // Load values from the response
+        $vals = array();
+        parse_str($request['body'], $vals);
+        
+        // Set markers
+        $_SERVER['mbgf_twitter_authed'] = true;
+        set_transient('mbgf_twitter_authed', true);
+        
+        // Set values in feed options
+        $this->feed_options['object_to_subscribe'] = $vals['screen_name'];
+        $this->feed_options['oauth_access_token'] = $vals['oauth_token'];
+        $this->feed_options['oauth_access_token_secret'] = $vals['oauth_token_secret'];
+        
+        // Save changes
+        $this->register_feed(true);
+        $this->globalfeed->print_debug_info("Oauth complete...");
+    }
+    
+    /**
+     * Generates a Titter request string (including signature) for the given URL 
+     * with the given parameters. This function should only be used when the user
+     * has chosen to use the App-Authenticated approach to connecting to the API,
+     * if the user has not supplied app info, the return request string will fail.
+     * 
+     * @uses $this->generate_twitter_request_signature()
+     * 
+     * @param str $endpoint
+     * @param array $parameters
+     * @param str $method
+     * 
+     * @return array|WP_Error The result from executing wp_remote_post on the generated request
+     */
+    private function do_twitter_remote_post( $endpoint, $parameters = array(), $method = 'POST' ) {
+        $default_parameters = array(
+            'oauth_consumer_key' => $this->feed_options['consumer_key'],
+            'oauth_nonce' => $_SESSION['state'],
+            'oauth_signature_method' => 'HMAC-SHA1',
+            'oauth_timestamp' => time(),
+            'oauth_version' => '1.0',
+            'oauth_callback' => get_bloginfo('wpurl').'/',
+            'x_auth_access_type' => 'read'
+        );
+        
+        if ( !empty($this->feed_options['oauth_access_token']) )
+            $default_parameters['oauth_access_token'] = $this->feed_options['oauth_access_token'];
+        
+        // Parse the default parameters
+        $parameters = wp_parse_args($parameters, $default_parameters);
+            
+        // Get the signature for the request
+        $parameters['oauth_signature'] = $this->generate_twitter_request_signature($endpoint, $method, $parameters);
+        
+        // The below code is what is SUPPOSED to be done -- but it didn't want to work :(
+//        // Build the Authorization header string
+//        $header_str = 'OAuth ';
+//        foreach ( $parameters as $key => $value )
+//            $header_str .= rawurlencode($key) . '="' . rawurlencode($value) . '", ';
+//        
+//        // Remove trailing ", " from string
+//        $header_str = substr($header_str, 0, -2);
+        
+        $endpoint .= '?';
+        foreach ( $parameters as $key => $value )
+            $endpoint .= $key . '=' . rawurlencode($value) . '&';
+        
+        $endpoint = substr($endpoint, 0, -1);
+        
+        // Execute the request, and return whatever results
+        return wp_remote_post($endpoint, array( 'method' => strtoupper($method), ) );
+    }
+    
+    /**
+     * Generates a request signature for the given request.
+     * 
+     * @param str $endpoint
+     * @param str $method
+     * @param array $parameters
+     * @return str 
+     */
+    private function generate_twitter_request_signature( $endpoint, $method, $parameters ) {
+        // Sort the parameters alphabetically
+        ksort($parameters);
+        
+        // Percent encode parameters and build the parameter string
+        $param_str = '';
+        foreach ($parameters as $key => $value)
+            $param_str .= rawurlencode($key) . '=' . rawurlencode($value) . '&';
+        
+        // Remove the trailing & from the string...
+        $param_str = substr($param_str, 0, -1);
+        
+        // The base string is the parameter string appendd to the base string (as per oauth spec)
+        $base_str = strtoupper($method) . '&' . rawurlencode($endpoint) . '&' . rawurlencode($param_str);
+        
+        // Build the signing key
+        $signing_key = rawurlencode($this->feed_options['consumer_secret']) . '&';
+        
+        // If we have a user request token, that needs to be a part of the signing key
+        if ( !empty($this->feed_options['oauth_access_token_secret']) )
+            $signing_key .= rawurlencode($this->feed_options['oauth_token_secret']);
+        
+        // Create and return the signature
+        return base64_encode(hash_hmac('sha1', $base_str, $signing_key, true));
+    }
+    
+    /**
+     * Adds a Twitter alert that should be displayed to the user
+     * 
+     * If an alert with the same $alert_code already exists, it will be overwritten.
+     * 
+     * @param str $alert_code A slug-style code for the alert
+     * @param str $alert_text The alert text
+     * @param bool $sitewide (optional, defaults to false) Whether the alert should be shown sitewide, or just within GlobalFeed.
+     */
+    
+    /**
+     * Adds a Twitter alert that should be displayed to the user
+     * 
+     * If an alert with the same $alert_code already exists, it will be overwritten.
+     * 
+     * @global type $current_user
+     * 
+     * @param str $alert_code A slug-style code for the alert
+     * @param str $alert_text The alert text
+     * @param type $important Whether the alert should be shown as a notice or an error
+     * @param bool $sitewide (optional, defaults to false) Whether the alert should be shown sitewide, or just within GlobalFeed.
+     * @param type $require_priv What privilege the alert requires to be seen. '' if none.
+     * @param type $dismissable Whether the alert should be dismissable by the user
+     */
+    function add_alert( $alert_code, $alert_text, $important = false, $sitewide = false, $require_priv = 'manage_options', $dismissable = true ) {
+        global $current_user;
+        
+        $this->feed_options['alerts'][$alert_code] = array(
+            'alert_code' => $alert_code,
+            'alert_text' => $alert_text,
+            'sitewide'   => $sitewide,
+            'hidden'     => false,
+            'remind'     => 0,
+            'important'  => $important,
+            'require_priv' => $require_priv,
+            'never_show' => (isset($this->feed_options['alerts'][$alert_code]) ? $this->feed_options['alerts'][$alert_code]['never_show'] : false),
+            'dismissable'=> $dismissable,
+        );
+        
+        $this->globalfeed->print_debug_info("Feed options");
+        $this->globalfeed->print_debug_info($this->feed_options['alerts']);
+        
+        $this->register_feed(true);
+        
+        delete_user_meta($current_user->ID, "mbgf_twitter_connect_hide_alert_" . $alert_code);
+        
+        $this->globalfeed->print_debug_info("Added alert: $alert_code");
+    }
+    
+    /**
+     * When an alert no longer applies, hide it from the user.
+     * 
+     * @param type $alert_code 
+     */
+    function hide_alert( $alert_code ) {
+        if ( isset($this->feed_options['alerts'][$alert_code]) )
+            $this->feed_options['alerts'][$alert_code]['hidden'] = true;
+        
+        $this->register_feed(true);
+    }
+    
+    /**
+     * Shows any queued alerts. Also detects if the user hides an alert
+     * 
+     * Called by WordPress Action 'admin_notices'
+     * 
+     */
+    function show_alerts() {
+        global $current_user;
+        
+        // Check if there are alerts
+        if ( !count($this->feed_options['alerts']) )
+            return;
+        
+        $hide_text = __('Hide', 'mb_twitter');
+        $never_show_text = __('Never show again', 'mb_twitter');
+        
+        // Used for show/hide urls
+        $server_args = array();
+        parse_str($_SERVER['QUERY_STRING'], $server_args);
+        
+        // Loop through alerts
+        foreach ($this->feed_options['alerts'] as $alert_code => $alert) {
+            // Check if this alert should be hidden from the user
+            $hide_alert = "mbgf_twitter_connect_hide_alert_" . $alert['alert_code'];
+            $never_show_alert = "mbgf_twitter_connect_never_show_alert_" . $alert['alert_code'];
+            
+            // Check if alert is disabled -- but make sure we catch anything telling us to hide the alert (but make sure the user has permission)
+            if ( !isset($_GET[$hide_alert]) && !isset($_GET[$never_show_alert]) && !( $alert['require_priv'] !== '' && current_user_can($require_priv) ) && ( 
+                    // Is this alert disabled?
+                    $alert['hidden'] || $alert['never_show']
+                    
+                    // Check if the alert should be shown accross WP-Admin
+                    || ( $this->globalfeed->in_admin() === false && !$alert['sitewide'] )
+                    
+                    // Check if the user has previously hidden this alert
+                    || get_user_meta($current_user->ID, $hide_alert, true) === true ) )
+                continue;
+            
+            // Check if alert show status changed
+            if ( isset($_GET[$hide_alert]) ) {
+                add_user_meta($current_user->ID, $hide_alert, true);
+                continue;
+            }
+            
+            if ( isset($_GET[$never_show_alert]) ) {
+                $this->feed_options['alerts'][$alert_code]['never_show'] = true;
+                $this->register_feed(true);
+                continue;
+            }
+            
+            // This alert should be shown to the user
+            echo "<div class='{$alert['alert_code']} " . ($alert['important'] ? 'error' : 'updated') . "'><p>{$alert['alert_text']}</p>";
+            
+            if ( $alert['dismissable'] ) {
+                $hide_addr = http_build_query(array_merge($server_args, array($hide_alert=>1)));
+                $never_addr=  http_build_query(array_merge($server_args, array($never_show_alert=>1)));
+                echo "<div class='align_right'><a href='?$hide_addr' title='$hide_text'>$hide_text</a> | <a href='?$never_addr' title='$never_show_text'>$never_show_text</a></div></div>";
+            } else
+                echo '</div>';
+        }
+    }
 
     /**
@@ -416 +875 @@
      * mode.
      * 
+     * @todo Alert the user if the endpoints are being rate limited.
      * @todo Give the user the option whether to show the user screen name, or name as the title.
      * @param type $args 
      */
     function update_feed() {
+        
+        // Don't try and update if authorization is in progress
+        if ( $this->feed_options['tw_auth_status'] !== 'authorized' && $this->feed_options['tw_auth_status'] !== 'not_initiated' )
+            return;
+        
         $globalfeed = &$this->globalfeed;
         $feed_options = &$this->feed_options;
-        $globalfeed->print_debug_info('Update Twitter Feed Called.', 'mb_twitter');
-        $globalfeed->print_debug_info($feed_options, 'mb_twitter');
-        
-        $endpoints = array(
-            "status" => "http://api.twitter.com/1/statuses/user_timeline.json?user_id={$feed_options['object_to_subscribe']}&count={$feed_options['max_feed_items']}" . ($feed_options['last_feed_update']['status'] ? "&since_id={$feed_options['last_feed_update']['status']}" : '')
-        );
-            
-        if ( $feed_options['allow_showing_retweets'] )
-            $endpoints["retweet"] = "http://api.twitter.com/1/statuses/retweeted_by_user.json?user_id={$feed_options['object_to_subscribe']}&count={$feed_options['max_feed_items']}" . ($feed_options['last_feed_update']['retweet'] ? "&since_id={$feed_options['last_feed_update']['retweet']}" : '');
-        
+        
+        // Check if we should be making authenticated requests
+        if ( !empty($this->feed_options['oauth_access_token']) ) {
+            $endpoints = array();
+            
+            // Add statuses to list if enabled
+            if ( $feed_options['allow_showing_statuses'] )
+                $endpoints["status"] = array(
+                    'endpoint_url' => $this->tw_endpoints['get_status'],
+                    'parameters' => array(
+                        'user_id' => $feed_options['object_to_subscribe'],
+                        'count'   => $feed_options['max_feed_items']
+                    )
+                );
+            
+            // Add retweets to the list if enabled
+            if ( $feed_options['allow_showing_retweets'] )
+                $endpoints['retweet'] = array(
+                    'endpoint_url' => $this->tw_endpoints['get_retweet'],
+                    'parameters' => array(
+                        'user_id' => $feed_options['object_to_subscribe'],
+                        'count'   => $feed_options['max_feed_items']
+                    )
+                );
+            
+            // If this isn't the first update, get the last update
+            foreach ( $endpoints as $key => $value ) {
+                if ( $feed_options['last_feed_update'][$key] )
+                    $endpoints[$key]['parameters']['since'] = $feed_options['last_feed_update'][$key];
+            }
+        } else {
+            $endpoints = array();
+            if ( $feed_options['allow_showing_statuses'] )
+                $endpoints["status"] = $this->tw_endpoints['get_status'] . "?user_id={$feed_options['object_to_subscribe']}&count={$feed_options['max_feed_items']}" . ($feed_options['last_feed_update']['status'] ? "&since_id={$feed_options['last_feed_update']['status']}" : '');
+
+            if ( $feed_options['allow_showing_retweets'] )
+                $endpoints["retweet"] = $this->tw_endpoints['get_retweet'] . "?user_id={$feed_options['object_to_subscribe']}&count={$feed_options['max_feed_items']}" . ($feed_options['last_feed_update']['retweet'] ? "&since_id={$feed_options['last_feed_update']['retweet']}" : '');
+        }
+        
+        // Get time info
         $feed_items = array();
         $gmt_timezone = new DateTimeZone('GMT');
         $time_offset = get_option( 'gmt_offset' ) * 3600;
         
+        // Loop through endpoints and grab content
         foreach ( $endpoints as $endpoint_id => $endpoint ) {
-            $request = wp_remote_get( $endpoint );
-
+            if ( is_array($endpoint) )
+                $request = $this->do_twitter_remote_post( $endpoint['endpoint_url'], $endpoint['parameters'], 'GET' );
+            else
+                $request = wp_remote_get( $endpoint );
+
+            $this->globalfeed->print_debug_info($endpoint);
+            
+            // Check for a WP Error
             if ( is_wp_error($request) )
                 return $request;
 
+            // Check the response code
+            $request['response']['code'] = (int) $request['response']['code'];
+            if ( $request['response']['code'] !== 200 ) {
+                if ( $request['response']['code'] === 302 ) {
+                    $this->globalfeed->print_debug_info('Rate limiting error', 'mb_twitter');
+                    
+                    // We are being rate limited
+                    if ( !empty($this->feed_options['oauth_access_token'])) {
+                        // Authentication is enabled
+                        $this->add_alert( 'rate_limiting', "GlobalFeed Twitter Connect is currently being rate limited by Twitter and is unable to fetch new content. Because you setup Twitter Connect with authentication, please ensure that any other apps using your Applications' consumer key and secret are not generating too many requests.", true, true );
+                    } else {
+                        $this->add_alert( 'rate_limiting', "GlobalFeed Twitter Connect is currently being rate limited by Twitter and is unable to fetch new content. You may want to consider setting up Twitter Connect using a Twitter Application, especially if you are on shared hosting. For more information, visit Twitter Connect within the GlobalFeed settings.", true, true );
+                    }
+                    
+                    return new WP_Error('rate_limiting', "Twitter connect is being rate limited by Twitter, Status Code 302");
+                } else {
+                    $this->globalfeed->print_debug_info('Request error.', 'mb_twitter');
+                    $this->add_alert('error_connecting', "Problems were experienced communicating with Twitter. Received response code {$request['response']['code']} on endpoint {$endpoint_id}");
+                    return new WP_Error('request_error', "Twitter connect experienced a comms error fetching new content from Twitter.", $request['response']['code']);
+                }
+            }
+            
+            // Hide any previous alerts
+            $this->hide_alert('request_error');
+            $this->hide_alert('rate_limiting');
+
             // Use the regex to replace numerical values to strings for older versions of php
             $updates = json_decode( preg_replace('/("\w+"):(\d+)/', '\\1:"\\2"', $request['body']), true );
 
-            if ( $updates == NULL || empty($updates) )
+            // Check that we actually have content
+            if ( $updates == NULL || empty($updates) || !is_array($updates) || !count($updates) )
                 continue;
-           
+            
             // Mark the last feed update item
-            $feed_options['last_feed_update'][$endpoint_id] = $updates[0]['id'];
+            $feed_options['last_feed_update'][$endpoint_id] = $updates[0]['id'];    
             
             foreach ($updates as $update) {

globalfeed/trunk/feeds/mb_twitter/pages/js/mb_twitter.js

@@ -64 +64 @@
     });
 }
+
+/* ----------------------------------------------- TW Authorization Interface */
+var authWindowChecker = null;
+var authWindow = null;
+function setAuthWindowChecker( statusdiv, fail, redir_url ) {
+    authWindowChecker = setTimeout(function(){
+        checkAuthWindow( statusdiv, fail, redir_url );
+    }, 1000);
+    //authWindowChecker = setTimeout('checkAuthWindow("' + statusdiv + ',' + fail + ',' + '")', 1000);
+    return;
+}
+function checkAuthWindow( statusdiv, fail, redir_url ) {
+    clearTimeout(authWindowChecker);
+    try {
+        // If this is true, then the user is most likely authenticating with Twitter, or we have checked before the opened window was redirected to TWitter.
+        if (typeof(authWindow) == undefined || Object.keys(authWindow).length == 0) {
+            setAuthWindowChecker( statusdiv, fail, redir_url );
+            return;
+        }
+    } catch(exc) {
+        // If an error has occured, we've most likely run into a problem accessing the authWindow object because Twitter is on the login page. We need to wait for the user to 
+        // authenticate.
+        if ( error_count < 40 ) {
+            error_count++;
+            setAuthWindowChecker( statusdiv, fail, redir_url );
+            return;
+        } else {
+            // We've restarted the script too many times. Assume the user closed the window.
+            hideAjaxIndicator( statusdiv );
+            eval(fail);
+            showMessage('The authorization either took too long, or the window was closed before authentication was completed.\n\nPlease try again.','authWindowError', true, 10000);
+            authWindow.close();
+            error_count = 0;
+            return;
+        }
+    }
+
+    if (authWindow.closed == true) {
+        // The window was closed by the user before auth was completed...
+        showMessage('The authorization window was closed before the authorization process was completed.\n\nPlease try again.', 'authWindowClosed', true, 10000);
+        hideAjaxIndicator( statusdiv );
+        eval(fail);
+        return;
+    }
+
+    childWinLocation = authWindow.location.href;
+    if (childWinLocation.indexOf( redir_url ) != -1) {
+        // The user has been redirected back to the site...
+        jQuery(authWindow.document).ready(function () {
+            authWindow.close();
+            if (childWinLocation.indexOf('error') != -1){
+                // Auth failed. Likely the user denied access.
+                showMessage('The authorization failed. Most likely you did not allow app access.\n\nPlease try again.', 'authNotApproved', true, 10000);
+                hideAjaxIndicator( statusdiv );
+                fail();
+                return;
+            }
+
+            // Check with the server to see if we now have an access token
+            jQuery.post(ajaxurl, {action:'mbgf_twitter_connect_is_authed',_wpnonce:jQuery('#_wpnonce').val()}, function(response){
+                if (jQuery.parseJSON(response) == true){
+                    // Get the object that was subscribed to
+                    jQuery.post(ajaxurl, {action:'mbgf_twitter_connect_get_tw_obj_id',_wpnonce:jQuery('#_wpnonce').val()}, function(response){
+                        response = jQuery.parseJSON(response);
+                        if (in_wizard == true) {
+                            if ( typeof tw_obj_id !== 'undefined' ) {
+                                tw_obj_id = response.object;
+                                console.log(response);
+                            }
+                            
+                            nextStep();
+                        } else {
+                            hideAjaxIndicator( statusdiv );
+                            showMessage('Authorization was successful. The access codes have been received.', 'authSuccessful', false, 10000);
+                        }
+                    });
+                } else {
+                    hideAjaxIndicator( statusdiv );
+                    fail();
+                }
+            });
+        });
+    } else {
+        setAuthWindowChecker( statusdiv, fail, redir_url );
+        return;
+    }
+}

globalfeed/trunk/feeds/mb_twitter/pages/setup.php

@@ -23 +23 @@
     <div id="notices"></div>
     <div id="step-1">
+        <p><h2>How would you like to connect to Twitter?</h2></p>
+        <div class="optgrp bottom-button" style="min-height:270px;">
+            <p class="center"><h2>Without a Twitter App</h2></p>
+            <p>
+                Setting up Twitter Connect without an App is the quickest and easiest way to get started with Twitter Connect.
+            </p>
+            <p>
+                When you setup without using a Twitter App, Twitter Connect will not authenticate with Twitter
+                (although all of your data is still communicated over SSL.) The caveat to this approach
+                is that if your site is located on shared hosting Twitter Connect may become rate limited by Twitter
+                and may not be able to consistently fetch content.
+            </p>
+            <p>
+                If you encounter issues with not receiving new content while using Twitter Connect without a Twitter App
+                you can always supply App information to switch to Authenticated mode at a later time.
+            </p>
+            <p class="center"><input type="button" id="setup_without_app" value="Without a Twitter App" class="button-primary" /></p>
+        </div>
+        <div class="optgrp" style="min-height:270px;">
+            <p class="center"><h2>With a Twitter App</h2></p>
+            <p>
+                This approach requires you to have a Twitter Application with a Consumer Key and Secret. If you
+                do not have an application already, you can <a href="https://dev.twitter.com/apps/new" title="Generate application on Twitter" target="_blank">generate one</a> with Twitter.
+            </p>
+            <p>
+                This method is less susceptible to rate limiting, especially on shared servers.
+            </p>
+            <p class="center bottom-button"><input type="button" id="setup_with_app" value="With a Twitter App"  class="button-primary" /></p>
+        </div>
+    </div>
+    <div id="step-3" class="hidden-step">
         <p>Welcome to the initial setup for Twitter Connect. We need a bit of information before you get started:</p>
         <p>All we need to know is the Twitter object whose updates you would like to appear in Globalfeed.</p>
@@ -32 +63 @@
             </tr> 
             <tr id="validate_button_container">
-                <th></th>
+                <td><input type="button" class="button-secondary last_step_button" value="Back" /></td>
                 <td><input type="button" class="button-primary" id="validate_button" value="Validate" /><img alt="" class="ajax-loading-icon" src="<?php bloginfo('wpurl') ?>/wp-admin/images/wpspin_light.gif" /></td>
             </tr>
@@ -44 +75 @@
             </div>
         </div>
+        <p><small>If your username contains only numbers, prefix it with an @ or a question mark (?)</small></p>
     </div>
-    <p><small>If your username contains only numbers, prefix it with a question mark (?)</small></p>
+    <div id="step-2" class="hidden-step">
+        <p>Welcome to the initial setup for Twitter Connect. We need a bit of information before you get started:</p>
+        <p>First, you'll need to setup a Twitter app, and get its consumer key and secret. If you have not done so already, you can <a href="https://dev.twitter.com/apps/new" title="Generate application on Twitter" target="_blank">create an app here</a></p>
+        <table class="form-table">
+            <tr>
+                <th><?php _e('Twitter Consumer Key:',$mb_globalfeed_twitter_connect->get_slug()) ?></th>
+                <td><input type="text" name="consumer_key" class="auth-form-input" id="consumer_key" value="<?php echo $feed_options['consumer_key']; ?>"/></td>
+            </tr>    
+            <tr>
+                <th><?php _e('Twitter Consumer Secret:',$mb_globalfeed_twitter_connect->get_slug()) ?></th>
+                <td><input type="text" name="consumer_secret" class="auth-form-input" id="consumer_secret" value="<?php echo $feed_options['consumer_secret']; ?>" /></td>
+            </tr>    
+            <tr>
+                <td><input type="button" class="button-secondary last_step_button" value="Back" /></td>
+                <td><input type="button" class="button-primary" id="authorize_button" value="Authorize" /><img alt="" class="ajax-loading-icon" src="<?php bloginfo('wpurl') ?>/wp-admin/images/wpspin_light.gif" /></td>
+            </tr>
+        </table>
+    </div>
 </form>
 <script type="text/javascript">
@@ -51 +100 @@
     var tw_obj_id = null;
     var tw_obj_type = null;
+    var setup_with_app = false;
     
     jQuery(document).ready(function(){
@@ -58 +108 @@
     });
     
+    function authorize(){
+        // Begin authorization
+        var consumer_key = jQuery('#consumer_key').val();
+        var consumer_secret = jQuery('#consumer_secret').val();
+        var consumer_match = new RegExp(/^[a-zA-Z0-9]+$/);
+        if (consumer_match.exec( consumer_key ) == null){
+            showMessage('You must provide a valid consumer key (can be numbers and letters)', 'consumer_key', true);
+            setMsgRemove( 'consumer_key', 'consumer_key' );
+            return false;
+        } else if (consumer_match.exec( consumer_secret ) == null){
+            showMessage('You must provide a valid consumer secret (can be numbers and letters)', 'consumer_secret', true);
+            setMsgRemove( 'consumer_secret', 'consumer_secret' );
+            return false;
+        } else {
+            hideMessage( 'consumer_key' );
+            hideMessage( 'consumer_secret' );
+        }
+
+        // Disable the button and begin auth
+        toggleAjaxIndicator( '#step-1' );
+        hideAllMessages();
+        jQuery('#authorize_button').attr("disabled", true);
+
+        // In order to get past popup blockers, we open the AuthWindow now. In the future, this should pop up a temporary loading page, however we aren't that fancy yet.
+        authWindow = window.open('',"tw_activation_window","location=0,status=0,scrollbars=0, width=750,height=500");
+
+        // Post the consumer_key and secret to the server for use in the auth process.
+        jQuery.post(ajaxurl, {action:'mbgf_twitter_connect_set_app_info',consumer_key:consumer_key,consumer_secret:consumer_secret,_wpnonce:jQuery('#_wpnonce').val()}, function(response){
+            response = jQuery.parseJSON(response);
+            authWindow.location.href = response.oauth_url;
+            setAuthWindowChecker( '#step-1', function(){
+                // Re-enable the auth button
+                jQuery('#authorize_button').attr("disabled", false);
+            }, response.callback_url );
+        });
+    }
+    
     function setupStep( step ) {
+        var stepClass = "#step-" + step;
         switch( step ){
             case 1:
-                if ( !jQuery('#step-1').hasClass('setup') ) {
+                if ( !jQuery(stepClass).hasClass('setup') ) {
+                    // Step 2 is for auth with an app
+                    jQuery('#setup_with_app').click(nextStep);
+                    
+                    // Steps 3+ are for auth without an app
+                    jQuery('#setup_without_app').click(function () {
+                        loadStep(3);
+                    });
+                    
+                    jQuery(stepClass).addClass('setup');
+                }
+                
+                break; // End of step 1
+            case 2:
+                setup_with_app = true;
+                jQuery('#authorize_button').attr("disabled", false).click(authorize);
+                if ( !jQuery(stepClass).hasClass('setup') ) {
+                    jQuery(stepClass + ' .last_step_button').click(lastStep);
+                    jQuery(stepClass).addClass('setup');
+                }
+                
+                break;
+            case 3:
+                setup_with_app = false;
+                
+                if ( jQuery('#tw_object_id').val() === '' && tw_obj_id !== '' )
+                    jQuery('#tw_object_id').val(tw_obj_id);
+                
+                jQuery('#validate_button, #confirm_id_yes').attr("disabled", false);
+                
+                if ( !jQuery(stepClass).hasClass('setup') ) {
+                    // Setup the last step button
+                    console.log(jQuery(stepClass + ' .last_step_button'));
+                    jQuery(stepClass + ' .last_step_button').click(function(){
+                        loadStep( 1 + setup_with_app );
+                    });
                     jQuery('#validate_button').attr("disabled", false);
                     jQuery('#confirm_id_no').click(function(){
@@ -67 +190 @@
                             jQuery(this).addClass('hidden-step');
                             showMessage('Please try again.', 'tryagain', false, 10000);
-                            jQuery('#validate_button').attr("disabled", false);
+                            jQuery('#validate_button, #confirm_id_yes').attr("disabled", false);
                         });
-                        jQuery('#step-1>table').show().fadeIn('fast');
+                        jQuery(stepClass + '>table').show().fadeIn('fast');
                     });
                     jQuery('#confirm_id_yes').click(function(){
-                        jQuery(this).attr('disabled', '');
+                        jQuery(this).attr('disabled', true);
                         toggleAjaxIndicator( '#confirm_buttons' );
                         
@@ -101 +224 @@
                         req = get_tw_object( jQuery('#tw_object_id').val(), '#confirm_tw_obj_id') 
                         req.success(function () {
-                            jQuery('#step-1>table').hide('fast', function () {jQuery(this).hide()});
+                            jQuery(stepClass + '>table').hide('fast', function () {jQuery(this).hide()});
                             jQuery( '#tw_obj_confirm' ).removeClass('hidden-step').show( 'fast' );
                         });
@@ -107 +230 @@
                             showMessage( 'Error: The given Twitter ID or Screen Name was not found or failure connecting to Twitter. Please try again.', 'tw_obj_not_found', true);
                             setMsgRemove( 'tw_object_id','tw_obj_not_found' );
-                            toggleAjaxIndicator( '#step-1' );
-                            jQuery('#step-1>table').show('fast');
+                            toggleAjaxIndicator( stepClass );
+                            jQuery(stepClass + '>table').show('fast');
                             jQuery('#validate_button').attr("disabled", false);
                         })
@@ -116 +239 @@
                     jQuery('#validate_button').click(validate);
                     jQuery('#setup-form').submit(validate);
-                    jQuery('#step-1').addClass('setup');
-                    
-                    
+                    jQuery(stepClass).addClass('setup');
                 }
                 break; // End of step 2

globalfeed/trunk/feeds/mbgf_rss/mbgf_rss.php

@@ -550 +550 @@
                 
                 // Check that a guid is not empty
-                $post_args['guid'] = str_replace(" ", "_", substr($post_args['meta']['source'], 0, 50) . $post_args['title'] . $post_args['post_date']);
-                
+                $post_args['guid'] = str_replace(" ", "_", substr($post_args['meta']['source'], 0, 50) . $post_args['post_title'] . $post_args['post_date']);
                 
                 // Process the post date
@@ -560 +559 @@
                 
                 // Check if this item is already stored in the DB, and update if so...
-                $posts = $wpdb->get_results($wpdb->prepare( "SELECT posts.ID FROM $wpdb->posts posts WHERE posts.guid = %s AND posts.post_type = '{$this->globalfeed->post_type_namespace()}{$this->feed_slug}' LIMIT 1", (string) trim($update->link)));
+                $posts = $wpdb->get_results($wpdb->prepare( "SELECT posts.ID FROM $wpdb->posts posts WHERE posts.guid = %s AND posts.post_type = '{$this->globalfeed->post_type_namespace()}{$this->feed_slug}' LIMIT 1", (string) trim($post_args['guid'])));
                 if ( count($posts) >= 1 ) 
                     $post_args['ID'] = $post_args['import_id'] = $posts[0]->ID;

globalfeed/trunk/mb_globalfeed.php

@@ -82 +82 @@
         /**
          * Returns the current instance of the GlobalFeed admin class.
+         * 
+         * admin_instance will be false if not in the GlobalFeed admin, or if 
+         * show_admin_page has not yet been called.
+         * 
          * @return type 
          */
         public function admin_instance() {
             return $this->_admin_instance;
+        }
+        
+        /**
+         * Returns whether or not we are current in the GlobalFeed admin.
+         * 
+         * @global str $pagenow
+         * @return bool 
+         */
+        public function in_admin() {
+            global $pagenow;
+            
+            return ( $pagenow === 'admin.php' && $_REQUEST['page'] === 'globalfeed' );
         }
         
@@ -1633 +1649 @@
          * anonymous functions for PHP < 5.3
          * 
-         * @param type $matches 
+         * Replaces newlines within the link, as WordPress breaks the hell out of them.
+         * 
+         * @param array $matches 
          */
         private function _replace_link_callback ( $matches ) {
-            return '<a href="' .$matches[0]. '"' . ($this->settings['autodetect_link_open_new_window'] ? ' target="_blank">' : '>') . $matches[0] . '</a>';
+            $no_newline = preg_replace("/(\n(\r)*)+/", '', $matches[0]);
+            return '<a href="' .$no_newline. '"' . ($this->settings['autodetect_link_open_new_window'] ? ' target="_blank">' : '>') . $no_newline . '</a>';
         }