[Mapbender-commits] r6743 - branches/banjo_dev/mapbender/http/rest

[svn_mapbender at osgeo.org]

Author: banjo
Date: 2010-08-10 16:11:11 +0000 (Tue, 10 Aug 2010)
New Revision: 6743

Modified:
   branches/banjo_dev/mapbender/http/rest/die_rest_response.php
   branches/banjo_dev/mapbender/http/rest/http_auth.php
Log:
refactoring code



Modified: branches/banjo_dev/mapbender/http/rest/die_rest_response.php
===================================================================
--- branches/banjo_dev/mapbender/http/rest/die_rest_response.php	2010-08-10 14:18:36 UTC (rev 6742)
+++ branches/banjo_dev/mapbender/http/rest/die_rest_response.php	2010-08-10 16:11:11 UTC (rev 6743)
@@ -1,6 +1,6 @@
 <?php
 
-send_die_rest_response($status = 500, $body = '', $content_type = 'text/html') {
+send_rest_response($status = 500, $body = '', $content_type = 'text/html') {
   $ini_file = "http_status.ini";
   $status_codes = parse_ini_file($file);
   $status_header = 'HTTP/1.1 '.$status.' '.$status_codes[$status];

Modified: branches/banjo_dev/mapbender/http/rest/http_auth.php
===================================================================
--- branches/banjo_dev/mapbender/http/rest/http_auth.php	2010-08-10 14:18:36 UTC (rev 6742)
+++ branches/banjo_dev/mapbender/http/rest/http_auth.php	2010-08-10 16:11:11 UTC (rev 6743)
@@ -15,7 +15,7 @@
     header('HTTP/1.1 401 Unauthorised');
     header('WWW-Authenticate: Digest realm="'.REALM.
       '",qop="auth",nonce="'.getNonce().'",opaque="'.md5(REALM).'"');
-    die(send_die_rest_response(401));
+    die(send_rest_response(401));
   }
 
   //Get the http header in an array
@@ -32,8 +32,8 @@
 
   $userInfo = getUserInfo($mbUsername, $mbEmail);
 
-  if ($userInfo[0] == '-1') {
-    die(send_die_rest_response(401));
+  if ($userInfo[0] === '-1') {
+    die(send_rest_response(401));
   }
 
   //First check the stale!
@@ -43,7 +43,7 @@
   } else {
     //Stale nonce received (probably more than x seconds old)
     $stale = true;
-    die(send_die_rest_response(408));
+    die(send_rest_response(408));
   }
 
   // generate the expected response
@@ -54,7 +54,7 @@
 
   //Compare the expected response with the actual response
   if ($getHeaderArray['response'] != $expected_response) {
-    die(send_die_rest_response(401));
+    die(send_rest_response(401));
   }
   
   //Authenticated