reserved chars are unescaped

git-svn-id: svn+ssh://svn.gna.org/svn/feed2imap/trunk/feed2imap@55 f70e237a-67f3-0310-a06c-d2b8a7116972

4 files changed, 9 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 3e71619..93d50f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 Feed2Imap 0.5 (XX/XX/2005)
 ============================
+* Reserved characters (eg @) can now be included in the login/password.
 * Feed2Imap is now included in Debian (package name: feed2imap).
 * Much better handling of feeds with escaped HTML (LinuxFR for example).
 
diff --git a/data/doc/feed2imap/examples/feed2imaprc b/data/doc/feed2imap/examples/feed2imaprc
index f27e671..13ac3c2 100644
--- a/data/doc/feed2imap/examples/feed2imaprc
+++ b/data/doc/feed2imap/examples/feed2imaprc
@@ -4,6 +4,9 @@
 # min-frequency (in HOURS) is the minimum frequency with which this particular
 #      feed will be fetched
 # disable: if set to something, the feed will be ignored
+#
+# If your login contains an @ character, replace it with %40. Other reserved
+# characters can be escaped in the same way (see man ascii to get their code)
 feeds: 
   - name: feed2imap
     url: http://home.gna.org/feed2imap/feed2imap.rss
diff --git a/lib/feed2imap/imap.rb b/lib/feed2imap/imap.rb
index 5317eb9..dca2ed4 100644
--- a/lib/feed2imap/imap.rb
+++ b/lib/feed2imap/imap.rb
@@ -70,7 +70,7 @@ class ImapAccount
     # use given port if port given
     port = uri.port if uri.port 
     @connection = Net::IMAP::new(uri.host, port, usessl)
-    user, password = uri.userinfo.split(':',2)
+    user, password = URI::unescape(uri.userinfo).split(':',2)
     @connection.login(user, password)
     self
   end
diff --git a/manpages/feed2imaprc.xml b/manpages/feed2imaprc.xml
index b2289b3..6731f6e 100644
--- a/manpages/feed2imaprc.xml
+++ b/manpages/feed2imaprc.xml
@@ -38,6 +38,10 @@
 	<para>See <filename>/usr/share/doc/feed2imap/examples/feed2imaprc</filename>.</para>
 </refsect1>
 <refsect1>
+	<title>RESERVED CHARACTERS</title>
+	<para>Some characters are reserved in RFC2396 (URI). If you need to include a reserved character in the login/password part of your target URI, replace it with its hex code. For example, @ can be replaced by %40.</para>
+</refsect1>
+<refsect1>
 	<title>BUGS</title>
 	<para>This manpage should probably give more details.</para>
 </refsect1>