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

Tue Aug 10 08:26:22 EDT 2010

Author: banjo
Date: 2010-08-10 12:26:22 +0000 (Tue, 10 Aug 2010)
New Revision: 6738

Added:
   branches/banjo_dev/mapbender/http/rest/die_rest_response.php
Modified:
   branches/banjo_dev/mapbender/http/rest/http_auth.php
Log:
Adding die_rest_response.php file


Added: branches/banjo_dev/mapbender/http/rest/die_rest_response.php
===================================================================

--- branches/banjo_dev/mapbender/http/rest/die_rest_response.php	                        (rev 0)
+++ branches/banjo_dev/mapbender/http/rest/die_rest_response.php	2010-08-10 12:26:22 UTC (rev 6738)
@@ -0,0 +1,30 @@
+<?php
+
+send_die_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];
+  header($status_header);
+  header('Content-type: '.$content_type);
+
+  if($body != '')
+  {
+    echo $body;
+    exit;
+  }
+  else
+  {
+    $body = '<html>
+      <head>
+      <meta http-equiv="Content-Type" content="text/html">
+      <title>' . $status . ' '. $status_codes[$status]. '</title>
+      </head>
+      <body>
+      <h1>'. $status_codes[$status].'</h1>
+      </body>
+      </html>';
+    echo $body;
+    exit;
+  }
+}
+?>

Modified: branches/banjo_dev/mapbender/http/rest/http_auth.php
===================================================================
--- branches/banjo_dev/mapbender/http/rest/http_auth.php	2010-08-10 10:54:26 UTC (rev 6737)
+++ branches/banjo_dev/mapbender/http/rest/http_auth.php	2010-08-10 12:26:22 UTC (rev 6738)
@@ -1,9 +1,10 @@
 <?php
 require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
 require_once("db_connect.php");
+require_once("die_rest_response.php");
 
 //nonceLife in seconds
-$nonceLife = 300
+$nonceLife = 300;
 
 function authenticate() {
 
@@ -14,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_die_rest_response(401));
   }
 
   //Get the http header in an array

