Changeset 57404

Timestamp:

04/07/08 14:52:23 (3 months ago)

Author:

sminnee

Message:

Added better error message for when form methods are left out of allowed_actions

Location:

modules/sapphire/branches/roa/core/control

Files:

• HTTPResponse.php (modified) (1 diff)
• RequestHandlingData.php (modified) (2 diffs)

modules/sapphire/branches/roa/core/control/HTTPResponse.php

@@ -76 +76 @@
         function getStatusCode() {
                 return $this->statusCode;
+        }
+        
+        /**
+         * Returns true if this HTTP response is in error
+         */
+        function isError() {
+                return $this->statusCode && ($this->statusCode < 200 || $this->statusCode > 399);
         }
         

modules/sapphire/branches/roa/core/control/RequestHandlingData.php

@@ -76 +76 @@
                         if(isset($_REQUEST['debug_request'])) Debug::message("Testing '$rule' with '" . $request->remaining() . "' on $this->class");
                         if($params = $request->match($rule, true)) {
-                                if(isset($_REQUEST['debug_request'])) Debug::message("Rule '$rule' matched on $this->class");
+                                if(isset($_REQUEST['debug_request'])) Debug::message("Rule '$rule' matched to action '$action' on $this->class");
                                 
                                 // Actions can reference URL parameters, eg, '$Action/$ID/$OtherID' => '$Action',
@@ -85 +85 @@
                                 } else {
                                         return $this->httpError(403, "Action '$action' isn't allowed on class $this->class");
+                                }
+                                
+                                if($result instanceof HTTPResponse && $result->isError()) {
+                                        if(isset($_REQUEST['debug_request'])) Debug::message("Rule resulted in HTTP error; breaking");
+                                        return $result;
                                 }