@@ -162,8 +162,7 @@ discard block |
||
| 162 | 162 | if ($match[1] == '$this->validationRules') |
| 163 | 163 | { |
| 164 | 164 | $route['body'] = $validationRules; |
| 165 | - } |
|
| 166 | - else |
|
| 165 | + } else |
|
| 167 | 166 | { |
| 168 | 167 | $route['body'] = eval('return ' . str_replace(',\'.$request->get(\'id\')', ',{id}\'', $match[1]) . ';'); |
| 169 | 168 | } |
@@ -173,14 +172,12 @@ discard block |
||
| 173 | 172 | if(strpos($rule, 'unique')) |
| 174 | 173 | { |
| 175 | 174 | $rule = substr($rule, 0, strpos($rule, 'unique') + 6); |
| 176 | - } |
|
| 177 | - elseif(strpos($rule, 'exists')) |
|
| 175 | + } elseif(strpos($rule, 'exists')) |
|
| 178 | 176 | { |
| 179 | 177 | $rule = substr($rule, 0, strpos($rule, 'exists') - 1); |
| 180 | 178 | } |
| 181 | 179 | } |
| 182 | - } |
|
| 183 | - else |
|
| 180 | + } else |
|
| 184 | 181 | { |
| 185 | 182 | $route['body'] = 'conditions'; |
| 186 | 183 | } |
@@ -173,8 +173,7 @@ discard block |
||
| 173 | 173 | if ($request->has('id')) |
| 174 | 174 | { |
| 175 | 175 | $rule = str_replace('{id}', $request->get('id'), $rule); |
| 176 | - } |
|
| 177 | - else |
|
| 176 | + } else |
|
| 178 | 177 | { |
| 179 | 178 | $rule = str_replace(',{id}', '', $rule); |
| 180 | 179 | } |
@@ -252,10 +251,8 @@ discard block |
||
| 252 | 251 | } |
| 253 | 252 | |
| 254 | 253 | if ($isPasswordClient && (in_array($permission, $this->skipPermissionCheck) || \Core::users()->can($permission, $this->model))) |
| 255 | - {} |
|
| 256 | - elseif ( ! $isPasswordClient && $user->tokenCan($this->model . '-' . $permission)) |
|
| 257 | - {} |
|
| 258 | - else |
|
| 254 | + {} elseif ( ! $isPasswordClient && $user->tokenCan($this->model . '-' . $permission)) |
|
| 255 | + {} else |
|
| 259 | 256 | { |
| 260 | 257 | |
| 261 | 258 | \ErrorHandler::noPermissions(); |