cadmium-org /
cadmium-cms
@@ -2,15 +2,15 @@ |
||
| 2 | 2 | |
| 3 | 3 | # Database tables |
| 4 | 4 | |
| 5 | -define('TABLE_PAGES', 'pages'); |
|
| 6 | -define('TABLE_PAGES_RELATIONS', 'pages_relations'); |
|
| 5 | +define('TABLE_PAGES', 'pages'); |
|
| 6 | +define('TABLE_PAGES_RELATIONS', 'pages_relations'); |
|
| 7 | 7 | |
| 8 | -define('TABLE_MENU', 'menu'); |
|
| 9 | -define('TABLE_MENU_RELATIONS', 'menu_relations'); |
|
| 8 | +define('TABLE_MENU', 'menu'); |
|
| 9 | +define('TABLE_MENU_RELATIONS', 'menu_relations'); |
|
| 10 | 10 | |
| 11 | -define('TABLE_VARIABLES', 'variables'); |
|
| 12 | -define('TABLE_WIDGETS', 'widgets'); |
|
| 11 | +define('TABLE_VARIABLES', 'variables'); |
|
| 12 | +define('TABLE_WIDGETS', 'widgets'); |
|
| 13 | 13 | |
| 14 | -define('TABLE_USERS', 'users'); |
|
| 15 | -define('TABLE_USERS_SECRETS', 'users_secrets'); |
|
| 16 | -define('TABLE_USERS_SESSIONS', 'users_sessions'); |
|
| 14 | +define('TABLE_USERS', 'users'); |
|
| 15 | +define('TABLE_USERS_SECRETS', 'users_secrets'); |
|
| 16 | +define('TABLE_USERS_SESSIONS', 'users_sessions'); |
|
@@ -2,126 +2,126 @@ |
||
| 2 | 2 | |
| 3 | 3 | # Admin ip |
| 4 | 4 | |
| 5 | -define('CONFIG_ADMIN_IP', ''); |
|
| 5 | +define('CONFIG_ADMIN_IP', ''); |
|
| 6 | 6 | |
| 7 | 7 | # Session |
| 8 | 8 | |
| 9 | -define('CONFIG_SESSION_NAME', '_sessid'); |
|
| 10 | -define('CONFIG_SESSION_LIFETIME', 2592000); # 30 days |
|
| 9 | +define('CONFIG_SESSION_NAME', '_sessid'); |
|
| 10 | +define('CONFIG_SESSION_LIFETIME', 2592000); # 30 days |
|
| 11 | 11 | |
| 12 | 12 | # Language |
| 13 | 13 | |
| 14 | -define('CONFIG_LANGUAGE_COOKIE_EXPIRES', 30758400); # 356 days |
|
| 14 | +define('CONFIG_LANGUAGE_COOKIE_EXPIRES', 30758400); # 356 days |
|
| 15 | 15 | |
| 16 | 16 | # Template |
| 17 | 17 | |
| 18 | -define('CONFIG_TEMPLATE_COOKIE_EXPIRES', 30758400); # 356 days |
|
| 18 | +define('CONFIG_TEMPLATE_COOKIE_EXPIRES', 30758400); # 356 days |
|
| 19 | 19 | |
| 20 | 20 | # Entitizer |
| 21 | 21 | |
| 22 | -define('CONFIG_ENTITIZER_MAX_DEPTH', 6); |
|
| 22 | +define('CONFIG_ENTITIZER_MAX_DEPTH', 6); |
|
| 23 | 23 | |
| 24 | 24 | # Page |
| 25 | 25 | |
| 26 | -define('CONFIG_PAGE_TITLE_MAX_LENGTH', 255); |
|
| 27 | -define('CONFIG_PAGE_NAME_MAX_LENGTH', 40); |
|
| 28 | -define('CONFIG_PAGE_DESCRIPTION_MAX_LENGTH', 512); |
|
| 29 | -define('CONFIG_PAGE_KEYWORDS_MAX_LENGTH', 512); |
|
| 26 | +define('CONFIG_PAGE_TITLE_MAX_LENGTH', 255); |
|
| 27 | +define('CONFIG_PAGE_NAME_MAX_LENGTH', 40); |
|
| 28 | +define('CONFIG_PAGE_DESCRIPTION_MAX_LENGTH', 512); |
|
| 29 | +define('CONFIG_PAGE_KEYWORDS_MAX_LENGTH', 512); |
|
| 30 | 30 | |
| 31 | 31 | # Menuitem |
| 32 | 32 | |
| 33 | -define('CONFIG_MENUITEM_TEXT_MAX_LENGTH', 255); |
|
| 34 | -define('CONFIG_MENUITEM_SLUG_MAX_LENGTH', 255); |
|
| 35 | -define('CONFIG_MENUITEM_POSITION_MAX_LENGTH', 2); |
|
| 33 | +define('CONFIG_MENUITEM_TEXT_MAX_LENGTH', 255); |
|
| 34 | +define('CONFIG_MENUITEM_SLUG_MAX_LENGTH', 255); |
|
| 35 | +define('CONFIG_MENUITEM_POSITION_MAX_LENGTH', 2); |
|
| 36 | 36 | |
| 37 | 37 | # Variables |
| 38 | 38 | |
| 39 | -define('CONFIG_VARIABLE_TITLE_MAX_LENGTH', 64); |
|
| 40 | -define('CONFIG_VARIABLE_NAME_MAX_LENGTH', 32); |
|
| 41 | -define('CONFIG_VARIABLE_VALUE_MAX_LENGTH', 255); |
|
| 39 | +define('CONFIG_VARIABLE_TITLE_MAX_LENGTH', 64); |
|
| 40 | +define('CONFIG_VARIABLE_NAME_MAX_LENGTH', 32); |
|
| 41 | +define('CONFIG_VARIABLE_VALUE_MAX_LENGTH', 255); |
|
| 42 | 42 | |
| 43 | 43 | # Widgets |
| 44 | 44 | |
| 45 | -define('CONFIG_WIDGET_TITLE_MAX_LENGTH', 64); |
|
| 46 | -define('CONFIG_WIDGET_NAME_MAX_LENGTH', 32); |
|
| 45 | +define('CONFIG_WIDGET_TITLE_MAX_LENGTH', 64); |
|
| 46 | +define('CONFIG_WIDGET_NAME_MAX_LENGTH', 32); |
|
| 47 | 47 | |
| 48 | 48 | # Filemanager |
| 49 | 49 | |
| 50 | -define('CONFIG_FILEMANAGER_NAME_MAX_LENGTH', 128); |
|
| 50 | +define('CONFIG_FILEMANAGER_NAME_MAX_LENGTH', 128); |
|
| 51 | 51 | |
| 52 | 52 | # User |
| 53 | 53 | |
| 54 | -define('CONFIG_USER_SESSION_LIFETIME', 604800); # 7 days |
|
| 55 | -define('CONFIG_USER_SECRET_LIFETIME', 86400); # 1 day |
|
| 54 | +define('CONFIG_USER_SESSION_LIFETIME', 604800); # 7 days |
|
| 55 | +define('CONFIG_USER_SECRET_LIFETIME', 86400); # 1 day |
|
| 56 | 56 | |
| 57 | -define('CONFIG_USER_NAME_MIN_LENGTH', 4); |
|
| 58 | -define('CONFIG_USER_NAME_MAX_LENGTH', 16); |
|
| 57 | +define('CONFIG_USER_NAME_MIN_LENGTH', 4); |
|
| 58 | +define('CONFIG_USER_NAME_MAX_LENGTH', 16); |
|
| 59 | 59 | |
| 60 | -define('CONFIG_USER_PASSWORD_MIN_LENGTH', 4); |
|
| 61 | -define('CONFIG_USER_PASSWORD_MAX_LENGTH', 32); |
|
| 60 | +define('CONFIG_USER_PASSWORD_MIN_LENGTH', 4); |
|
| 61 | +define('CONFIG_USER_PASSWORD_MAX_LENGTH', 32); |
|
| 62 | 62 | |
| 63 | -define('CONFIG_USER_EMAIL_MAX_LENGTH', 128); |
|
| 63 | +define('CONFIG_USER_EMAIL_MAX_LENGTH', 128); |
|
| 64 | 64 | |
| 65 | -define('CONFIG_USER_FIRST_NAME_MAX_LENGTH', 32); |
|
| 66 | -define('CONFIG_USER_LAST_NAME_MAX_LENGTH', 32); |
|
| 65 | +define('CONFIG_USER_FIRST_NAME_MAX_LENGTH', 32); |
|
| 66 | +define('CONFIG_USER_LAST_NAME_MAX_LENGTH', 32); |
|
| 67 | 67 | |
| 68 | -define('CONFIG_USER_CITY_MAX_LENGTH', 32); |
|
| 68 | +define('CONFIG_USER_CITY_MAX_LENGTH', 32); |
|
| 69 | 69 | |
| 70 | -define('CONFIG_USER_CAPTCHA_MAX_LENGTH', 16); |
|
| 70 | +define('CONFIG_USER_CAPTCHA_MAX_LENGTH', 16); |
|
| 71 | 71 | |
| 72 | 72 | # Captcha |
| 73 | 73 | |
| 74 | -define('CONFIG_CAPTCHA_LENGTH', 5); |
|
| 74 | +define('CONFIG_CAPTCHA_LENGTH', 5); |
|
| 75 | 75 | |
| 76 | -define('CONFIG_CAPTCHA_WIDTH', 150); |
|
| 77 | -define('CONFIG_CAPTCHA_HEIGHT', 40); |
|
| 76 | +define('CONFIG_CAPTCHA_WIDTH', 150); |
|
| 77 | +define('CONFIG_CAPTCHA_HEIGHT', 40); |
|
| 78 | 78 | |
| 79 | -define('CONFIG_CAPTCHA_FONT', 'Fonts/airstrip.ttf'); |
|
| 80 | -define('CONFIG_CAPTCHA_FONT_SIZE', 20); |
|
| 79 | +define('CONFIG_CAPTCHA_FONT', 'Fonts/airstrip.ttf'); |
|
| 80 | +define('CONFIG_CAPTCHA_FONT_SIZE', 20); |
|
| 81 | 81 | |
| 82 | -define('CONFIG_CAPTCHA_TEXT_INDENT', 15); |
|
| 83 | -define('CONFIG_CAPTCHA_TEXT_STEP', 25); |
|
| 82 | +define('CONFIG_CAPTCHA_TEXT_INDENT', 15); |
|
| 83 | +define('CONFIG_CAPTCHA_TEXT_STEP', 25); |
|
| 84 | 84 | |
| 85 | 85 | # Admin |
| 86 | 86 | |
| 87 | -define('CONFIG_ADMIN_LANGUAGE_DEFAULT', 'en-US'); |
|
| 88 | -define('CONFIG_ADMIN_TEMPLATE_DEFAULT', 'Default'); |
|
| 87 | +define('CONFIG_ADMIN_LANGUAGE_DEFAULT', 'en-US'); |
|
| 88 | +define('CONFIG_ADMIN_TEMPLATE_DEFAULT', 'Default'); |
|
| 89 | 89 | |
| 90 | -define('CONFIG_ADMIN_PAGES_DISPLAY', 50); |
|
| 91 | -define('CONFIG_ADMIN_MENUITEMS_DISPLAY', 50); |
|
| 92 | -define('CONFIG_ADMIN_VARIABLES_DISPLAY', 50); |
|
| 93 | -define('CONFIG_ADMIN_WIDGETS_DISPLAY', 50); |
|
| 94 | -define('CONFIG_ADMIN_USERS_DISPLAY', 50); |
|
| 90 | +define('CONFIG_ADMIN_PAGES_DISPLAY', 50); |
|
| 91 | +define('CONFIG_ADMIN_MENUITEMS_DISPLAY', 50); |
|
| 92 | +define('CONFIG_ADMIN_VARIABLES_DISPLAY', 50); |
|
| 93 | +define('CONFIG_ADMIN_WIDGETS_DISPLAY', 50); |
|
| 94 | +define('CONFIG_ADMIN_USERS_DISPLAY', 50); |
|
| 95 | 95 | |
| 96 | -define('CONFIG_ADMIN_FILEMANAGER_ITEMS_DISPLAY', 50); |
|
| 96 | +define('CONFIG_ADMIN_FILEMANAGER_ITEMS_DISPLAY', 50); |
|
| 97 | 97 | |
| 98 | 98 | # Site |
| 99 | 99 | |
| 100 | -define('CONFIG_SITE_LANGUAGE_DEFAULT', 'en-US'); |
|
| 101 | -define('CONFIG_SITE_TEMPLATE_DEFAULT', 'Default'); |
|
| 100 | +define('CONFIG_SITE_LANGUAGE_DEFAULT', 'en-US'); |
|
| 101 | +define('CONFIG_SITE_TEMPLATE_DEFAULT', 'Default'); |
|
| 102 | 102 | |
| 103 | -define('CONFIG_SITE_TITLE_DEFAULT', 'Demo Site'); |
|
| 104 | -define('CONFIG_SITE_SLOGAN_DEFAULT', 'A place for site slogan'); |
|
| 103 | +define('CONFIG_SITE_TITLE_DEFAULT', 'Demo Site'); |
|
| 104 | +define('CONFIG_SITE_SLOGAN_DEFAULT', 'A place for site slogan'); |
|
| 105 | 105 | |
| 106 | -define('CONFIG_SITE_TITLE_MAX_LENGTH', 128); |
|
| 107 | -define('CONFIG_SITE_SLOGAN_MAX_LENGTH', 255); |
|
| 108 | -define('CONFIG_SITE_DESCRIPTION_MAX_LENGTH', 512); |
|
| 109 | -define('CONFIG_SITE_KEYWORDS_MAX_LENGTH', 512); |
|
| 106 | +define('CONFIG_SITE_TITLE_MAX_LENGTH', 128); |
|
| 107 | +define('CONFIG_SITE_SLOGAN_MAX_LENGTH', 255); |
|
| 108 | +define('CONFIG_SITE_DESCRIPTION_MAX_LENGTH', 512); |
|
| 109 | +define('CONFIG_SITE_KEYWORDS_MAX_LENGTH', 512); |
|
| 110 | 110 | |
| 111 | 111 | # System |
| 112 | 112 | |
| 113 | -define('CONFIG_SYSTEM_URL_MAX_LENGTH', 128); |
|
| 114 | -define('CONFIG_SYSTEM_EMAIL_MAX_LENGTH', 128); |
|
| 113 | +define('CONFIG_SYSTEM_URL_MAX_LENGTH', 128); |
|
| 114 | +define('CONFIG_SYSTEM_EMAIL_MAX_LENGTH', 128); |
|
| 115 | 115 | |
| 116 | -define('CONFIG_SYSTEM_TIMEZONE_DEFAULT', 'UTC'); |
|
| 116 | +define('CONFIG_SYSTEM_TIMEZONE_DEFAULT', 'UTC'); |
|
| 117 | 117 | |
| 118 | 118 | # Database |
| 119 | 119 | |
| 120 | -define('CONFIG_DATABASE_SERVER_MAX_LENGTH', 128); |
|
| 121 | -define('CONFIG_DATABASE_USER_MAX_LENGTH', 64); |
|
| 122 | -define('CONFIG_DATABASE_PASSWORD_MAX_LENGTH', 64); |
|
| 123 | -define('CONFIG_DATABASE_NAME_MAX_LENGTH', 64); |
|
| 120 | +define('CONFIG_DATABASE_SERVER_MAX_LENGTH', 128); |
|
| 121 | +define('CONFIG_DATABASE_USER_MAX_LENGTH', 64); |
|
| 122 | +define('CONFIG_DATABASE_PASSWORD_MAX_LENGTH', 64); |
|
| 123 | +define('CONFIG_DATABASE_NAME_MAX_LENGTH', 64); |
|
| 124 | 124 | |
| 125 | 125 | # Other |
| 126 | 126 | |
| 127 | -define('CONFIG_UPLOADS_MAX_SIZE', 104857600); # 100 MB |
|
| 127 | +define('CONFIG_UPLOADS_MAX_SIZE', 104857600); # 100 MB |
|
@@ -20,7 +20,9 @@ discard block |
||
| 20 | 20 | |
| 21 | 21 | $item->children = ($children = Template::group()); |
| 22 | 22 | |
| 23 | - foreach ($this->menu[$id]['children'] as $child) $children->add($this->parseItem($child)); |
|
| 23 | + foreach ($this->menu[$id]['children'] as $child) { |
|
| 24 | + $children->add($this->parseItem($child)); |
|
| 25 | + } |
|
| 24 | 26 | |
| 25 | 27 | } else { |
| 26 | 28 | |
@@ -44,7 +46,9 @@ discard block |
||
| 44 | 46 | |
| 45 | 47 | $menu = Entitizer::treeview(TABLE_MENU)->subtree(0, ['active' => true]); |
| 46 | 48 | |
| 47 | - if (false !== $menu) $this->menu = $menu; |
|
| 49 | + if (false !== $menu) { |
|
| 50 | + $this->menu = $menu; |
|
| 51 | + } |
|
| 48 | 52 | } |
| 49 | 53 | |
| 50 | 54 | # Get block |
@@ -53,7 +57,9 @@ discard block |
||
| 53 | 57 | |
| 54 | 58 | $menu = Template::group(); |
| 55 | 59 | |
| 56 | - foreach ($this->menu[0]['children'] as $id) $menu->add($this->parseItem($id)); |
|
| 60 | + foreach ($this->menu[0]['children'] as $id) { |
|
| 61 | + $menu->add($this->parseItem($id)); |
|
| 62 | + } |
|
| 57 | 63 | |
| 58 | 64 | # ------------------------ |
| 59 | 65 | |
@@ -21,7 +21,9 @@ discard block |
||
| 21 | 21 | |
| 22 | 22 | public static function set(string $type, string $text, string $title = null) { |
| 23 | 23 | |
| 24 | - if (!in_array($type, static::$types, true) || isset(static::$items[$type]) || ('' === $text)) return; |
|
| 24 | + if (!in_array($type, static::$types, true) || isset(static::$items[$type]) || ('' === $text)) { |
|
| 25 | + return; |
|
| 26 | + } |
|
| 25 | 27 | |
| 26 | 28 | static::$items[$type] = ['text' => $text, 'title' => (('' !== $title) ? $title : null)]; |
| 27 | 29 | } |
@@ -45,7 +47,9 @@ discard block |
||
| 45 | 47 | |
| 46 | 48 | $block->type = $type; $block->text = Template::block($item['text']); |
| 47 | 49 | |
| 48 | - if (isset($item['title'])) $block->block('title')->set('text', $item['title'])->enable(); |
|
| 50 | + if (isset($item['title'])) { |
|
| 51 | + $block->block('title')->set('text', $item['title'])->enable(); |
|
| 52 | + } |
|
| 49 | 53 | } |
| 50 | 54 | |
| 51 | 55 | # ------------------------ |
@@ -14,11 +14,15 @@ |
||
| 14 | 14 | |
| 15 | 15 | $selection = ['name', 'value']; $order = ['name' => 'ASC']; |
| 16 | 16 | |
| 17 | - if (!(DB::select(TABLE_VARIABLES, $selection, null, $order) && DB::last()->status)) return; |
|
| 17 | + if (!(DB::select(TABLE_VARIABLES, $selection, null, $order) && DB::last()->status)) { |
|
| 18 | + return; |
|
| 19 | + } |
|
| 18 | 20 | |
| 19 | 21 | # Process results |
| 20 | 22 | |
| 21 | - while (null !== ($variable = DB::last()->row())) yield $variable['name'] => $variable['value']; |
|
| 23 | + while (null !== ($variable = DB::last()->row())) { |
|
| 24 | + yield $variable['name'] => $variable['value']; |
|
| 25 | + } |
|
| 22 | 26 | } |
| 23 | 27 | } |
| 24 | 28 | } |
@@ -14,11 +14,15 @@ |
||
| 14 | 14 | |
| 15 | 15 | $selection = ['name', 'contents']; $condition = ['active' => 1]; $order = ['name' => 'ASC']; |
| 16 | 16 | |
| 17 | - if (!(DB::select(TABLE_WIDGETS, $selection, $condition, $order) && DB::last()->status)) return; |
|
| 17 | + if (!(DB::select(TABLE_WIDGETS, $selection, $condition, $order) && DB::last()->status)) { |
|
| 18 | + return; |
|
| 19 | + } |
|
| 18 | 20 | |
| 19 | 21 | # Process results |
| 20 | 22 | |
| 21 | - while (null !== ($widget = DB::last()->row())) yield $widget['name'] => Template::block($widget['contents']); |
|
| 23 | + while (null !== ($widget = DB::last()->row())) { |
|
| 24 | + yield $widget['name'] => Template::block($widget['contents']); |
|
| 25 | + } |
|
| 22 | 26 | } |
| 23 | 27 | } |
| 24 | 28 | } |
@@ -12,7 +12,11 @@ discard block |
||
| 12 | 12 | |
| 13 | 13 | $text = Language::get($code); |
| 14 | 14 | |
| 15 | - if (!$popup) Messages::set('error', $text); else Popup::set('negative', $text); |
|
| 15 | + if (!$popup) { |
|
| 16 | + Messages::set('error', $text); |
|
| 17 | + } else { |
|
| 18 | + Popup::set('negative', $text); |
|
| 19 | + } |
|
| 16 | 20 | |
| 17 | 21 | # ------------------------ |
| 18 | 22 | |
@@ -23,15 +27,21 @@ discard block |
||
| 23 | 27 | |
| 24 | 28 | public function handle(callable $callback, bool $popup = false) { |
| 25 | 29 | |
| 26 | - if (false === ($post = $this->post())) return false; |
|
| 30 | + if (false === ($post = $this->post())) { |
|
| 31 | + return false; |
|
| 32 | + } |
|
| 27 | 33 | |
| 28 | 34 | # Check form for errors |
| 29 | 35 | |
| 30 | - if ($this->errors()) return $this->displayError('FORM_ERROR_REQUIRED', $popup); |
|
| 36 | + if ($this->errors()) { |
|
| 37 | + return $this->displayError('FORM_ERROR_REQUIRED', $popup); |
|
| 38 | + } |
|
| 31 | 39 | |
| 32 | 40 | # Call controller method |
| 33 | 41 | |
| 34 | - if (is_string($result = $callback($post))) return $this->displayError($result, $popup); |
|
| 42 | + if (is_string($result = $callback($post))) { |
|
| 43 | + return $this->displayError($result, $popup); |
|
| 44 | + } |
|
| 35 | 45 | |
| 36 | 46 | if (is_array($result)) { $this->get($result[0])->error(true); return $this->displayError($result[1], $popup); } |
| 37 | 47 | |
@@ -10,7 +10,9 @@ discard block |
||
| 10 | 10 | |
| 11 | 11 | public function __invoke(array $post) { |
| 12 | 12 | |
| 13 | - if (!Auth::check()) return false; |
|
| 13 | + if (!Auth::check()) { |
|
| 14 | + return false; |
|
| 15 | + } |
|
| 14 | 16 | |
| 15 | 17 | # Declare variables |
| 16 | 18 | |
@@ -22,13 +24,15 @@ discard block |
||
| 22 | 24 | |
| 23 | 25 | # Validate values |
| 24 | 26 | |
| 25 | - if (false === ($password_new = Validate::userPassword($password_new))) |
|
| 26 | - |
|
| 27 | + if (false === ($password_new = Validate::userPassword($password_new))) { |
|
| 28 | + |
|
| 27 | 29 | return ['password_new', 'USER_ERROR_PASSWORD_NEW_INVALID']; |
| 30 | + } |
|
| 28 | 31 | |
| 29 | - if (0 !== strcmp($password_new, $password_retype)) |
|
| 30 | - |
|
| 32 | + if (0 !== strcmp($password_new, $password_retype)) { |
|
| 33 | + |
|
| 31 | 34 | return ['password_retype', 'USER_ERROR_PASSWORD_MISMATCH']; |
| 35 | + } |
|
| 32 | 36 | |
| 33 | 37 | # Encode password |
| 34 | 38 | |
@@ -38,7 +42,9 @@ discard block |
||
| 38 | 42 | |
| 39 | 43 | $data = ['auth_key' => $auth_key, 'password' => $password]; |
| 40 | 44 | |
| 41 | - if (!Auth::user()->edit($data)) return 'USER_ERROR_AUTH_RECOVER'; |
|
| 45 | + if (!Auth::user()->edit($data)) { |
|
| 46 | + return 'USER_ERROR_AUTH_RECOVER'; |
|
| 47 | + } |
|
| 42 | 48 | |
| 43 | 49 | # Remove secret |
| 44 | 50 | |
@@ -10,7 +10,9 @@ discard block |
||
| 10 | 10 | |
| 11 | 11 | public function __invoke(array $post) { |
| 12 | 12 | |
| 13 | - if (Auth::check()) return true; |
|
| 13 | + if (Auth::check()) { |
|
| 14 | + return true; |
|
| 15 | + } |
|
| 14 | 16 | |
| 15 | 17 | # Declare variables |
| 16 | 18 | |
@@ -22,15 +24,25 @@ discard block |
||
| 22 | 24 | |
| 23 | 25 | # Validate values |
| 24 | 26 | |
| 25 | - if (false === ($name = Validate::userName($name))) return ['name', 'USER_ERROR_NAME_INVALID']; |
|
| 27 | + if (false === ($name = Validate::userName($name))) { |
|
| 28 | + return ['name', 'USER_ERROR_NAME_INVALID']; |
|
| 29 | + } |
|
| 26 | 30 | |
| 27 | - if (false === ($password = Validate::userPassword($password))) return ['password', 'USER_ERROR_PASSWORD_INVALID']; |
|
| 31 | + if (false === ($password = Validate::userPassword($password))) { |
|
| 32 | + return ['password', 'USER_ERROR_PASSWORD_INVALID']; |
|
| 33 | + } |
|
| 28 | 34 | |
| 29 | - if (false === ($email = Validate::userEmail($email))) return ['email', 'USER_ERROR_EMAIL_INVALID']; |
|
| 35 | + if (false === ($email = Validate::userEmail($email))) { |
|
| 36 | + return ['email', 'USER_ERROR_EMAIL_INVALID']; |
|
| 37 | + } |
|
| 30 | 38 | |
| 31 | - if (0 !== strcmp($password, $password_retype)) return ['password_retype', 'USER_ERROR_PASSWORD_MISMATCH']; |
|
| 39 | + if (0 !== strcmp($password, $password_retype)) { |
|
| 40 | + return ['password_retype', 'USER_ERROR_PASSWORD_MISMATCH']; |
|
| 41 | + } |
|
| 32 | 42 | |
| 33 | - if (false === Security::checkCaptcha($captcha)) return ['captcha', 'USER_ERROR_CAPTCHA_INCORRECT']; |
|
| 43 | + if (false === Security::checkCaptcha($captcha)) { |
|
| 44 | + return ['captcha', 'USER_ERROR_CAPTCHA_INCORRECT']; |
|
| 45 | + } |
|
| 34 | 46 | |
| 35 | 47 | # Create user object |
| 36 | 48 | |
@@ -38,15 +50,23 @@ discard block |
||
| 38 | 50 | |
| 39 | 51 | # Check name exists |
| 40 | 52 | |
| 41 | - if (false === ($check_name = $user->check($name, 'name'))) return 'USER_ERROR_AUTH_REGISTER'; |
|
| 53 | + if (false === ($check_name = $user->check($name, 'name'))) { |
|
| 54 | + return 'USER_ERROR_AUTH_REGISTER'; |
|
| 55 | + } |
|
| 42 | 56 | |
| 43 | - if ($check_name === 1) return ['name', 'USER_ERROR_NAME_DUPLICATE']; |
|
| 57 | + if ($check_name === 1) { |
|
| 58 | + return ['name', 'USER_ERROR_NAME_DUPLICATE']; |
|
| 59 | + } |
|
| 44 | 60 | |
| 45 | 61 | # Check email exists |
| 46 | 62 | |
| 47 | - if (false === ($check_email = $user->check($email, 'email'))) return 'USER_ERROR_AUTH_REGISTER'; |
|
| 63 | + if (false === ($check_email = $user->check($email, 'email'))) { |
|
| 64 | + return 'USER_ERROR_AUTH_REGISTER'; |
|
| 65 | + } |
|
| 48 | 66 | |
| 49 | - if ($check_email === 1) return ['email', 'USER_ERROR_EMAIL_DUPLICATE']; |
|
| 67 | + if ($check_email === 1) { |
|
| 68 | + return ['email', 'USER_ERROR_EMAIL_DUPLICATE']; |
|
| 69 | + } |
|
| 50 | 70 | |
| 51 | 71 | # Encode password |
| 52 | 72 | |
@@ -69,7 +89,9 @@ discard block |
||
| 69 | 89 | $data['time_registered'] = REQUEST_TIME; |
| 70 | 90 | $data['time_logged'] = REQUEST_TIME; |
| 71 | 91 | |
| 72 | - if (!$user->create($data)) return 'USER_ERROR_AUTH_REGISTER'; |
|
| 92 | + if (!$user->create($data)) { |
|
| 93 | + return 'USER_ERROR_AUTH_REGISTER'; |
|
| 94 | + } |
|
| 73 | 95 | |
| 74 | 96 | # Send mail |
| 75 | 97 | |
