Completed
Push — master ( c3ae58...fbef1b )
by Nazar
04:32
created
core/classes/h.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
- * @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
- * Class for HTML code rendering in accordance with the standards of HTML5, and with useful syntax extensions for simpler usage
10
- */
9
+	 * Class for HTML code rendering in accordance with the standards of HTML5, and with useful syntax extensions for simpler usage
10
+	 */
11 11
 use	cs\h\Base;
12 12
 class h extends Base {}
Please login to merge, or discard this patch.
core/classes/User.php 1 patch
Indentation   +57 added lines, -57 removed lines patch added patch discarded remove patch
@@ -1,43 +1,43 @@  discard block
 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
- * Provides next events:
10
- *  System/User/construct/before
11
- *
12
- *  System/User/construct/after
13
- *
14
- *  System/User/registration/before
15
- *  ['email' => <i>email</i>]
16
- *
17
- *  System/User/registration/after
18
- *  ['id' => <i>user_id</i>]
19
- *
20
- *  System/User/registration/confirmation/before
21
- *  ['reg_key' => <i>reg_key</i>]
22
- *
23
- *  System/User/registration/confirmation/after
24
- *  ['id' => <i>user_id</i>]
25
- *
26
- *  System/User/del/before
27
- *  ['id' => <i>user_id</i>]
28
- *
29
- *  System/User/del/after
30
- *  ['id' => <i>user_id</i>]
31
- *
32
- *  System/User/add_bot
33
- *  ['id' => <i>bot_id</i>]
34
- *
35
- *  System/User/get_contacts
36
- *  [
37
- *    'id'       => <i>user_id</i>,
38
- *    'contacts' => <i>&$contacts</i> //Array of user id
39
- *  ]
40
- */
9
+	 * Provides next events:
10
+	 *  System/User/construct/before
11
+	 *
12
+	 *  System/User/construct/after
13
+	 *
14
+	 *  System/User/registration/before
15
+	 *  ['email' => <i>email</i>]
16
+	 *
17
+	 *  System/User/registration/after
18
+	 *  ['id' => <i>user_id</i>]
19
+	 *
20
+	 *  System/User/registration/confirmation/before
21
+	 *  ['reg_key' => <i>reg_key</i>]
22
+	 *
23
+	 *  System/User/registration/confirmation/after
24
+	 *  ['id' => <i>user_id</i>]
25
+	 *
26
+	 *  System/User/del/before
27
+	 *  ['id' => <i>user_id</i>]
28
+	 *
29
+	 *  System/User/del/after
30
+	 *  ['id' => <i>user_id</i>]
31
+	 *
32
+	 *  System/User/add_bot
33
+	 *  ['id' => <i>bot_id</i>]
34
+	 *
35
+	 *  System/User/get_contacts
36
+	 *  [
37
+	 *    'id'       => <i>user_id</i>,
38
+	 *    'contacts' => <i>&$contacts</i> //Array of user id
39
+	 *  ]
40
+	 */
41 41
 namespace cs;
42 42
 use
43 43
 	cs\Cache\Prefix,
@@ -47,26 +47,26 @@  discard block
 block discarded – undo
47 47
 	cs\User\Management as User_management,
48 48
 	cs\User\Permission as User_permission;
49 49
 /**
50
- * Class for users manipulating
51
- *
52
- * @property int    $id
53
- * @property string $login
54
- * @property string $login_hash    sha224 hash
55
- * @property string $username
56
- * @property string $password_hash sha512 hash
57
- * @property string $email
58
- * @property string $email_hash    sha224 hash
59
- * @property string $language
60
- * @property string $timezone
61
- * @property int    $reg_date      unix timestamp
62
- * @property string $reg_ip        hex value, obtained by function ip2hex()
63
- * @property string $reg_key       random md5 hash, generated during registration
64
- * @property int    $status        '-1' - not activated (for example after registration), 0 - inactive, 1 - active
65
- * @property int    $block_until   unix timestamp
66
- * @property string $avatar
67
- *
68
- * @method static User instance($check = false)
69
- */
50
+	 * Class for users manipulating
51
+	 *
52
+	 * @property int    $id
53
+	 * @property string $login
54
+	 * @property string $login_hash    sha224 hash
55
+	 * @property string $username
56
+	 * @property string $password_hash sha512 hash
57
+	 * @property string $email
58
+	 * @property string $email_hash    sha224 hash
59
+	 * @property string $language
60
+	 * @property string $timezone
61
+	 * @property int    $reg_date      unix timestamp
62
+	 * @property string $reg_ip        hex value, obtained by function ip2hex()
63
+	 * @property string $reg_key       random md5 hash, generated during registration
64
+	 * @property int    $status        '-1' - not activated (for example after registration), 0 - inactive, 1 - active
65
+	 * @property int    $block_until   unix timestamp
66
+	 * @property string $avatar
67
+	 *
68
+	 * @method static User instance($check = false)
69
+	 */
70 70
 class User {
71 71
 	use
72 72
 		Accessor,
Please login to merge, or discard this patch.
core/traits/DB/Accessor.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -1,18 +1,18 @@
 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\DB;
9 9
 use
10 10
 	cs\DB;
11 11
 /**
12
- * Accessor trait
13
- *
14
- * Provides db() and db_prime() methods for simplified for with DB
15
- */
12
+	 * Accessor trait
13
+	 *
14
+	 * Provides db() and db_prime() methods for simplified for with DB
15
+	 */
16 16
 trait Accessor {
17 17
 	/**
18 18
 	 * Link to db object
Please login to merge, or discard this patch.
core/traits/Singleton.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,16 +1,16 @@
 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;
9 9
 use
10 10
 	cs\Singleton\Base;
11 11
 /**
12
- * @inheritdoc
13
- */
12
+	 * @inheritdoc
13
+	 */
14 14
 trait Singleton {
15 15
 	use Base;
16 16
 }
Please login to merge, or discard this patch.
core/traits/CRUD/Data_model_processing.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) 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/Permission/Any.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -1,21 +1,21 @@
 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\Permission;
9 9
 use
10 10
 	cs\Cache;
11 11
 /**
12
- * Class Any with common methods for User and Group classes
13
- *
14
- * @property Cache $cache
15
- *
16
- * @method \cs\DB\_Abstract db()
17
- * @method \cs\DB\_Abstract db_prime()
18
- */
12
+	 * Class Any with common methods for User and Group classes
13
+	 *
14
+	 * @property Cache $cache
15
+	 *
16
+	 * @method \cs\DB\_Abstract db()
17
+	 * @method \cs\DB\_Abstract db_prime()
18
+	 */
19 19
 trait Any {
20 20
 	/**
21 21
 	 * @param int    $id
Please login to merge, or discard this patch.
core/traits/CRUD_helpers.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -1,16 +1,16 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * @package   CleverStyle CMS
4
- * @author    Nazar Mokrynskyi <[email protected]>
5
- * @copyright Copyright (c) 2015-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) 2015-2016, Nazar Mokrynskyi
6
+	 * @license   MIT License, see license.txt
7
+	 */
8 8
 namespace cs;
9 9
 /**
10
- * CRUD trait extended with useful additional methods, for example, for searching
11
- *
12
- * Might me used instead of regular CRUD trait
13
- */
10
+	 * CRUD trait extended with useful additional methods, for example, for searching
11
+	 *
12
+	 * Might me used instead of regular CRUD trait
13
+	 */
14 14
 trait CRUD_helpers {
15 15
 	use
16 16
 		CRUD;
Please login to merge, or discard this patch.
components/modules/Blockchain_payment/admin/general.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   Blockchain payment
4
- * @category  modules
5
- * @author    Nazar Mokrynskyi <[email protected]>
6
- * @copyright Copyright (c) 2015-2016, Nazar Mokrynskyi
7
- * @license   MIT License, see license.txt
8
- */
3
+	 * @package   Blockchain payment
4
+	 * @category  modules
5
+	 * @author    Nazar Mokrynskyi <[email protected]>
6
+	 * @copyright Copyright (c) 2015-2016, Nazar Mokrynskyi
7
+	 * @license   MIT License, see license.txt
8
+	 */
9 9
 namespace cs\modules\Blockchain_payment;
10 10
 use
11 11
 	cs\ExitException,
Please login to merge, or discard this patch.
components/modules/Blockchain_payment/admin/transactions.php 2 patches
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   Blockchain payment
4
- * @category  modules
5
- * @author    Nazar Mokrynskyi <[email protected]>
6
- * @copyright Copyright (c) 2015-2016, Nazar Mokrynskyi
7
- * @license   MIT License, see license.txt
8
- */
3
+	 * @package   Blockchain payment
4
+	 * @category  modules
5
+	 * @author    Nazar Mokrynskyi <[email protected]>
6
+	 * @copyright Copyright (c) 2015-2016, Nazar Mokrynskyi
7
+	 * @license   MIT License, see license.txt
8
+	 */
9 9
 namespace cs\modules\Blockchain_payment;
10 10
 use
11 11
 	cs\ExitException,
Please login to merge, or discard this patch.
Spacing   +3 added lines, -4 removed lines patch added patch discarded remove patch
@@ -76,12 +76,12 @@  discard block
 block discarded – undo
76 76
 			h::tr(
77 77
 				array_map(
78 78
 					function ($transaction) use ($L) {
79
-						$created   = $transaction['created']
79
+						$created = $transaction['created']
80 80
 							? $L->to_locale(
81 81
 								date($L->{TIME - $transaction['created'] < 24 * 3600 ? '_time' : '_datetime_long'}, $transaction['created'])
82 82
 							)
83 83
 							: '-';
84
-						$paid      = $transaction['paid']
84
+						$paid = $transaction['paid']
85 85
 							? $L->to_locale(
86 86
 								date($L->{TIME - $transaction['paid'] < 24 * 3600 ? '_time' : '_datetime_long'}, $transaction['paid'])
87 87
 							)
@@ -93,8 +93,7 @@  discard block
 block discarded – undo
93 93
 							: '-';
94 94
 						$username  = User::instance()->username($transaction['user']);
95 95
 						$class     =
96
-							$transaction['confirmed'] ? 'cs-block-success.cs-text-success' :
97
-								($transaction['paid'] ? 'cs-block-warning.cs-text-warning' : 'cs-block-error.cs-text-error');
96
+							$transaction['confirmed'] ? 'cs-block-success.cs-text-success' : ($transaction['paid'] ? 'cs-block-warning.cs-text-warning' : 'cs-block-error.cs-text-error');
98 97
 						$tag       = "td.$class";
99 98
 						return [
100 99
 							[
Please login to merge, or discard this patch.