Completed
Push — 1.10.x ( f89535...7ba96a )
by Angel Fernando Quiroz
126:15 queued 89:30
created
main/inc/lib/pear/HTML/QuickForm/Action/Jump.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
                 }
70 70
 
71 71
             } elseif ('..' == $pathAry[$i] && $i > 1 && '..' != $pathAry[$i - 1]) {
72
-                if ($i < count($pathAry) -1) {
72
+                if ($i < count($pathAry) - 1) {
73 73
                     array_splice($pathAry, $i - 1, 2);
74 74
                     $i--;
75 75
                 } else {
@@ -98,28 +98,28 @@  discard block
 block discarded – undo
98 98
     function _resolveRelativeURL($url)
99 99
     {
100 100
         $https  = !empty($_SERVER['HTTPS']) && ('off' != strtolower($_SERVER['HTTPS']));
101
-        $scheme = ($https? 'https:': 'http:');
101
+        $scheme = ($https ? 'https:' : 'http:');
102 102
         if ('//' == substr($url, 0, 2)) {
103
-            return $scheme . $url;
103
+            return $scheme.$url;
104 104
 
105 105
         } else {
106
-            $host   = $scheme . '//' . $_SERVER['SERVER_NAME'] .
106
+            $host = $scheme.'//'.$_SERVER['SERVER_NAME'].
107 107
                       (($https && 443 == $_SERVER['SERVER_PORT'] ||
108
-                        !$https && 80 == $_SERVER['SERVER_PORT'])? '': ':' . $_SERVER['SERVER_PORT']);
108
+                        !$https && 80 == $_SERVER['SERVER_PORT']) ? '' : ':'.$_SERVER['SERVER_PORT']);
109 109
             if ('' == $url) {
110
-                return $host . $_SERVER['REQUEST_URI'];
110
+                return $host.$_SERVER['REQUEST_URI'];
111 111
 
112 112
             } elseif ('/' == $url[0]) {
113
-                return $host . $url;
113
+                return $host.$url;
114 114
 
115 115
             } else {
116 116
                 list($basePath, $baseQuery) = $this->_splitUri($_SERVER['REQUEST_URI']);
117 117
                 list($actPath, $actQuery)   = $this->_splitUri($url);
118 118
                 if ('' == $actPath) {
119
-                    return $host . $basePath . $actQuery;
119
+                    return $host.$basePath.$actQuery;
120 120
                 } else {
121
-                    $path = substr($basePath, 0, strrpos($basePath, '/') + 1) . $actPath;
122
-                    return $host . $this->_normalizePath($path) . $actQuery;
121
+                    $path = substr($basePath, 0, strrpos($basePath, '/') + 1).$actPath;
122
+                    return $host.$this->_normalizePath($path).$actQuery;
123 123
                 }
124 124
             }
125 125
         }
@@ -136,10 +136,10 @@  discard block
 block discarded – undo
136 136
             if (!$page->controller->isValid($pageName)) {
137 137
                 $pageName = $page->controller->findInvalid();
138 138
             }
139
-            $current =& $page->controller->getPage($pageName);
139
+            $current = & $page->controller->getPage($pageName);
140 140
 
141 141
         } else {
142
-            $current =& $page;
142
+            $current = & $page;
143 143
         }
144 144
         // generate the URL for the page 'display' event and redirect to it
145 145
         $action = $current->getAttribute('action');
@@ -147,10 +147,10 @@  discard block
 block discarded – undo
147 147
         if (!preg_match('!^https?://!i', $action)) {
148 148
             $action = $this->_resolveRelativeURL($action);
149 149
         }
150
-        $url    = $action . (false === strpos($action, '?')? '?': '&') .
151
-                  $current->getButtonName('display') . '=true' .
152
-                  ((!defined('SID') || '' == SID || ini_get('session.use_only_cookies'))? '': '&' . SID);
153
-        header('Location: ' . $url);
150
+        $url = $action.(false === strpos($action, '?') ? '?' : '&').
151
+                  $current->getButtonName('display').'=true'.
152
+                  ((!defined('SID') || '' == SID || ini_get('session.use_only_cookies')) ? '' : '&'.SID);
153
+        header('Location: '.$url);
154 154
         exit;
155 155
     }
156 156
 }
Please login to merge, or discard this patch.
main/inc/lib/pear/HTML/QuickForm/Action/Back.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -35,8 +35,8 @@  discard block
 block discarded – undo
35 35
     {
36 36
         // save the form values and validation status to the session
37 37
         $page->isFormBuilt() or $page->buildForm();
38
-        $pageName =  $page->getAttribute('id');
39
-        $data     =& $page->controller->container();
38
+        $pageName = $page->getAttribute('id');
39
+        $data     = & $page->controller->container();
40 40
         $data['values'][$pageName] = $page->exportValues();
41 41
         if (!$page->controller->isModal()) {
42 42
             if (PEAR::isError($valid = $page->validate())) {
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
             return $page->handle('jump');
54 54
             //
55 55
         } else {
56
-            $prev =& $page->controller->getPage($prevName);
56
+            $prev = & $page->controller->getPage($prevName);
57 57
             // Modified by Chamilo team, 16-MAR-2010.
58 58
             //$prev->handle('jump');
59 59
             return $prev->handle('jump');
Please login to merge, or discard this patch.
main/inc/lib/pear/HTML/QuickForm/Action/Display.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -45,13 +45,13 @@
 block discarded – undo
45 45
             // If the controller is "modal" we should not allow direct access to a page
46 46
             // unless all previous pages are valid (see also bug #2323)
47 47
             if ($page->controller->isModal() && !$page->controller->isValid($page->getAttribute('id'))) {
48
-                $target =& $page->controller->getPage($page->controller->findInvalid());
48
+                $target = & $page->controller->getPage($page->controller->findInvalid());
49 49
                 // Modified by Chamilo team, 16-MAR-2010.
50 50
                 //$target->handle('jump');
51 51
                 return $target->handle('jump');
52 52
                 //
53 53
             }
54
-            $data =& $page->controller->container();
54
+            $data = & $page->controller->container();
55 55
             if (!empty($data['values'][$pageName])) {
56 56
                 $page->loadValues($data['values'][$pageName]);
57 57
                 $validate = false === $data['valid'][$pageName];
Please login to merge, or discard this patch.
main/inc/lib/pear/HTML/QuickForm/Action/Next.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -35,8 +35,8 @@  discard block
 block discarded – undo
35 35
     {
36 36
         // save the form values and validation status to the session
37 37
         $page->isFormBuilt() or $page->buildForm();
38
-        $pageName =  $page->getAttribute('id');
39
-        $data     =& $page->controller->container();
38
+        $pageName = $page->getAttribute('id');
39
+        $data     = & $page->controller->container();
40 40
         $data['values'][$pageName] = $page->exportValues();
41 41
         if (PEAR::isError($valid = $page->validate())) {
42 42
             return $valid;
@@ -49,13 +49,13 @@  discard block
 block discarded – undo
49 49
         }
50 50
         // More pages?
51 51
         if (null !== ($nextName = $page->controller->getNextName($pageName))) {
52
-            $next =& $page->controller->getPage($nextName);
52
+            $next = & $page->controller->getPage($nextName);
53 53
             // Modified by Chamilo team, 16-MAR-2010.
54 54
             //$next->handle('jump');
55 55
             return $next->handle('jump');
56 56
             //
57 57
         // Consider this a 'finish' button, if there is no explicit one
58
-        } elseif($page->controller->isModal()) {
58
+        } elseif ($page->controller->isModal()) {
59 59
             if ($page->controller->isValid()) {
60 60
                 // Modified by Chamilo team, 16-MAR-2010.
61 61
                 //$page->handle('process');
Please login to merge, or discard this patch.
main/inc/lib/pear/HTML/QuickForm/Action/Direct.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -38,15 +38,15 @@
 block discarded – undo
38 38
     {
39 39
         // save the form values and validation status to the session
40 40
         $page->isFormBuilt() or $page->buildForm();
41
-        $pageName =  $page->getAttribute('id');
42
-        $data     =& $page->controller->container();
41
+        $pageName = $page->getAttribute('id');
42
+        $data     = & $page->controller->container();
43 43
         $data['values'][$pageName] = $page->exportValues();
44 44
         if (PEAR::isError($valid = $page->validate())) {
45 45
             return $valid;
46 46
         }
47 47
         $data['valid'][$pageName] = $valid;
48 48
 
49
-        $target =& $page->controller->getPage($actionName);
49
+        $target = & $page->controller->getPage($actionName);
50 50
         if (PEAR::isError($target)) {
51 51
             return $target;
52 52
         } else {
Please login to merge, or discard this patch.
main/inc/lib/pear/HTML/QuickForm/Action/Submit.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -35,8 +35,8 @@  discard block
 block discarded – undo
35 35
     {
36 36
         // save the form values and validation status to the session
37 37
         $page->isFormBuilt() or $page->buildForm();
38
-        $pageName =  $page->getAttribute('id');
39
-        $data     =& $page->controller->container();
38
+        $pageName = $page->getAttribute('id');
39
+        $data     = & $page->controller->container();
40 40
         $data['values'][$pageName] = $page->exportValues();
41 41
         if (PEAR::isError($valid = $page->validate())) {
42 42
             return $valid;
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 
60 60
         // Some other page is invalid, redirect to it
61 61
         } else {
62
-            $target =& $page->controller->getPage($page->controller->findInvalid());
62
+            $target = & $page->controller->getPage($page->controller->findInvalid());
63 63
             // Modified by Chamilo team, 16-MAR-2010.
64 64
             //$target->handle('jump');
65 65
             return $target->handle('jump');
Please login to merge, or discard this patch.
main/inc/lib/pear/HTML/QuickForm/reset.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
15 15
      * @access    public
16 16
      * @return    void
17 17
      */
18
-    public function __construct($elementName=null, $value=null, $attributes=null)
18
+    public function __construct($elementName = null, $value = null, $attributes = null)
19 19
     {
20 20
         parent::__construct($elementName, null, $attributes);
21 21
         $this->setValue($value);
Please login to merge, or discard this patch.
main/inc/lib/pear/HTML/QuickForm/autocomplete.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -116,10 +116,10 @@  discard block
 block discarded – undo
116 116
     function toHtml()
117 117
     {
118 118
         // prevent problems with grouped elements
119
-        $arrayName = str_replace(array('[', ']'), array('__', ''), $this->getName()) . '_values';
119
+        $arrayName = str_replace(array('[', ']'), array('__', ''), $this->getName()).'_values';
120 120
 
121 121
         $this->updateAttributes(array(
122
-            'onkeypress' => 'return autocomplete(this, event, ' . $arrayName . ');'
122
+            'onkeypress' => 'return autocomplete(this, event, '.$arrayName.');'
123 123
         ));
124 124
         if ($this->_flagFrozen) {
125 125
             $js = '';
@@ -239,13 +239,13 @@  discard block
 block discarded – undo
239 239
             );
240 240
 
241 241
             $js .= $this->_js;
242
-            $js .= 'var ' . $arrayName . " = new Array();\n";
242
+            $js .= 'var '.$arrayName." = new Array();\n";
243 243
             for ($i = 0; $i < count($this->_options); $i++) {
244
-                $js .= $arrayName . '[' . $i . "] = '" . strtr($this->_options[$i], $jsEscape) . "';\n";
244
+                $js .= $arrayName.'['.$i."] = '".strtr($this->_options[$i], $jsEscape)."';\n";
245 245
             }
246 246
             $js .= "//]]>\n</script>";
247 247
         }
248
-        return $js . parent::toHtml();
248
+        return $js.parent::toHtml();
249 249
     }// end func toHtml
250 250
 
251 251
     // }}}
Please login to merge, or discard this patch.
main/inc/lib/pear/HTML/QuickForm/Renderer/Object.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
      * The object being generated
42 42
      * @var QuickformForm
43 43
      */
44
-    var $_obj= null;
44
+    var $_obj = null;
45 45
 
46 46
     /**
47 47
      * Number of sections in the form (i.e. number of headers in it)
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
         $this->_obj->requirednote = $form->getRequiredNote();
122 122
         $this->_obj->errors = new StdClass;
123 123
 
124
-        if($this->_collectHidden) {
124
+        if ($this->_collectHidden) {
125 125
             $this->_obj->hidden = '';
126 126
         }
127 127
         $this->_elementIdx = 1;
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
     function renderElement(&$element, $required, $error)
141 141
     {
142 142
         $elObj = $this->_elementToObject($element, $required, $error);
143
-        if(!empty($error)) {
143
+        if (!empty($error)) {
144 144
             $name = $elObj->name;
145 145
             $this->_obj->errors->$name = $error;
146 146
         }
@@ -149,8 +149,8 @@  discard block
 block discarded – undo
149 149
 
150 150
     function renderHidden(&$element)
151 151
     {
152
-        if($this->_collectHidden) {
153
-            $this->_obj->hidden .= $element->toHtml() . "\n";
152
+        if ($this->_collectHidden) {
153
+            $this->_obj->hidden .= $element->toHtml()."\n";
154 154
         } else {
155 155
             $this->renderElement($element, false, null);
156 156
         }
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
     function startGroup(&$group, $required, $error)
160 160
     {
161 161
         $this->_currentGroup = $this->_elementToObject($group, $required, $error);
162
-        if(!empty($error)) {
162
+        if (!empty($error)) {
163 163
             $name = $this->_currentGroup->name;
164 164
             $this->_obj->errors->$name = $error;
165 165
         }
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
      */
183 183
     function _elementToObject(&$element, $required, $error)
184 184
     {
185
-        if($this->_elementType) {
185
+        if ($this->_elementType) {
186 186
             $ret = new $this->_elementType;
187 187
         }
188 188
         $ret->name = $element->getName();
@@ -193,8 +193,8 @@  discard block
 block discarded – undo
193 193
         if (is_array($labels)) {
194 194
             $ret->label = array_shift($labels);
195 195
             foreach ($labels as $key => $label) {
196
-                $key = is_int($key)? $key + 2: $key;
197
-                $ret->{'label_' . $key} = $label;
196
+                $key = is_int($key) ? $key + 2 : $key;
197
+                $ret->{'label_'.$key} = $label;
198 198
             }
199 199
         } else {
200 200
             $ret->label = $labels;
@@ -202,11 +202,11 @@  discard block
 block discarded – undo
202 202
         $ret->required = $required;
203 203
         $ret->error = $error;
204 204
 
205
-        if(isset($this->_elementStyles[$ret->name])) {
205
+        if (isset($this->_elementStyles[$ret->name])) {
206 206
             $ret->style = $this->_elementStyles[$ret->name];
207
-            $ret->styleTemplate = "styles/". $ret->style .".html";
207
+            $ret->styleTemplate = "styles/".$ret->style.".html";
208 208
         }
209
-        if($ret->type == 'group') {
209
+        if ($ret->type == 'group') {
210 210
             $ret->separator = $element->_separator;
211 211
             $ret->elements = array();
212 212
         } else {
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
     function _storeObject($elObj)
226 226
     {
227 227
         $name = $elObj->name;
228
-        if(is_object($this->_currentGroup) && $elObj->type != 'group') {
228
+        if (is_object($this->_currentGroup) && $elObj->type != 'group') {
229 229
             $this->_currentGroup->elements[] = $elObj;
230 230
         } elseif (isset($this->_currentSection)) {
231 231
             $this->_obj->sections[$this->_currentSection]->elements[] = $elObj;
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
236 236
 
237 237
     function setElementStyle($elementName, $styleName = null)
238 238
     {
239
-        if(is_array($elementName)) {
239
+        if (is_array($elementName)) {
240 240
             $this->_elementStyles = array_merge($this->_elementStyles, $elementName);
241 241
         } else {
242 242
             $this->_elementStyles[$elementName] = $styleName;
@@ -329,7 +329,7 @@  discard block
 block discarded – undo
329 329
     */
330 330
     function outputHeader()
331 331
     {
332
-        return "<form " . $this->attributes . ">\n";
332
+        return "<form ".$this->attributes.">\n";
333 333
     }
334 334
 
335 335
    /**
@@ -447,7 +447,7 @@  discard block
 block discarded – undo
447 447
     function outputStyle()
448 448
     {
449 449
         ob_start();
450
-        HTML_Template_Flexy::staticQuickTemplate('styles/' . $this->style . '.html', $this);
450
+        HTML_Template_Flexy::staticQuickTemplate('styles/'.$this->style.'.html', $this);
451 451
         $ret = ob_get_contents();
452 452
         ob_end_clean();
453 453
         return $ret;
Please login to merge, or discard this patch.