@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | * @access public |
84 | 84 | * @return void |
85 | 85 | */ |
86 | - function HTML_QuickForm_hierselect($elementName=null, $elementLabel=null, $attributes=null, $separator=null) |
|
86 | + function HTML_QuickForm_hierselect($elementName = null, $elementLabel = null, $attributes = null, $separator = null) |
|
87 | 87 | { |
88 | 88 | $this->HTML_QuickForm_element($elementName, $elementLabel, $attributes); |
89 | 89 | $this->_persistantFreeze = true; |
@@ -154,8 +154,8 @@ discard block |
||
154 | 154 | // setDefaults has probably been called before this function |
155 | 155 | // check if all elements have been created |
156 | 156 | $totalNbElements = count($this->_options); |
157 | - for ($i = $this->_nbElements; $i < $totalNbElements; $i ++) { |
|
158 | - $this->_elements[] =& new HTML_QuickForm_select($i, null, array(), $this->getAttributes()); |
|
157 | + for ($i = $this->_nbElements; $i < $totalNbElements; $i++) { |
|
158 | + $this->_elements[] = & new HTML_QuickForm_select($i, null, array(), $this->getAttributes()); |
|
159 | 159 | $this->_nbElements++; |
160 | 160 | } |
161 | 161 | } |
@@ -209,8 +209,8 @@ discard block |
||
209 | 209 | // setDefaults has probably been called before this function |
210 | 210 | // check if all elements have been created |
211 | 211 | $totalNbElements = 2; |
212 | - for ($i = $this->_nbElements; $i < $totalNbElements; $i ++) { |
|
213 | - $this->_elements[] =& new HTML_QuickForm_select($i, null, array(), $this->getAttributes()); |
|
212 | + for ($i = $this->_nbElements; $i < $totalNbElements; $i++) { |
|
213 | + $this->_elements[] = & new HTML_QuickForm_select($i, null, array(), $this->getAttributes()); |
|
214 | 214 | $this->_nbElements++; |
215 | 215 | } |
216 | 216 | } |
@@ -233,12 +233,12 @@ discard block |
||
233 | 233 | foreach (array_keys($this->_elements) AS $key) { |
234 | 234 | $array = eval("return isset(\$this->_options[{$key}]{$toLoad})? \$this->_options[{$key}]{$toLoad}: null;"); |
235 | 235 | if (is_array($array)) { |
236 | - $select =& $this->_elements[$key]; |
|
236 | + $select = & $this->_elements[$key]; |
|
237 | 237 | $select->_options = array(); |
238 | 238 | $select->loadArray($array); |
239 | 239 | |
240 | - $value = is_array($v = $select->getValue()) ? $v[0] : key($array); |
|
241 | - $toLoad .= '[\'' . str_replace(array('\\', '\''), array('\\\\', '\\\''), $value) . '\']'; |
|
240 | + $value = is_array($v = $select->getValue()) ? $v[0] : key($array); |
|
241 | + $toLoad .= '[\''.str_replace(array('\\', '\''), array('\\\\', '\\\''), $value).'\']'; |
|
242 | 242 | } |
243 | 243 | } |
244 | 244 | } // end func _setOptions |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | function _createElements() |
278 | 278 | { |
279 | 279 | for ($i = 0; $i < $this->_nbElements; $i++) { |
280 | - $this->_elements[] =& new HTML_QuickForm_select($i, null, array(), $this->getAttributes()); |
|
280 | + $this->_elements[] = & new HTML_QuickForm_select($i, null, array(), $this->getAttributes()); |
|
281 | 281 | } |
282 | 282 | } // end func _createElements |
283 | 283 | |
@@ -292,10 +292,10 @@ discard block |
||
292 | 292 | $keys = array_keys($this->_elements); |
293 | 293 | $onChange = array(); |
294 | 294 | for ($i = 0; $i < count($keys) - 1; $i++) { |
295 | - $select =& $this->_elements[$keys[$i]]; |
|
295 | + $select = & $this->_elements[$keys[$i]]; |
|
296 | 296 | $onChange[$i] = $select->getAttribute('onchange'); |
297 | 297 | $select->updateAttributes( |
298 | - array('onchange' => '_hs_swapOptions(this.form, \'' . $this->_escapeString($this->getName()) . '\', ' . $keys[$i] . ');' . $onChange[$i]) |
|
298 | + array('onchange' => '_hs_swapOptions(this.form, \''.$this->_escapeString($this->getName()).'\', '.$keys[$i].');'.$onChange[$i]) |
|
299 | 299 | ); |
300 | 300 | } |
301 | 301 | |
@@ -433,37 +433,36 @@ discard block |
||
433 | 433 | for ($i = 1; $i < $this->_nbElements; $i++) { |
434 | 434 | $jsParts[] = $this->_convertArrayToJavascript($this->_options[$i]); |
435 | 435 | } |
436 | - $this->_js .= "\n_hs_options['" . $this->_escapeString($this->getName()) . "'] = [\n" . |
|
437 | - implode(",\n", $jsParts) . |
|
436 | + $this->_js .= "\n_hs_options['".$this->_escapeString($this->getName())."'] = [\n". |
|
437 | + implode(",\n", $jsParts). |
|
438 | 438 | "\n];\n"; |
439 | 439 | // default value; if we don't actually have any values yet just use |
440 | 440 | // the first option (for single selects) or empty array (for multiple) |
441 | 441 | $values = array(); |
442 | 442 | foreach (array_keys($this->_elements) as $key) { |
443 | 443 | if (is_array($v = $this->_elements[$key]->getValue())) { |
444 | - $values[] = count($v) > 1? $v: $v[0]; |
|
444 | + $values[] = count($v) > 1 ? $v : $v[0]; |
|
445 | 445 | } else { |
446 | 446 | // XXX: accessing the supposedly private _options array |
447 | - $values[] = $this->_elements[$key]->getMultiple() || empty($this->_elements[$key]->_options[0])? |
|
448 | - array(): |
|
449 | - $this->_elements[$key]->_options[0]['attr']['value']; |
|
447 | + $values[] = $this->_elements[$key]->getMultiple() || empty($this->_elements[$key]->_options[0]) ? |
|
448 | + array() : $this->_elements[$key]->_options[0]['attr']['value']; |
|
450 | 449 | } |
451 | 450 | } |
452 | - $this->_js .= "_hs_defaults['" . $this->_escapeString($this->getName()) . "'] = " . |
|
453 | - $this->_convertArrayToJavascript($values, false) . ";\n"; |
|
451 | + $this->_js .= "_hs_defaults['".$this->_escapeString($this->getName())."'] = ". |
|
452 | + $this->_convertArrayToJavascript($values, false).";\n"; |
|
454 | 453 | } |
455 | 454 | include_once('HTML/QuickForm/Renderer/Default.php'); |
456 | - $renderer =& new HTML_QuickForm_Renderer_Default(); |
|
455 | + $renderer = & new HTML_QuickForm_Renderer_Default(); |
|
457 | 456 | $renderer->setElementTemplate('{element}'); |
458 | 457 | parent::accept($renderer); |
459 | 458 | |
460 | 459 | if (!empty($onChange)) { |
461 | - $keys = array_keys($this->_elements); |
|
460 | + $keys = array_keys($this->_elements); |
|
462 | 461 | for ($i = 0; $i < count($keys) - 1; $i++) { |
463 | 462 | $this->_elements[$keys[$i]]->updateAttributes(array('onchange' => $onChange[$i])); |
464 | 463 | } |
465 | 464 | } |
466 | - return (empty($this->_js)? '': "<script type=\"text/javascript\">\n//<![CDATA[\n" . $this->_js . "//]]>\n</script>") . |
|
465 | + return (empty($this->_js) ? '' : "<script type=\"text/javascript\">\n//<![CDATA[\n".$this->_js."//]]>\n</script>"). |
|
467 | 466 | $renderer->toHtml(); |
468 | 467 | } // end func toHtml |
469 | 468 | |
@@ -491,12 +490,12 @@ discard block |
||
491 | 490 | $onReset = $caller->getAttribute('onreset'); |
492 | 491 | if (strlen($onReset)) { |
493 | 492 | if (strpos($onReset, '_hs_setupOnReset')) { |
494 | - $caller->updateAttributes(array('onreset' => str_replace('_hs_setupOnReset(this, [', "_hs_setupOnReset(this, ['" . $this->_escapeString($this->getName()) . "', ", $onReset))); |
|
493 | + $caller->updateAttributes(array('onreset' => str_replace('_hs_setupOnReset(this, [', "_hs_setupOnReset(this, ['".$this->_escapeString($this->getName())."', ", $onReset))); |
|
495 | 494 | } else { |
496 | - $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()) . "']); } ")); |
|
495 | + $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())."']); } ")); |
|
497 | 496 | } |
498 | 497 | } else { |
499 | - $caller->updateAttributes(array('onreset' => "if (typeof _hs_setupOnReset != 'undefined') { return _hs_setupOnReset(this, ['" . $this->_escapeString($this->getName()) . "']); } ")); |
|
498 | + $caller->updateAttributes(array('onreset' => "if (typeof _hs_setupOnReset != 'undefined') { return _hs_setupOnReset(this, ['".$this->_escapeString($this->getName())."']); } ")); |
|
500 | 499 | } |
501 | 500 | } |
502 | 501 | return $ret; |
@@ -521,7 +520,7 @@ discard block |
||
521 | 520 | } else { |
522 | 521 | $items = array(); |
523 | 522 | foreach ($array as $key => $val) { |
524 | - $item = $assoc? "'" . $this->_escapeString($key) . "': ": ''; |
|
523 | + $item = $assoc ? "'".$this->_escapeString($key)."': " : ''; |
|
525 | 524 | if (is_array($val)) { |
526 | 525 | $item .= $this->_convertArrayToJavascript($val, $assoc); |
527 | 526 | } else { |
@@ -531,7 +530,7 @@ discard block |
||
531 | 530 | } |
532 | 531 | } |
533 | 532 | $js = implode(', ', $items); |
534 | - return $assoc? '{ ' . $js . ' }': '[' . $js . ']'; |
|
533 | + return $assoc ? '{ '.$js.' }' : '['.$js.']'; |
|
535 | 534 | } |
536 | 535 | |
537 | 536 | // }}} |
@@ -551,7 +550,7 @@ discard block |
||
551 | 550 | } elseif (is_int($val) || is_double($val)) { |
552 | 551 | return $val; |
553 | 552 | } elseif (is_string($val)) { |
554 | - return "'" . $this->_escapeString($val) . "'"; |
|
553 | + return "'".$this->_escapeString($val)."'"; |
|
555 | 554 | } elseif (is_null($val)) { |
556 | 555 | return 'null'; |
557 | 556 | } else { |
@@ -572,7 +571,7 @@ discard block |
||
572 | 571 | */ |
573 | 572 | function _escapeString($str) |
574 | 573 | { |
575 | - return strtr($str,array( |
|
574 | + return strtr($str, array( |
|
576 | 575 | "\r" => '\r', |
577 | 576 | "\n" => '\n', |
578 | 577 | "\t" => '\t', |
@@ -247,7 +247,7 @@ |
||
247 | 247 | unset($attr['name']); |
248 | 248 | |
249 | 249 | $html = $this->_getTabs() |
250 | - . '<span' . $this->_getAttrString($attr) . '>' |
|
250 | + . '<span'.$this->_getAttrString($attr).'>' |
|
251 | 251 | . htmlspecialchars($captcha) |
252 | 252 | . '</span>'; |
253 | 253 | return $html; |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | * @access public |
92 | 92 | * @return void |
93 | 93 | */ |
94 | - public function __construct($elementName=null, $elementLabel=null, $elements=null, $separator=null, $appendName = true) |
|
94 | + public function __construct($elementName = null, $elementLabel = null, $elements = null, $separator = null, $appendName = true) |
|
95 | 95 | { |
96 | 96 | parent::__construct($elementName, $elementLabel); |
97 | 97 | $this->_type = 'group'; |
@@ -174,13 +174,13 @@ discard block |
||
174 | 174 | { |
175 | 175 | $value = null; |
176 | 176 | foreach (array_keys($this->_elements) as $key) { |
177 | - $element =& $this->_elements[$key]; |
|
177 | + $element = & $this->_elements[$key]; |
|
178 | 178 | switch ($element->getType()) { |
179 | 179 | case 'radio': |
180 | - $v = $element->getChecked()? $element->getValue(): null; |
|
180 | + $v = $element->getChecked() ? $element->getValue() : null; |
|
181 | 181 | break; |
182 | 182 | case 'checkbox': |
183 | - $v = $element->getChecked()? true: null; |
|
183 | + $v = $element->getChecked() ? true : null; |
|
184 | 184 | break; |
185 | 185 | default: |
186 | 186 | $v = $element->getValue(); |
@@ -191,7 +191,7 @@ discard block |
||
191 | 191 | $value = $v; |
192 | 192 | } else { |
193 | 193 | if (!is_array($value)) { |
194 | - $value = is_null($value)? array(): array($value); |
|
194 | + $value = is_null($value) ? array() : array($value); |
|
195 | 195 | } |
196 | 196 | if ('' === $elementName) { |
197 | 197 | $value[] = $v; |
@@ -360,9 +360,9 @@ discard block |
||
360 | 360 | if (is_null($elementName)) { |
361 | 361 | $this->_elements[$key]->setName($this->getName()); |
362 | 362 | } elseif ('' === $elementName) { |
363 | - $this->_elements[$key]->setName($this->getName() . '[' . $key . ']'); |
|
363 | + $this->_elements[$key]->setName($this->getName().'['.$key.']'); |
|
364 | 364 | } else { |
365 | - $this->_elements[$key]->setName($this->getName() . '[' . $elementName . ']'); |
|
365 | + $this->_elements[$key]->setName($this->getName().'['.$elementName.']'); |
|
366 | 366 | } |
367 | 367 | } |
368 | 368 | $this->_elements[$key]->onQuickFormEvent('updateValue', $arg, $caller); |
@@ -393,12 +393,12 @@ discard block |
||
393 | 393 | $renderer->startGroup($this, $required, $error); |
394 | 394 | $name = $this->getName(); |
395 | 395 | foreach (array_keys($this->_elements) as $key) { |
396 | - $element =& $this->_elements[$key]; |
|
396 | + $element = & $this->_elements[$key]; |
|
397 | 397 | |
398 | 398 | if ($this->_appendName) { |
399 | 399 | $elementName = $element->getName(); |
400 | 400 | if (isset($elementName)) { |
401 | - $element->setName($name . '['. (strlen($elementName)? $elementName: $key) .']'); |
|
401 | + $element->setName($name.'['.(strlen($elementName) ? $elementName : $key).']'); |
|
402 | 402 | } else { |
403 | 403 | $element->setName($name); |
404 | 404 | } |
@@ -429,9 +429,9 @@ discard block |
||
429 | 429 | if (is_null($elementName)) { |
430 | 430 | $this->_elements[$key]->setName($this->getName()); |
431 | 431 | } elseif ('' === $elementName) { |
432 | - $this->_elements[$key]->setName($this->getName() . '[' . $key . ']'); |
|
432 | + $this->_elements[$key]->setName($this->getName().'['.$key.']'); |
|
433 | 433 | } else { |
434 | - $this->_elements[$key]->setName($this->getName() . '[' . $elementName . ']'); |
|
434 | + $this->_elements[$key]->setName($this->getName().'['.$elementName.']'); |
|
435 | 435 | } |
436 | 436 | } |
437 | 437 | $v = $this->_elements[$key]->exportValue($submitValues, $assoc); |
@@ -26,7 +26,7 @@ |
||
26 | 26 | * @return void |
27 | 27 | * @throws |
28 | 28 | */ |
29 | - function HTML_QuickForm_email($elementName=null, $elementLabel=null, $attributes=null) |
|
29 | + function HTML_QuickForm_email($elementName = null, $elementLabel = null, $attributes = null) |
|
30 | 30 | { |
31 | 31 | parent::__construct($elementName, $elementLabel, $attributes); |
32 | 32 | $this->setType('email'); |
@@ -69,7 +69,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 | } |
@@ -35,8 +35,8 @@ discard block |
||
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 |
||
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'); |
@@ -45,13 +45,13 @@ |
||
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]; |
@@ -35,8 +35,8 @@ discard block |
||
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 |
||
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'); |
@@ -38,15 +38,15 @@ |
||
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 { |