From 75156b282775348ab8936d36272fd23274de3a1e Mon Sep 17 00:00:00 2001
From: Mitsukarenai <mitsu@suumitsu.eu>
Date: Wed, 14 Aug 2013 11:55:13 +0200
Subject: [PATCH 1/2] test: rss-bridge info

---
 config.php.example | 9 +++++++--
 index.php          | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/config.php.example b/config.php.example
index 31808ca..1c884e9 100644
--- a/config.php.example
+++ b/config.php.example
@@ -28,8 +28,13 @@
 // define( 'ALLOW_NEW_AUTOBLOGS_BY_XSAF', TRUE );
 
 /**
- * More about TwitterBridge : https://github.com/mitsukarenai/twitterbridge and twitter2feed: https://github.com/mitsukarenai/twitter2feed
- * replace LOCAL with the twitterbridge request URL (example: 'http://www.suumitsu.eu/twitter/?u=' ) or leave LOCAL to use the included twitter2feed.php.
+ * TwitterBridge: https://github.com/mitsukarenai/twitterbridge
+ * twitter2feed : https://github.com/mitsukarenai/twitter2feed
+ * rss-bridge   : https://github.com/sebsauvage/rss-bridge
+ * replace LOCAL with:
+	- the twitterbridge request URL (example: 'http://www.some.website/twitterbridge/?u=' )
+	- or the rss-bridge request URL (example: 'http://www.some.website/rss-bridge/?action=display&bridge=TwitterBridge&format=AtomFormat&u=' )
+	- or leave LOCAL to use the included twitter2feed.php.
  * set to FALSE if you want to fully disable Twitter support
  **/
 // define( 'API_TWITTER', 'LOCAL' );
diff --git a/index.php b/index.php
index 084e81e..f645c9c 100755
--- a/index.php
+++ b/index.php
@@ -830,7 +830,7 @@ if( !empty($_POST['opml_file']) && ALLOW_NEW_AUTOBLOGS && ALLOW_NEW_AUTOBLOGS_BY
 				if( API_TWITTER === 'LOCAL' )
 					echo '<input type="radio" name="socialinstance" value="twitter">Twitter (local)<br>';
 				else
-					echo '<input type="radio" name="socialinstance" value="twitter">Twitter (via <a href="'.substr(API_TWITTER, 0, -2).'status">twitterbridge</a>)<br>';
+					echo '<input type="radio" name="socialinstance" value="twitter">Twitter (via <a href="'.serverUrl(API_TWITTER).'">bridge</a>)<br>';
 				}
                             else echo '<s>Twitter</s><br>'; ?>
                             <input type="radio" name="socialinstance" value="statusnet">

From d2d75b657f5a20c01dbcd36053046a530e0bfff3 Mon Sep 17 00:00:00 2001
From: Mitsukarenai <mitsu@suumitsu.eu>
Date: Wed, 14 Aug 2013 12:01:17 +0200
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20..=20je=20faisais=20quoi=20l=C3=A0?=
 =?UTF-8?q?=20=3F..?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.php b/index.php
index f645c9c..484ead8 100755
--- a/index.php
+++ b/index.php
@@ -830,7 +830,7 @@ if( !empty($_POST['opml_file']) && ALLOW_NEW_AUTOBLOGS && ALLOW_NEW_AUTOBLOGS_BY
 				if( API_TWITTER === 'LOCAL' )
 					echo '<input type="radio" name="socialinstance" value="twitter">Twitter (local)<br>';
 				else
-					echo '<input type="radio" name="socialinstance" value="twitter">Twitter (via <a href="'.serverUrl(API_TWITTER).'">bridge</a>)<br>';
+					echo '<input type="radio" name="socialinstance" value="twitter">Twitter (via <a href="'.strtok(API_TWITTER,'?').'">bridge</a>)<br>';
 				}
                             else echo '<s>Twitter</s><br>'; ?>
                             <input type="radio" name="socialinstance" value="statusnet">