@@ -608,7 +608,7 @@ |
||
608 | 608 | * |
609 | 609 | * @param integer $userId User ID |
610 | 610 | * |
611 | - * @return array |
|
611 | + * @return integer[] |
|
612 | 612 | */ |
613 | 613 | public function getUserGroups($userId) |
614 | 614 | { |
@@ -138,16 +138,16 @@ discard block |
||
138 | 138 | return $filename; |
139 | 139 | } |
140 | 140 | |
141 | - /** |
|
142 | - * Clean the filename of any uploaded file by the user and force an error |
|
143 | - * when calling is_uploaded_file($_FILES[key]['tmp_name']) if the cleanup goes wrong. |
|
144 | - */ |
|
145 | - private static function _cleanFilenames() |
|
146 | - { |
|
147 | - reset($_FILES); |
|
148 | - foreach ($_FILES as $key => $value) { |
|
149 | - if (is_array($_FILES[$key]['name'])) { |
|
150 | - reset($_FILES[$key]['name']); |
|
141 | + /** |
|
142 | + * Clean the filename of any uploaded file by the user and force an error |
|
143 | + * when calling is_uploaded_file($_FILES[key]['tmp_name']) if the cleanup goes wrong. |
|
144 | + */ |
|
145 | + private static function _cleanFilenames() |
|
146 | + { |
|
147 | + reset($_FILES); |
|
148 | + foreach ($_FILES as $key => $value) { |
|
149 | + if (is_array($_FILES[$key]['name'])) { |
|
150 | + reset($_FILES[$key]['name']); |
|
151 | 151 | // We have a multiple upload with the same name for <input /> |
152 | 152 | while (list($idx, $value2) = each($_FILES[$key]['name'])) { |
153 | 153 | $_FILES[$key]['name'][$idx] = self::_basicFilenameClean($_FILES[$key]['name'][$idx]); |
@@ -158,19 +158,19 @@ discard block |
||
158 | 158 | $_FILES[$key]['error'][$idx] = UPLOAD_ERR_NO_FILE; |
159 | 159 | } |
160 | 160 | } |
161 | - reset($_FILES[$key]['name']); |
|
162 | - } else { |
|
163 | - $_FILES[$key]['name'] = self::_basicFilenameClean($_FILES[$key]['name']); |
|
164 | - if ('' == $_FILES[$key]['name']) { |
|
165 | - $_FILES[$key]['type'] = ''; |
|
166 | - $_FILES[$key]['tmp_name'] = ''; |
|
167 | - $_FILES[$key]['size'] = 0; |
|
168 | - $_FILES[$key]['error'] = UPLOAD_ERR_NO_FILE; |
|
169 | - } |
|
170 | - } |
|
171 | - } |
|
172 | - reset($_FILES); |
|
173 | - } |
|
161 | + reset($_FILES[$key]['name']); |
|
162 | + } else { |
|
163 | + $_FILES[$key]['name'] = self::_basicFilenameClean($_FILES[$key]['name']); |
|
164 | + if ('' == $_FILES[$key]['name']) { |
|
165 | + $_FILES[$key]['type'] = ''; |
|
166 | + $_FILES[$key]['tmp_name'] = ''; |
|
167 | + $_FILES[$key]['size'] = 0; |
|
168 | + $_FILES[$key]['error'] = UPLOAD_ERR_NO_FILE; |
|
169 | + } |
|
170 | + } |
|
171 | + } |
|
172 | + reset($_FILES); |
|
173 | + } |
|
174 | 174 | |
175 | 175 | /** |
176 | 176 | * Cleans a html string from some xss issues. |