Issue 5709 - Added new redirects for new options page

modules/web/templates/adblockplus.org.conf.erb

 # XSS and clickjacking prevention headers
 
 set $csp_frame "";
 if ($uri ~ ^/(:?\w\w(_\w\w)?/)?(?:index|firefox|chrome|opera|android|internet-explorer|safari|yandex-browser|maxthon)?$|^/blog/)
 {
   set $csp_frame "; frame-src www.youtube-nocookie.com;";
 }
 add_header Content-Security-Policy "default-src 'self'; img-src * data:; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval' $csp_frame";
 add_header X-Frame-Options "sameorigin";
 
@@ skipping 166 matching lines @@
     rewrite ^ /forum/viewforum.php?f=26? redirect;
   }
   if ($arg_link = "adblock_plus_safari_ios_store")
   {
     rewrite ^ https://itunes.apple.com/app/adblock-plus-abp/id1028871868? redirect;
   }
   if ($arg_link = "adblock_plus_sbrowser_store")
   {
     rewrite ^ https://play.google.com/store/apps/details?id=org.adblockplus.adblockplussbrowser? redirect;
   }
+  if ($arg_link = "adblock_plus_chrome_dnt")
+  {
+    rewrite ^ https://support.google.com/chrome/answer/2790761? redirect;
+  }
+  if ($arg_link = "adblock_plus_firefox_dnt")
+  {
+    rewrite ^ https://www.mozilla.org/en-US/firefox/dnt/? redirect;
+  }
+  if ($arg_link = "adblock_plus_opera_dnt")
+  {
+    rewrite ^ http://help.opera.com/Windows/12.10/en/notrack.html? redirect;
+  }
+  if ($arg_link = "adblock_plus_edge_dnt")
+  {
+    rewrite ^ https://privacy.microsoft.com/en-us/windows-10-microsoft-edge-and-privacy? redirect;
+  }
+  if ($arg_link = "adblock_plus_report_bug")
+  {
+    rewrite ^ https://adblockplus.org/bugs#reporting? redirect;
+  }
+  if ($arg_link = "adblock_plus_report_ad")
+  {
+    rewrite ^ https://forums.lanik.us/viewforum.php?f=62? redirect;
+  }
+
+  set $forum_id "64";
+  set $forum_link "";
+  if ($arg_link = "adblock_plus_report_issue")
+  {
+    set $forum_link "https://forums.lanik.us/viewforum.php?f=";
+  }
+  if ($lang = "id")
+  {
+    set $forum_id "94";
+  }
+  if ($lang = "nl")
+  {
+    set $forum_id "100";
+  }
+  if ($lang = "de")
+  {
+    set $forum_id "90";
+  }
+  if ($lang = "it")
+  {
+    set $forum_id "96";
+  }
+  if ($lang = "es")
+  {
+    set $forum_id "103";
+  }
+  if ($lang = "lt")
+  {
+    set $forum_id "101";
+  }
+  if ($lang = "lv")
+  {
+    set $forum_id "99";
+  }
+  if ($lang = "ar")
+  {
+    set $forum_id "98";
+  }
+  if ($lang = "fr")
+  {
+    set $forum_id "91";
+  }
+  if ($lang = "ru")
+  {
+    set $forum_id "102";
+  }
+  if ($forum_link != "")
+  {
+    rewrite ^ $forum_link$forum_id? redirect;
+  }
   if ($arg_link = "releases")
   {
     rewrite ^ /releases? redirect;
   }
   if ($arg_link = "social_facebook")
   {
     rewrite ^ https://www.facebook.com/adblockplus? redirect;
   }
   if ($arg_link = "social_gplus")
   {
@@ skipping 63 matching lines @@
   }
   if ($arg_link = "acceptable_ads_criteria")
   {
     set $link "acceptable-ads";
     set $anchor "#criteria";
   }
   if ($arg_link = "contributors")
   {
     set $link "contributors";
   }
+  if ($arg_link = "whitelist")
+  {
+    set $link "faq_basics";
+    set $anchor "#disable";
+  }
 
   if ($link = "")
   {
     return 404;
   }
 
   if (!-f "$document_root/$lang/$link")
   {
     set $lang "!!";
   }
@@ skipping 65 matching lines @@
 location /403.html
 {
   try_files $uri @proxied;
 }
 location @proxied
 {
   proxy_pass https://server16.adblockplus.org;
   proxy_set_header Host adblockplus.org;
   proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 }