Completed
Push — master ( 1d0329...a2f21f )
by Nazar
05:08
created
core/traits/User/Data.php 3 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -439,7 +439,7 @@
 block discarded – undo
439 439
 		if (!$user || !$item || $user == User::GUEST_ID) {
440 440
 			return false;
441 441
 		}
442
-		$item   = implode(
442
+		$item = implode(
443 443
 			',',
444 444
 			$this->db_prime()->s((array)$item)
445 445
 		);
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -119,7 +119,7 @@
 block discarded – undo
119 119
 			 */
120 120
 			$new_items = '`'.implode('`, `', $new_items).'`';
121 121
 			$res       = $this->db()->qf(
122
-				"SELECT $new_items
122
+				"select $new_items
123 123
 				FROM `[prefix]users`
124 124
 				WHERE `id` = '$user'
125 125
 				LIMIT 1"
Please login to merge, or discard this 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/traits/User/Management.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -269,7 +269,7 @@
 block discarded – undo
269 269
 	 * Checks for unconfirmed registrations and deletes expired
270 270
 	 */
271 271
 	protected function delete_unconfirmed_users () {
272
-		$reg_date = time() - Config::instance()->core['registration_confirmation_time'] * 86400;    //1 day = 86400 seconds
272
+		$reg_date = time() - Config::instance()->core['registration_confirmation_time'] * 86400; //1 day = 86400 seconds
273 273
 		$ids      = $this->db_prime()->qfas(
274 274
 			[
275 275
 				"SELECT `id`
Please login to merge, or discard this 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.
index.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@
 block discarded – undo
31 31
  * Time of start of execution, is used as current time
32 32
  */
33 33
 define('MICROTIME', microtime(true)); //Time in seconds (float)
34
-define('TIME', floor(MICROTIME));     //Time in seconds (integer)
35
-define('DIR', __DIR__);               //Root directory
34
+define('TIME', floor(MICROTIME)); //Time in seconds (integer)
35
+define('DIR', __DIR__); //Root directory
36 36
 chdir(DIR);
37
-require_once DIR.'/core/loader.php';  //Loader starting
37
+require_once DIR.'/core/loader.php'; //Loader starting
Please login to merge, or discard this patch.
Indentation   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -1,35 +1,35 @@
 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
 /**
9
- * Requirements:
10
- * * Apache2
11
- *  Apache2 modules MUST be enabled:
12
- *  * rewrite
13
- *  * headers
14
- *  Optional Apache2 modules:
15
- *  * expires
16
- * * or Nginx
17
- * * PHP 5.5+
18
- *  PHP libraries MUST be present:
19
- *  * cURL
20
- *  Optional PHP libraries:
21
- *  * APCu, Memcached
22
- * * or HHVM 3.3.2+ LTS or HHVM 3.4.1+
23
- * * MySQL 5.6+
24
- * * or MariaDB 10.0.5+
25
- */
9
+	 * Requirements:
10
+	 * * Apache2
11
+	 *  Apache2 modules MUST be enabled:
12
+	 *  * rewrite
13
+	 *  * headers
14
+	 *  Optional Apache2 modules:
15
+	 *  * expires
16
+	 * * or Nginx
17
+	 * * PHP 5.5+
18
+	 *  PHP libraries MUST be present:
19
+	 *  * cURL
20
+	 *  Optional PHP libraries:
21
+	 *  * APCu, Memcached
22
+	 * * or HHVM 3.3.2+ LTS or HHVM 3.4.1+
23
+	 * * MySQL 5.6+
24
+	 * * or MariaDB 10.0.5+
25
+	 */
26 26
 if (version_compare(PHP_VERSION, '5.5', '<')) {
27 27
 	echo 'CleverStyle CMS require PHP 5.5 or higher';
28 28
 	return;
29 29
 }
30 30
 /**
31
- * Time of start of execution, is used as current time
32
- */
31
+	 * Time of start of execution, is used as current time
32
+	 */
33 33
 define('MICROTIME', microtime(true)); //Time in seconds (float)
34 34
 define('TIME', floor(MICROTIME));     //Time in seconds (integer)
35 35
 define('DIR', __DIR__);               //Root directory
Please login to merge, or discard this patch.
install.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
 	define('DIR', __DIR__);
21 21
 }
22 22
 mb_internal_encoding('utf-8');
23
-define('ROOT', getcwd());    //Path to site root
23
+define('ROOT', getcwd()); //Path to site root
24 24
 $fs = json_decode(file_get_contents(DIR.'/fs.json'), true);
25 25
 require DIR.'/fs/'.$fs['core/thirdparty/upf.php'];
26 26
 require DIR.'/fs/'.$fs['core/functions.php'];
Please login to merge, or discard this patch.
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,19 +1,19 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * @package        CleverStyle CMS
4
- * @subpackage     Installer
5
- * @author         Nazar Mokrynskyi <[email protected]>
6
- * @copyright      Copyright (c) 2011-2016, Nazar Mokrynskyi
7
- * @license        MIT License, see license.txt
8
- */
3
+	 * @package        CleverStyle CMS
4
+	 * @subpackage     Installer
5
+	 * @author         Nazar Mokrynskyi <[email protected]>
6
+	 * @copyright      Copyright (c) 2011-2016, Nazar Mokrynskyi
7
+	 * @license        MIT License, see license.txt
8
+	 */
9 9
 if (version_compare(PHP_VERSION, '5.5', '<')) {
10 10
 	echo 'CleverStyle CMS require PHP 5.5 or higher';
11 11
 	return;
12 12
 }
13 13
 $cli = PHP_SAPI == 'cli';
14 14
 /**
15
- * Path to installer dir
16
- */
15
+	 * Path to installer dir
16
+	 */
17 17
 if ($cli) {
18 18
 	define('DIR', 'phar://cleverstyle_cms.phar');
19 19
 } else {
Please login to merge, or discard this patch.
install/functions.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -144,7 +144,7 @@
 block discarded – undo
144 144
 		$url = $_POST['site_url'];
145 145
 	} else {
146 146
 		$url = "$_SERVER->protocol://$_SERVER->host$_SERVER->request_uri";
147
-		$url = implode('/', array_slice(explode('/', $url), 0, -2));    //Remove 2 last items
147
+		$url = implode('/', array_slice(explode('/', $url), 0, -2)); //Remove 2 last items
148 148
 	}
149 149
 	preg_match('#//([^/]+)#', $url, $domain);
150 150
 	$domain = $domain[1];
Please login to merge, or discard this 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    CleverStyle CMS
4
- * @subpackage Installer
5
- * @author     Nazar Mokrynskyi <[email protected]>
6
- * @copyright  Copyright (c) 2011-2016, Nazar Mokrynskyi
7
- * @license    MIT License, see license.txt
8
- */
3
+	 * @package    CleverStyle CMS
4
+	 * @subpackage Installer
5
+	 * @author     Nazar Mokrynskyi <[email protected]>
6
+	 * @copyright  Copyright (c) 2011-2016, Nazar Mokrynskyi
7
+	 * @license    MIT License, see license.txt
8
+	 */
9 9
 function install_form () {
10 10
 	$timezones = get_timezones_list();
11 11
 	return h::{'form[method=post]'}(
Please login to merge, or discard this patch.
themes/CleverStyle/prepare.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,5 +11,5 @@
 block discarded – undo
11 11
  * @var _SERVER $_SERVER
12 12
  */
13 13
 if (preg_match('/msie|trident/i', $_SERVER->user_agent)) {
14
-	Page::instance()->Head	.= '<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">';
14
+	Page::instance()->Head .= '<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">';
15 15
 }
Please login to merge, or discard this patch.
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,15 +1,15 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * @package		CleverStyle CMS
4
- * @subpackage	CleverStyle theme
5
- * @author		Nazar Mokrynskyi <[email protected]>
6
- * @copyright	Copyright (c) 2013-2016, Nazar Mokrynskyi
7
- * @license		MIT License, see license.txt
8
- */
3
+	 * @package		CleverStyle CMS
4
+	 * @subpackage	CleverStyle theme
5
+	 * @author		Nazar Mokrynskyi <[email protected]>
6
+	 * @copyright	Copyright (c) 2013-2016, Nazar Mokrynskyi
7
+	 * @license		MIT License, see license.txt
8
+	 */
9 9
 namespace	cs;
10 10
 /**
11
- * @var _SERVER $_SERVER
12
- */
11
+	 * @var _SERVER $_SERVER
12
+	 */
13 13
 if (preg_match('/msie|trident/i', $_SERVER->user_agent)) {
14 14
 	Page::instance()->Head	.= '<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">';
15 15
 }
Please login to merge, or discard this patch.
components/modules/Plupload/admin/index.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   Plupload
4
- * @category  modules
5
- * @author    Moxiecode Systems AB
6
- * @author    Nazar Mokrynskyi <[email protected]> (integration with CleverStyle CMS)
7
- * @copyright Moxiecode Systems AB
8
- * @license   GNU GPL v2, see license.txt
9
- */
3
+	 * @package   Plupload
4
+	 * @category  modules
5
+	 * @author    Moxiecode Systems AB
6
+	 * @author    Nazar Mokrynskyi <[email protected]> (integration with CleverStyle CMS)
7
+	 * @copyright Moxiecode Systems AB
8
+	 * @license   GNU GPL v2, see license.txt
9
+	 */
10 10
 namespace cs;
11 11
 Event::instance()
12 12
 	->on(
Please login to merge, or discard this patch.
components/modules/Polls/Options.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
 	use
21 21
 		CRUD,
22 22
 		Singleton;
23
-	protected $data_model          = [
23
+	protected $data_model = [
24 24
 		'id'     => 'int',
25 25
 		'title'  => 'ml:text',
26 26
 		'path'   => 'ml:text',
Please login to merge, or discard this 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   Polls
4
- * @category  modules
5
- * @author    Nazar Mokrynskyi <[email protected]>
6
- * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi
7
- * @license   MIT License, see license.txt
8
- */
3
+	 * @package   Polls
4
+	 * @category  modules
5
+	 * @author    Nazar Mokrynskyi <[email protected]>
6
+	 * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi
7
+	 * @license   MIT License, see license.txt
8
+	 */
9 9
 namespace cs\modules\Polls;
10 10
 
11 11
 use
Please login to merge, or discard this patch.
components/modules/Polls/Polls.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
 	use
21 21
 		CRUD,
22 22
 		Singleton;
23
-	protected $data_model          = [
23
+	protected $data_model = [
24 24
 		'id'     => 'int',
25 25
 		'title'  => 'ml:text',
26 26
 		'path'   => 'ml:text',
Please login to merge, or discard this 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   Polls
4
- * @category  modules
5
- * @author    Nazar Mokrynskyi <[email protected]>
6
- * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi
7
- * @license   MIT License, see license.txt
8
- */
3
+	 * @package   Polls
4
+	 * @category  modules
5
+	 * @author    Nazar Mokrynskyi <[email protected]>
6
+	 * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi
7
+	 * @license   MIT License, see license.txt
8
+	 */
9 9
 namespace cs\modules\Polls;
10 10
 
11 11
 use
Please login to merge, or discard this patch.