More rigorous fix for ImageMagick parameter interpretation (bug 23148 etc.) based...

[lhc/web/wiklou.git] / includes / AjaxDispatcher.php

diff --git a/includes/AjaxDispatcher.php b/includes/AjaxDispatcher.php
index ca6f180..5bd7cfa 100644 (file)
--- a/includes/AjaxDispatcher.php
+++ b/includes/AjaxDispatcher.php
@@ -1,9 +1,13 @@
 <?php
 /**
+ * @defgroup Ajax Ajax
+ *
+ * @file
+ * @ingroup Ajax
  * Handle ajax requests and send them to the proper handler.
  */
 
-if( !(defined( 'MEDIAWIKI' ) && $wgUseAjax ) ) {
+if ( !( defined( 'MEDIAWIKI' ) && $wgUseAjax ) ) {
        die( 1 );
 }
 
@@ -11,7 +15,7 @@ require_once( 'AjaxFunctions.php' );
 
 /**
  * Object-Oriented Ajax functions.
- * @addtogroup Ajax
+ * @ingroup Ajax
  */
 class AjaxDispatcher {
        /** The way the request was made, either a 'get' or a 'post' */
@@ -29,11 +33,11 @@ class AjaxDispatcher {
 
                $this->mode = "";
 
-               if (! empty($_GET["rs"])) {
+               if ( ! empty( $_GET["rs"] ) ) {
                        $this->mode = "get";
                }
 
-               if (!empty($_POST["rs"])) {
+               if ( !empty( $_POST["rs"] ) ) {
                        $this->mode = "post";
                }
 
@@ -41,7 +45,7 @@ class AjaxDispatcher {
 
                case 'get':
                        $this->func_name = isset( $_GET["rs"] ) ? $_GET["rs"] : '';
-                       if (! empty($_GET["rsargs"])) {
+                       if ( ! empty( $_GET["rsargs"] ) ) {
                                $this->args = $_GET["rsargs"];
                        } else {
                                $this->args = array();
@@ -50,7 +54,7 @@ class AjaxDispatcher {
 
                case 'post':
                        $this->func_name = isset( $_POST["rs"] ) ? $_POST["rs"] : '';
-                       if (! empty($_POST["rsargs"])) {
+                       if ( ! empty( $_POST["rsargs"] ) ) {
                                $this->args = $_POST["rsargs"];
                        } else {
                                $this->args = array();
@@ -61,7 +65,7 @@ class AjaxDispatcher {
                        wfProfileOut( __METHOD__ );
                        return;
                        # Or we could throw an exception:
-                       #throw new MWException( __METHOD__ . ' called without any data (mode empty).' );
+                       # throw new MWException( __METHOD__ . ' called without any data (mode empty).' );
 
                }
 
@@ -79,35 +83,50 @@ class AjaxDispatcher {
                if ( empty( $this->mode ) ) {
                        return;
                }
+
                wfProfileIn( __METHOD__ );
 
-               if (! in_array( $this->func_name, $wgAjaxExportList ) ) {
+               if ( ! in_array( $this->func_name, $wgAjaxExportList ) ) {
+                       wfDebug( __METHOD__ . ' Bad Request for unknown function ' . $this->func_name . "\n" );
+
                        wfHttpError( 400, 'Bad Request',
                                "unknown function " . (string) $this->func_name );
                } else {
+                       wfDebug( __METHOD__ . ' dispatching ' . $this->func_name . "\n" );
+
                        if ( strpos( $this->func_name, '::' ) !== false ) {
                                $func = explode( '::', $this->func_name, 2 );
                        } else {
                                $func = $this->func_name;
                        }
                        try {
-                               $result = call_user_func_array($func, $this->args);
+                               $result = call_user_func_array( $func, $this->args );
+
+                               if ( $result === false || $result === null ) {
+                                       wfDebug( __METHOD__ . ' ERROR while dispatching '
+                                                       . $this->func_name . "(" . var_export( $this->args, true ) . "): "
+                                                       . "no data returned\n" );
 
-                               if ( $result === false || $result === NULL ) {
                                        wfHttpError( 500, 'Internal Error',
                                                "{$this->func_name} returned no data" );
                                }
                                else {
                                        if ( is_string( $result ) ) {
-                                               $result= new AjaxResponse( $result );
+                                               $result = new AjaxResponse( $result );
                                        }
 
                                        $result->sendHeaders();
                                        $result->printText();
+
+                                       wfDebug( __METHOD__ . ' dispatch complete for ' . $this->func_name . "\n" );
                                }
 
-                       } catch (Exception $e) {
-                               if (!headers_sent()) {
+                       } catch ( Exception $e ) {
+                               wfDebug( __METHOD__ . ' ERROR while dispatching '
+                                               . $this->func_name . "(" . var_export( $this->args, true ) . "): "
+                                               . get_class( $e ) . ": " . $e->getMessage() . "\n" );
+
+                               if ( !headers_sent() ) {
                                        wfHttpError( 500, 'Internal Error',
                                                $e->getMessage() );
                                } else {