fixed rss feed urls

w8tcha · w8tcha · commit 044e401cac31 · 2013-10-29T12:57:13.000+01:00
diff --git a/yafsrc/YAF.Core/URLBuilder/AdvancedUrlRewriter.cs b/yafsrc/YAF.Core/URLBuilder/AdvancedUrlRewriter.cs
@@ -137,12 +137,17 @@ public override string BuildUrl(string url)
 
                         if (parser["f"].IsSet())
                         {
-                            description += UrlRewriteHelper.GetForumName(parser["f"].ToType<int>());
+                            description += "_{0}".FormatWith(UrlRewriteHelper.GetForumName(parser["f"].ToType<int>()));
                         }
                         
                         if (parser["t"].IsSet())
                         {
-                            description += UrlRewriteHelper.GetTopicName(parser["t"].ToType<int>());
+                            description += "_{0}".FormatWith(UrlRewriteHelper.GetTopicName(parser["t"].ToType<int>()));
+                        }
+
+                        if (parser["c"].IsSet())
+                        {
+                            description += "_{0}".FormatWith(UrlRewriteHelper.GetCategoryName(parser["c"].ToType<int>()));
                         }
                         
                         if (parser["ft"].IsSet())
diff --git a/yafsrc/YAF.Core/URLBuilder/StandardUrlRewriter.cs b/yafsrc/YAF.Core/URLBuilder/StandardUrlRewriter.cs
@@ -62,7 +62,7 @@ public override string BuildUrl(string url)
                 var parser = new SimpleURLParameterParser(url);
 
                 // create "rewritten" url...
-                newUrl = before + Config.UrlRewritingPrefix;
+                newUrl = "{0}{1}".FormatWith(before, Config.UrlRewritingPrefix);
 
                 var useKey = string.Empty;
                 var description = string.Empty;
@@ -117,20 +117,24 @@ public override string BuildUrl(string url)
                     case "rsstopic":
                         if (parser["pg"].IsSet())
                         {
-                            useKey = "pg";
-                            description = parser[useKey].ToEnum<YafRssFeeds>().ToString().ToLower();
+                            description = parser["pg"].ToEnum<YafRssFeeds>().ToString().ToLower();
                         }
 
                         if (parser["f"].IsSet())
                         {
-                            description += UrlRewriteHelper.GetForumName(parser["f"].ToType<int>());
+                            description += "_{0}".FormatWith(UrlRewriteHelper.GetForumName(parser["f"].ToType<int>()));
                         }
 
                         if (parser["t"].IsSet())
                         {
-                            description += UrlRewriteHelper.GetTopicName(parser["t"].ToType<int>());
+                            description += "_{0}".FormatWith(UrlRewriteHelper.GetTopicName(parser["t"].ToType<int>()));
                         }
 
+                        if (parser["c"].IsSet())
+                        {
+                            description += "_{0}".FormatWith(UrlRewriteHelper.GetCategoryName(parser["c"].ToType<int>()));
+                        }
+                        
                         if (parser["ft"].IsSet())
                         {
                             description += parser["ft"].ToType<int>() == YafSyndicationFormats.Atom.ToInt()
diff --git a/yafsrc/YetAnotherForum.NET/UrlRewriter.config b/yafsrc/YetAnotherForum.NET/UrlRewriter.config
@@ -11,9 +11,9 @@
   <rewrite url="^~/(.+)?yaf_postsm([0-9]+)find([-a-z]+)(_([-a-z0-9]+))?\.aspx(\?(.+))?$" to="~/$1Default.aspx?g=posts&amp;m=$2&amp;find=$3&amp;$7" processing="stop" />
   <rewrite url="^~/(.+)?yaf_postsm([0-9]+)(_([-a-z0-9]+))?\.aspx(\?(.+))?$" to="~/$1Default.aspx?g=posts&amp;m=$2&amp;$6" processing="stop" />
   <rewrite url="^~/(.+)?yaf_profile([0-9]+)(_([-a-z0-9]+))?\.aspx(\?(.+))?$" to="~/$1Default.aspx?g=profile&amp;u=$2&amp;$6" processing="stop" />
-  <rewrite url="^~/(.+)?yaf_rsstopic([0-9]+)ft([0-9]+)t([0-9]+)(_([-a-z0-9]+))?\.aspx(\?(.+))?$" to="~/$1Default.aspx?g=rsstopic&amp;pg=$2&amp;ft=$3&amp;t=$4&amp;$7" processing="stop" />
-  <rewrite url="^~/(.+)?yaf_rsstopic([0-9]+)ft([0-9]+)f([0-9]+)(_([-a-z0-9]+))?\.aspx(\?(.+))?$" to="~/$1Default.aspx?g=rsstopic&amp;pg=$2&amp;ft=$3&amp;f=$4&amp;$7" processing="stop" /> 
-  <rewrite url="^~/(.+)?yaf_rsstopic([0-9]+)ft([0-9]+)(_([-a-z0-9]+))?\.aspx(\?(.+))?$" to="~/$1Default.aspx?g=rsstopic&amp;pg=$2&amp;ft=$3&amp;$7" processing="stop" />
+  <rewrite url="^~/(.+)?yaf_rsstopicft([0-9]+)t([0-9]+)(_([-a-z0-9]+))(_([-a-z0-9]+))?\.aspx(\?(.+))?$" to="~/$1Default.aspx?g=rsstopic&amp;ft=$2&amp;t=$3&amp;$9" processing="stop" />
+  <rewrite url="^~/(.+)?yaf_rsstopicft([0-9]+)f([0-9]+)(_([-a-z0-9]+))(_([-a-z0-9]+))?\.aspx(\?(.+))?$" to="~/$1Default.aspx?g=rsstopic&amp;ft=$2&amp;f=$3&amp;$9" processing="stop" /> 
+  <rewrite url="^~/(.+)?yaf_rsstopicft([0-9]+)(_([-a-z0-9]+))(_([-a-z0-9]+))?\.aspx(\?(.+))?$" to="~/$1Default.aspx?g=rsstopic&amp;ft=$2&amp;$8" processing="stop" />
   <rewrite url="^~/(.+)?yaf_([-0-9a-z_]+?)\.aspx\?(.+)?$" to="~/$1Default.aspx?g=$2&amp;$3" processing="stop" />
   <rewrite url="^~/(.+)?yaf_([-0-9a-z_]+?)\.aspx$" to="~/$1Default.aspx?g=$2" processing="stop" />
   <!-- Advanced URL Rewriting Format -->
@@ -30,9 +30,10 @@
   <rewrite url="^~/(.+)?profile/([0-9]+)-(([-a-z0-9]+))?(\?(.+))?$" to="~/$1Default.aspx?g=profile&amp;u=$2&amp;$6" processing="stop" />
   <rewrite url="^~/(.+)?admin/([-a-z0-9]+)?/([-a-z0-9]+)?(\?(.+))?$" to="~/$1Default.aspx?g=admin_$2_$3&amp;$5" processing="stop" />
   <rewrite url="^~/(.+)?admin/([-a-z0-9]+)?(\?(.+))?$" to="~/$1Default.aspx?g=admin_$2&amp;$4" processing="stop" />
-  <rewrite url="^~/(.+)?rsstopic/([0-9]+)ft([0-9]+)t([0-9]+)-(([-a-z0-9]+))?(\?(.+))?$" to="~/$1Default.aspx?g=rsstopic&amp;pg=$2&amp;ft=$3&amp;t=$4&amp;$7" processing="stop" />
-  <rewrite url="^~/(.+)?rsstopic/([0-9]+)ft([0-9]+)f([0-9]+)-(([-a-z0-9]+))?(\?(.+))?$" to="~/$1Default.aspx?g=rsstopic&amp;pg=$2&amp;ft=$3&amp;f=$4&amp;$7" processing="stop" />
-  <rewrite url="^~/(.+)?rsstopic/([0-9]+)ft([0-9]+)-(([-a-z0-9]+))?(\?(.+))?$" to="~/$1Default.aspx?g=rsstopic&amp;pg=$2&amp;ft=$3&amp;$7" processing="stop" />
+  <rewrite url="^~/(.+)?rsstopic/ft([0-9]+)t([0-9]+)-(([-a-z0-9]+))(_([-a-z0-9]+))?(\?(.+))?$" to="~/$1Default.aspx?g=rsstopic&amp;ft=$2&amp;t=$3&amp;pg=$5&amp;$7" processing="stop" />
+  <rewrite url="^~/(.+)?rsstopic/ft([0-9]+)f([0-9]+)-(([-a-z0-9]+))(_([-a-z0-9]+))?(\?(.+))?$" to="~/$1Default.aspx?g=rsstopic&amp;ft=$2&amp;f=$3&amp;pg=$5&amp;$7" processing="stop" /> 
+  <rewrite url="^~/(.+)?rsstopic/ft([0-9]+)-(([-a-z0-9]+))_([-a-z0-9]+)(\?(.+))?$" to="~/$1Default.aspx?g=rsstopic&amp;ft=$2&amp;pg=$3&amp;$7" processing="stop" />
+  <rewrite url="^~/(.+)?rsstopic/ft([0-9]+)-(([-a-z0-9]+))-([-a-z0-9]+)(\?(.+))?$" to="~/$1Default.aspx?g=rsstopic&amp;ft=$2&amp;pg=$3&amp;$7" processing="stop" />
   <if url="^((?!\.ashx|\.asmx|\.axd|\.gif|\.png|\.jpg|\.ico|\.pdf|\.css|\.js|install|error|auth\.aspx|default\.aspx|popup\.aspx|advanced\.aspx|digest\.aspx).)*$">
     <rewrite url="^~/(.+)?\?(.+)?$" to="~/Default.aspx?g=$1&amp;$2" processing="stop" />
     <rewrite url="^~/(.+)?\.aspx$" to="~/Default.aspx?g=$1" processing="stop" /> 

Original file line number	Diff line number	Diff line change
`@@ -137,12 +137,17 @@ public override string BuildUrl(string url)`
`137`	`137`
`138`	`138`	`if (parser["f"].IsSet())`
`139`	`139`	`{`
`140`		`- description += UrlRewriteHelper.GetForumName(parser["f"].ToType<int>());`
	`140`	`+ description += "_{0}".FormatWith(UrlRewriteHelper.GetForumName(parser["f"].ToType<int>()));`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`if (parser["t"].IsSet())`
`144`	`144`	`{`
`145`		`- description += UrlRewriteHelper.GetTopicName(parser["t"].ToType<int>());`
	`145`	`+ description += "_{0}".FormatWith(UrlRewriteHelper.GetTopicName(parser["t"].ToType<int>()));`
	`146`	`+ }`
	`147`	`+`
	`148`	`+ if (parser["c"].IsSet())`
	`149`	`+ {`
	`150`	`+ description += "_{0}".FormatWith(UrlRewriteHelper.GetCategoryName(parser["c"].ToType<int>()));`
`146`	`151`	`}`
`147`	`152`
`148`	`153`	`if (parser["ft"].IsSet())`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public override string BuildUrl(string url)`
`62`	`62`	`var parser = new SimpleURLParameterParser(url);`
`63`	`63`
`64`	`64`	`// create "rewritten" url...`
`65`		`- newUrl = before + Config.UrlRewritingPrefix;`
	`65`	`+ newUrl = "{0}{1}".FormatWith(before, Config.UrlRewritingPrefix);`
`66`	`66`
`67`	`67`	`var useKey = string.Empty;`
`68`	`68`	`var description = string.Empty;`
`@@ -117,20 +117,24 @@ public override string BuildUrl(string url)`
`117`	`117`	`case "rsstopic":`
`118`	`118`	`if (parser["pg"].IsSet())`
`119`	`119`	`{`
`120`		`- useKey = "pg";`
`121`		`- description = parser[useKey].ToEnum<YafRssFeeds>().ToString().ToLower();`
	`120`	`+ description = parser["pg"].ToEnum<YafRssFeeds>().ToString().ToLower();`
`122`	`121`	`}`
`123`	`122`
`124`	`123`	`if (parser["f"].IsSet())`
`125`	`124`	`{`
`126`		`- description += UrlRewriteHelper.GetForumName(parser["f"].ToType<int>());`
	`125`	`+ description += "_{0}".FormatWith(UrlRewriteHelper.GetForumName(parser["f"].ToType<int>()));`
`127`	`126`	`}`
`128`	`127`
`129`	`128`	`if (parser["t"].IsSet())`
`130`	`129`	`{`
`131`		`- description += UrlRewriteHelper.GetTopicName(parser["t"].ToType<int>());`
	`130`	`+ description += "_{0}".FormatWith(UrlRewriteHelper.GetTopicName(parser["t"].ToType<int>()));`
`132`	`131`	`}`
`133`	`132`
	`133`	`+ if (parser["c"].IsSet())`
	`134`	`+ {`
	`135`	`+ description += "_{0}".FormatWith(UrlRewriteHelper.GetCategoryName(parser["c"].ToType<int>()));`
	`136`	`+ }`
	`137`	`+`
`134`	`138`	`if (parser["ft"].IsSet())`
`135`	`139`	`{`
`136`	`140`	`description += parser["ft"].ToType<int>() == YafSyndicationFormats.Atom.ToInt()`