chamilo / chamilo-lms

main/inc/lib/pear/HTML/QuickForm.php

Spacing +86 added lines, -86 removed lines

@@ -42,16 +42,16 @@ 
  *
  * @see HTML_QuickForm::errorMessage()
  */
-define('QUICKFORM_OK',                      1);
-define('QUICKFORM_ERROR',                  -1);
-define('QUICKFORM_INVALID_RULE',           -2);
-define('QUICKFORM_NONEXIST_ELEMENT',       -3);
-define('QUICKFORM_INVALID_FILTER',         -4);
-define('QUICKFORM_UNREGISTERED_ELEMENT',   -5);
-define('QUICKFORM_INVALID_ELEMENT_NAME',   -6);
-define('QUICKFORM_INVALID_PROCESS',        -7);
-define('QUICKFORM_DEPRECATED',             -8);
-define('QUICKFORM_INVALID_DATASOURCE',     -9);
+define('QUICKFORM_OK', 1);
+define('QUICKFORM_ERROR', -1);
+define('QUICKFORM_INVALID_RULE', -2);
+define('QUICKFORM_NONEXIST_ELEMENT', -3);
+define('QUICKFORM_INVALID_FILTER', -4);
+define('QUICKFORM_UNREGISTERED_ELEMENT', -5);
+define('QUICKFORM_INVALID_ELEMENT_NAME', -6);
+define('QUICKFORM_INVALID_PROCESS', -7);
+define('QUICKFORM_DEPRECATED', -8);
+define('QUICKFORM_INVALID_DATASOURCE', -9);
 /**#@-*/
 
 // }}}
@@ -229,7 +229,7 @@ 
      * @param    bool        $trackSubmit       (optional)Whether to track if the form was submitted by adding a special hidden field
      * @access   public
      */
-    public function __construct($formName='', $method='post', $action='', $target='', $attributes=null, $trackSubmit = false)
+    public function __construct($formName = '', $method = 'post', $action = '', $target = '', $attributes = null, $trackSubmit = false)
     {
         parent::__construct($attributes);
         $method = (strtoupper($method) == 'GET') ? 'get' : 'post';
@@ -246,9 +246,9 @@ 
             'id' => $form_id
         ) + $target;
         $this->updateAttributes($attributes);
-        if (!$trackSubmit || isset($_REQUEST['_qf__' . $formName])) {
+        if (!$trackSubmit || isset($_REQUEST['_qf__'.$formName])) {
             if (1 == get_magic_quotes_gpc()) {
-                $this->_submitValues = $this->_recursiveFilter('stripslashes', 'get' == $method? $_GET: $_POST);
+                $this->_submitValues = $this->_recursiveFilter('stripslashes', 'get' == $method ? $_GET : $_POST);
                 foreach ($_FILES as $keyFirst => $valFirst) {
                     foreach ($valFirst as $keySecond => $valSecond) {
                         if ('name' == $keySecond) {
@@ -259,14 +259,14 @@ 
                     }
                 }
             } else {
-                $this->_submitValues = 'get' == $method? $_GET: $_POST;
+                $this->_submitValues = 'get' == $method ? $_GET : $_POST;
                 $this->_submitFiles  = $_FILES;
             }
             $this->_flagSubmitted = count($this->_submitValues) > 0 || count($this->_submitFiles) > 0;
         }
         if ($trackSubmit) {
-            unset($this->_submitValues['_qf__' . $formName]);
-            $this->addElement('hidden', '_qf__' . $formName, null);
+            unset($this->_submitValues['_qf__'.$formName]);
+            $this->addElement('hidden', '_qf__'.$formName, null);
         }
 
         if (preg_match('/^([0-9]+)([a-zA-Z]*)$/', ini_get('upload_max_filesize'), $matches)) {
@@ -345,7 +345,7 @@ 
      */
     public static function registerRule($ruleName, $type, $data1, $data2 = null)
     {
-        $registry =& HTML_QuickForm_RuleRegistry::singleton();
+        $registry = & HTML_QuickForm_RuleRegistry::singleton();
         $registry->registerRule($ruleName, $type, $data1, $data2);
     } // end func registerRule
 
@@ -360,7 +360,7 @@ 
      * @access    public
      * @return    boolean
      */
-    function elementExists($element=null)
+    function elementExists($element = null)
     {
         return isset($this->_elementIndex[$element]);
     } // end func elementExists
@@ -385,7 +385,7 @@ 
     function setDatasource(&$datasource, $defaultsFilter = null, $constantsFilter = null)
     {
         if (is_object($datasource)) {
-            $this->_datasource =& $datasource;
+            $this->_datasource = & $datasource;
             if (is_callable(array($datasource, 'defaultValues'))) {
                 $this->setDefaults($datasource->defaultValues($this), $defaultsFilter);
             }
@@ -496,7 +496,7 @@ 
         if (!$this->elementExists('MAX_FILE_SIZE')) {
             $this->addElement('hidden', 'MAX_FILE_SIZE', $this->_maxFileSize);
         } else {
-            $el =& $this->getElement('MAX_FILE_SIZE');
+            $el = & $this->getElement('MAX_FILE_SIZE');
             $el->updateAttributes(array('value' => $this->_maxFileSize));
         }
     } // end func setMaxFileSize
@@ -634,7 +634,7 @@ 
            $elementObject->onQuickFormEvent('updateValue', null, $this);
         } else {
             $args = func_get_args();
-            $elementObject =& $this->_loadElement('addElement', $element, array_slice($args, 1));
+            $elementObject = & $this->_loadElement('addElement', $element, array_slice($args, 1));
             if (PEAR::isError($elementObject)) {
                 return $elementObject;
             }
@@ -646,7 +646,7 @@ 
             isset($this->_elementIndex[$elementName])
         ) {
             if ($this->_elements[$this->_elementIndex[$elementName]]->getType() == $elementObject->getType()) {
-                $this->_elements[] =& $elementObject;
+                $this->_elements[] = & $elementObject;
                 $elKeys = array_keys($this->_elements);
                 $this->_duplicateIndex[$elementName][] = end($elKeys);
             } else {
@@ -661,7 +661,7 @@ 
                 return $error;
             }
         } else {
-            $this->_elements[] =& $elementObject;
+            $this->_elements[] = & $elementObject;
             $elKeys = array_keys($this->_elements);
             $this->_elementIndex[$elementName] = end($elKeys);
         }
@@ -695,7 +695,7 @@ 
     function &insertElementBefore(&$element, $nameAfter)
     {
         if (!empty($this->_duplicateIndex[$nameAfter])) {
-            $error = PEAR::raiseError(null, QUICKFORM_INVALID_ELEMENT_NAME, null, E_USER_WARNING, 'Several elements named "' . $nameAfter . '" exist in HTML_QuickForm::insertElementBefore().', 'HTML_QuickForm_Error', true);
+            $error = PEAR::raiseError(null, QUICKFORM_INVALID_ELEMENT_NAME, null, E_USER_WARNING, 'Several elements named "'.$nameAfter.'" exist in HTML_QuickForm::insertElementBefore().', 'HTML_QuickForm_Error', true);
             return $error;
         } elseif (!$this->elementExists($nameAfter)) {
             $error = PEAR::raiseError(null, QUICKFORM_NONEXIST_ELEMENT, null, E_USER_WARNING, "Element '$nameAfter' does not exist in HTML_QuickForm::insertElementBefore()", 'HTML_QuickForm_Error', true);
@@ -717,7 +717,7 @@ 
         for ($i = end($elKeys); $i >= $targetIdx; $i--) {
             if (isset($this->_elements[$i])) {
                 $currentName = $this->_elements[$i]->getName();
-                $this->_elements[$i + 1] =& $this->_elements[$i];
+                $this->_elements[$i + 1] = & $this->_elements[$i];
                 if ($this->_elementIndex[$currentName] == $i) {
                     $this->_elementIndex[$currentName] = $i + 1;
                 } else {
@@ -728,7 +728,7 @@ 
             }
         }
         // Put the element in place finally
-        $this->_elements[$targetIdx] =& $element;
+        $this->_elements[$targetIdx] = & $element;
         if (!$duplicate) {
             $this->_elementIndex[$elementName] = $targetIdx;
         } else {
@@ -759,12 +759,12 @@ 
      * @access   public
      * @throws   HTML_QuickForm_Error
      */
-    function &addGroup($elements, $name=null, $groupLabel='', $separator=null, $appendName = true)
+    function &addGroup($elements, $name = null, $groupLabel = '', $separator = null, $appendName = true)
     {
         static $anonGroups = 1;
 
         if (0 == strlen($name)) {
-            $name       = 'qf_group_' . $anonGroups++;
+            $name       = 'qf_group_'.$anonGroups++;
             $appendName = false;
         }
         $group = & $this->addElement('group', $name, $groupLabel, $elements, $separator, $appendName);
@@ -821,7 +821,7 @@ 
                     if (is_array($value)) {
                         $value[] = $v;
                     } else {
-                        $value = (null === $value)? $v: array($value, $v);
+                        $value = (null === $value) ? $v : array($value, $v);
                     }
                 }
             }
@@ -844,7 +844,7 @@ 
     {
         $value = null;
         if (isset($this->_submitValues[$elementName]) || isset($this->_submitFiles[$elementName])) {
-            $value = isset($this->_submitValues[$elementName])? $this->_submitValues[$elementName]: array();
+            $value = isset($this->_submitValues[$elementName]) ? $this->_submitValues[$elementName] : array();
             if (is_array($value) && isset($this->_submitFiles[$elementName])) {
                 foreach ($this->_submitFiles[$elementName] as $k => $v) {
                     $value = HTML_QuickForm::arrayMerge($value, $this->_reindexFiles($this->_submitFiles[$elementName][$k], $k));
@@ -859,34 +859,34 @@ 
                         array('\\', '\''), array('\\\\', '\\\''),
                         substr($elementName, 0, $pos)
                     );
-            $idx  = "['" . str_replace(
+            $idx = "['".str_replace(
                         array('\\', '\'', ']', '['), array('\\\\', '\\\'', '', "']['"),
                         substr($elementName, $pos + 1, -1)
-                    ) . "']";
+                    )."']";
             if (isset($this->_submitValues[$base])) {
                 $value = eval("return (isset(\$this->_submitValues['{$base}']{$idx})) ? \$this->_submitValues['{$base}']{$idx} : null;");
             }
 
             if ((is_array($value) || null === $value) && isset($this->_submitFiles[$base])) {
                 $props = array('name', 'type', 'size', 'tmp_name', 'error');
-                $code  = "if (!isset(\$this->_submitFiles['{$base}']['name']{$idx})) {\n" .
-                         "    return null;\n" .
-                         "} else {\n" .
+                $code  = "if (!isset(\$this->_submitFiles['{$base}']['name']{$idx})) {\n".
+                         "    return null;\n".
+                         "} else {\n".
                          "    \$v = array();\n";
                 foreach ($props as $prop) {
                     $code .= "    \$v = HTML_QuickForm::arrayMerge(\$v, \$this->_reindexFiles(\$this->_submitFiles['{$base}']['{$prop}']{$idx}, '{$prop}'));\n";
                 }
-                $fileValue = eval($code . "    return \$v;\n}\n");
+                $fileValue = eval($code."    return \$v;\n}\n");
                 if (null !== $fileValue) {
-                    $value = null === $value? $fileValue: HTML_QuickForm::arrayMerge($value, $fileValue);
+                    $value = null === $value ? $fileValue : HTML_QuickForm::arrayMerge($value, $fileValue);
                 }
             }
         }
 
         // This is only supposed to work for groups with appendName = false
         if (null === $value && 'group' == $this->getElementType($elementName)) {
-            $group    =& $this->getElement($elementName);
-            $elements =& $group->getElements();
+            $group    = & $this->getElement($elementName);
+            $elements = & $group->getElements();
             foreach (array_keys($elements) as $key) {
                 $name = $group->getElementName($key);
                 // prevent endless recursion in case of radios and such
@@ -1049,7 +1049,7 @@ 
             $error = PEAR::raiseError(null, QUICKFORM_NONEXIST_ELEMENT, null, E_USER_WARNING, "Element '$elementName' does not exist in HTML_QuickForm::removeElement()", 'HTML_QuickForm_Error', true);
             return $error;
         }
-        $el =& $this->_elements[$this->_elementIndex[$elementName]];
+        $el = & $this->_elements[$this->_elementIndex[$elementName]];
         unset($this->_elements[$this->_elementIndex[$elementName]]);
         if (empty($this->_duplicateIndex[$elementName])) {
             unset($this->_elementIndex[$elementName]);
@@ -1148,7 +1148,7 @@ 
             $this->_rules[$element] = array();
         }
         if ($validation == 'client') {
-            $this->updateAttributes(array('onsubmit' => 'try { var myValidator = validate_' . $this->_attributes['id'] . '; } catch(e) { return true; } return myValidator(this);'));
+            $this->updateAttributes(array('onsubmit' => 'try { var myValidator = validate_'.$this->_attributes['id'].'; } catch(e) { return true; } return myValidator(this);'));
         }
         $this->_rules[$element][] = array(
             'type'        => $type,
@@ -1181,20 +1181,20 @@ 
      * @access   public
      * @throws   HTML_QuickForm_Error
      */
-    function addGroupRule($group, $arg1, $type='', $format=null, $howmany=0, $validation = 'server', $reset = false)
+    function addGroupRule($group, $arg1, $type = '', $format = null, $howmany = 0, $validation = 'server', $reset = false)
     {
         if (!$this->elementExists($group)) {
             return PEAR::raiseError(null, QUICKFORM_NONEXIST_ELEMENT, null, E_USER_WARNING, "Group '$group' does not exist in HTML_QuickForm::addGroupRule()", 'HTML_QuickForm_Error', true);
         }
 
-        $groupObj =& $this->getElement($group);
+        $groupObj = & $this->getElement($group);
         if (is_array($arg1)) {
             $required = 0;
             foreach ($arg1 as $elementIndex => $rules) {
                 $elementName = $groupObj->getElementName($elementIndex);
                 foreach ($rules as $rule) {
                     $format = (isset($rule[2])) ? $rule[2] : null;
-                    $validation = (isset($rule[3]) && 'client' == $rule[3])? 'client': 'server';
+                    $validation = (isset($rule[3]) && 'client' == $rule[3]) ? 'client' : 'server';
                     $reset = isset($rule[4]) && $rule[4];
                     $type = $rule[1];
                     if (false === ($newName = $this->isRuleRegistered($type, true))) {
@@ -1218,7 +1218,7 @@ 
                         $required++;
                     }
                     if ('client' == $validation) {
-                        $this->updateAttributes(array('onsubmit' => 'try { var myValidator = validate_' . $this->_attributes['id'] . '; } catch(e) { return true; } return myValidator(this);'));
+                        $this->updateAttributes(array('onsubmit' => 'try { var myValidator = validate_'.$this->_attributes['id'].'; } catch(e) { return true; } return myValidator(this);'));
                     }
                 }
             }
@@ -1255,7 +1255,7 @@ 
                 $this->_required[] = $group;
             }
             if ($validation == 'client') {
-                $this->updateAttributes(array('onsubmit' => 'try { var myValidator = validate_' . $this->_attributes['id'] . '; } catch(e) { return true; } return myValidator(this);'));
+                $this->updateAttributes(array('onsubmit' => 'try { var myValidator = validate_'.$this->_attributes['id'].'; } catch(e) { return true; } return myValidator(this);'));
             }
         }
     } // end func addGroupRule
@@ -1312,10 +1312,10 @@ 
                     if (false === strpos($elName, '[')) {
                         $this->_submitValues[$elName] = $this->_recursiveFilter($filter, $value);
                     } else {
-                        $idx  = "['" . str_replace(
+                        $idx = "['".str_replace(
                                     array('\\', '\'', ']', '['), array('\\\\', '\\\'', '', "']['"),
                                     $elName
-                                ) . "']";
+                                )."']";
                         eval("\$this->_submitValues{$idx} = \$this->_recursiveFilter(\$filter, \$value);");
                     }
                 }
@@ -1435,7 +1435,7 @@ 
         }
         $ruleName = false;
         if (is_object($name) && is_a($name, 'html_quickform_rule')) {
-            $ruleName = !empty($name->name)? $name->name: strtolower(get_class($name));
+            $ruleName = !empty($name->name) ? $name->name : strtolower(get_class($name));
         } elseif (is_string($name) && class_exists($name)) {
             $parent = strtolower($name);
             do {
@@ -1446,7 +1446,7 @@ 
             } while ($parent = get_parent_class($parent));
         }
         if ($ruleName) {
-            $registry =& HTML_QuickForm_RuleRegistry::singleton();
+            $registry = & HTML_QuickForm_RuleRegistry::singleton();
             $registry->registerRule($ruleName, null, $name);
         }
         return $ruleName;
@@ -1570,7 +1570,7 @@ 
             return false;
         }
 
-        $registry =& HTML_QuickForm_RuleRegistry::singleton();
+        $registry = & HTML_QuickForm_RuleRegistry::singleton();
 
         foreach ($this->_rules as $target => $rules) {
             $submitValue = $this->getSubmitValue($target);
@@ -1601,10 +1601,10 @@ 
                                         array('\\', '\''), array('\\\\', '\\\''),
                                         substr($target, 0, $pos)
                                     );
-                            $idx  = "['" . str_replace(
+                            $idx = "['".str_replace(
                                         array('\\', '\'', ']', '['), array('\\\\', '\\\'', '', "']['"),
                                         substr($target, $pos + 1, -1)
-                                    ) . "']";
+                                    )."']";
                             eval("\$isUpload = isset(\$this->_submitFiles['{$base}']['name']{$idx});");
                         }
                         if ($isUpload && (!isset($submitValue['error']) || UPLOAD_ERR_NO_FILE == $submitValue['error'])) {
@@ -1624,7 +1624,7 @@ 
                     $result = $registry->validate($rule['type'], $submitValue, $rule['format'], false);
                 }
 
-                if (!$result || (!empty($rule['howmany']) && $rule['howmany'] > (int)$result)) {
+                if (!$result || (!empty($rule['howmany']) && $rule['howmany'] > (int) $result)) {
                     if (isset($rule['group'])) {
                         $this->_errors[$rule['group']] = $rule['message'];
                     } else {
@@ -1659,7 +1659,7 @@ 
      * @access   public
      * @throws   HTML_QuickForm_Error
      */
-    function freeze($elementList=null)
+    function freeze($elementList = null)
     {
         if (!isset($elementList)) {
             $this->_freezeAll = true;
@@ -1680,7 +1680,7 @@ 
         }
 
         if (!empty($elementList)) {
-            return PEAR::raiseError(null, QUICKFORM_NONEXIST_ELEMENT, null, E_USER_WARNING, "Nonexistant element(s): '" . implode("', '", array_keys($elementList)) . "' in HTML_QuickForm::freeze()", 'HTML_QuickForm_Error', true);
+            return PEAR::raiseError(null, QUICKFORM_NONEXIST_ELEMENT, null, E_USER_WARNING, "Nonexistant element(s): '".implode("', '", array_keys($elementList))."' in HTML_QuickForm::freeze()", 'HTML_QuickForm_Error', true);
         }
         return true;
     } // end func freeze
@@ -1736,7 +1736,7 @@ 
     function accept(&$renderer) {
         $renderer->startForm($this);
         foreach (array_keys($this->_elements) as $key) {
-            $element =& $this->_elements[$key];
+            $element = & $this->_elements[$key];
             $elementName = $element->getName();
             $required    = ($this->isElementRequired($elementName) && !$element->isFrozen());
             $error = $this->getElementError($elementName);
@@ -1782,7 +1782,7 @@ 
         if (!is_null($in_data)) {
             $this->addElement('html', $in_data);
         }
-        $renderer =& $this->defaultRenderer();
+        $renderer = & $this->defaultRenderer();
         $this->accept($renderer);
 
         return $renderer->toHtml();
@@ -1804,7 +1804,7 @@ 
             return '';
         }
 
-        $registry =& HTML_QuickForm_RuleRegistry::singleton();
+        $registry = & HTML_QuickForm_RuleRegistry::singleton();
         $test = array();
         $js_escape = array(
             "\r"    => '\r',
@@ -1820,30 +1820,30 @@ 
                 if ('client' == $rule['validation']) {
                     unset($element);
 
-                    $dependent  = isset($rule['dependent']) && is_array($rule['dependent']);
+                    $dependent = isset($rule['dependent']) && is_array($rule['dependent']);
                     $rule['message'] = strtr($rule['message'], $js_escape);
 
                     if (isset($rule['group'])) {
-                        $group    =& $this->getElement($rule['group']);
+                        $group = & $this->getElement($rule['group']);
                         // No JavaScript validation for frozen elements
                         if ($group->isFrozen()) {
                             continue 2;
                         }
-                        $elements =& $group->getElements();
+                        $elements = & $group->getElements();
                         foreach (array_keys($elements) as $key) {
                             if ($elementName == $group->getElementName($key)) {
-                                $element =& $elements[$key];
+                                $element = & $elements[$key];
                                 break;
                             }
                         }
                     } elseif ($dependent) {
-                        $element   =  array();
-                        $element[] =& $this->getElement($elementName);
+                        $element   = array();
+                        $element[] = & $this->getElement($elementName);
                         foreach ($rule['dependent'] as $elName) {
-                            $element[] =& $this->getElement($elName);
+                            $element[] = & $this->getElement($elName);
                         }
                     } else {
-                        $element =& $this->getElement($elementName);
+                        $element = & $this->getElement($elementName);
                     }
                     // No JavaScript validation for frozen elements
                     if (is_object($element) && $element->isFrozen()) {
@@ -1862,23 +1862,23 @@ 
         }
         if (count($test) > 0) {
             return
-                "\n<script type=\"text/javascript\">\n" .
-                "//<![CDATA[\n" .
-                "function validate_" . $this->_attributes['id'] . "(frm) {\n" .
-                "  var value = '';\n" .
-                "  var errFlag = new Array();\n" .
-                "  var _qfGroups = {};\n" .
-                "  _qfMsg = '';\n\n" .
-                join("\n", $test) .
-                "\n  if (_qfMsg != '') {\n" .
-                "    _qfMsg = '" . strtr($this->_jsPrefix, $js_escape) . "' + _qfMsg;\n" .
-                "    _qfMsg = _qfMsg + '\\n" . strtr($this->_jsPostfix, $js_escape) . "';\n" .
-                "    alert(_qfMsg);\n" .
-                "    return false;\n" .
-                "  }\n" .
-                "  return true;\n" .
-                "}\n" .
-                "//]]>\n" .
+                "\n<script type=\"text/javascript\">\n".
+                "//<![CDATA[\n".
+                "function validate_".$this->_attributes['id']."(frm) {\n".
+                "  var value = '';\n".
+                "  var errFlag = new Array();\n".
+                "  var _qfGroups = {};\n".
+                "  _qfMsg = '';\n\n".
+                join("\n", $test).
+                "\n  if (_qfMsg != '') {\n".
+                "    _qfMsg = '".strtr($this->_jsPrefix, $js_escape)."' + _qfMsg;\n".
+                "    _qfMsg = _qfMsg + '\\n".strtr($this->_jsPostfix, $js_escape)."';\n".
+                "    alert(_qfMsg);\n".
+                "    return false;\n".
+                "  }\n".
+                "  return true;\n".
+                "}\n".
+                "//]]>\n".
                 "</script>";
         }
         return '';
@@ -1897,7 +1897,7 @@ 
      */
     function getSubmitValues($mergeFiles = false)
     {
-        return $mergeFiles? HTML_QuickForm::arrayMerge($this->_submitValues, $this->_submitFiles): $this->_submitValues;
+        return $mergeFiles ? HTML_QuickForm::arrayMerge($this->_submitValues, $this->_submitFiles) : $this->_submitValues;
     } // end func getSubmitValues
 
     // }}}
@@ -1951,7 +1951,7 @@ 
                     if (is_array($value)) {
                         $value[] = $v;
                     } else {
-                        $value = (null === $value)? $v: array($value, $v);
+                        $value = (null === $value) ? $v : array($value, $v);
                     }
                 }
             }

main/inc/lib/pear/HTML/Table.php

Spacing +26 added lines, -26 removed lines

@@ -164,8 +164,8 @@ 
      */
     function HTML_Table($attributes = null, $tabOffset = 0, $useTGroups = false)
     {
-        parent::__construct($attributes, (int)$tabOffset);
-        $this->_useTGroups = (boolean)$useTGroups;
+        parent::__construct($attributes, (int) $tabOffset);
+        $this->_useTGroups = (boolean) $useTGroups;
         $this->addBody();
         if ($this->_useTGroups) {
             $this->_thead = new HTML_Table_Storage($tabOffset, $this->_useTGroups);
@@ -272,12 +272,12 @@ 
     function _adjustTbodyCount($body, $method)
     {
         if ($this->_autoGrow) {
-            while ($this->_tbodyCount <= (int)$body) {
+            while ($this->_tbodyCount <= (int) $body) {
                 $this->addBody();
             }
         } else {
-            return PEAR::raiseError('Invalid body reference[' .
-                $body . '] in HTML_Table::' . $method);
+            return PEAR::raiseError('Invalid body reference['.
+                $body.'] in HTML_Table::'.$method);
         }
     }
 
@@ -939,26 +939,26 @@ 
             $tBodyMaxColCount = max($tBodyColCounts);
         }
         if ($this->_comment) {
-            $strHtml .= $tabs . "<!-- $this->_comment -->" . $lnEnd;
+            $strHtml .= $tabs."<!-- $this->_comment -->".$lnEnd;
         }
         if ($this->getRowCount() > 0 && $tBodyMaxColCount > 0) {
             $strHtml .=
-                $tabs . '<table' . $this->_getAttrString($this->_attributes) . '>' . $lnEnd;
+                $tabs.'<table'.$this->_getAttrString($this->_attributes).'>'.$lnEnd;
             if (!empty($this->_caption)) {
                 $attr = $this->_caption['attr'];
                 $contents = $this->_caption['contents'];
-                $strHtml .= $tabs . $tab . '<caption' . $this->_getAttrString($attr) . '>';
+                $strHtml .= $tabs.$tab.'<caption'.$this->_getAttrString($attr).'>';
                 if (is_array($contents)) {
                     $contents = implode(', ', $contents);
                 }
                 $strHtml .= $contents;
-                $strHtml .= '</caption>' . $lnEnd;
+                $strHtml .= '</caption>'.$lnEnd;
             }
             if (!empty($this->_colgroup)) {
                 foreach ($this->_colgroup as $g => $col) {
                     $attr = $this->_colgroup[$g]['attr'];
                     $contents = $this->_colgroup[$g]['contents'];
-                    $strHtml .= $tabs . $tab . '<colgroup' . $this->_getAttrString($attr) . '>';
+                    $strHtml .= $tabs.$tab.'<colgroup'.$this->_getAttrString($attr).'>';
                     if (!empty($contents)) {
                         $strHtml .= $lnEnd;
                         if (!is_array($contents)) {
@@ -966,11 +966,11 @@ 
                         }
                         foreach ($contents as $a => $colAttr) {
                             $attr = $this->_parseAttributes($colAttr);
-                            $strHtml .= $tabs . $tab . $tab . '<col' . $this->_getAttrString($attr) . ' />' . $lnEnd;
+                            $strHtml .= $tabs.$tab.$tab.'<col'.$this->_getAttrString($attr).' />'.$lnEnd;
                         }
-                        $strHtml .= $tabs . $tab;
+                        $strHtml .= $tabs.$tab;
                     }
-                    $strHtml .= '</colgroup>' . $lnEnd;
+                    $strHtml .= '</colgroup>'.$lnEnd;
                 }
             }
             if ($this->_useTGroups) {
@@ -986,31 +986,31 @@ 
                 if ($this->_thead !== null) {
                     $this->_thead->setColCount($maxColCount);
                     if ($this->_thead->getRowCount() > 0) {
-                        $strHtml .= $tabs . $tab . '<thead' .
-                                    $this->_getAttrString($this->_thead->_attributes) .
-                                    '>' . $lnEnd;
+                        $strHtml .= $tabs.$tab.'<thead'.
+                                    $this->_getAttrString($this->_thead->_attributes).
+                                    '>'.$lnEnd;
                         $strHtml .= $this->_thead->toHtml($tabs, $tab);
-                        $strHtml .= $tabs . $tab . '</thead>' . $lnEnd;
+                        $strHtml .= $tabs.$tab.'</thead>'.$lnEnd;
                     }
                 }
                 if ($this->_tfoot !== null) {
                     $this->_tfoot->setColCount($maxColCount);
                     if ($this->_tfoot->getRowCount() > 0) {
-                        $strHtml .= $tabs . $tab . '<tfoot' .
-                                    $this->_getAttrString($this->_tfoot->_attributes) .
-                                    '>' . $lnEnd;
+                        $strHtml .= $tabs.$tab.'<tfoot'.
+                                    $this->_getAttrString($this->_tfoot->_attributes).
+                                    '>'.$lnEnd;
                         $strHtml .= $this->_tfoot->toHtml($tabs, $tab);
-                        $strHtml .= $tabs . $tab . '</tfoot>' . $lnEnd;
+                        $strHtml .= $tabs.$tab.'</tfoot>'.$lnEnd;
                     }
                 }
                 for ($i = 0; $i < $this->_tbodyCount; $i++) {
                     $this->_tbodies[$i]->setColCount($maxColCount);
                     if ($this->_tbodies[$i]->getRowCount() > 0) {
-                        $strHtml .= $tabs . $tab . '<tbody' .
-                                    $this->_getAttrString($this->_tbodies[$i]->_attributes) .
-                                    '>' . $lnEnd;
+                        $strHtml .= $tabs.$tab.'<tbody'.
+                                    $this->_getAttrString($this->_tbodies[$i]->_attributes).
+                                    '>'.$lnEnd;
                         $strHtml .= $this->_tbodies[$i]->toHtml($tabs, $tab);
-                        $strHtml .= $tabs . $tab . '</tbody>' . $lnEnd;
+                        $strHtml .= $tabs.$tab.'</tbody>'.$lnEnd;
                     }
                 }
             } else {
@@ -1019,7 +1019,7 @@ 
                     $strHtml .= $this->_tbodies[$i]->toHtml($tabs, $tab);
                 }
             }
-            $strHtml .= $tabs . '</table>' . $lnEnd;
+            $strHtml .= $tabs.'</table>'.$lnEnd;
         }
         return $strHtml;
     }

main/inc/lib/pear/HTML/Common.php

Spacing +3 added lines, -3 removed lines

@@ -143,7 +143,7 @@ 
             foreach ($attributes as $key => $value) {
             	// Modified by Ivan Tcholakov, 16-MAR-2010
                 $value = @htmlspecialchars($value, ENT_COMPAT, $charset);
-                $strAttr .= ' ' . $key . '= "' . $value. '"';
+                $strAttr .= ' '.$key.'= "'.$value.'"';
             }
         }
         return $strAttr;
@@ -170,10 +170,10 @@ 
             return $ret;
 
         } elseif (is_string($attributes)) {
-            $preg = "/(([A-Za-z_:]|[^\\x00-\\x7F])([A-Za-z0-9_:.-]|[^\\x00-\\x7F])*)" .
+            $preg = "/(([A-Za-z_:]|[^\\x00-\\x7F])([A-Za-z0-9_:.-]|[^\\x00-\\x7F])*)".
                 "([ \\n\\t\\r]+)?(=([ \\n\\t\\r]+)?(\"[^\"]*\"|'[^']*'|[^ \\n\\t\\r]*))?/";
             if (preg_match_all($preg, $attributes, $regs)) {
-                for ($counter=0; $counter<count($regs[1]); $counter++) {
+                for ($counter = 0; $counter < count($regs[1]); $counter++) {
                     $name  = $regs[1][$counter];
                     $check = $regs[0][$counter];
                     $value = $regs[7][$counter];

main/inc/lib/pear/HTML/QuickForm/element.php

Spacing +10 added lines, -10 removed lines

@@ -288,7 +288,7 @@ 
         //return ('' != $value? htmlspecialchars($value): ' ') .
         //       $this->_getPersistantData();
 
-        $value =  ('' != $value ? @htmlspecialchars($value, ENT_COMPAT, HTML_Common::charset()): ' ') .
+        $value = ('' != $value ? @htmlspecialchars($value, ENT_COMPAT, HTML_Common::charset()) : ' ').
                $this->_getPersistantData();
         return '<span class="freeze">'.$value.'</span>';
         //
@@ -309,11 +309,11 @@ 
             return '';
         } else {
             $id = $this->getAttribute('id');
-            return '<input' . $this->_getAttrString(array(
+            return '<input'.$this->_getAttrString(array(
                        'type'  => 'hidden',
                        'name'  => $this->getName(),
                        'value' => $this->getValue()
-                   ) + (isset($id)? array('id' => $id): array())) . ' />';
+                   ) + (isset($id) ? array('id' => $id) : array())).' />';
         }
     }
 
@@ -344,7 +344,7 @@ 
      * @access    public
      * @return    void
      */
-    function setPersistantFreeze($persistant=false)
+    function setPersistantFreeze($persistant = false)
     {
         $this->_persistantFreeze = $persistant;
     } //end func setPersistantFreeze
@@ -414,10 +414,10 @@ 
         if (isset($values[$elementName])) {
             return $values[$elementName];
         } elseif (strpos($elementName, '[')) {
-            $myVar = "['" . str_replace(
+            $myVar = "['".str_replace(
                          array('\\', '\'', ']', '['), array('\\\\', '\\\'', '', "']['"),
                          $elementName
-                     ) . "']";
+                     )."']";
             return eval("return (isset(\$values$myVar)) ? \$values$myVar : null;");
         } else {
             return null;
@@ -480,7 +480,7 @@ 
     * @access public
     * @return void
     */
-    function accept(&$renderer, $required=false, $error=null)
+    function accept(&$renderer, $required = false, $error = null)
     {
         $renderer->renderElement($this, $required, $error);
     }
@@ -499,7 +499,7 @@ 
         static $idx = 1;
 
         if (!$this->getAttribute('id')) {
-            $this->updateAttributes(array('id' => 'qf_' . substr(md5(microtime() . $idx++), 0, 6)));
+            $this->updateAttributes(array('id' => 'qf_'.substr(md5(microtime().$idx++), 0, 6)));
         }
     }
 
@@ -543,10 +543,10 @@ 
                 return array($name => $value);
             } else {
                 $valueAry = array();
-                $myIndex  = "['" . str_replace(
+                $myIndex  = "['".str_replace(
                                 array('\\', '\'', ']', '['), array('\\\\', '\\\'', '', "']['"),
                                 $name
-                            ) . "']";
+                            )."']";
                 eval("\$valueAry$myIndex = \$value;");
                 return $valueAry;
             }

main/inc/lib/pear/HTML/QuickForm/hierselect.php

Spacing +28 added lines, -29 removed lines

@@ -83,7 +83,7 @@ 
      * @access    public
      * @return    void
      */
-    function HTML_QuickForm_hierselect($elementName=null, $elementLabel=null, $attributes=null, $separator=null)
+    function HTML_QuickForm_hierselect($elementName = null, $elementLabel = null, $attributes = null, $separator = null)
     {
         $this->HTML_QuickForm_element($elementName, $elementLabel, $attributes);
         $this->_persistantFreeze = true;
@@ -154,8 +154,8 @@ 
             // setDefaults has probably been called before this function
             // check if all elements have been created
             $totalNbElements = count($this->_options);
-            for ($i = $this->_nbElements; $i < $totalNbElements; $i ++) {
-                $this->_elements[] =& new HTML_QuickForm_select($i, null, array(), $this->getAttributes());
+            for ($i = $this->_nbElements; $i < $totalNbElements; $i++) {
+                $this->_elements[] = & new HTML_QuickForm_select($i, null, array(), $this->getAttributes());
                 $this->_nbElements++;
             }
         }
@@ -209,8 +209,8 @@ 
             // setDefaults has probably been called before this function
             // check if all elements have been created
             $totalNbElements = 2;
-            for ($i = $this->_nbElements; $i < $totalNbElements; $i ++) {
-                $this->_elements[] =& new HTML_QuickForm_select($i, null, array(), $this->getAttributes());
+            for ($i = $this->_nbElements; $i < $totalNbElements; $i++) {
+                $this->_elements[] = & new HTML_QuickForm_select($i, null, array(), $this->getAttributes());
                 $this->_nbElements++;
             }
         }
@@ -233,12 +233,12 @@ 
         foreach (array_keys($this->_elements) AS $key) {
             $array = eval("return isset(\$this->_options[{$key}]{$toLoad})? \$this->_options[{$key}]{$toLoad}: null;");
             if (is_array($array)) {
-                $select =& $this->_elements[$key];
+                $select = & $this->_elements[$key];
                 $select->_options = array();
                 $select->loadArray($array);
 
-                $value  = is_array($v = $select->getValue()) ? $v[0] : key($array);
-                $toLoad .= '[\'' . str_replace(array('\\', '\''), array('\\\\', '\\\''), $value) . '\']';
+                $value = is_array($v = $select->getValue()) ? $v[0] : key($array);
+                $toLoad .= '[\''.str_replace(array('\\', '\''), array('\\\\', '\\\''), $value).'\']';
             }
         }
     } // end func _setOptions
@@ -277,7 +277,7 @@ 
     function _createElements()
     {
         for ($i = 0; $i < $this->_nbElements; $i++) {
-            $this->_elements[] =& new HTML_QuickForm_select($i, null, array(), $this->getAttributes());
+            $this->_elements[] = & new HTML_QuickForm_select($i, null, array(), $this->getAttributes());
         }
     } // end func _createElements
 
@@ -292,10 +292,10 @@ 
             $keys     = array_keys($this->_elements);
             $onChange = array();
             for ($i = 0; $i < count($keys) - 1; $i++) {
-                $select =& $this->_elements[$keys[$i]];
+                $select = & $this->_elements[$keys[$i]];
                 $onChange[$i] = $select->getAttribute('onchange');
                 $select->updateAttributes(
-                    array('onchange' => '_hs_swapOptions(this.form, \'' . $this->_escapeString($this->getName()) . '\', ' . $keys[$i] . ');' . $onChange[$i])
+                    array('onchange' => '_hs_swapOptions(this.form, \''.$this->_escapeString($this->getName()).'\', '.$keys[$i].');'.$onChange[$i])
                 );
             }
 
@@ -433,37 +433,36 @@ 
             for ($i = 1; $i < $this->_nbElements; $i++) {
                 $jsParts[] = $this->_convertArrayToJavascript($this->_options[$i]);
             }
-            $this->_js .= "\n_hs_options['" . $this->_escapeString($this->getName()) . "'] = [\n" .
-                          implode(",\n", $jsParts) .
+            $this->_js .= "\n_hs_options['".$this->_escapeString($this->getName())."'] = [\n".
+                          implode(",\n", $jsParts).
                           "\n];\n";
             // default value; if we don't actually have any values yet just use
             // the first option (for single selects) or empty array (for multiple)
             $values = array();
             foreach (array_keys($this->_elements) as $key) {
                 if (is_array($v = $this->_elements[$key]->getValue())) {
-                    $values[] = count($v) > 1? $v: $v[0];
+                    $values[] = count($v) > 1 ? $v : $v[0];
                 } else {
                     // XXX: accessing the supposedly private _options array
-                    $values[] = $this->_elements[$key]->getMultiple() || empty($this->_elements[$key]->_options[0])?
-                                array():
-                                $this->_elements[$key]->_options[0]['attr']['value'];
+                    $values[] = $this->_elements[$key]->getMultiple() || empty($this->_elements[$key]->_options[0]) ?
+                                array() : $this->_elements[$key]->_options[0]['attr']['value'];
                 }
             }
-            $this->_js .= "_hs_defaults['" . $this->_escapeString($this->getName()) . "'] = " .
-                          $this->_convertArrayToJavascript($values, false) . ";\n";
+            $this->_js .= "_hs_defaults['".$this->_escapeString($this->getName())."'] = ".
+                          $this->_convertArrayToJavascript($values, false).";\n";
         }
         include_once('HTML/QuickForm/Renderer/Default.php');
-        $renderer =& new HTML_QuickForm_Renderer_Default();
+        $renderer = & new HTML_QuickForm_Renderer_Default();
         $renderer->setElementTemplate('{element}');
         parent::accept($renderer);
 
         if (!empty($onChange)) {
-            $keys     = array_keys($this->_elements);
+            $keys = array_keys($this->_elements);
             for ($i = 0; $i < count($keys) - 1; $i++) {
                 $this->_elements[$keys[$i]]->updateAttributes(array('onchange' => $onChange[$i]));
             }
         }
-        return (empty($this->_js)? '': "<script type=\"text/javascript\">\n//<![CDATA[\n" . $this->_js . "//]]>\n</script>") .
+        return (empty($this->_js) ? '' : "<script type=\"text/javascript\">\n//<![CDATA[\n".$this->_js."//]]>\n</script>").
                $renderer->toHtml();
     } // end func toHtml
 
@@ -491,12 +490,12 @@ 
                 $onReset = $caller->getAttribute('onreset');
                 if (strlen($onReset)) {
                     if (strpos($onReset, '_hs_setupOnReset')) {
-                        $caller->updateAttributes(array('onreset' => str_replace('_hs_setupOnReset(this, [', "_hs_setupOnReset(this, ['" . $this->_escapeString($this->getName()) . "', ", $onReset)));
+                        $caller->updateAttributes(array('onreset' => str_replace('_hs_setupOnReset(this, [', "_hs_setupOnReset(this, ['".$this->_escapeString($this->getName())."', ", $onReset)));
                     } else {
-                        $caller->updateAttributes(array('onreset' => "var temp = function() { {$onReset} } ; if (!temp()) { return false; } ; if (typeof _hs_setupOnReset != 'undefined') { return _hs_setupOnReset(this, ['" . $this->_escapeString($this->getName()) . "']); } "));
+                        $caller->updateAttributes(array('onreset' => "var temp = function() { {$onReset} } ; if (!temp()) { return false; } ; if (typeof _hs_setupOnReset != 'undefined') { return _hs_setupOnReset(this, ['".$this->_escapeString($this->getName())."']); } "));
                     }
                 } else {
-                    $caller->updateAttributes(array('onreset' => "if (typeof _hs_setupOnReset != 'undefined') { return _hs_setupOnReset(this, ['" . $this->_escapeString($this->getName()) . "']); } "));
+                    $caller->updateAttributes(array('onreset' => "if (typeof _hs_setupOnReset != 'undefined') { return _hs_setupOnReset(this, ['".$this->_escapeString($this->getName())."']); } "));
                 }
             }
             return $ret;
@@ -521,7 +520,7 @@ 
         } else {
             $items = array();
             foreach ($array as $key => $val) {
-                $item = $assoc? "'" . $this->_escapeString($key) . "': ": '';
+                $item = $assoc ? "'".$this->_escapeString($key)."': " : '';
                 if (is_array($val)) {
                     $item .= $this->_convertArrayToJavascript($val, $assoc);
                 } else {
@@ -531,7 +530,7 @@ 
             }
         }
         $js = implode(', ', $items);
-        return $assoc? '{ ' . $js . ' }': '[' . $js . ']';
+        return $assoc ? '{ '.$js.' }' : '['.$js.']';
     }
 
     // }}}
@@ -551,7 +550,7 @@ 
         } elseif (is_int($val) || is_double($val)) {
             return $val;
         } elseif (is_string($val)) {
-            return "'" . $this->_escapeString($val) . "'";
+            return "'".$this->_escapeString($val)."'";
         } elseif (is_null($val)) {
             return 'null';
         } else {
@@ -572,7 +571,7 @@ 
     */
     function _escapeString($str)
     {
-        return strtr($str,array(
+        return strtr($str, array(
             "\r"    => '\r',
             "\n"    => '\n',
             "\t"    => '\t',

main/inc/lib/pear/HTML/QuickForm/CAPTCHA.php

Spacing +1 added lines, -1 removed lines

@@ -247,7 +247,7 @@
         unset($attr['name']);
 
         $html = $this->_getTabs()
-                . '<span' . $this->_getAttrString($attr) . '>'
+                . '<span'.$this->_getAttrString($attr).'>'
                 . htmlspecialchars($captcha)
                 . '</span>';
         return $html;

main/inc/lib/pear/HTML/QuickForm/group.php

Spacing +11 added lines, -11 removed lines

@@ -91,7 +91,7 @@ 
      * @access    public
      * @return    void
      */
-    public function __construct($elementName=null, $elementLabel=null, $elements=null, $separator=null, $appendName = true)
+    public function __construct($elementName = null, $elementLabel = null, $elements = null, $separator = null, $appendName = true)
     {
         parent::__construct($elementName, $elementLabel);
         $this->_type = 'group';
@@ -174,13 +174,13 @@ 
     {
         $value = null;
         foreach (array_keys($this->_elements) as $key) {
-            $element =& $this->_elements[$key];
+            $element = & $this->_elements[$key];
             switch ($element->getType()) {
                 case 'radio':
-                    $v = $element->getChecked()? $element->getValue(): null;
+                    $v = $element->getChecked() ? $element->getValue() : null;
                     break;
                 case 'checkbox':
-                    $v = $element->getChecked()? true: null;
+                    $v = $element->getChecked() ? true : null;
                     break;
                 default:
                     $v = $element->getValue();
@@ -191,7 +191,7 @@ 
                     $value = $v;
                 } else {
                     if (!is_array($value)) {
-                        $value = is_null($value)? array(): array($value);
+                        $value = is_null($value) ? array() : array($value);
                     }
                     if ('' === $elementName) {
                         $value[] = $v;
@@ -360,9 +360,9 @@ 
                         if (is_null($elementName)) {
                             $this->_elements[$key]->setName($this->getName());
                         } elseif ('' === $elementName) {
-                            $this->_elements[$key]->setName($this->getName() . '[' . $key . ']');
+                            $this->_elements[$key]->setName($this->getName().'['.$key.']');
                         } else {
-                            $this->_elements[$key]->setName($this->getName() . '[' . $elementName . ']');
+                            $this->_elements[$key]->setName($this->getName().'['.$elementName.']');
                         }
                     }
                     $this->_elements[$key]->onQuickFormEvent('updateValue', $arg, $caller);
@@ -393,12 +393,12 @@ 
         $renderer->startGroup($this, $required, $error);
         $name = $this->getName();
         foreach (array_keys($this->_elements) as $key) {
-            $element =& $this->_elements[$key];
+            $element = & $this->_elements[$key];
 
             if ($this->_appendName) {
                 $elementName = $element->getName();
                 if (isset($elementName)) {
-                    $element->setName($name . '['. (strlen($elementName)? $elementName: $key) .']');
+                    $element->setName($name.'['.(strlen($elementName) ? $elementName : $key).']');
                 } else {
                     $element->setName($name);
                 }
@@ -429,9 +429,9 @@ 
                 if (is_null($elementName)) {
                     $this->_elements[$key]->setName($this->getName());
                 } elseif ('' === $elementName) {
-                    $this->_elements[$key]->setName($this->getName() . '[' . $key . ']');
+                    $this->_elements[$key]->setName($this->getName().'['.$key.']');
                 } else {
-                    $this->_elements[$key]->setName($this->getName() . '[' . $elementName . ']');
+                    $this->_elements[$key]->setName($this->getName().'['.$elementName.']');
                 }
             }
             $v = $this->_elements[$key]->exportValue($submitValues, $assoc);

main/inc/lib/pear/HTML/QuickForm/email.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
      * @return    void
      * @throws
      */
-    function HTML_QuickForm_email($elementName=null, $elementLabel=null, $attributes=null)
+    function HTML_QuickForm_email($elementName = null, $elementLabel = null, $attributes = null)
     {
         parent::__construct($elementName, $elementLabel, $attributes);
         $this->setType('email');

main/inc/lib/pear/HTML/QuickForm/Action/Jump.php

Spacing +16 added lines, -16 removed lines

@@ -69,7 +69,7 @@ 
                 }

 

             } elseif ('..' == $pathAry[$i] && $i > 1 && '..' != $pathAry[$i - 1]) {

-                if ($i < count($pathAry) -1) {

+                if ($i < count($pathAry) - 1) {

                     array_splice($pathAry, $i - 1, 2);

                     $i--;

                 } else {

@@ -98,28 +98,28 @@ 
     function _resolveRelativeURL($url)

     {

         $https  = !empty($_SERVER['HTTPS']) && ('off' != strtolower($_SERVER['HTTPS']));

-        $scheme = ($https? 'https:': 'http:');

+        $scheme = ($https ? 'https:' : 'http:');

         if ('//' == substr($url, 0, 2)) {

-            return $scheme . $url;

+            return $scheme.$url;

 

         } else {

-            $host   = $scheme . '//' . $_SERVER['SERVER_NAME'] .

+            $host = $scheme.'//'.$_SERVER['SERVER_NAME'].

                       (($https && 443 == $_SERVER['SERVER_PORT'] ||

-                        !$https && 80 == $_SERVER['SERVER_PORT'])? '': ':' . $_SERVER['SERVER_PORT']);

+                        !$https && 80 == $_SERVER['SERVER_PORT']) ? '' : ':'.$_SERVER['SERVER_PORT']);

             if ('' == $url) {

-                return $host . $_SERVER['REQUEST_URI'];

+                return $host.$_SERVER['REQUEST_URI'];

 

             } elseif ('/' == $url[0]) {

-                return $host . $url;

+                return $host.$url;

 

             } else {

                 list($basePath, $baseQuery) = $this->_splitUri($_SERVER['REQUEST_URI']);

                 list($actPath, $actQuery)   = $this->_splitUri($url);

                 if ('' == $actPath) {

-                    return $host . $basePath . $actQuery;

+                    return $host.$basePath.$actQuery;

                 } else {

-                    $path = substr($basePath, 0, strrpos($basePath, '/') + 1) . $actPath;

-                    return $host . $this->_normalizePath($path) . $actQuery;

+                    $path = substr($basePath, 0, strrpos($basePath, '/') + 1).$actPath;

+                    return $host.$this->_normalizePath($path).$actQuery;

                 }

             }

         }

@@ -136,10 +136,10 @@ 
             if (!$page->controller->isValid($pageName)) {

                 $pageName = $page->controller->findInvalid();

             }

-            $current =& $page->controller->getPage($pageName);

+            $current = & $page->controller->getPage($pageName);

 

         } else {

-            $current =& $page;

+            $current = & $page;

         }

         // generate the URL for the page 'display' event and redirect to it

         $action = $current->getAttribute('action');

@@ -147,10 +147,10 @@ 
         if (!preg_match('!^https?://!i', $action)) {

             $action = $this->_resolveRelativeURL($action);

         }

-        $url    = $action . (false === strpos($action, '?')? '?': '&') .

-                  $current->getButtonName('display') . '=true' .

-                  ((!defined('SID') || '' == SID || ini_get('session.use_only_cookies'))? '': '&' . SID);

-        header('Location: ' . $url);

+        $url = $action.(false === strpos($action, '?') ? '?' : '&').

+                  $current->getButtonName('display').'=true'.

+                  ((!defined('SID') || '' == SID || ini_get('session.use_only_cookies')) ? '' : '&'.SID);

+        header('Location: '.$url);

         exit;

     }

 }