This is giving me a syntax error. It looks gross this way, but I can't think of any...

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

diff --git a/includes/AjaxDispatcher.php b/includes/AjaxDispatcher.php
index 4a84ea2..7b85ed2 100644 (file)
--- a/includes/AjaxDispatcher.php
+++ b/includes/AjaxDispatcher.php
@@ -1,19 +1,29 @@
 <?php
+/**
+ * Handle ajax requests and send them to the proper handler.
+ */
 
-if( !defined( 'MEDIAWIKI' ) )
-        die( 1 );
-
-if ( ! $wgUseAjax ) {
+if( !(defined( 'MEDIAWIKI' ) && $wgUseAjax ) ) {
        die( 1 );
 }
 
 require_once( 'AjaxFunctions.php' );
 
+/**
+ * Object-Oriented Ajax functions.
+ * @addtogroup Ajax
+ */
 class AjaxDispatcher {
-       var $mode;
-       var $func_name;
-       var $args;
+       /** The way the request was made, either a 'get' or a 'post' */
+       private $mode;
+
+       /** Name of the requested handler */
+       private $func_name;
 
+       /** Arguments passed */
+       private $args;
+
+       /** Load up our object with user supplied data */
        function __construct() {
                wfProfileIn( __METHOD__ );
 
@@ -27,24 +37,41 @@ class AjaxDispatcher {
                        $this->mode = "post";
                }
 
-               if ($this->mode == "get") {
+               switch( $this->mode ) {
+
+               case 'get':
                        $this->func_name = isset( $_GET["rs"] ) ? $_GET["rs"] : '';
                        if (! empty($_GET["rsargs"])) {
                                $this->args = $_GET["rsargs"];
                        } else {
                                $this->args = array();
                        }
-               } else {
+               break;
+
+               case 'post':
                        $this->func_name = isset( $_POST["rs"] ) ? $_POST["rs"] : '';
                        if (! empty($_POST["rsargs"])) {
                                $this->args = $_POST["rsargs"];
                        } else {
                                $this->args = array();
                        }
+               break;
+
+               default:
+                       return;
+                       # Or we could throw an exception:
+                       #throw new MWException( __METHOD__ . ' called without any data (mode empty).' );
+
                }
+
                wfProfileOut( __METHOD__ );
        }
 
+       /** Pass the request to our internal function.
+        * BEWARE! Data are passed as they have been supplied by the user,
+        * they should be carefully handled in the function processing the
+        * request.
+        */
        function performAction() {
                global $wgAjaxExportList, $wgOut;
 
@@ -57,8 +84,13 @@ class AjaxDispatcher {
                        wfHttpError( 400, 'Bad Request',
                                "unknown function " . (string) $this->func_name );
                } else {
+                       if ( strpos( $this->func_name, '::' ) !== false ) {
+                               $func = explode( '::', $this->func_name, 2 );
+                       } else {
+                               $func = $this->func_name;
+                       }
                        try {
-                               $result = call_user_func_array($this->func_name, $this->args);
+                               $result = call_user_func_array($func, $this->args);
 
                                if ( $result === false || $result === NULL ) {
                                        wfHttpError( 500, 'Internal Error',
@@ -88,4 +120,4 @@ class AjaxDispatcher {
        }
 }
 
-?>
+