Completed
Push — master ( 7aea5e...35c95f )
by Nazar
04:34
created
core/loader_base.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -5,9 +5,9 @@
 block discarded – undo
5 5
  * @copyright Copyright (c) 2011-2015, Nazar Mokrynskyi
6 6
  * @license   MIT License, see license.txt
7 7
  */
8
-require DIR.'/core/thirdparty/upf.php';           //Inclusion of Useful PHP Functions
8
+require DIR.'/core/thirdparty/upf.php'; //Inclusion of Useful PHP Functions
9 9
 _require_once(DIR.'/vendor/autoload.php', false); //Inclusion of composer's autoloader.php with user's dependencies
10
-require DIR.'/core/functions.php';                //Inclusion of general system functions and system autoloader
10
+require DIR.'/core/functions.php'; //Inclusion of general system functions and system autoloader
11 11
 
12 12
 error_reporting(E_ALL);
13 13
 
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/CRUD.php 3 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 				)",
59 59
 			$prepared_arguments
60 60
 		);
61
-		$id      = $insert_id !== false ? $insert_id : $this->db_prime()->id();
61
+		$id = $insert_id !== false ? $insert_id : $this->db_prime()->id();
62 62
 		/**
63 63
 		 * Id might be 0 if insertion failed or if we insert duplicate entry (which is fine since we use 'INSERT IGNORE'
64 64
 		 */
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
 			}
156 156
 			return $id;
157 157
 		}
158
-		$columns      = array_filter(
158
+		$columns = array_filter(
159 159
 			$data_model,
160 160
 			function ($column) {
161 161
 				return !is_array($column) || !isset($column['data_model']);
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
 				$id
224 224
 			]
225 225
 		) ?: [];
226
-		$language_field           = isset($model['language_field']) ? $model['language_field'] : null;
226
+		$language_field = isset($model['language_field']) ? $model['language_field'] : null;
227 227
 		/**
228 228
 		 * If no rows found for current language - find another language that should contain some rows
229 229
 		 */
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
 			$data_before = $this->read_internal($table, $data_model, $id);
295 295
 		}
296 296
 		list($prepared_arguments, $joined_tables) = self::crud_arguments_preparation(array_slice($data_model, 1), $prepared_arguments, $id);
297
-		$columns              = implode(
297
+		$columns = implode(
298 298
 			',',
299 299
 			array_map(
300 300
 				function ($column) {
Please login to merge, or discard this patch.
Upper-Lower-Casing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 		$first_column = array_keys($data_model)[0];
166 166
 		$data         = $this->db()->qf(
167 167
 			[
168
-				"SELECT $columns
168
+				"select $columns
169 169
 				FROM `$table`
170 170
 				WHERE `$first_column` = '%s'
171 171
 				LIMIT 1",
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
 		$fields                   = '`'.implode('`,`', array_keys($model['data_model'])).'`';
216 216
 		$rows                     = $this->db_prime()->qfa(
217 217
 			[
218
-				"SELECT $fields
218
+				"select $fields
219 219
 				FROM `{$this->table}_$table`
220 220
 				WHERE
221 221
 						`$id_field`	= '%s'
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) 2013-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) 2013-2016, Nazar Mokrynskyi
6
+	 * @license   MIT License, see license.txt
7
+	 */
8 8
 namespace cs\CRUD;
9 9
 use
10 10
 	cs\Event,
Please login to merge, or discard this patch.
core/traits/User/Data.php 2 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.
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/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.
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.