Changeset 899

Timestamp:

09/07/08 19:41:49 (3 months ago)

Author:

mikelietz

Message:

plugin: Twitter added an option to linkify URLs (and it works better than twitter's method, thanks ringmaster).
Didn't bump the version - still doesn't seem to be 1.0 quality yet.

Location:

plugins/twitter/trunk

Files:

• tweets.php (modified) (1 diff)
• twitter.plugin.php (modified) (3 diffs)

plugins/twitter/trunk/tweets.php

@@ -3 +3 @@
 <div id="twitterbox">
  <img src="<?php echo htmlspecialchars( $tweet_image_url ); ?>" alt="<?php echo urlencode( Options::get( 'twitter:username' )); ?>">
- <p><?php echo htmlspecialchars( $tweet_text ) . ' @ ' . htmlspecialchars( $tweet_time ); ?></p>
+ <p><?php /* remove the following htmlspecialchars if you are linkifying links */ echo htmlspecialchars( $tweet_text ) . ' @ ' . htmlspecialchars( $tweet_time ); 
+?></p>
 <p><small>via <a href="http://twitter.com/<?php echo urlencode( Options::get( 'twitter:username' )); ?>">Twitter</a></small></p>
  </div>

plugins/twitter/trunk/twitter.plugin.php

@@ -67 +67 @@
                 Options::set( 'twitter__hide_replies', 0 );
             }
+            if ( Options::get( 'twitter__linkify_urls' ) == null ) {
+                Options::set( 'twitter__linkify_urls', 0 );
+            }
         }
     }
@@ -82 +85 @@
                 case 'Configure' :
                     $ui= new FormUI( strtolower( get_class( $this ) ) );
-                    $twitter_username= $ui->append( 'text', 'username', 'twitter__username', 'Twitter Username:' );
-                    $twitter_password= $ui->append( 'password', 'password', 'twitter__password', 'Twitter Password:' );
-                    $twitter_post= $ui->append( 'select', 'post_status', 'twitter__post_status', 'Autopost to Twitter:' );
-                    $twitter_post->options= array( '0' => 'Disabled', '1' => 'Enabled' );
-                    $twitter_show= $ui->append( 'select', 'show', 'twitter__show', 'Make Tweets available to Habari' );
-                    $twitter_show->options= array( '0' => 'No', '1' => 'Yes' );
-                    $twitter_show= $ui->append( 'select', 'hide_replies', 'twitter__hide_replies', 'Hide @replies' );
-                    $twitter_show->options= array( '1' => 'Yes' , '0' => 'No' );
-                    $twitter_cache_time= $ui->append( 'text', 'cache', 'twitter__cache', 'Cache expiry in seconds:' );
+                    $twitter_username= $ui->append( 'text', 'username', 'twitter__username', 
+                        _t('Twitter Username:') );
+                    $twitter_password= $ui->append( 'password', 'password', 'twitter__password', 
+                        _t('Twitter Password:') );
+                    $twitter_post= $ui->append( 'select', 'post_status', 'twitter__post_status', 
+                        _t('Autopost to Twitter:') );
+                    $twitter_post->options= array( '0' => _t('Disabled'), '1' => _t('Enabled') );
+                    $twitter_show= $ui->append( 'select', 'show', 'twitter__show', 
+                        _t('Make Tweets available to Habari') );
+                    $twitter_show->options= array( '0' => _t('No'), '1' => _t('Yes') );
+                    $twitter_show= $ui->append( 'select', 'hide_replies', 
+                        'twitter__hide_replies', _t('Hide @replies') );
+                    $twitter_show->options= array( '1' => _t('Yes') , '0' => _t('No') );
+                    $twitter_show= $ui->append( 'select', 'linkify_urls', 
+                        'twitter__linkify_urls', _t('Linkify URLs') );
+                    $twitter_show->options= array( '1' => _t('Yes') , '0' => _t('No') );
+                    $twitter_cache_time= $ui->append( 'text', 'cache', 'twitter__cache', 
+                        _t('Cache expiry in seconds:') );
                     // $ui->on_success( array( $this, 'updated_config' ) );
                     $ui->append( 'submit', 'save', _t('Save') );
@@ -253 +265 @@
             $theme->tweet_image_url= '';
         }
+        if ( Options::get( 'twitter__linkify_urls' ) != FALSE ) {
+            $theme->tweet_text = preg_replace("%https?://(\S*)%i",
+            ' <a href="$0">$0</a> ', $theme->tweet_text);
+}
         return $theme->fetch( 'tweets' );
     }