nazar-pc / CleverStyle-Framework

components/modules/Http_server/run_server.php

Spacing +2 added lines, -2 removed lines

@@ -11,8 +11,8 @@
 /**
  * Time of start of execution, is used as current time
  */
-define('MICROTIME', microtime(true));         //Time in seconds (float)
-define('TIME', floor(MICROTIME));             //Time in seconds (integer)
+define('MICROTIME', microtime(true)); //Time in seconds (float)
+define('TIME', floor(MICROTIME)); //Time in seconds (integer)
 define('DIR', realpath(__DIR__.'/../../..')); //Root directory
 chdir(DIR);
 $async = false;

Indentation +10 added lines, -10 removed lines

@@ -1,16 +1,16 @@ 
 <?php
 /**
- * @package   Http server
- * @category  modules
- * @author    Nazar Mokrynskyi <nazar@mokrynskyi.com>
- * @copyright Copyright (c) 2015-2016, Nazar Mokrynskyi
- * @license   MIT License, see license.txt
- */
+	 * @package   Http server
+	 * @category  modules
+	 * @author    Nazar Mokrynskyi <nazar@mokrynskyi.com>
+	 * @copyright Copyright (c) 2015-2016, Nazar Mokrynskyi
+	 * @license   MIT License, see license.txt
+	 */
 use
 	cs\modules\Http_server\Request;
 /**
- * Time of start of execution, is used as current time
- */
+	 * Time of start of execution, is used as current time
+	 */
 define('MICROTIME', microtime(true));         //Time in seconds (float)
 define('TIME', floor(MICROTIME));             //Time in seconds (integer)
 define('DIR', realpath(__DIR__.'/../../..')); //Root directory
@@ -24,8 +24,8 @@ 
 }
 require_once __DIR__.'/custom_loader.php';
 /**
- * Manually require composer autoloader because otherwise it will be included much later
- */
+	 * Manually require composer autoloader because otherwise it will be included much later
+	 */
 require_once STORAGE.'/Composer/vendor/autoload.php';
 $loop   = React\EventLoop\Factory::create();
 $socket = new React\Socket\Server($loop);

components/modules/HybridAuth/events/enabled.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 						return strtolower($provider);
 				}
 			};
-			$providers     = [];
+			$providers = [];
 			foreach ($Config->module('HybridAuth')->providers as $provider => $provider_settings) {
 				if ($provider_settings['enabled']) {
 					$providers[$provider] = [

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * @package   HybridAuth
- * @category  modules
- * @author    Nazar Mokrynskyi <nazar@mokrynskyi.com>
- * @copyright Copyright (c) 2012-2016, Nazar Mokrynskyi
- * @license   MIT License, see license.txt
- */
+	 * @package   HybridAuth
+	 * @category  modules
+	 * @author    Nazar Mokrynskyi <nazar@mokrynskyi.com>
+	 * @copyright Copyright (c) 2012-2016, Nazar Mokrynskyi
+	 * @license   MIT License, see license.txt
+	 */
 namespace	cs;
 Event::instance()->on(
 	'admin/System/components/modules/install/after',

components/modules/HybridAuth/events/uninstalled.php

Spacing +1 added lines, -1 removed lines

@@ -13,6 +13,6 @@
 		if ($data['name'] != 'HybridAuth') {
 			return;
 		}
-		Config::instance()->module('HybridAuth')->providers	= [];
+		Config::instance()->module('HybridAuth')->providers = [];
 	}
 );

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * @package   HybridAuth
- * @category  modules
- * @author    Nazar Mokrynskyi <nazar@mokrynskyi.com>
- * @copyright Copyright (c) 2012-2016, Nazar Mokrynskyi
- * @license   MIT License, see license.txt
- */
+	 * @package   HybridAuth
+	 * @category  modules
+	 * @author    Nazar Mokrynskyi <nazar@mokrynskyi.com>
+	 * @copyright Copyright (c) 2012-2016, Nazar Mokrynskyi
+	 * @license   MIT License, see license.txt
+	 */
 namespace	cs;
 Event::instance()->on(
 	'admin/System/components/modules/install/after',

components/modules/OAuth2/authorize.php

Switch Indentation +75 added lines, -75 removed lines

@@ -233,86 +233,86 @@
 	return;
 }
 switch ($_GET['response_type']) {
-	case 'code':
-		_header(
-			'Location: '.http_build_url(
-				urldecode($redirect_uri),
-				[
-					'code'  => $code,
-					'state' => isset($_GET['state']) ? $_GET['state'] : false
-				]
-			),
-			true,
-			302
-		);
-		$Page->Content = '';
-		return;
-	case 'token':
-		$token_data = $OAuth2->get_code($code, $client['id'], $client['secret'], $redirect_uri);
-		if ($token_data) {
-			unset($token_data['refresh_token']);
+		case 'code':
 			_header(
-				'Location: '.uri_for_token(
-					http_build_url(
-						urldecode($redirect_uri),
-						array_merge(
-							$token_data,
-							[
-								'state' => isset($_GET['state']) ? $_GET['state'] : false
-							]
-						)
-					)
+				'Location: '.http_build_url(
+					urldecode($redirect_uri),
+					[
+						'code'  => $code,
+						'state' => isset($_GET['state']) ? $_GET['state'] : false
+					]
 				),
 				true,
 				302
 			);
 			$Page->Content = '';
 			return;
-		} else {
-			error_redirect('server_error', "Server can't get token data, try later");
-			return;
-		}
-	case 'guest_token':
-		_header('Cache-Control: no-store');
-		_header('Pragma: no-cache');
-		interface_off();
-		if ($User->user()) {
-			$e = new ExitException(
-				[
-					'access_denied',
-					'Only guests, not users allowed to access this response_type'
-				],
-				403
-			);
-			$e->setJson();
-			throw $e;
-		}
-		$code = $OAuth2->add_code($client['id'], 'token', urldecode($_GET['redirect_uri']));
-		if (!$code) {
-			$e = new ExitException(
-				[
-					'server_error',
-					"Server can't generate code, try later"
-				],
-				500
-			);
-			$e->setJson();
-			throw $e;
-		}
-		$token_data = $OAuth2->get_code($code, $client['id'], $client['secret'], urldecode($_GET['redirect_uri']));
-		if ($token_data) {
-			unset($token_data['refresh_token']);
-			$Page->json($token_data);
-			return;
-		} else {
-			$e = new ExitException(
-				[
-					'server_error',
-					"Server can't get token data, try later"
-				],
-				500
-			);
-			$e->setJson();
-			throw $e;
-		}
+		case 'token':
+			$token_data = $OAuth2->get_code($code, $client['id'], $client['secret'], $redirect_uri);
+			if ($token_data) {
+				unset($token_data['refresh_token']);
+				_header(
+					'Location: '.uri_for_token(
+						http_build_url(
+							urldecode($redirect_uri),
+							array_merge(
+								$token_data,
+								[
+									'state' => isset($_GET['state']) ? $_GET['state'] : false
+								]
+							)
+						)
+					),
+					true,
+					302
+				);
+				$Page->Content = '';
+				return;
+			} else {
+				error_redirect('server_error', "Server can't get token data, try later");
+				return;
+			}
+		case 'guest_token':
+			_header('Cache-Control: no-store');
+			_header('Pragma: no-cache');
+			interface_off();
+			if ($User->user()) {
+				$e = new ExitException(
+					[
+						'access_denied',
+						'Only guests, not users allowed to access this response_type'
+					],
+					403
+				);
+				$e->setJson();
+				throw $e;
+			}
+			$code = $OAuth2->add_code($client['id'], 'token', urldecode($_GET['redirect_uri']));
+			if (!$code) {
+				$e = new ExitException(
+					[
+						'server_error',
+						"Server can't generate code, try later"
+					],
+					500
+				);
+				$e->setJson();
+				throw $e;
+			}
+			$token_data = $OAuth2->get_code($code, $client['id'], $client['secret'], urldecode($_GET['redirect_uri']));
+			if ($token_data) {
+				unset($token_data['refresh_token']);
+				$Page->json($token_data);
+				return;
+			} else {
+				$e = new ExitException(
+					[
+						'server_error',
+						"Server can't get token data, try later"
+					],
+					500
+				);
+				$e->setJson();
+				throw $e;
+			}
 }

Indentation +16 added lines, -16 removed lines

@@ -1,16 +1,16 @@ 
 <?php
 /**
- * @package   OAuth2
- * @category  modules
- * @author    Nazar Mokrynskyi <nazar@mokrynskyi.com>
- * @copyright Copyright (c) 2011-2016, Nazar Mokrynskyi
- * @license   MIT License, see license.txt
- */
+	 * @package   OAuth2
+	 * @category  modules
+	 * @author    Nazar Mokrynskyi <nazar@mokrynskyi.com>
+	 * @copyright Copyright (c) 2011-2016, Nazar Mokrynskyi
+	 * @license   MIT License, see license.txt
+	 */
 /**
- * Provides next events:<br>
- *  OAuth2/custom_sign_in_page
- *  OAuth2/custom_allow_access_page
- */
+	 * Provides next events:<br>
+	 *  OAuth2/custom_sign_in_page
+	 *  OAuth2/custom_allow_access_page
+	 */
 namespace cs\modules\OAuth2;
 use
 	h,
@@ -46,8 +46,8 @@ 
 $L      = new Prefix('oauth2_');
 $Page   = Page::instance();
 /**
- * Errors processing
- */
+	 * Errors processing
+	 */
 if (!isset($_GET['client_id'])) {
 	error_redirect('invalid_request', 'client_id parameter required');
 	return;
@@ -115,8 +115,8 @@ 
 	}
 }
 /**
- * guest_token should return JSON data while all other works with redirects
- */
+	 * guest_token should return JSON data while all other works with redirects
+	 */
 if ($_GET['response_type'] != 'guest_token') {
 	if (!isset($_GET['redirect_uri'])) {
 		$e = new ExitException(
@@ -189,8 +189,8 @@ 
 	}
 }
 /**
- * Authorization processing
- */
+	 * Authorization processing
+	 */
 if (isset($_POST['mode'])) {
 	switch ($_POST['mode']) {
 		case 'allow':

components/modules/OAuth2/prepare.php

Spacing +6 added lines, -6 removed lines

@@ -31,19 +31,19 @@
  * @return string
  */
 function http_build_url ($url, $parts) {
-	$url	= explode('?', $url, 2);
-	$params	= [];
+	$url = explode('?', $url, 2);
+	$params = [];
 	if (isset($url[1])) {
 		foreach (explode('&', $url[1]) as $u) {
-			$params[]	= $u;
+			$params[] = $u;
 		}
 		unset($u, $url[1]);
 	}
-	$url	= $url[0];
+	$url = $url[0];
 	foreach ($parts as $name => $value) {
-		$params[]	= $name.'='.urlencode($value);
+		$params[] = $name.'='.urlencode($value);
 	}
 	unset($parts, $p);
-	$params	= array_unique($params);
+	$params = array_unique($params);
 	return "$url?".implode('&', $params);
 }

Indentation +17 added lines, -17 removed lines

@@ -1,19 +1,19 @@ 
 <?php
 /**
- * @package		OAuth2
- * @category	modules
- * @author		Nazar Mokrynskyi <nazar@mokrynskyi.com>
- * @copyright	Copyright (c) 2011-2016, Nazar Mokrynskyi
- * @license		MIT License, see license.txt
- */
+		 * @package		OAuth2
+		 * @category	modules
+		 * @author		Nazar Mokrynskyi <nazar@mokrynskyi.com>
+		 * @copyright	Copyright (c) 2011-2016, Nazar Mokrynskyi
+		 * @license		MIT License, see license.txt
+		 */
 namespace	cs\modules\OAuth2;
 /**
- * Just replaces first "?" symbol by "#"
- *
- * @param string	$str
- *
- * @return string
- */
+		 * Just replaces first "?" symbol by "#"
+		 *
+		 * @param string	$str
+		 *
+		 * @return string
+		 */
 function uri_for_token ($str) {
 	return implode(
 		'#',
@@ -25,11 +25,11 @@ 
 	);
 }
 /**
- * @param string	$url
- * @param string[]	$parts
- *
- * @return string
- */
+	 * @param string	$url
+	 * @param string[]	$parts
+	 *
+	 * @return string
+	 */
 function http_build_url ($url, $parts) {
 	$url	= explode('?', $url, 2);
 	$params	= [];

components/modules/OAuth2/token.php

Switch Indentation +112 added lines, -112 removed lines

@@ -142,118 +142,118 @@
  * Tokens operations processing
  */
 switch ($_POST['grant_type']) {
-	case 'authorization_code':
-		if (!isset($_POST['code'])) {
-			$e = new ExitException(
-				[
-					'invalid_request',
-					'code parameter required'
-				],
-				400
-			);
-			$e->setJson();
-			throw $e;
-		}
-		$token_data = $OAuth2->get_code($_POST['code'], $client['id'], $client['secret'], urldecode($_POST['redirect_uri']));
-		if (!$token_data) {
-			$e = new ExitException(
-				[
-					'access_denied',
-					"Server can't get token data, check parameters and try again"
-				],
-				403
-			);
-			$e->setJson();
-			throw $e;
-		}
-		if ($token_data['expires_in'] < 0) {
-			$e = new ExitException(
-				[
-					'access_denied',
-					'access_token expired'
-				],
-				403
-			);
-			$e->setJson();
-			throw $e;
-		}
-		$Page->json($token_data);
-		return;
-	case 'refresh_token':
-		if (!isset($_POST['refresh_token'])) {
-			$e = new ExitException(
-				[
-					'invalid_request',
-					'refresh_token parameter required'
-				],
-				400
-			);
-			$e->setJson();
-			throw $e;
-		}
-		$token_data = $OAuth2->refresh_token($_POST['refresh_token'], $client['id'], $client['secret']);
-		if (!$token_data) {
-			$e = new ExitException(
-				[
-					'access_denied',
-					'User session invalid'
-				],
-				403
-			);
-			$e->setJson();
-			throw $e;
-		}
-		$Page->json($token_data);
-		return;
-	case 'guest_token':
-		if (User::instance()->user()) {
-			$e = new ExitException(
-				[
-					'access_denied',
-					'Only guests, not user allowed to access this grant_type'
-				],
-				403
-			);
-			$e->setJson();
-			throw $e;
-		}
-		if (!$Config->module('OAuth2')->guest_tokens) {
-			$e = new ExitException(
-				[
-					'access_denied',
-					'Guest tokens disabled'
-				],
-				403
-			);
-			$e->setJson();
-			throw $e;
-		}
-		$code = $OAuth2->add_code($client['id'], 'code', '');
-		if (!$code) {
-			$e = new ExitException(
-				[
-					'server_error',
-					"Server can't generate code, try later"
-				],
-				500
-			);
-			$e->setJson();
-			throw $e;
-		}
-		$token_data = $OAuth2->get_code($code, $client['id'], $client['secret'], '');
-		if ($token_data) {
-			unset($token_data['refresh_token']);
+		case 'authorization_code':
+			if (!isset($_POST['code'])) {
+				$e = new ExitException(
+					[
+						'invalid_request',
+						'code parameter required'
+					],
+					400
+				);
+				$e->setJson();
+				throw $e;
+			}
+			$token_data = $OAuth2->get_code($_POST['code'], $client['id'], $client['secret'], urldecode($_POST['redirect_uri']));
+			if (!$token_data) {
+				$e = new ExitException(
+					[
+						'access_denied',
+						"Server can't get token data, check parameters and try again"
+					],
+					403
+				);
+				$e->setJson();
+				throw $e;
+			}
+			if ($token_data['expires_in'] < 0) {
+				$e = new ExitException(
+					[
+						'access_denied',
+						'access_token expired'
+					],
+					403
+				);
+				$e->setJson();
+				throw $e;
+			}
 			$Page->json($token_data);
 			return;
-		} else {
-			$e = new ExitException(
-				[
-					'server_error',
-					"Server can't get token data, try later"
-				],
-				500
-			);
-			$e->setJson();
-			throw $e;
-		}
+		case 'refresh_token':
+			if (!isset($_POST['refresh_token'])) {
+				$e = new ExitException(
+					[
+						'invalid_request',
+						'refresh_token parameter required'
+					],
+					400
+				);
+				$e->setJson();
+				throw $e;
+			}
+			$token_data = $OAuth2->refresh_token($_POST['refresh_token'], $client['id'], $client['secret']);
+			if (!$token_data) {
+				$e = new ExitException(
+					[
+						'access_denied',
+						'User session invalid'
+					],
+					403
+				);
+				$e->setJson();
+				throw $e;
+			}
+			$Page->json($token_data);
+			return;
+		case 'guest_token':
+			if (User::instance()->user()) {
+				$e = new ExitException(
+					[
+						'access_denied',
+						'Only guests, not user allowed to access this grant_type'
+					],
+					403
+				);
+				$e->setJson();
+				throw $e;
+			}
+			if (!$Config->module('OAuth2')->guest_tokens) {
+				$e = new ExitException(
+					[
+						'access_denied',
+						'Guest tokens disabled'
+					],
+					403
+				);
+				$e->setJson();
+				throw $e;
+			}
+			$code = $OAuth2->add_code($client['id'], 'code', '');
+			if (!$code) {
+				$e = new ExitException(
+					[
+						'server_error',
+						"Server can't generate code, try later"
+					],
+					500
+				);
+				$e->setJson();
+				throw $e;
+			}
+			$token_data = $OAuth2->get_code($code, $client['id'], $client['secret'], '');
+			if ($token_data) {
+				unset($token_data['refresh_token']);
+				$Page->json($token_data);
+				return;
+			} else {
+				$e = new ExitException(
+					[
+						'server_error',
+						"Server can't get token data, try later"
+					],
+					500
+				);
+				$e->setJson();
+				throw $e;
+			}
 }

Indentation +8 added lines, -8 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 /**
- * @package   OAuth2
- * @category  modules
- * @author    Nazar Mokrynskyi <nazar@mokrynskyi.com>
- * @copyright Copyright (c) 2011-2016, Nazar Mokrynskyi
- * @license   MIT License, see license.txt
- */
+		 * @package   OAuth2
+		 * @category  modules
+		 * @author    Nazar Mokrynskyi <nazar@mokrynskyi.com>
+		 * @copyright Copyright (c) 2011-2016, Nazar Mokrynskyi
+		 * @license   MIT License, see license.txt
+		 */
 namespace cs\modules\OAuth2;
 
 use
@@ -139,8 +139,8 @@ 
 	throw $e;
 }
 /**
- * Tokens operations processing
- */
+	 * Tokens operations processing
+	 */
 switch ($_POST['grant_type']) {
 	case 'authorization_code':
 		if (!isset($_POST['code'])) {

components/modules/Shop/Items.php

Spacing +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
 
 	const DEFAULT_IMAGE = 'components/modules/Shop/includes/img/no-image.svg';
 
-	protected $data_model                  = [
+	protected $data_model = [
 		'id'         => 'int',
 		'date'       => 'int',
 		'category'   => 'int',
@@ -443,7 +443,7 @@ 
 				'string'  => '',
 				'text'    => ''
 			];
-			$lang       = '';
+			$lang = '';
 			switch ($this->attribute_type_to_value_field($attribute_data['type'])) {
 				case 'numeric_value':
 					$value_type['numeric'] = $value;

Braces +6 added lines, -3 removed lines

@@ -286,17 +286,20 @@
 		$where        = [];
 		$where_params = [];
 		foreach ($search_parameters as $key => $details) {
-			if (isset($this->data_model[$key])) { // Property
+			if (isset($this->data_model[$key])) {
+// Property
 				$where[]        = "`i`.`$key` = '%s'";
 				$where_params[] = $details;
-			} elseif (is_numeric($key)) { // Tag
+			} elseif (is_numeric($key)) {
+// Tag
 				$joins .=
 					"INNER JOIN `{$this->table}_tags` AS `t`
 					ON
 						`i`.`id`	= `t`.`id` AND
 						`t`.`tag`	= '%s'";
 				$where_params[] = $details;
-			} else { // Attribute
+			} else {
+// Attribute
 				$field = @$this->attribute_type_to_value_field($Attributes->get($key)['type']);
 				if (!$field || empty($details)) {
 					continue;

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * @package   Shop
- * @category  modules
- * @author    Nazar Mokrynskyi <nazar@mokrynskyi.com>
- * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi
- * @license   MIT License, see license.txt
- */
+	 * @package   Shop
+	 * @category  modules
+	 * @author    Nazar Mokrynskyi <nazar@mokrynskyi.com>
+	 * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi
+	 * @license   MIT License, see license.txt
+	 */
 namespace cs\modules\Shop;
 use
 	h,

components/modules/Shop/Orders.php

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 
 	const PAYMENT_METHOD_CASH = 'shop:cash';
 
-	protected $data_model            = [
+	protected $data_model = [
 		'id'                => 'int',
 		'user'              => 'int',
 		'date'              => 'int',

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * @package   Shop
- * @category  modules
- * @author    Nazar Mokrynskyi <nazar@mokrynskyi.com>
- * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi
- * @license   MIT License, see license.txt
- */
+	 * @package   Shop
+	 * @category  modules
+	 * @author    Nazar Mokrynskyi <nazar@mokrynskyi.com>
+	 * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi
+	 * @license   MIT License, see license.txt
+	 */
 namespace cs\modules\Shop;
 use
 	h,

components/modules/Shop/categories_.php

Spacing +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
 if (!$items) {
 	return;
 }
-$items_total     = $Items->search(
+$items_total = $Items->search(
 	[
 		'listed'      => 1,
 		'category'    => $current_category,

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * @package   Shop
- * @category  modules
- * @author    Nazar Mokrynskyi <nazar@mokrynskyi.com>
- * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi
- * @license   MIT License, see license.txt
- */
+	 * @package   Shop
+	 * @category  modules
+	 * @author    Nazar Mokrynskyi <nazar@mokrynskyi.com>
+	 * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi
+	 * @license   MIT License, see license.txt
+	 */
 namespace cs\modules\Shop;
 use
 	h,