Skip to content

Commit

Permalink
Forum subscriptions: add URL schemes and rewrite rules
Browse files Browse the repository at this point in the history
  • Loading branch information
@dimkalinux
dimkalinux committed Jun 28, 2011
1 parent 8a1765e commit ce26fbe
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 2 deletions.
4 changes: 2 additions & 2 deletions include/url/Default/rewrite_rules.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
'/^search[\/_-]?(recent)[\/_-]([0-9]+)[\/_-]p(age)?[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?action=show_recent&value=$2&p=$4',
'/^search[\/_-]?(new|recent|unanswered)(\.html?|\/)?$/i' => 'search.php?action=show_$1',
'/^search[\/_-]?(new|recent|unanswered)[\/_-]p(age)?[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?action=show_$1&p=$3',
'/^search[\/_-]?(subscriptions|forum_subscriptions)[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?action=show_subscriptions&user_id=$1',
'/^search[\/_-]?(subscriptions|forum_subscriptions)[\/_-]?([0-9]+)[\/_-]p(age)?[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?action=show_subscriptions&user_id=$1&p=$3',
'/^search[\/_-]?(subscriptions|forum_subscriptions)[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?action=show_subscriptions&user_id=$1',
'/^search[\/_-]?(subscriptions|forum_subscriptions)[\/_-]?([0-9]+)[\/_-]p(age)?[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?action=show_subscriptions&user_id=$1&p=$3',
'/^search[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?search_id=$1',
'/^search[\/_-]?([0-9]+)[\/_-]?p(age)?[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?search_id=$1&p=$3',
'/^search[\/_-]?(posts|topics)[\/_-]?user[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?action=show_user_$1&user_id=$2',
Expand Down
3 changes: 3 additions & 0 deletions include/url/File_based/forum_urls.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
'forum' => 'forum$1.html',
'forum_rss' => 'feed-rss-forum$1.xml',
'forum_atom' => 'feed-atom-forum$1.xml',
'forum_subscribe' => 'subscribe-forum$1-$2.html',
'forum_unsubscribe' => 'unsubscribe-forum$1-$2.html',
'help' => 'help-$1.html',
'index' => '',
'index_rss' => 'feed-rss.xml',
Expand Down Expand Up @@ -60,6 +62,7 @@
'search_recent_results' => 'search-recent-$1.html',
'search_unanswered' => 'search-unanswered.html',
'search_subscriptions' => 'search-subscriptions$1.html',
'search_forum_subscriptions' => 'search-forum-subscriptions$1.html',
'search_user_posts' => 'search-posts-user$1.html',
'search_user_topics' => 'search-topics-user$1.html',
'subscribe' => 'subscribe$1-$2.html',
Expand Down
3 changes: 3 additions & 0 deletions include/url/File_based/rewrite_rules.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
'/^search[\/_-]?(new|recent|unanswered)[\/_-]p(age)?[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?action=show_$1&p=$3',
'/^search[\/_-]?subscriptions[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?action=show_subscriptions&user_id=$1',
'/^search[\/_-]?subscriptions[\/_-]?([0-9]+)[\/_-]p(age)?[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?action=show_subscriptions&user_id=$1&p=$3',
'/^search[\/_-]forum[\/_-]subscriptions[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?action=show_forum_subscriptions&user_id=$1',
'/^search[\/_-]forum[\/_-]subscriptions[\/_-]?([0-9]+)[\/_-]p(age)?[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?action=show_forum_subscriptions&user_id=$1&p=$3',
'/^search[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?search_id=$1',
'/^search[\/_-]?([0-9]+)[\/_-]?p(age)?[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?search_id=$1&p=$3',
'/^search[\/_-]?(posts|topics)[\/_-]?user[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?action=show_user_$1&user_id=$2',
Expand All @@ -47,6 +49,7 @@
'/^users\/(.*)\/([0-9-]+)\/?([a-z_]+)[\/_-]([a-zA-Z]+)[\/_-]p(age)?[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'userlist.php?username=$1&show_group=$2&sort_by=$3&sort_dir=$4&p=$6',
'/^users\/(.*)\/([0-9-]+)\/?([a-z_]+)[\/_-]([a-zA-Z]+)(\.html?|\/)?$/i' => 'userlist.php?username=$1&show_group=$2&sort_by=$3&sort_dir=$4',
'/^(email|report|subscribe|unsubscribe)[\/_-]?([0-9]+)[\/_-]?([a-z0-9]+)?(\.html?|\/)?$/i' => 'misc.php?$1=$2&csrf_token=$3',
'/^(subscribe|unsubscribe)[\/_-]forum[\/_-]?([0-9]+)[\/_-]?([a-z0-9]+)?(\.html?|\/)?$/i' => 'misc.php?forum_$1=$2&csrf_token=$3',
'/^(mark|rules)[\/_-]?(read)?[\/_-]?([a-z0-9]+)?(\.html?|\/)?$/i' => 'misc.php?action=$1$2&csrf_token=$3',
'/^mark[\/_-](forum)[\/_-]?([0-9]+)[\/_-](read)[\/_-]([a-z0-9]+)(\.html?|\/)?$/i' => 'misc.php?action=markforumread&fid=$2&csrf_token=$4',
'/^help[\/_-]([a-z]+)(\.html?|\/)?$/i' => 'help.php?section=$1',
Expand Down
3 changes: 3 additions & 0 deletions include/url/File_based_(fancy)/forum_urls.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
'forum' => 'forum$1-$2.html',
'forum_rss' => 'feed-rss-forum$1.xml',
'forum_atom' => 'feed-atom-forum$1.xml',
'forum_subscribe' => 'subscribe-forum$1-$2.html',
'forum_unsubscribe' => 'unsubscribe-forum$1-$2.html',
'help' => 'help-$1.html',
'index' => '',
'index_rss' => 'feed-rss.xml',
Expand Down Expand Up @@ -61,6 +63,7 @@
'search_recent_results' => 'search-recent-$1.html',
'search_unanswered' => 'search-unanswered.html',
'search_subscriptions' => 'search-subscriptions$1.html',
'search_forum_subscriptions' => 'search-forum-subscriptions$1.html',
'search_user_posts' => 'search-posts-user$1.html',
'search_user_topics' => 'search-topics-user$1.html',
'subscribe' => 'subscribe$1-$2.html',
Expand Down
3 changes: 3 additions & 0 deletions include/url/File_based_(fancy)/rewrite_rules.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
'/^search[\/_-]?(new|recent|unanswered)[\/_-]p(age)?[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?action=show_$1&p=$3',
'/^search[\/_-]?subscriptions[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?action=show_subscriptions&user_id=$1',
'/^search[\/_-]?subscriptions[\/_-]?([0-9]+)[\/_-]p(age)?[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?action=show_subscriptions&user_id=$1&p=$3',
'/^search[\/_-]forum[\/_-]subscriptions[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?action=show_forum_subscriptions&user_id=$1',
'/^search[\/_-]forum[\/_-]subscriptions[\/_-]?([0-9]+)[\/_-]p(age)?[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?action=show_forum_subscriptions&user_id=$1&p=$3',
'/^search[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?search_id=$1',
'/^search[\/_-]?([0-9]+)[\/_-]?p(age)?[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?search_id=$1&p=$3',
'/^search[\/_-]?(posts|topics)[\/_-]?user[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?action=show_user_$1&user_id=$2',
Expand All @@ -47,6 +49,7 @@
'/^users\/(.*)\/([0-9-]+)\/?([a-z_]+)[\/_-]([a-zA-Z]+)[\/_-]p(age)?[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'userlist.php?username=$1&show_group=$2&sort_by=$3&sort_dir=$4&p=$6',
'/^users\/(.*)\/([0-9-]+)\/?([a-z_]+)[\/_-]([a-zA-Z]+)(\.html?|\/)?$/i' => 'userlist.php?username=$1&show_group=$2&sort_by=$3&sort_dir=$4',
'/^(email|report|subscribe|unsubscribe)[\/_-]?([0-9]+)[\/_-]?([a-z0-9]+)?(\.html?|\/)?$/i' => 'misc.php?$1=$2&csrf_token=$3',
'/^(subscribe|unsubscribe)[\/_-]forum[\/_-]?([0-9]+)[\/_-]?([a-z0-9]+)?(\.html?|\/)?$/i' => 'misc.php?forum_$1=$2&csrf_token=$3',
'/^(mark|rules)[\/_-]?(read)?[\/_-]?([a-z0-9]+)?(\.html?|\/)?$/i' => 'misc.php?action=$1$2&csrf_token=$3',
'/^mark[\/_-](forum)[\/_-]?([0-9]+)[\/_-](read)[\/_-]([a-z0-9]+)(\.html?|\/)?$/i' => 'misc.php?action=markforumread&fid=$2&csrf_token=$4',
'/^help[\/_-]([a-z]+)(\.html?|\/)?$/i' => 'help.php?section=$1',
Expand Down
3 changes: 3 additions & 0 deletions include/url/Folder_based/forum_urls.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
'forum' => 'forum/$1/',
'forum_rss' => 'feed/rss/forum/$1/',
'forum_atom' => 'feed/atom/forum/$1/',
'forum_subscribe' => 'subscribe/forum/$1/$2/',
'forum_unsubscribe' => 'unsubscribe/forum/$1/$2/',
'help' => 'help/$1/',
'index' => '',
'index_rss' => 'feed/rss/',
Expand Down Expand Up @@ -58,6 +60,7 @@
'search_recent_results' => 'search/recent/$1/',
'search_unanswered' => 'search/unanswered/',
'search_subscriptions' => 'search/subscriptions/$1/',
'search_forum_subscriptions' => 'search/subscriptions/forum/$1/',
'search_user_posts' => 'search/posts/user/$1/',
'search_user_topics' => 'search/topics/user/$1/',
'subscribe' => 'subscribe/$1/$2/',
Expand Down
3 changes: 3 additions & 0 deletions include/url/Folder_based/rewrite_rules.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
'/^search[\/_-]?(new|recent|unanswered)[\/_-]p(age)?[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?action=show_$1&p=$3',
'/^search[\/_-]?subscriptions[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?action=show_subscriptions&user_id=$1',
'/^search[\/_-]?subscriptions[\/_-]?([0-9]+)[\/_-]p(age)?[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?action=show_subscriptions&user_id=$1&p=$3',
'/^search[\/_-]?subscriptions[\/_-]forum[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?action=show_forum_subscriptions&user_id=$1',
'/^search[\/_-]?subscriptions[\/_-]forum[\/_-]?([0-9]+)[\/_-]p(age)?[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?action=show_forum_subscriptions&user_id=$1&p=$3',
'/^search[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?search_id=$1',
'/^search[\/_-]?([0-9]+)[\/_-]?p(age)?[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?search_id=$1&p=$3',
'/^search[\/_-]?(posts|topics)[\/_-]?user[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?action=show_user_$1&user_id=$2',
Expand All @@ -47,6 +49,7 @@
'/^users\/(.*)\/([0-9-]+)\/?([a-z_]+)[\/_-]([a-zA-Z]+)[\/_-]p(age)?[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'userlist.php?username=$1&show_group=$2&sort_by=$3&sort_dir=$4&p=$6',
'/^users\/(.*)\/([0-9-]+)\/?([a-z_]+)[\/_-]([a-zA-Z]+)(\.html?|\/)?$/i' => 'userlist.php?username=$1&show_group=$2&sort_by=$3&sort_dir=$4',
'/^(email|report|subscribe|unsubscribe)[\/_-]?([0-9]+)[\/_-]?([a-z0-9]+)?(\.html?|\/)?$/i' => 'misc.php?$1=$2&csrf_token=$3',
'/^(subscribe|unsubscribe)[\/_-]forum[\/_-]?([0-9]+)[\/_-]?([a-z0-9]+)?(\.html?|\/)?$/i' => 'misc.php?forum_$1=$2&csrf_token=$3',
'/^(mark|rules)[\/_-]?(read)?[\/_-]?([a-z0-9]+)?(\.html?|\/)?$/i' => 'misc.php?action=$1$2&csrf_token=$3',
'/^mark[\/_-](forum)[\/_-]?([0-9]+)[\/_-](read)[\/_-]([a-z0-9]+)(\.html?|\/)?$/i' => 'misc.php?action=markforumread&fid=$2&csrf_token=$4',
'/^help[\/_-]([a-z]+)(\.html?|\/)?$/i' => 'help.php?section=$1',
Expand Down
3 changes: 3 additions & 0 deletions include/url/Folder_based_(fancy)/forum_urls.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
'forum' => 'forum/$1/$2/',
'forum_rss' => 'feed/rss/forum/$1/',
'forum_atom' => 'feed/atom/forum/$1/',
'forum_subscribe' => 'subscribe/forum/$1/$2/',
'forum_unsubscribe' => 'unsubscribe/forum/$1/$2/',
'help' => 'help/$1/',
'index' => '',
'index_rss' => 'feed/rss/',
Expand Down Expand Up @@ -59,6 +61,7 @@
'search_recent_results' => 'search/recent/$1/',
'search_unanswered' => 'search/unanswered/',
'search_subscriptions' => 'search/subscriptions/$1/',
'search_forum_subscriptions' => 'search/subscriptions/forum/$1/',
'search_user_posts' => 'search/posts/user/$1/',
'search_user_topics' => 'search/topics/user/$1/',
'subscribe' => 'subscribe/$1/$2/',
Expand Down
3 changes: 3 additions & 0 deletions include/url/Folder_based_(fancy)/rewrite_rules.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
'/^search[\/_-]?(new|recent|unanswered)[\/_-]p(age)?[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?action=show_$1&p=$3',
'/^search[\/_-]?subscriptions[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?action=show_subscriptions&user_id=$1',
'/^search[\/_-]?subscriptions[\/_-]?([0-9]+)[\/_-]p(age)?[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?action=show_subscriptions&user_id=$1&p=$3',
'/^search[\/_-]?subscriptions[\/_-]forum[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?action=show_forum_subscriptions&user_id=$1',
'/^search[\/_-]?subscriptions[\/_-]forum[\/_-]?([0-9]+)[\/_-]p(age)?[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?action=show_forum_subscriptions&user_id=$1&p=$3',
'/^search[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?search_id=$1',
'/^search[\/_-]?([0-9]+)[\/_-]?p(age)?[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?search_id=$1&p=$3',
'/^search[\/_-]?(posts|topics)[\/_-]?user[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'search.php?action=show_user_$1&user_id=$2',
Expand All @@ -47,6 +49,7 @@
'/^users\/(.*)\/([0-9-]+)\/?([a-z_]+)[\/_-]([a-zA-Z]+)[\/_-]p(age)?[\/_-]?([0-9]+)(\.html?|\/)?$/i' => 'userlist.php?username=$1&show_group=$2&sort_by=$3&sort_dir=$4&p=$6',
'/^users\/(.*)\/([0-9-]+)\/?([a-z_]+)[\/_-]([a-zA-Z]+)(\.html?|\/)?$/i' => 'userlist.php?username=$1&show_group=$2&sort_by=$3&sort_dir=$4',
'/^(email|report|subscribe|unsubscribe)[\/_-]?([0-9]+)[\/_-]?([a-z0-9]+)?(\.html?|\/)?$/i' => 'misc.php?$1=$2&csrf_token=$3',
'/^(subscribe|unsubscribe)[\/_-]forum[\/_-]?([0-9]+)[\/_-]?([a-z0-9]+)?(\.html?|\/)?$/i' => 'misc.php?forum_$1=$2&csrf_token=$3',
'/^(mark|rules)[\/_-]?(read)?[\/_-]?([a-z0-9]+)?(\.html?|\/)?$/i' => 'misc.php?action=$1$2&csrf_token=$3',
'/^mark[\/_-](forum)[\/_-]?([0-9]+)[\/_-](read)[\/_-]([a-z0-9]+)(\.html?|\/)?$/i' => 'misc.php?action=markforumread&fid=$2&csrf_token=$4',
'/^help[\/_-]([a-z]+)(\.html?|\/)?$/i' => 'help.php?section=$1',
Expand Down

0 comments on commit ce26fbe

Please sign in to comment.