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

Tue Aug 10 12:26:02 EDT 2010

Author: banjo
Date: 2010-08-10 16:26:02 +0000 (Tue, 10 Aug 2010)
New Revision: 6744

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


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

--- branches/banjo_dev/mapbender/http/rest/die_rest_response.php	2010-08-10 16:11:11 UTC (rev 6743)
+++ branches/banjo_dev/mapbender/http/rest/die_rest_response.php	2010-08-10 16:26:02 UTC (rev 6744)
@@ -1,30 +0,0 @@
-<?php
-
-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];
-  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 16:11:11 UTC (rev 6743)
+++ branches/banjo_dev/mapbender/http/rest/http_auth.php	2010-08-10 16:26:02 UTC (rev 6744)
@@ -1,7 +1,7 @@
 <?php
 require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
 require_once("db_connect.php");
-require_once("die_rest_response.php");
+require_once("rest_response.php");
 
 //nonceLife in seconds
 $nonceLife = 300;

