jaxon-php / jaxon-core

templates/plugins/config.js.php

Spacing +5 added lines, -5 removed lines

@@ -14,18 +14,18 @@
 jaxon.config.defaultMode = "<?php echo $this->sDefaultMode ?>";
 jaxon.config.defaultMethod = "<?php echo $this->sDefaultMethod ?>";
 jaxon.config.responseType = "<?php echo $this->sResponseType ?>";
-<?php if($this->nResponseQueueSize > 0): ?>
+<?php if ($this->nResponseQueueSize > 0): ?>
 jaxon.config.responseQueueSize = <?php echo $this->nResponseQueueSize ?>;
 <?php endif ?>
-<?php if(($this->bDebug)): ?>
-<?php if(($this->sDebugOutputID)): ?>
+<?php if (($this->bDebug)): ?>
+<?php if (($this->sDebugOutputID)): ?>
 jaxon.debug.outputID = "<?php echo $this->sDebugOutputID ?>";
 <?php endif ?>
-<?php if(($this->bVerboseDebug)): ?>
+<?php if (($this->bVerboseDebug)): ?>
 jaxon.debug.verbose.active = true;
 <?php endif ?>
 <?php endif ?>
-<?php if(($this->sCsrfMetaName)): ?>
+<?php if (($this->sCsrfMetaName)): ?>
 metaTags = document.getElementsByTagName('meta');
 for(i = 0; i < metaTags.length; i++)
 {

src/Response/Response.php

Doc Comments +49 added lines, -49 removed lines

@@ -159,7 +159,7 @@ 
      * @param array         $aAttributes        Associative array of attributes that will describe the command
      * @param mixed            $mData                The data to be associated with this command
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function addCommand($aAttributes, $mData)
     {
@@ -200,7 +200,7 @@ 
     /**
      * Clear all the commands already added to the response
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function clearCommands()
     {
@@ -214,9 +214,9 @@ 
      *
      * @param \Jaxon\Plugin\Plugin  $xPlugin            The plugin object
      * @param array                 $aAttributes        The attributes for this response command
-     * @param mixed                 $mData              The data to be sent with this command
+     * @param string                 $mData              The data to be sent with this command
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function addPluginCommand($xPlugin, $aAttributes, $mData)
     {
@@ -277,7 +277,7 @@ 
      * @param integer        $iCmdNumber            The number of commands to skip upon cancel
      * @param string        $sMessage            The message to display to the user
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function confirmCommands($iCmdNumber, $sMessage)
     {
@@ -297,7 +297,7 @@ 
      * @param string        $sAttribute           The attribute to be assigned
      * @param string        $sData                The value to be assigned to the attribute
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function assign($sTarget, $sAttribute, $sData)
     {
@@ -319,7 +319,7 @@ 
      * @param string        $sTarget              The id of the html element on the browser
      * @param string        $sData                The value to be assigned to the attribute
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function html($sTarget, $sData)
     {
@@ -333,7 +333,7 @@ 
      * @param string        $sAttribute            The name of the attribute to be appended to
      * @param string        $sData                The data to be appended to the attribute
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function append($sTarget, $sAttribute, $sData)
     {
@@ -354,7 +354,7 @@ 
      * @param string        $sAttribute            The name of the attribute to be prepended to
      * @param string        $sData                The value to be prepended to the attribute
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function prepend($sTarget, $sAttribute, $sData)
     {
@@ -376,7 +376,7 @@ 
      * @param string        $sSearch            The needle to search for
      * @param string        $sData                The data to use in place of the needle
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function replace($sTarget, $sAttribute, $sSearch, $sData)
     {
@@ -399,7 +399,7 @@ 
      * @param string        $sTarget            The id of the element to be updated.
      * @param string        $sAttribute            The attribute to be cleared
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function clear($sTarget, $sAttribute)
     {
@@ -415,7 +415,7 @@ 
      * @param string        $sAttribute            The attribute to be updated
      * @param string        $sData                The value to assign
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function contextAssign($sAttribute, $sData)
     {
@@ -437,7 +437,7 @@ 
      * @param string        $sAttribute            The attribute to be appended to
      * @param string        $sData                The value to append
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function contextAppend($sAttribute, $sData)
     {
@@ -459,7 +459,7 @@ 
      * @param string        $sAttribute            The attribute to be updated
      * @param string        $sData                The value to be prepended
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function contextPrepend($sAttribute, $sData)
     {
@@ -480,7 +480,7 @@ 
      *
      * @param string        $sAttribute            The attribute to be cleared
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function contextClear($sAttribute)
     {
@@ -492,7 +492,7 @@ 
      *
      * @param string        $sMessage            The message to be displayed
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function alert($sMessage)
     {
@@ -509,7 +509,7 @@ 
      *
      * @param string        $sMessage            The message to be displayed
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function debug($sMessage)
     {
@@ -527,7 +527,7 @@ 
      * @param string        $sURL                The relative or fully qualified URL
      * @param integer        $iDelay                Number of seconds to delay before the redirect occurs
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function redirect($sURL, $iDelay=0)
     {
@@ -580,7 +580,7 @@ 
      *
      * @param string        $sJS                The script to execute
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function script($sJS)
     {
@@ -597,7 +597,7 @@ 
      *
      * @param string        $sFunc                The name of the function to call
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function call($sFunc)
     {
@@ -617,7 +617,7 @@ 
      *
      * @param string        $sTarget            The id of the element to be removed
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function remove($sTarget)
     {
@@ -637,7 +637,7 @@ 
      * @param string        $sTag                The tag name to be used for the new element
      * @param string        $sId                The id to assign to the new element
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function create($sParent, $sTag, $sId)
     {
@@ -658,7 +658,7 @@ 
      * @param string        $sTag               The tag name to be used for the new element
      * @param string        $sId                The id to assign to the new element
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function insert($sBefore, $sTag, $sId)
     {
@@ -679,7 +679,7 @@ 
      * @param string        $sTag               The tag name to be used for the new element
      * @param string        $sId                The id to assign to the new element
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function insertAfter($sAfter, $sTag, $sId)
     {
@@ -701,7 +701,7 @@ 
      * @param string        $sName                The name of the new input element
      * @param string        $sId                The id of the new element
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function createInput($sParent, $sType, $sName, $sId)
     {
@@ -724,7 +724,7 @@ 
      * @param string        $sName                The name of the new input element
      * @param string        $sId                The id of the new element
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function insertInput($sBefore, $sType, $sName, $sId)
     {
@@ -747,7 +747,7 @@ 
      * @param string        $sName                The name of the new input element
      * @param string        $sId                The id of the new element
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function insertInputAfter($sAfter, $sType, $sName, $sId)
     {
@@ -769,7 +769,7 @@ 
      * @param string        $sEvent                The name of the event
      * @param string        $sScript            The javascript to execute when the event is fired
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function setEvent($sTarget, $sEvent, $sScript)
     {
@@ -789,7 +789,7 @@ 
      * @param string        $sTarget            The id of the element that contains the event
      * @param string        $sScript            The javascript to execute when the event is fired
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function onClick($sTarget, $sScript)
     {
@@ -805,7 +805,7 @@ 
      * @param string        $sEvent              The name of the event
      * @param string        $sHandler            The name of the javascript function to call when the event is fired
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function addHandler($sTarget, $sEvent, $sHandler)
     {
@@ -826,7 +826,7 @@ 
      * @param string        $sEvent              The name of the event
      * @param string        $sHandler            The name of the javascript function called when the event is fired
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function removeHandler($sTarget, $sEvent, $sHandler)
     {
@@ -847,7 +847,7 @@ 
      * @param string        $sArgs                Comma separated list of parameter names
      * @param string        $sScript            The javascript code that will become the body of the function
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function setFunction($sFunction, $sArgs, $sScript)
     {
@@ -874,7 +874,7 @@ 
      * @param string        $sReturnValueVar    The name of the variable that will retain the return value
      *                                             from the call to the original function
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function wrapFunction($sFunction, $sArgs, $aScripts, $sReturnValueVar)
     {
@@ -895,7 +895,7 @@ 
      * @param string        $sFileName            The relative or fully qualified URI of the javascript file
      * @param string        $sType                Determines the script type. Defaults to 'text/javascript'
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function includeScript($sFileName, $sType = null, $sId = null)
     {
@@ -916,7 +916,7 @@ 
      * @param string        $sFileName            The relative or fully qualified URI of the javascript file
      * @param string        $sType                Determines the script type. Defaults to 'text/javascript'
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function includeScriptOnce($sFileName, $sType = null, $sId = null)
     {
@@ -939,7 +939,7 @@ 
      * @param string        $sFileName            The relative or fully qualified URI of the javascript file
      * @param string        $sUnload            Name of a javascript function to call prior to unlaoding the file
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function removeScript($sFileName, $sUnload = '')
     {
@@ -960,7 +960,7 @@ 
      * @param string        $sFileName            The relative or fully qualified URI of the css file
      * @param string        $sMedia                The media type of the CSS file. Defaults to 'screen'
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function includeCSS($sFileName, $sMedia = null)
     {
@@ -979,7 +979,7 @@ 
      *
      * @param string        $sFileName            The relative or fully qualified URI of the css file
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function removeCSS($sFileName, $sMedia = null)
     {
@@ -1004,7 +1004,7 @@ 
      * @param integer        $iTimeout            The number of 1/10ths of a second to pause before timing out
      *                                             and continuing with the execution of the response commands
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function waitForCSS($iTimeout = 600)
     {
@@ -1029,7 +1029,7 @@ 
      * @param integer        $tenths                The number of 1/10ths of a second to wait before timing out
      *                                             and continuing with the execution of the response commands.
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function waitFor($script, $tenths)
     {
@@ -1050,7 +1050,7 @@ 
      *
      * @param integer        $tenths                The number of 1/10ths of a second to sleep
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function sleep($tenths)
     {
@@ -1079,7 +1079,7 @@ 
      * @param string        $variable            The DOM element name (id or class)
      * @param string        $tag                The HTML tag of the new DOM element
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function domCreateElement($variable, $tag)
     {
@@ -1099,7 +1099,7 @@ 
      * @param string        $key                The name of the attribute
      * @param string        $value                The value of the attribute
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function domSetAttribute($variable, $key, $value)
     {
@@ -1120,7 +1120,7 @@ 
      * @param string        $skip                The ??
      * @param string        $remove                The ??
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function domRemoveChildren($parent, $skip = null, $remove = null)
     {
@@ -1141,7 +1141,7 @@ 
      * @param string        $parent                The DOM parent element
      * @param string        $variable            The DOM element name (id or class)
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function domAppendChild($parent, $variable)
     {
@@ -1160,7 +1160,7 @@ 
      * @param string        $target                The DOM target element
      * @param string        $variable            The DOM element name (id or class)
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function domInsertBefore($target, $variable)
     {
@@ -1179,7 +1179,7 @@ 
      * @param string        $target                The DOM target element
      * @param string        $variable            The DOM element name (id or class)
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function domInsertAfter($target, $variable)
     {
@@ -1198,7 +1198,7 @@ 
      * @param string        $parent                The DOM parent element
      * @param string        $text                The HTML text to append
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function domAppendText($parent, $text)
     {
@@ -1239,7 +1239,7 @@ 
      *
      * @param mixed        $value                Any value
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function setReturnValue($value)
     {

Braces +44 added lines, -40 removed lines

@@ -174,20 +174,17 @@ 
                             $aLastCommand['cmd'] == 'js')
                     {
                         $mData = $aLastCommand['data'].'; '.$mData;
-                    }
-                    elseif($this->getOption('core.response.merge.ap') &&
+                    } elseif($this->getOption('core.response.merge.ap') &&
                             $aLastCommand['cmd'] == 'ap' &&
                             $aLastCommand['id'] == $aAttributes['id'] &&
                             $aLastCommand['prop'] == $aAttributes['prop'])
                     {
                         $mData = $aLastCommand['data'].' '.$mData;
-                    }
-                    else
+                    } else
                     {
                         $this->aCommands[] = $aLastCommand;
                     }
-                }
-                else
+                } else
                 {
                     $this->aCommands[] = $aLastCommand;
                 }
@@ -244,24 +241,20 @@ 
             if($bBefore)
             {
                 $this->aCommands = array_merge($mCommands->aCommands, $this->aCommands);
-            }
-            else
+            } else
             {
                 $this->aCommands = array_merge($this->aCommands, $mCommands->aCommands);
             }
-        }
-        elseif(is_array($mCommands))
+        } elseif(is_array($mCommands))
         {
             if($bBefore)
             {
                 $this->aCommands = array_merge($mCommands, $this->aCommands);
-            }
-            else
+            } else
             {
                 $this->aCommands = array_merge($this->aCommands, $mCommands);
             }
-        }
-        else
+        } else
         {
             if(!empty($mCommands))
             {
@@ -541,8 +534,9 @@ 
         {
             $queryStart++;
             $queryEnd = strpos($sURL, '#', $queryStart);
-            if($queryEnd === false)
-                $queryEnd = strlen($sURL);
+            if($queryEnd === false) {
+                            $queryEnd = strlen($sURL);
+            }
             $queryPart = substr($sURL, $queryStart, $queryEnd-$queryStart);
             parse_str($queryPart, $queryParts);
             $newQueryPart = "";
@@ -551,10 +545,11 @@ 
                 $first = true;
                 foreach($queryParts as $key => $value)
                 {
-                    if($first)
-                        $first = false;
-                    else
-                        $newQueryPart .= '&';
+                    if($first) {
+                                            $first = false;
+                    } else {
+                                            $newQueryPart .= '&';
+                    }
                     $newQueryPart .= rawurlencode($key).'='.rawurlencode($value);
                 }
             } elseif($_SERVER['QUERY_STRING']) {
@@ -565,10 +560,11 @@ 
                 }
             $sURL = str_replace($queryPart, $newQueryPart, $sURL);
         }
-        if($iDelay)
-            $this->script('window.setTimeout("window.location = \'' . $sURL . '\';",' . ($iDelay*1000) . ');');
-        else
-            $this->script('window.location = "' . $sURL . '";');
+        if($iDelay) {
+                    $this->script('window.setTimeout("window.location = \'' . $sURL . '\';",' . ($iDelay*1000) . ');');
+        } else {
+                    $this->script('window.location = "' . $sURL . '";');
+        }
         return $this;
     }
 
@@ -903,11 +899,13 @@ 
     {
         $command = array('cmd'  =>  'in');
         
-        if(($sType))
-            $command['type'] = trim((string)$sType, " \t");
+        if(($sType)) {
+                    $command['type'] = trim((string)$sType, " \t");
+        }
         
-        if(($sId))
-            $command['elm_id'] = trim((string)$sId, " \t");
+        if(($sId)) {
+                    $command['elm_id'] = trim((string)$sId, " \t");
+        }
 
         return $this->addCommand($command, trim((string)$sFileName, " \t"));
     }
@@ -924,11 +922,13 @@ 
     {
         $command = array('cmd' => 'ino');
         
-        if(($sType))
-            $command['type'] = trim((string)$sType, " \t");
+        if(($sType)) {
+                    $command['type'] = trim((string)$sType, " \t");
+        }
         
-        if(($sId))
-            $command['elm_id'] = trim((string)$sId, " \t");
+        if(($sId)) {
+                    $command['elm_id'] = trim((string)$sId, " \t");
+        }
             
         return $this->addCommand($command, trim((string)$sFileName, " \t"));
     }
@@ -968,8 +968,9 @@ 
     {
         $command = array('cmd' => 'css');
         
-        if(($sMedia))
-            $command['media'] = trim((string)$sMedia, " \t");
+        if(($sMedia)) {
+                    $command['media'] = trim((string)$sMedia, " \t");
+        }
         
         return $this->addCommand($command, trim((string)$sFileName, " \t"));
     }
@@ -987,8 +988,9 @@ 
     {
         $command = array('cmd' => 'rcss');
         
-        if(($sMedia))
-            $command['media'] = trim((string)$sMedia, " \t");
+        if(($sMedia)) {
+                    $command['media'] = trim((string)$sMedia, " \t");
+        }
         
         return $this->addCommand($command, trim((string)$sFileName, " \t"));
     }
@@ -1128,11 +1130,13 @@ 
     {
         $command = array('cmd' => 'DRC');
 
-        if(($skip))
-            $command['skip'] = $skip;
+        if(($skip)) {
+                    $command['skip'] = $skip;
+        }
 
-        if(($remove))
-            $command['remove'] = $remove;
+        if(($remove)) {
+                    $command['remove'] = $remove;
+        }
 
         return $this->addCommand($command, $parent);
     }

Spacing +36 added lines, -36 removed lines

@@ -101,7 +101,7 @@ 
     public function plugin($sName)
     {
         $xPlugin = $this->getPluginManager()->getResponsePlugin($sName);
-        if(!$xPlugin)
+        if (!$xPlugin)
         {
             return null;
         }
@@ -164,23 +164,23 @@ 
     public function addCommand($aAttributes, $mData)
     {
         /* merge commands if possible */
-        if(in_array($aAttributes['cmd'], array('js', 'ap')))
+        if (in_array($aAttributes['cmd'], array('js', 'ap')))
         {
-            if(($aLastCommand = array_pop($this->aCommands)))
+            if (($aLastCommand = array_pop($this->aCommands)))
             {
-                if($aLastCommand['cmd'] == $aAttributes['cmd'])
+                if ($aLastCommand['cmd'] == $aAttributes['cmd'])
                 {
-                    if($this->getOption('core.response.merge.js') &&
+                    if ($this->getOption('core.response.merge.js') &&
                             $aLastCommand['cmd'] == 'js')
                     {
-                        $mData = $aLastCommand['data'].'; '.$mData;
+                        $mData = $aLastCommand['data'] . '; ' . $mData;
                     }
-                    elseif($this->getOption('core.response.merge.ap') &&
+                    elseif ($this->getOption('core.response.merge.ap') &&
                             $aLastCommand['cmd'] == 'ap' &&
                             $aLastCommand['id'] == $aAttributes['id'] &&
                             $aLastCommand['prop'] == $aAttributes['prop'])
                     {
-                        $mData = $aLastCommand['data'].' '.$mData;
+                        $mData = $aLastCommand['data'] . ' ' . $mData;
                     }
                     else
                     {
@@ -237,11 +237,11 @@ 
      */
     public function appendResponse($mCommands, $bBefore = false)
     {
-        if($mCommands instanceof Response)
+        if ($mCommands instanceof Response)
         {
             $this->returnValue = $mCommands->returnValue;
 
-            if($bBefore)
+            if ($bBefore)
             {
                 $this->aCommands = array_merge($mCommands->aCommands, $this->aCommands);
             }
@@ -250,9 +250,9 @@ 
                 $this->aCommands = array_merge($this->aCommands, $mCommands->aCommands);
             }
         }
-        elseif(is_array($mCommands))
+        elseif (is_array($mCommands))
         {
-            if($bBefore)
+            if ($bBefore)
             {
                 $this->aCommands = array_merge($mCommands, $this->aCommands);
             }
@@ -263,7 +263,7 @@ 
         }
         else
         {
-            if(!empty($mCommands))
+            if (!empty($mCommands))
             {
                 throw new \Jaxon\Exception\Error($this->trans('errors.response.data.invalid'));
             }
@@ -531,33 +531,33 @@ 
      *
      * @return \Jaxon\Plugin\Response
      */
-    public function redirect($sURL, $iDelay=0)
+    public function redirect($sURL, $iDelay = 0)
     {
         // we need to parse the query part so that the values are rawurlencode()'ed
         // can't just use parse_url() cos we could be dealing with a relative URL which
         // parse_url() can't deal with.
         $queryStart = strpos($sURL, '?', strrpos($sURL, '/'));
-        if($queryStart !== false)
+        if ($queryStart !== false)
         {
             $queryStart++;
             $queryEnd = strpos($sURL, '#', $queryStart);
-            if($queryEnd === false)
+            if ($queryEnd === false)
                 $queryEnd = strlen($sURL);
-            $queryPart = substr($sURL, $queryStart, $queryEnd-$queryStart);
+            $queryPart = substr($sURL, $queryStart, $queryEnd - $queryStart);
             parse_str($queryPart, $queryParts);
             $newQueryPart = "";
-            if($queryParts)
+            if ($queryParts)
             {
                 $first = true;
-                foreach($queryParts as $key => $value)
+                foreach ($queryParts as $key => $value)
                 {
-                    if($first)
+                    if ($first)
                         $first = false;
                     else
                         $newQueryPart .= '&';
-                    $newQueryPart .= rawurlencode($key).'='.rawurlencode($value);
+                    $newQueryPart .= rawurlencode($key) . '=' . rawurlencode($value);
                 }
-            } elseif($_SERVER['QUERY_STRING']) {
+            } elseif ($_SERVER['QUERY_STRING']) {
                     //couldn't break up the query, but there's one there
                     //possibly "http://url/page.html?query1234" type of query?
                     //just encode it and hope it works
@@ -565,8 +565,8 @@ 
                 }
             $sURL = str_replace($queryPart, $newQueryPart, $sURL);
         }
-        if($iDelay)
-            $this->script('window.setTimeout("window.location = \'' . $sURL . '\';",' . ($iDelay*1000) . ');');
+        if ($iDelay)
+            $this->script('window.setTimeout("window.location = \'' . $sURL . '\';",' . ($iDelay * 1000) . ');');
         else
             $this->script('window.location = "' . $sURL . '";');
         return $this;
@@ -903,10 +903,10 @@ 
     {
         $command = array('cmd'  =>  'in');
 
-        if(($sType))
+        if (($sType))
             $command['type'] = trim((string)$sType, " \t");
 
-        if(($sId))
+        if (($sId))
             $command['elm_id'] = trim((string)$sId, " \t");
 
         return $this->addCommand($command, trim((string)$sFileName, " \t"));
@@ -924,10 +924,10 @@ 
     {
         $command = array('cmd' => 'ino');
 
-        if(($sType))
+        if (($sType))
             $command['type'] = trim((string)$sType, " \t");
 
-        if(($sId))
+        if (($sId))
             $command['elm_id'] = trim((string)$sId, " \t");
 
         return $this->addCommand($command, trim((string)$sFileName, " \t"));
@@ -968,7 +968,7 @@ 
     {
         $command = array('cmd' => 'css');
 
-        if(($sMedia))
+        if (($sMedia))
             $command['media'] = trim((string)$sMedia, " \t");
 
         return $this->addCommand($command, trim((string)$sFileName, " \t"));
@@ -987,7 +987,7 @@ 
     {
         $command = array('cmd' => 'rcss');
 
-        if(($sMedia))
+        if (($sMedia))
             $command['media'] = trim((string)$sMedia, " \t");
 
         return $this->addCommand($command, trim((string)$sFileName, " \t"));
@@ -1128,10 +1128,10 @@ 
     {
         $command = array('cmd' => 'DRC');
 
-        if(($skip))
+        if (($skip))
             $command['skip'] = $skip;
 
-        if(($remove))
+        if (($remove))
             $command['remove'] = $remove;
 
         return $this->addCommand($command, $parent);
@@ -1257,7 +1257,7 @@ 
     public function sendHeaders()
     {
         $xRequestManager = $this->getRequestManager();
-        if($xRequestManager->getRequestMethod() == Jaxon::METHOD_GET)
+        if ($xRequestManager->getRequestMethod() == Jaxon::METHOD_GET)
         {
             header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
             header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
@@ -1267,7 +1267,7 @@ 
 
         $sCharacterSet = '';
         $sCharacterEncoding = trim($this->getOption('core.encoding'));
-        if(($sCharacterEncoding) && strlen($sCharacterEncoding) > 0)
+        if (($sCharacterEncoding) && strlen($sCharacterEncoding) > 0)
         {
             $sCharacterSet = '; charset="' . trim($sCharacterEncoding) . '"';
         }
@@ -1284,13 +1284,13 @@ 
     {
         $response = [];
 
-        if(($this->returnValue))
+        if (($this->returnValue))
         {
             $response['jxnrv'] = $this->returnValue;
         }
         $response['jxnobj'] = [];
 
-        foreach($this->aCommands as $xCommand)
+        foreach ($this->aCommands as $xCommand)
         {
             $response['jxnobj'][] = $xCommand;
         }

src/Traits/Upload.php

Spacing +7 added lines, -7 removed lines

@@ -36,7 +36,7 @@ 
      */
     public function hasUploadedFiles()
     {
-        if(($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
+        if (($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
         {
             return false;
         }
@@ -52,11 +52,11 @@ 
     {
         try
         {
-            if(($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
+            if (($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
             {
                 throw new Exception($this->trans('errors.upload.plugin'));
             }
-            elseif(!$xUploadPlugin->canProcessRequest())
+            elseif (!$xUploadPlugin->canProcessRequest())
             {
                 throw new Exception($this->trans('errors.upload.request'));
             }
@@ -65,14 +65,14 @@ 
             $sResponse = '{"code": "success", "upl": "' . $sKey . '"}';
             $return = true;
         }
-        catch(Exception $e)
+        catch (Exception $e)
         {
             $sResponse = '{"code": "error", "msg": "' . addslashes($e->getMessage()) . '"}';
             $return = false;
         }
         // Send the response back to the browser
         echo '<script>var res = ', $sResponse, '; </script>';
-        if(($this->getOption('core.process.exit')))
+        if (($this->getOption('core.process.exit')))
         {
             exit();
         }
@@ -86,7 +86,7 @@ 
      */
     public function getUploadedFiles()
     {
-        if(($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
+        if (($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
         {
             return [];
         }
@@ -102,7 +102,7 @@ 
      */
     public function setUploadFileFilter(Closure $fFileFilter)
     {
-        if(($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
+        if (($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
         {
             return;
         }

Braces +2 added lines, -4 removed lines

@@ -55,8 +55,7 @@ 
             if(($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
             {
                 throw new Exception($this->trans('errors.upload.plugin'));
-            }
-            elseif(!$xUploadPlugin->canProcessRequest())
+            } elseif(!$xUploadPlugin->canProcessRequest())
             {
                 throw new Exception($this->trans('errors.upload.request'));
             }
@@ -64,8 +63,7 @@ 
             $sKey = $xUploadPlugin->saveUploadedFiles();
             $sResponse = '{"code": "success", "upl": "' . $sKey . '"}';
             $return = true;
-        }
-        catch(Exception $e)
+        } catch(Exception $e)
         {
             $sResponse = '{"code": "error", "msg": "' . addslashes($e->getMessage()) . '"}';
             $return = false;

src/Jaxon.php

Braces +3 added lines, -6 removed lines

@@ -320,8 +320,7 @@ 
             try
             {
                 $mResult = $this->getPluginManager()->processRequest();
-            }
-            catch(Exception $e)
+            } catch(Exception $e)
             {
                 // An exception was thrown while processing the request.
                 // The request missed the corresponding handler function,
@@ -337,8 +336,7 @@ 
                 {
                     $sEvent = self::PROCESSING_EVENT_INVALID;
                     $aParams = array($e->getMessage());
-                }
-                else
+                } else
                 {
                     $sEvent = self::PROCESSING_EVENT_ERROR;
                     $aParams = array($e);
@@ -348,8 +346,7 @@ 
                 {
                     // Call the processing event
                     $this->aProcessingEvents[$sEvent]->call($aParams);
-                }
-                else
+                } else
                 {
                     // The exception is not to be processed here.
                     throw $e;

Spacing +16 added lines, -16 removed lines

@@ -156,7 +156,7 @@ 
             'core.prefix.class'                 => 'Jaxon',
             // 'core.request.uri'               => '',
             'core.request.mode'                 => 'asynchronous',
-            'core.request.method'               => 'POST',    // W3C: Method is case sensitive
+            'core.request.method'               => 'POST', // W3C: Method is case sensitive
             'core.response.merge.ap'            => true,
             'core.response.merge.js'            => true,
             'core.debug.on'                     => false,
@@ -242,16 +242,16 @@ 
      */
     public function getScript($bIncludeJs = false, $bIncludeCss = false)
     {
-        if(!$this->getOption('core.request.uri'))
+        if (!$this->getOption('core.request.uri'))
         {
             $this->setOption('core.request.uri', URI::detect());
         }
         $sCode = '';
-        if(($bIncludeCss))
+        if (($bIncludeCss))
         {
             $sCode .= $this->getPluginManager()->getCss() . "\n";
         }
-        if(($bIncludeJs))
+        if (($bIncludeJs))
         {
             $sCode .= $this->getPluginManager()->getJs() . "\n";
         }
@@ -322,7 +322,7 @@ 
     public function processRequest()
     {
         // Check to see if headers have already been sent out, in which case we can't do our job
-        if(headers_sent($filename, $linenumber))
+        if (headers_sent($filename, $linenumber))
         {
             echo $this->trans('errors.output.already-sent', array(
                 'location' => $filename . ':' . $linenumber
@@ -331,7 +331,7 @@ 
         }
 
         // Check if there is a plugin to process this request
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
         {
             return;
         }
@@ -341,18 +341,18 @@ 
         $xResponseManager = $this->getResponseManager();
 
         // Handle before processing event
-        if(isset($this->aProcessingEvents[self::PROCESSING_EVENT_BEFORE]))
+        if (isset($this->aProcessingEvents[self::PROCESSING_EVENT_BEFORE]))
         {
             $this->aProcessingEvents[self::PROCESSING_EVENT_BEFORE]->call(array(&$bEndRequest));
         }
 
-        if(!$bEndRequest)
+        if (!$bEndRequest)
         {
             try
             {
                 $mResult = $this->getPluginManager()->processRequest();
             }
-            catch(Exception $e)
+            catch (Exception $e)
             {
                 // An exception was thrown while processing the request.
                 // The request missed the corresponding handler function,
@@ -364,7 +364,7 @@ 
                 $xResponseManager->debug($e->getMessage());
                 $mResult = false;
 
-                if($e instanceof \Jaxon\Exception\Error)
+                if ($e instanceof \Jaxon\Exception\Error)
                 {
                     $sEvent = self::PROCESSING_EVENT_INVALID;
                     $aParams = array($e->getMessage());
@@ -375,7 +375,7 @@ 
                     $aParams = array($e);
                 }
 
-                if(isset($this->aProcessingEvents[$sEvent]))
+                if (isset($this->aProcessingEvents[$sEvent]))
                 {
                     // Call the processing event
                     $this->aProcessingEvents[$sEvent]->call($aParams);
@@ -388,7 +388,7 @@ 
             }
         }
         // Clean the processing buffer
-        if(($this->getOption('core.process.clean')))
+        if (($this->getOption('core.process.clean')))
         {
             $er = error_reporting(0);
             while (ob_get_level() > 0)
@@ -398,16 +398,16 @@ 
             error_reporting($er);
         }
 
-        if($mResult === true)
+        if ($mResult === true)
         {
             // Handle after processing event
-            if(isset($this->aProcessingEvents[self::PROCESSING_EVENT_AFTER]))
+            if (isset($this->aProcessingEvents[self::PROCESSING_EVENT_AFTER]))
             {
                 $bEndRequest = false;
                 $this->aProcessingEvents[self::PROCESSING_EVENT_AFTER]->call(array($bEndRequest));
             }
             // If the called function returned no response, give the the global response instead
-            if($xResponseManager->hasNoResponse())
+            if ($xResponseManager->hasNoResponse())
             {
                 $xResponseManager->append($this->getResponse());
             }
@@ -415,7 +415,7 @@ 
 
         $xResponseManager->printDebug();
 
-        if(($this->getOption('core.process.exit')))
+        if (($this->getOption('core.process.exit')))
         {
             $xResponseManager->sendOutput();
             exit();

src/Response/Plugin/JQuery/Dom/Element.php

Spacing +3 added lines, -3 removed lines

@@ -58,11 +58,11 @@ 
         $this->aCalls = [];
 
         $jQueryNs = jaxon()->getOption('core.jquery.no_conflict', false) ? 'jQuery' : '$';
-        if(!$sSelector)
+        if (!$sSelector)
         {
             $this->sSelector = "$jQueryNs(this)"; // If an empty selector is given, use javascript "this" instead
         }
-        elseif(($sContext))
+        elseif (($sContext))
         {
             $this->sSelector = "$jQueryNs('" . $sSelector . "', $jQueryNs('" . $sContext . "'))";
         }
@@ -118,7 +118,7 @@ 
      */
     public function getScript()
     {
-        if(count($this->aCalls) == 0)
+        if (count($this->aCalls) == 0)
         {
             return $this->sSelector;
         }

Braces +2 added lines, -4 removed lines

@@ -57,12 +57,10 @@
         if(!$sSelector)
         {
             $this->sSelector = "$jQueryNs(this)"; // If an empty selector is given, use javascript "this" instead
-        }
-        elseif(($sContext))
+        } elseif(($sContext))
         {
             $this->sSelector = "$jQueryNs('" . $sSelector . "', $jQueryNs('" . $sContext . "'))";
-        }
-        else
+        } else
         {
             $this->sSelector = "$jQueryNs('" . $sSelector . "')";
         }

src/Utils/Template/Renderer.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
     public function render($sPath, array $aVars = [])
     {
         // Make the template vars available as attributes
-        foreach($aVars as $sName => $xValue)
+        foreach ($aVars as $sName => $xValue)
         {
             $sName = (string)$sName;
             $this->$sName = $xValue;

src/Plugin/Dialogs/Confirm.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
      */
     public function confirm($question, $yesScript, $noScript)
     {
-        if(!$noScript)
+        if (!$noScript)
         {
             return 'if(confirm(' . $question . ')){' . $yesScript . ';}';
         }

Braces +1 added lines, -2 removed lines

@@ -25,8 +25,7 @@
         if(!$noScript)
         {
             return 'if(confirm(' . $question . ')){' . $yesScript . ';}';
-        }
-        else
+        } else
         {
             return 'if(confirm(' . $question . ')){' . $yesScript . ';}else{' . $noScript . ';}';
         }

src/Plugin/Dialogs/Alert.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
      */
     protected function alert($message, $title)
     {
-        if($this->getReturn())
+        if ($this->getReturn())
         {
             return 'alert(' . $message . ')';
         }

src/Factory/Request.php

Doc Comments +2 added lines, -5 removed lines

@@ -35,7 +35,7 @@ 
      *
      * @param string|null            $sClass              The callable class
      *
-     * @return Factory
+     * @return Request
      */
     public function setClassName($sClass)
     {
@@ -58,7 +58,7 @@ 
      *
      * @param CallableObject          $xCallable              The callable object
      *
-     * @return Factory
+     * @return Request
      */
     public function setCallable(CallableObject $xCallable)
     {
@@ -71,7 +71,6 @@ 
      * Return the javascript call to a Jaxon function or object method
      *
      * @param string            $sFunction          The function or method (without class) name
-     * @param ...               $xParams            The parameters of the function or method
      *
      * @return \Jaxon\Request\Request
      */
@@ -100,7 +99,6 @@ 
      * Return the javascript call to a generic function
      *
      * @param string            $sFunction          The function or method (with class) name
-     * @param ...               $xParams            The parameters of the function or method
      *
      * @return \Jaxon\Request\Request
      */
@@ -124,7 +122,6 @@ 
      * @param integer       $nItemsPerPage          The number of items per page page
      * @param integer       $nCurrentPage           The current page
      * @param string        $sMethod                The name of function or a method prepended with its class name
-     * @param ...           $xParams                The parameters of the function or method
      *
      * @return string the pagination links
      */

Spacing +3 added lines, -3 removed lines

@@ -61,12 +61,12 @@ 
         $this->sPrefix = $this->getOption('core.prefix.function');
 
         $sClass = trim($sClass, '.\\ ');
-        if(!$sClass)
+        if (!$sClass)
         {
             return $this;
         }
 
-        if(!($xCallable = $this->xRepository->getCallableObject($sClass)))
+        if (!($xCallable = $this->xRepository->getCallableObject($sClass)))
         {
             // Todo: decide which of these values to return
             // return null;
@@ -107,7 +107,7 @@ 
         array_shift($aArguments);
 
         // Makes legacy code works
-        if(strpos($sFunction, '.') !== false)
+        if (strpos($sFunction, '.') !== false)
         {
             // If there is a dot in the name, then it is a call to a class
             $this->sPrefix = $this->getOption('core.prefix.class');