Changeset 1178 in ExiteCMS

Timestamp:

12/21/07 10:48:52 (4 years ago)

Author:

hverton

Message:

modified the 404 handler to support both "ErrorDocument 404" and mod_rewrite

File:

• trunk/404handler.php (modified) (2 diffs)

trunk/404handler.php

@@ -18 +18 @@
 
 // requested url
-$url = isset($_SERVER['REDIRECT_URL']) ? $_SERVER['REDIRECT_URL'] : "";
+$url = isset($_SERVER['REDIRECT_URL']) ? $_SERVER['REDIRECT_URL'] : $_SERVER['SCRIPT_URL'];
 
 // check if we have a redirect for this URL
-$result = dbquery("SELECT * from ".$db_prefix."redirects WHERE url_from = '".$_SERVER['REDIRECT_URL']."'");
+$result = dbquery("SELECT * from ".$db_prefix."redirects WHERE url_from = '".((isset($_SERVER['REDIRECT_URL']) && $_SERVER['REDIRECT_URL'] != "") ? $_SERVER['REDIRECT_URL'] : $_SERVER['SCRIPT_URL'])."'");
 
 // if we had a URL, and found a redirect, compose the URL to redirect to
@@ -73 +73 @@
     } else {
         // check for post variables
-        $rawpostvars = explode("&", file_get_contents("php://input"));
-        if (is_array($rawpostvars)) {
+        $rawpostvars = file_get_contents("php://input");
+        if (!empty($rawpostvars)) {
+            $rawpostvars = explode("&", $rawpostvars);
             foreach($rawpostvars as $postvar) {
                 $postvar = explode("=", $postvar);