@@ -137,6 +137,9 @@ |
||
| 137 | 137 | } |
| 138 | 138 | } |
| 139 | 139 | |
| 140 | + /** |
|
| 141 | + * @param string $type |
|
| 142 | + */ |
|
| 140 | 143 | public function html($type, array $options) |
| 141 | 144 | { |
| 142 | 145 | if ($type == 'links') { |
@@ -426,7 +426,7 @@ |
||
| 426 | 426 | * @param string $table The table to take $action on.. |
| 427 | 427 | * @param string|array $values The appropriate values for a given query. |
| 428 | 428 | * |
| 429 | - * @return array|false|int |
|
| 429 | + * @return string |
|
| 430 | 430 | */ |
| 431 | 431 | |
| 432 | 432 | private function exec($action, $table, $values) |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | |
| 178 | 178 | return Asset::dispatch('xml', array($last_modified => implode("\n", $xml), 'expires' => $expires)); |
| 179 | 179 | } else { |
| 180 | - $page->filter('response', function ($page, $response, $type) { |
|
| 180 | + $page->filter('response', function($page, $response, $type) { |
|
| 181 | 181 | if ($type == 'html') { |
| 182 | 182 | $sitemap = new Component(); |
| 183 | 183 | $sitemap->delete($page->url['path']); |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | if ($page->url['format'] != 'html') { |
| 205 | 205 | return; |
| 206 | 206 | } |
| 207 | - $page->filter('response', function ($page, $response) use ($category, $content, $save) { |
|
| 207 | + $page->filter('response', function($page, $response) use ($category, $content, $save) { |
|
| 208 | 208 | if (empty($page->url['query'])) { |
| 209 | 209 | $sitemap = new Component(); |
| 210 | 210 | $sitemap->upsert($category, array_merge(array( |
@@ -51,6 +51,9 @@ discard block |
||
| 51 | 51 | } |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | + /** |
|
| 55 | + * @param string $table |
|
| 56 | + */ |
|
| 54 | 57 | public function create($table, array $fields, $index = array(), array $changes = array()) |
| 55 | 58 | { |
| 56 | 59 | $columns = array(); |
@@ -107,6 +110,10 @@ discard block |
||
| 107 | 110 | } |
| 108 | 111 | |
| 109 | 112 | // http://stackoverflow.com/questions/396748/ordering-by-the-order-of-values-in-a-sql-in-clause |
| 113 | + |
|
| 114 | + /** |
|
| 115 | + * @param string $field |
|
| 116 | + */ |
|
| 110 | 117 | public function orderIn($field, array $ids) |
| 111 | 118 | { |
| 112 | 119 | if (empty($ids)) { |
@@ -170,6 +177,9 @@ discard block |
||
| 170 | 177 | $db->connection()->close(); |
| 171 | 178 | } |
| 172 | 179 | |
| 180 | + /** |
|
| 181 | + * @param string $columns |
|
| 182 | + */ |
|
| 173 | 183 | private function alter($table, array $fields, array $changes, $columns) |
| 174 | 184 | { |
| 175 | 185 | $map = array(); |
@@ -238,6 +248,9 @@ discard block |
||
| 238 | 248 | } |
| 239 | 249 | } |
| 240 | 250 | |
| 251 | + /** |
|
| 252 | + * @param string $master |
|
| 253 | + */ |
|
| 241 | 254 | public function info($master) // only make public so that $this->fts can call it |
| 242 | 255 | { |
| 243 | 256 | if ($master == 'settings') { |
@@ -79,6 +79,9 @@ discard block |
||
| 79 | 79 | return $html.'</table>'; |
| 80 | 80 | } |
| 81 | 81 | |
| 82 | + /** |
|
| 83 | + * @param string $vars |
|
| 84 | + */ |
|
| 82 | 85 | protected function values($vars) |
| 83 | 86 | { |
| 84 | 87 | if (is_array($vars)) { |
@@ -95,6 +98,9 @@ discard block |
||
| 95 | 98 | return $attributes; |
| 96 | 99 | } |
| 97 | 100 | |
| 101 | + /** |
|
| 102 | + * @param string $section |
|
| 103 | + */ |
|
| 98 | 104 | private function wrapUp($section) |
| 99 | 105 | { |
| 100 | 106 | $html = $this->cell; |
@@ -91,6 +91,9 @@ discard block |
||
| 91 | 91 | return $this->fetchSmarty($index['file'], $vars); |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | + /** |
|
| 95 | + * @param string $name |
|
| 96 | + */ |
|
| 94 | 97 | public function globalVars($name, $value = null) |
| 95 | 98 | { |
| 96 | 99 | $vars = (is_array($name)) ? $name : array($name => $value); |
@@ -103,6 +106,9 @@ discard block |
||
| 103 | 106 | } |
| 104 | 107 | } |
| 105 | 108 | |
| 109 | + /** |
|
| 110 | + * @param string $name |
|
| 111 | + */ |
|
| 106 | 112 | public function addPageMethod($name, $function) |
| 107 | 113 | { |
| 108 | 114 | if (!is_callable($function, false, $method)) { |
@@ -79,8 +79,8 @@ |
||
| 79 | 79 | $config = array(); |
| 80 | 80 | $previous = ''; |
| 81 | 81 | foreach (explode('/', substr($theme, 0, -1)) as $folder) { |
| 82 | - $previous .= $folder . '/'; |
|
| 83 | - $file = $this->folder . $previous . 'config.yml'; |
|
| 82 | + $previous .= $folder.'/'; |
|
| 83 | + $file = $this->folder.$previous.'config.yml'; |
|
| 84 | 84 | if (is_file($file)) { // any child values will override the parents |
| 85 | 85 | $config = array_merge($config, (array) Yaml::parse(file_get_contents($file))); |
| 86 | 86 | } |
@@ -119,7 +119,7 @@ |
||
| 119 | 119 | * |
| 120 | 120 | * Your $field names can be an array by adding brackets to the end ie. 'name[]'. They can also be multi-dimensional arrays such as 'name[first]', or 'name[players][]', or 'name[parent][child]', etc. The important thing to remember is that you must always use the exact name given here when referencing them in other methods. |
| 121 | 121 | * |
| 122 | - * @param string|array $rules A pipe delimited set (or an array) of rules to validate and filter the $field with. You can also specify custom messages by making this an ``array($rule => $message, ...)``. Parameters are comma-delimited, and placed within '**[]**' two brackets. The available options are: |
|
| 122 | + * @param string $rules A pipe delimited set (or an array) of rules to validate and filter the $field with. You can also specify custom messages by making this an ``array($rule => $message, ...)``. Parameters are comma-delimited, and placed within '**[]**' two brackets. The available options are: |
|
| 123 | 123 | * |
| 124 | 124 | * - '**remote[rule]**' - Set ``$form->rules['rule'] = function($value){}`` to determine the validity of a submitted value. The function should return a boolean true or false. |
| 125 | 125 | * - '**default**' - A default value if the field is empty, or not even set. |
@@ -866,14 +866,14 @@ |
||
| 866 | 866 | return count($words[0]); |
| 867 | 867 | } |
| 868 | 868 | |
| 869 | - /** |
|
| 870 | - * A helper method to validate a $value via a callable $param. |
|
| 871 | - * |
|
| 872 | - * @param string $value |
|
| 873 | - * @param string $param |
|
| 874 | - * |
|
| 875 | - * @return string |
|
| 876 | - */ |
|
| 869 | + /** |
|
| 870 | + * A helper method to validate a $value via a callable $param. |
|
| 871 | + * |
|
| 872 | + * @param string $value |
|
| 873 | + * @param string $param |
|
| 874 | + * |
|
| 875 | + * @return string |
|
| 876 | + */ |
|
| 877 | 877 | private function remote($value, $param) |
| 878 | 878 | { |
| 879 | 879 | $value = (isset($this->rules[$param]) && is_callable($this->rules[$param])) ? $this->rules[$param]($value) : false; |
@@ -385,9 +385,9 @@ |
||
| 385 | 385 | if ($this->submitted) { |
| 386 | 386 | $submitted = array(); |
| 387 | 387 | foreach ($this->data as $field => $data) { |
| 388 | - $value =& $submitted; |
|
| 388 | + $value = & $submitted; |
|
| 389 | 389 | foreach ($data['field'] as $index) { |
| 390 | - $value =& $value[$index]; |
|
| 390 | + $value = & $value[$index]; |
|
| 391 | 391 | } |
| 392 | 392 | $value = $this->values[$field]; |
| 393 | 393 | if (isset($data['rules']['required']) && empty($value)) { |