php code profiling made. Fixed huge set of issues

Author: very-twi

web/vesta/api/AjaxHandler.php

@@ -9,11 +9,12 @@
  * @copyright vesta 2010-2011
  */
 class AjaxHandler {
-
+    
     static public $instance = null;
 
-    public $errors = array();
-    public $status = TRUE;
+    const JSON      = 'json';
+    public $errors  = array();
+    public $status  = TRUE;
 
     /**
      * Grab current instance or create it
@@ -37,7 +38,8 @@ public function getLoggedUser()
      * @param Request $request
      * @return string 
      */
-    function dispatch($request) {
+    public function dispatch(Request $request) 
+    {
         $method = Request::parseAjaxMethod($request);
         $inc_file = V_ROOT_DIR . 'api' . DIRECTORY_SEPARATOR . $method['namespace'] . '.class.php';
         if (!is_readable($inc_file)) {
@@ -59,7 +61,8 @@ function dispatch($request) {
     /**
      * Prepare response for ajax
      */
-    function reply($result, $data, $message = '', $extra = array()) {
+    public function reply($result, $data, $message = '', $extra = array()) 
+    {
       return json_encode(array('result' => $result,
                    'data' => $data,
                    'message' => $message,
@@ -68,7 +71,8 @@ function reply($result, $data, $message = '', $extra = array()) {
                    ));
     }
 
-    static function makeReply($reply) {
+    static function makeReply($reply) 
+    {
         print $reply;
     }
 
@@ -93,7 +97,7 @@ static function renderGlobalError($type, $message, $error) {
         AjaxHandler::makeReply(
                         AjaxHandler::getInstance()->reply(false, $type, $message . ': ' . $error->getMessage(), $trace[0]['file'] . ' / ' . $trace[0]['line'])
         );*/
-    print $message;
+        print $message;
     }
 
 }

web/vesta/api/CRON.class.php

@@ -16,7 +16,7 @@ class CRON extends AjaxHandler
      * @param Request $request
      * @return string - Ajax Reply
      */
-    public function getListExecute($request) 
+    public function getListExecute(Request $request) 
     {
         $user = $this->getLoggedUser();
         $reply = array();
@@ -32,7 +32,7 @@ public function getListExecute($request)
                             'WDAY'      => $record['WDAY'],
                             'SUSPENDED' => $record['SUSPEND'],
                             'DATE'      => date(Config::get('ui_date_format', strtotime($record['DATE']))),
-			    'JOB'	=> $id
+                            'JOB'    => $id
                           );
         }
 
@@ -51,8 +51,8 @@ public function getListExecute($request)
      */
     public function addExecute(Request $request) 
     {
-	$user   = $this->getLoggedUser();
-	$spell  = $request->getParameter('spell');
+    $user   = $this->getLoggedUser();
+    $spell  = $request->getParameter('spell');
         $params = array(
                     'USER'      => $user['uid'],
                     'MIN'       => $spell['MIN'],
@@ -89,8 +89,8 @@ public function addExecute(Request $request)
      */
     public function deleteExecute(Request $request) 
     {
-	$user   = $this->getLoggedUser();
-	$spell  = $request->getParameter('spell'); 
+    $user   = $this->getLoggedUser();
+    $spell  = $request->getParameter('spell'); 
         $params = array(
                     'USER' => $user['uid'],
                     'JOB'  => $spell['JOB']
@@ -113,7 +113,7 @@ public function deleteExecute(Request $request)
      */
     public function changeExecute(Request $request)
     {
-	$user = $this->getLoggedUser();
+    $user = $this->getLoggedUser();
         $_old   = $request->getParameter('old');
         $_new   = $request->getParameter('new');
         $result = array();
@@ -147,7 +147,7 @@ public function changeExecute(Request $request)
     public function suspendExecute(Request $request)
     {
         $user   = $this->getLoggedUser();
-	$spell  = $request->getParameter('spell');
+    $spell  = $request->getParameter('spell');
         $params = array(
                     'USER' => $user['uid'],
                     'JOB'  => $spell['JOB']
@@ -168,10 +168,10 @@ public function suspendExecute(Request $request)
      * @param Request $request
      * @return string - Ajax Reply
      */
-    public function unsuspendExecute($request)
+    public function unsuspendExecute(Request $request)
     {        
-	$user   = $this->getLoggedUser();
-	$spell  = $request->getParameter('spell');
+    $user   = $this->getLoggedUser();
+    $spell  = $request->getParameter('spell');
         $params = array(
                     'USER' => $user['uid'],
                     'JOB'  => $spell['JOB']
@@ -185,55 +185,5 @@ public function unsuspendExecute($request)
 
         return $this->reply($result['status'], $result['data']);
     }
-
-
-    /**
-     * Batch suspend CRON entries
-     * 
-     * @param Request $request
-     * @return string - Ajax Reply
-     */
-    /*public function suspendAllExecute($request)
-    {
-        $r = new Request();
-        $_s = $r->getSpell();
-        $_user = 'vesta';
-        $_JOB = $_s['JOB'];
-        $params = array(
-                    'USER' => $_user
-                  );
-    
-        $result = Vesta::execute(Vesta::V_SUSPEND_CRON_JOBS, $params);
-    
-        if (!$result['status']) {
-            $this->errors[] = array($result['error_code'] => $result['error_message']);
-        }
-    
-        return $this->reply($result['status'], $result['data']);
-    }*/
-
-    /**
-     * Batch unsuspend CRON entries
-     * 
-     * @param Request $request
-     * @return string - Ajax Reply
-     */
-    /*public function unsuspendAllExecute($request)
-    {
-        $r      = new Request();
-        $_s     = $r->getSpell();
-        $_user  = 'vesta';
-        $params = array(
-                    'USER' => $_user
-                  );
-    
-        $result = Vesta::execute(Vesta::V_UNSUSPEND_CRON_JOBS, $params);
-    
-        if (!$result['status']) {
-            $this->errors[] = array($result['error_code'] => $result['error_message']);
-        }
-    
-        return $this->reply($result['status'], $result['data']);
-    }*/
 
 }