[MediaWiki-commits] [Gerrit] Cleanup error pages - change (labs/toollabs)

2016-01-24 Thread BryanDavis (Code Review)
BryanDavis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/266077

Change subject: Cleanup error pages
..

Cleanup error pages

Apply MediaWiki code style to error pages and consolidate common logic
into functions in an include file.

Change-Id: I9b8eac8ae8d09cc773c3f57e03b60f86d49a7f00
---
M www/content/403.php
M www/content/404.php
M www/content/500.php
M www/content/503.php
A www/content/common.inc.php
5 files changed, 122 insertions(+), 175 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/77/266077/1

diff --git a/www/content/403.php b/www/content/403.php
index 9977e82..1961072 100644
--- a/www/content/403.php
+++ b/www/content/403.php
@@ -6,47 +6,23 @@
 
 
 
-
-  Forbidden
-  The URI you have requested, , might exist but the server has been instructed not to let you 
reach it.
-  
-  If you have reached this page from somewhere else...
-  This URI is managed by the  tool, maintained by 
-   $maint):
-   $mu = posix_getpwnam($maint);
-   if($mu):
- $wtu = $mu['gecos'];
- ?>https://wikitech.wikimedia.org/wiki/User:">.
-  Perhaps this content can only be accessed from the secret underground 
lair of the maintainers, or the link you've followed doesn't actually lead 
somewhere useful?
-  If you're pretty sure this shouldn't be an error, you may wish to 
notify the tool's maintainers (above) about the error and how you ended up 
here.
-  If you maintain this tool
-  The error might be caused by incorrect permissions, or by the absence 
of an index file (this webserver does not list directory contents by 
default).
-  
-  Perhaps the webserver has temporarily lost its mind, or the link 
you've followed doesn't actually lead somewhere useful?
-  If you're pretty sure this shouldn't be an error, you may wish to 
notify the project administrators about the error 
and how you ended up here.
-  
+
+Forbidden
+The URI you have requested, , might exist but the server has been instructed not to let you 
reach it.
+
+If you have reached this page from somewhere else...
+This URI is managed by the  tool, maintained by .
+Perhaps this content can only be accessed from the secret underground lair 
of the maintainers, or the link you've followed doesn't actually lead somewhere 
useful?
+If you're pretty sure this shouldn't be an error, you may wish to notify 
the tool's maintainers (above) about the error and how you ended up here.
+If you maintain this tool
+The error might be caused by incorrect permissions, or by the absence of an 
index file (this webserver does not list directory contents by default).
+
+Perhaps the webserver has temporarily lost its mind, or the link you've 
followed doesn't actually lead somewhere useful?
+If you're pretty sure this shouldn't be an error, you may wish to notify 
the project administrators about the error and how 
you ended up here.
+
 
 
diff --git a/www/content/404.php b/www/content/404.php
index b8f2693..5f778b1 100644
--- a/www/content/404.php
+++ b/www/content/404.php
@@ -6,45 +6,21 @@
 
 
 
-
-  Four hundred and four!
-  The URI you have requested, , doesn't seem to actually exist.
-  
-  If you have reached this page from somewhere else...
-  This URI is managed by the  tool, maintained by 
-   $maint):
-   $mu = posix_getpwnam($maint);
-   if($mu):
- $wtu = $mu['gecos'];
- ?>https://wikitech.wikimedia.org/wiki/User:">.
-  Perhaps its files are on vacation, or the link you've followed 
doesn't actually lead somewhere useful?
-  You might want to looks at the list of tools to 
find what you were looking for, or one of the links on the sidebar to the left. 
If you're pretty sure this shouldn't be an error, you may wish to notify the 
tool's maintainers (above) about the error and how you ended up here.
-  
-  Perhaps the webserver has temporarily lost its mind, or the link 
you've followed doesn't actually lead somewhere useful?
-  You might want to looks at the list of tools to 
find what you were looking for, or one of the links on the sidebar to the left. 
If you're pretty sure this shouldn't be an error, you may wish to notify the project administrators about the error and how you 
ended up here.
-  
+
+Four hundred and four!
+The URI you have requested, , 
doesn't seem to actually exist.
+
+If you have reached this page from somewhere else...
+This URI is managed by the  tool, maintained by .
+Perhaps its files are on vacation, or the link you've followed doesn't 
actually lead somewhere useful?
+You might want to looks at the list of tools to find 
what you were looking for, or one of the links on the sidebar to the left. If 
you're pretty sure this shouldn't be an error, you may wish to notify the 
tool's maintainers (above) about the error and how you ended 

[MediaWiki-commits] [Gerrit] Cleanup error pages - change (labs/toollabs)

2016-01-24 Thread Merlijn van Deen (Code Review)
Merlijn van Deen has submitted this change and it was merged.

Change subject: Cleanup error pages
..


Cleanup error pages

Apply MediaWiki code style to error pages and consolidate common logic
into functions in an include file.

Change-Id: I9b8eac8ae8d09cc773c3f57e03b60f86d49a7f00
---
M www/content/403.php
M www/content/404.php
M www/content/500.php
M www/content/503.php
A www/content/common.inc.php
5 files changed, 122 insertions(+), 175 deletions(-)

Approvals:
  Merlijn van Deen: Verified; Looks good to me, approved



diff --git a/www/content/403.php b/www/content/403.php
index 9977e82..1961072 100644
--- a/www/content/403.php
+++ b/www/content/403.php
@@ -6,47 +6,23 @@
 
 
 
-
-  Forbidden
-  The URI you have requested, , might exist but the server has been instructed not to let you 
reach it.
-  
-  If you have reached this page from somewhere else...
-  This URI is managed by the  tool, maintained by 
-   $maint):
-   $mu = posix_getpwnam($maint);
-   if($mu):
- $wtu = $mu['gecos'];
- ?>https://wikitech.wikimedia.org/wiki/User:">.
-  Perhaps this content can only be accessed from the secret underground 
lair of the maintainers, or the link you've followed doesn't actually lead 
somewhere useful?
-  If you're pretty sure this shouldn't be an error, you may wish to 
notify the tool's maintainers (above) about the error and how you ended up 
here.
-  If you maintain this tool
-  The error might be caused by incorrect permissions, or by the absence 
of an index file (this webserver does not list directory contents by 
default).
-  
-  Perhaps the webserver has temporarily lost its mind, or the link 
you've followed doesn't actually lead somewhere useful?
-  If you're pretty sure this shouldn't be an error, you may wish to 
notify the project administrators about the error 
and how you ended up here.
-  
+
+Forbidden
+The URI you have requested, , might exist but the server has been instructed not to let you 
reach it.
+
+If you have reached this page from somewhere else...
+This URI is managed by the  tool, maintained by .
+Perhaps this content can only be accessed from the secret underground lair 
of the maintainers, or the link you've followed doesn't actually lead somewhere 
useful?
+If you're pretty sure this shouldn't be an error, you may wish to notify 
the tool's maintainers (above) about the error and how you ended up here.
+If you maintain this tool
+The error might be caused by incorrect permissions, or by the absence of an 
index file (this webserver does not list directory contents by default).
+
+Perhaps the webserver has temporarily lost its mind, or the link you've 
followed doesn't actually lead somewhere useful?
+If you're pretty sure this shouldn't be an error, you may wish to notify 
the project administrators about the error and how 
you ended up here.
+
 
 
diff --git a/www/content/404.php b/www/content/404.php
index b8f2693..5f778b1 100644
--- a/www/content/404.php
+++ b/www/content/404.php
@@ -6,45 +6,21 @@
 
 
 
-
-  Four hundred and four!
-  The URI you have requested, , doesn't seem to actually exist.
-  
-  If you have reached this page from somewhere else...
-  This URI is managed by the  tool, maintained by 
-   $maint):
-   $mu = posix_getpwnam($maint);
-   if($mu):
- $wtu = $mu['gecos'];
- ?>https://wikitech.wikimedia.org/wiki/User:">.
-  Perhaps its files are on vacation, or the link you've followed 
doesn't actually lead somewhere useful?
-  You might want to looks at the list of tools to 
find what you were looking for, or one of the links on the sidebar to the left. 
If you're pretty sure this shouldn't be an error, you may wish to notify the 
tool's maintainers (above) about the error and how you ended up here.
-  
-  Perhaps the webserver has temporarily lost its mind, or the link 
you've followed doesn't actually lead somewhere useful?
-  You might want to looks at the list of tools to 
find what you were looking for, or one of the links on the sidebar to the left. 
If you're pretty sure this shouldn't be an error, you may wish to notify the project administrators about the error and how you 
ended up here.
-  
+
+Four hundred and four!
+The URI you have requested, , 
doesn't seem to actually exist.
+
+If you have reached this page from somewhere else...
+This URI is managed by the  tool, maintained by .
+Perhaps its files are on vacation, or the link you've followed doesn't 
actually lead somewhere useful?
+You might want to looks at the list of tools to find 
what you were looking for, or one of the links on the sidebar to the left. If 
you're pretty sure this shouldn't be an error, you may wish to notify the 
tool's maintainers (above) about the error and how you ended up here.
+
+Perhaps the webserver has