Completed
Push — master ( 561c31...ac170c )
by Nazar
04:13
created
core/classes/Page.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * @package   CleverStyle CMS
4
- * @author    Nazar Mokrynskyi <[email protected]>
5
- * @copyright Copyright (c) 2011-2016, Nazar Mokrynskyi
6
- * @license   MIT License, see license.txt
7
- */
3
+	 * @package   CleverStyle CMS
4
+	 * @author    Nazar Mokrynskyi <[email protected]>
5
+	 * @copyright Copyright (c) 2011-2016, Nazar Mokrynskyi
6
+	 * @license   MIT License, see license.txt
7
+	 */
8 8
 namespace cs\User;
9 9
 use
10 10
 	cs\Config,
Please login to merge, or discard this patch.
core/engines/Cache/Memcached.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * @package   CleverStyle CMS
4
- * @author    Nazar Mokrynskyi <[email protected]>
5
- * @copyright Copyright (c) 2011-2016, Nazar Mokrynskyi
6
- * @license   MIT License, see license.txt
7
- */
3
+	 * @package   CleverStyle CMS
4
+	 * @author    Nazar Mokrynskyi <[email protected]>
5
+	 * @copyright Copyright (c) 2011-2016, Nazar Mokrynskyi
6
+	 * @license   MIT License, see license.txt
7
+	 */
8 8
 namespace cs\User;
9 9
 use
10 10
 	cs\Config,
Please login to merge, or discard this patch.
components/modules/System/Packages_manipulation.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * @package    CleverStyle CMS
4
- * @subpackage System module
5
- * @category   modules
6
- * @author     Nazar Mokrynskyi <[email protected]>
7
- * @copyright  Copyright (c) 2015-2016, Nazar Mokrynskyi
8
- * @license    MIT License, see license.txt
9
- */
3
+	 * @package    CleverStyle CMS
4
+	 * @subpackage System module
5
+	 * @category   modules
6
+	 * @author     Nazar Mokrynskyi <[email protected]>
7
+	 * @copyright  Copyright (c) 2015-2016, Nazar Mokrynskyi
8
+	 * @license    MIT License, see license.txt
9
+	 */
10 10
 namespace cs;
11 11
 
12 12
 $Config = Config::instance();
Please login to merge, or discard this patch.
components/modules/Composer/events/uninstalled.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * @package   Composer
4
- * @category  modules
5
- * @author    Nazar Mokrynskyi <[email protected]>
6
- * @copyright Copyright (c) 2016, Nazar Mokrynskyi
7
- * @license   MIT License, see license.txt
8
- */
3
+	 * @package   Composer
4
+	 * @category  modules
5
+	 * @author    Nazar Mokrynskyi <[email protected]>
6
+	 * @copyright Copyright (c) 2016, Nazar Mokrynskyi
7
+	 * @license   MIT License, see license.txt
8
+	 */
9 9
 namespace cs\modules\Composer;
10 10
 use
11 11
 	cs\Event;
Please login to merge, or discard this patch.
components/modules/Composer/00.Composer_autoloader.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * @package   Composer
4
- * @category  modules
5
- * @author    Nazar Mokrynskyi <[email protected]>
6
- * @copyright Copyright (c) 2016, Nazar Mokrynskyi
7
- * @license   MIT License, see license.txt
8
- */
3
+	 * @package   Composer
4
+	 * @category  modules
5
+	 * @author    Nazar Mokrynskyi <[email protected]>
6
+	 * @copyright Copyright (c) 2016, Nazar Mokrynskyi
7
+	 * @license   MIT License, see license.txt
8
+	 */
9 9
 namespace cs\modules\Composer;
10 10
 use
11 11
 	cs\Event;
Please login to merge, or discard this patch.
components/modules/Composer/meta/update/1.0.0-alpha11+cs-1.0.0.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * @package   Composer
4
- * @category  modules
5
- * @author    Nazar Mokrynskyi <[email protected]>
6
- * @copyright Copyright (c) 2016, Nazar Mokrynskyi
7
- * @license   MIT License, see license.txt
8
- */
3
+	 * @package   Composer
4
+	 * @category  modules
5
+	 * @author    Nazar Mokrynskyi <[email protected]>
6
+	 * @copyright Copyright (c) 2016, Nazar Mokrynskyi
7
+	 * @license   MIT License, see license.txt
8
+	 */
9 9
 namespace cs\modules\Composer;
10 10
 use
11 11
 	cs\Event;
Please login to merge, or discard this patch.
components/modules/OAuth2/authorize.php 2 patches
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -1,16 +1,16 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * @package   OAuth2
4
- * @category  modules
5
- * @author    Nazar Mokrynskyi <[email protected]>
6
- * @copyright Copyright (c) 2011-2016, Nazar Mokrynskyi
7
- * @license   MIT License, see license.txt
8
- */
3
+		 * @package   OAuth2
4
+		 * @category  modules
5
+		 * @author    Nazar Mokrynskyi <[email protected]>
6
+		 * @copyright Copyright (c) 2011-2016, Nazar Mokrynskyi
7
+		 * @license   MIT License, see license.txt
8
+		 */
9 9
 /**
10
- * Provides next events:<br>
11
- *  OAuth2/custom_sign_in_page
12
- *  OAuth2/custom_allow_access_page
13
- */
10
+		 * Provides next events:<br>
11
+		 *  OAuth2/custom_sign_in_page
12
+		 *  OAuth2/custom_allow_access_page
13
+		 */
14 14
 namespace cs\modules\OAuth2;
15 15
 use
16 16
 	h,
@@ -43,8 +43,8 @@  discard block
 block discarded – undo
43 43
 $L      = new Prefix('oauth2_');
44 44
 $Page   = Page::instance();
45 45
 /**
46
- * Errors processing
47
- */
46
+	 * Errors processing
47
+	 */
48 48
 if (!isset($_GET['client_id'])) {
49 49
 	error_redirect('invalid_request', 'client_id parameter required');
50 50
 	return;
@@ -112,8 +112,8 @@  discard block
 block discarded – undo
112 112
 	}
113 113
 }
114 114
 /**
115
- * guest_token should return JSON data while all other works with redirects
116
- */
115
+	 * guest_token should return JSON data while all other works with redirects
116
+	 */
117 117
 if ($_GET['response_type'] != 'guest_token') {
118 118
 	if (!isset($_GET['redirect_uri'])) {
119 119
 		$e = new ExitException(
@@ -186,8 +186,8 @@  discard block
 block discarded – undo
186 186
 	}
187 187
 }
188 188
 /**
189
- * Authorization processing
190
- */
189
+	 * Authorization processing
190
+	 */
191 191
 if (isset($_POST['mode'])) {
192 192
 	switch ($_POST['mode']) {
193 193
 		case 'allow':
Please login to merge, or discard this patch.
Switch Indentation   +75 added lines, -75 removed lines patch added patch discarded remove patch
@@ -230,85 +230,85 @@
 block discarded – undo
230 230
 	return;
231 231
 }
232 232
 switch ($_GET['response_type']) {
233
-	case 'code':
234
-		$Response->redirect(
235
-			http_build_url(
236
-				urldecode($redirect_uri),
237
-				[
238
-					'code'  => $code,
239
-					'state' => isset($_GET['state']) ? $_GET['state'] : false
240
-				]
241
-			),
242
-			302
243
-		);
244
-		$Page->Content = '';
245
-		return;
246
-	case 'token':
247
-		$token_data = $OAuth2->get_code($code, $client['id'], $client['secret'], $redirect_uri);
248
-		if ($token_data) {
249
-			unset($token_data['refresh_token']);
233
+		case 'code':
250 234
 			$Response->redirect(
251
-				uri_for_token(
252
-					http_build_url(
253
-						urldecode($redirect_uri),
254
-						array_merge(
255
-							$token_data,
256
-							[
257
-								'state' => isset($_GET['state']) ? $_GET['state'] : false
258
-							]
259
-						)
260
-					)
235
+				http_build_url(
236
+					urldecode($redirect_uri),
237
+					[
238
+						'code'  => $code,
239
+						'state' => isset($_GET['state']) ? $_GET['state'] : false
240
+					]
261 241
 				),
262 242
 				302
263 243
 			);
264 244
 			$Page->Content = '';
265 245
 			return;
266
-		} else {
267
-			error_redirect('server_error', "Server can't get token data, try later");
268
-			return;
269
-		}
270
-	case 'guest_token':
271
-		$Response
272
-			->header('cache-control', 'no-store')
273
-			->header('pragma', 'no-cache');
274
-		interface_off();
275
-		if ($User->user()) {
276
-			$e = new ExitException(
277
-				[
278
-					'access_denied',
279
-					'Only guests, not users allowed to access this response_type'
280
-				],
281
-				403
282
-			);
283
-			$e->setJson();
284
-			throw $e;
285
-		}
286
-		$code = $OAuth2->add_code($client['id'], 'token', urldecode($_GET['redirect_uri']));
287
-		if (!$code) {
288
-			$e = new ExitException(
289
-				[
290
-					'server_error',
291
-					"Server can't generate code, try later"
292
-				],
293
-				500
294
-			);
295
-			$e->setJson();
296
-			throw $e;
297
-		}
298
-		$token_data = $OAuth2->get_code($code, $client['id'], $client['secret'], urldecode($_GET['redirect_uri']));
299
-		if ($token_data) {
300
-			unset($token_data['refresh_token']);
301
-			$Page->json($token_data);
302
-			return;
303
-		} else {
304
-			$e = new ExitException(
305
-				[
306
-					'server_error',
307
-					"Server can't get token data, try later"
308
-				],
309
-				500
310
-			);
311
-			$e->setJson();
312
-			throw $e;
313
-		}
246
+		case 'token':
247
+			$token_data = $OAuth2->get_code($code, $client['id'], $client['secret'], $redirect_uri);
248
+			if ($token_data) {
249
+				unset($token_data['refresh_token']);
250
+				$Response->redirect(
251
+					uri_for_token(
252
+						http_build_url(
253
+							urldecode($redirect_uri),
254
+							array_merge(
255
+								$token_data,
256
+								[
257
+									'state' => isset($_GET['state']) ? $_GET['state'] : false
258
+								]
259
+							)
260
+						)
261
+					),
262
+					302
263
+				);
264
+				$Page->Content = '';
265
+				return;
266
+			} else {
267
+				error_redirect('server_error', "Server can't get token data, try later");
268
+				return;
269
+			}
270
+		case 'guest_token':
271
+			$Response
272
+				->header('cache-control', 'no-store')
273
+				->header('pragma', 'no-cache');
274
+			interface_off();
275
+			if ($User->user()) {
276
+				$e = new ExitException(
277
+					[
278
+						'access_denied',
279
+						'Only guests, not users allowed to access this response_type'
280
+					],
281
+					403
282
+				);
283
+				$e->setJson();
284
+				throw $e;
285
+			}
286
+			$code = $OAuth2->add_code($client['id'], 'token', urldecode($_GET['redirect_uri']));
287
+			if (!$code) {
288
+				$e = new ExitException(
289
+					[
290
+						'server_error',
291
+						"Server can't generate code, try later"
292
+					],
293
+					500
294
+				);
295
+				$e->setJson();
296
+				throw $e;
297
+			}
298
+			$token_data = $OAuth2->get_code($code, $client['id'], $client['secret'], urldecode($_GET['redirect_uri']));
299
+			if ($token_data) {
300
+				unset($token_data['refresh_token']);
301
+				$Page->json($token_data);
302
+				return;
303
+			} else {
304
+				$e = new ExitException(
305
+					[
306
+						'server_error',
307
+						"Server can't get token data, try later"
308
+					],
309
+					500
310
+				);
311
+				$e->setJson();
312
+				throw $e;
313
+			}
314 314
 }
Please login to merge, or discard this patch.
core/classes/h/Base.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * @package   CleverStyle CMS
4
- * @author    Nazar Mokrynskyi <[email protected]>
5
- * @copyright Copyright (c) 2011-2016, Nazar Mokrynskyi
6
- * @license   MIT License, see license.txt
7
- */
3
+	 * @package   CleverStyle CMS
4
+	 * @author    Nazar Mokrynskyi <[email protected]>
5
+	 * @copyright Copyright (c) 2011-2016, Nazar Mokrynskyi
6
+	 * @license   MIT License, see license.txt
7
+	 */
8 8
 namespace cs\User;
9 9
 use
10 10
 	cs\Config,
Please login to merge, or discard this patch.
components/modules/System/meta/update/3.153.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * @package    CleverStyle CMS
4
- * @subpackage System module
5
- * @category   modules
6
- * @author     Nazar Mokrynskyi <[email protected]>
7
- * @copyright  Copyright (c) 2015-2016, Nazar Mokrynskyi
8
- * @license    MIT License, see license.txt
9
- */
3
+	 * @package    CleverStyle CMS
4
+	 * @subpackage System module
5
+	 * @category   modules
6
+	 * @author     Nazar Mokrynskyi <[email protected]>
7
+	 * @copyright  Copyright (c) 2015-2016, Nazar Mokrynskyi
8
+	 * @license    MIT License, see license.txt
9
+	 */
10 10
 namespace cs;
11 11
 
12 12
 $Config = Config::instance();
Please login to merge, or discard this patch.