@@ -37,7 +37,7 @@ |
||
37 | 37 | * @param int $user |
38 | 38 | */ |
39 | 39 | function __construct ($user) { |
40 | - $this->id = $user; |
|
40 | + $this->id = $user; |
|
41 | 41 | } |
42 | 42 | /** |
43 | 43 | * Get data item of user |
@@ -1,31 +1,31 @@ |
||
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 cs\User; |
10 | 10 | /** |
11 | - * Class for getting of user information |
|
12 | - * |
|
13 | - * @property int $id |
|
14 | - * @property string $login |
|
15 | - * @property string $login_hash sha224 hash |
|
16 | - * @property string $username |
|
17 | - * @property string $password_hash sha512 hash |
|
18 | - * @property string $email |
|
19 | - * @property string $email_hash sha224 hash |
|
20 | - * @property string $language |
|
21 | - * @property string $timezone |
|
22 | - * @property int $reg_date unix timestamp |
|
23 | - * @property string $reg_ip hex value, obtained by function ip2hex() |
|
24 | - * @property string $reg_key random md5 hash, generated during registration |
|
25 | - * @property int $status '-1' - not activated (for example after registration), 0 - inactive, 1 - active |
|
26 | - * @property int $block_until unix timestamp |
|
27 | - * @property string $avatar |
|
28 | - */ |
|
11 | + * Class for getting of user information |
|
12 | + * |
|
13 | + * @property int $id |
|
14 | + * @property string $login |
|
15 | + * @property string $login_hash sha224 hash |
|
16 | + * @property string $username |
|
17 | + * @property string $password_hash sha512 hash |
|
18 | + * @property string $email |
|
19 | + * @property string $email_hash sha224 hash |
|
20 | + * @property string $language |
|
21 | + * @property string $timezone |
|
22 | + * @property int $reg_date unix timestamp |
|
23 | + * @property string $reg_ip hex value, obtained by function ip2hex() |
|
24 | + * @property string $reg_key random md5 hash, generated during registration |
|
25 | + * @property int $status '-1' - not activated (for example after registration), 0 - inactive, 1 - active |
|
26 | + * @property int $block_until unix timestamp |
|
27 | + * @property string $avatar |
|
28 | + */ |
|
29 | 29 | class Properties { |
30 | 30 | /** |
31 | 31 | * @var int |
@@ -71,7 +71,7 @@ |
||
71 | 71 | if (!file_exists($path_in_filesystem) || is_writable($path_in_filesystem)) { |
72 | 72 | return file_put_contents($path_in_filesystem, $data, LOCK_EX | FILE_BINARY); |
73 | 73 | } |
74 | - trigger_error("File $path_in_filesystem not available for writing", E_USER_WARNING); |
|
74 | + trigger_error("file $path_in_filesystem not available for writing", E_USER_WARNING); |
|
75 | 75 | return false; |
76 | 76 | } |
77 | 77 | /** |
@@ -6,7 +6,7 @@ |
||
6 | 6 | * @license MIT License, see license.txt |
7 | 7 | */ |
8 | 8 | namespace cs; |
9 | -require __DIR__.'/loader_base.php'; //Inclusion of loader base |
|
9 | +require __DIR__.'/loader_base.php'; //Inclusion of loader base |
|
10 | 10 | require __DIR__.'/functions_global.php'; //Inclusion of functions that work with global state |
11 | 11 | /** |
12 | 12 | * Wrapper around default `$_SERVER` superglobal |
@@ -1,20 +1,20 @@ |
||
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; |
9 | 9 | require __DIR__.'/loader_base.php'; //Inclusion of loader base |
10 | 10 | require __DIR__.'/functions_global.php'; //Inclusion of functions that work with global state |
11 | 11 | /** |
12 | - * Wrapper around default `$_SERVER` superglobal |
|
13 | - */ |
|
12 | + * Wrapper around default `$_SERVER` superglobal |
|
13 | + */ |
|
14 | 14 | $_SERVER = new _SERVER($_SERVER); |
15 | 15 | /** |
16 | - * Including of custom files |
|
17 | - */ |
|
16 | + * Including of custom files |
|
17 | + */ |
|
18 | 18 | foreach (glob(CUSTOM.'/*.php') ?: [] as $custom) { |
19 | 19 | include $custom; |
20 | 20 | } |
@@ -5,9 +5,9 @@ |
||
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 |
@@ -1,10 +1,10 @@ |
||
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, |
@@ -58,7 +58,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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) { |
@@ -165,7 +165,7 @@ discard block |
||
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 |
||
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' |
@@ -1,10 +1,10 @@ |
||
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, |
@@ -370,7 +370,7 @@ |
||
370 | 370 | * @return array |
371 | 371 | */ |
372 | 372 | protected function get_includes_prepare ($dependencies, $separator) { |
373 | - $includes = [ |
|
373 | + $includes = [ |
|
374 | 374 | 'css' => [], |
375 | 375 | 'js' => [], |
376 | 376 | 'html' => [] |
@@ -1,10 +1,10 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * @package CleverStyle CMS |
|
4 | - * @author Nazar Mokrynskyi <[email protected]> |
|
5 | - * @copyright Copyright (c) 2014-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) 2014-2016, Nazar Mokrynskyi |
|
6 | + * @license MIT License, see license.txt |
|
7 | + */ |
|
8 | 8 | namespace cs\Page; |
9 | 9 | use |
10 | 10 | cs\Core, |
@@ -439,7 +439,7 @@ |
||
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 | ); |
@@ -119,7 +119,7 @@ |
||
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" |
@@ -1,10 +1,10 @@ |
||
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, |
@@ -269,7 +269,7 @@ |
||
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` |
@@ -1,10 +1,10 @@ |
||
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, |
@@ -31,7 +31,7 @@ |
||
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 |
@@ -1,35 +1,35 @@ |
||
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 |