PHP code formatted + made more readable

Author: very-twi

web/dispatch.php

@@ -1,49 +1,6 @@
 <?php
 
-function error_dumper($errno, $errstr, $errfile, $errline)
-{
-    if (!(error_reporting() & $errno)) {
-        return;
-    }
-    
-    $log = fopen('/tmp/vesta.php.log', 'a+');
-    
-    switch ($errno) {
-    case E_USER_ERROR:
-        $o = "ERROR: [$errno] $errstr\n";
-        $o.= "  Fatal error on line $errline in file $errfile";
-        $o.= ", PHP " . PHP_VERSION . " (" . PHP_OS . ")\n";
-        $o.= "Aborting...\n";
-	fwrite($log, $o);
-	fclose($log);
-        exit(1);
-        break;
+require dirname(__FILE__) . DIRECTORY_SEPARATOR . 'vesta/core/utils/error_logger.php'
+require dirname(__FILE__) . DIRECTORY_SEPARATOR . 'vesta/app.init.php';
 
-    case E_USER_WARNING:
-        $o = "WARNING: [$errno] $errstr\n";
-        fwrite($log, $o);
-	fclose($log);
-	break;
-
-    case E_USER_NOTICE:
-        $o =  "NOTICE: [$errno] $errstr\n";
-        fwrite($log, $o);
-	fclose($log);
-	break;
-
-    default:
-        $o = "Unknown error type: [$errno] $errstr\n";
-        fwrite($log, $o);
-	fclose($log);
-	break;
-    }
-
-    /* Don't execute PHP internal error handler */
-    return true;
-}
-
-set_error_handler('error_dumper');
-
-require dirname(__FILE__).DIRECTORY_SEPARATOR.'vesta/app.init.php';
-
-?>
+?>

web/vesta/api/AjaxHandler.php

@@ -1,12 +1,12 @@
 <?php
-
 /**
  * Ajax Handler
  * 
  * @author vesta, http://vestacp.com/
- * @copyright vesta 2010
+ * @copyright vesta 2010-2011
  */
-class AjaxHandler {
+class AjaxHandler 
+{
 
     static public $instance = null;
 
@@ -16,23 +16,26 @@ class AjaxHandler {
     /**
      * Grab current instance or create it
      *
-     * @return <type>
+     * @return AjaxHandler
      */
-    static function getInstance($request=null) {
+    static function getInstance($request=null) 
+    {
         return null == self::$instance ? self::$instance = new self() : self::$instance;
     }
 
     /**
      * Called functions should reply in the following way
      * return $this->reply($result, $data, $msg, $extra);
      * 
-     * @param type $request
-     * @return type 
+     * @param Request $request
+     * @return mixed 
      */
-    function dispatch($request) {
+    function dispatch($request) 
+    {
         $method = Request::parseAjaxMethod($request);
         $inc_file = V_ROOT_DIR . 'api' . DIRECTORY_SEPARATOR . $method['namespace'] . '.class.php';
-        if (!is_readable($inc_file)) {
+        if (!is_readable($inc_file)) 
+        {
             throw new SystemException(Message::INVALID_METHOD);
         }
 
@@ -41,14 +44,24 @@ function dispatch($request) {
         $space = new $method['namespace'];
         $method = $method['function'] . 'Execute';
 
-        if (!method_exists($space, $method)) {
+        if (!method_exists($space, $method)) 
+        {
             throw new SystemException(Message::INVALID_METHOD);
         }
 
         return $space->$method($request);
     }
 
-    function reply($result, $data, $message = '', $extra = array()) {
+	/**
+	 * Prepare the result of method execution into ajax-readable format
+	 * 
+	 * @param boolean $result - result of method execution
+	 * @param array $data - data to be replied
+	 * @param string $message - replied message
+	 * @param array $extra - extra data 
+	 */
+    function reply($result, $data, $message = '', $extra = array()) 
+    {
       return json_encode(array('result' => $result,
 			       'data' => $data,
 			       'message' => $message,
@@ -57,30 +70,55 @@ function reply($result, $data, $message = '', $extra = array()) {
 			       ));
     }
 
-    static function makeReply($reply) {
+	/**
+	 * TODO: delete this method
+	 * @deprecated	 
+	 */
+    static function makeReply($reply) 
+    {
         print $reply;
     }
 
     //
     // Error handlers
     //
 
-    static function generalError($error) {
+    /**
+     * Generate general error
+     * @param Exception $error
+     */
+    static function generalError($error) 
+    {
         self::renderGlobalError(Message::ERROR, Message::GENERAL_ERROR, $error);
     }
 
-    static function protectionError($error) {
+	/**
+     * Generate protection error
+     * @param Exception $error
+     */
+    static function protectionError($error) 
+    {
         self::renderGlobalError(Message::ERROR, Message::PROTECTION_ERROR, $error);
     }
 
-    static function systemError($error) {
+	/**
+     * Generate system error
+     * @param Exception $error
+     */
+    static function systemError($error) 
+    {
         self::renderGlobalError(Message::ERROR, Message::SYSTEM_ERROR, $error);
     }
 
-    static function renderGlobalError($type, $message, $error) {
+	/**
+     * Prepare and render the error
+     * @param Exception $error
+     */
+    static function renderGlobalError($type, $message, $error) 
+    {
         $trace = $error->getTrace();
         AjaxHandler::makeReply(
-                        AjaxHandler::getInstance()->reply(false, $type, $message . ': ' . $error->getMessage(), $trace[0]['file'] . ' / ' . $trace[0]['line'])
+             AjaxHandler::getInstance()->reply(false, $type, $message . ': ' . $error->getMessage(), $trace[0]['file'] . ' / ' . $trace[0]['line'])
         );
     }