cadmium-org /
cadmium-cms
@@ -2,7 +2,9 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Modules\Entitizer\Controller { |
| 4 | 4 | |
| 5 | - use Modules\Auth, Modules\Entitizer, Utils\Validate, Str; |
|
| 5 | + use Modules\Entitizer; |
|
| 6 | + use Utils\Validate; |
|
| 7 | + use Str; |
|
| 6 | 8 | |
| 7 | 9 | class User { |
| 8 | 10 | |
@@ -31,30 +31,46 @@ discard block |
||
| 31 | 31 | |
| 32 | 32 | # Validate name & email |
| 33 | 33 | |
| 34 | - if (false === ($name = Validate::userName($name))) return 'USER_ERROR_NAME_INVALID'; |
|
| 34 | + if (false === ($name = Validate::userName($name))) { |
|
| 35 | + return 'USER_ERROR_NAME_INVALID'; |
|
| 36 | + } |
|
| 35 | 37 | |
| 36 | - if (false === ($email = Validate::userEmail($email))) return 'USER_ERROR_EMAIL_INVALID'; |
|
| 38 | + if (false === ($email = Validate::userEmail($email))) { |
|
| 39 | + return 'USER_ERROR_EMAIL_INVALID'; |
|
| 40 | + } |
|
| 37 | 41 | |
| 38 | 42 | # Validate password |
| 39 | 43 | |
| 40 | 44 | if ((0 === $this->user->id) || ('' !== $password)) { |
| 41 | 45 | |
| 42 | - if (false === ($password = Validate::userPassword($password))) return 'USER_ERROR_PASSWORD_INVALID'; |
|
| 46 | + if (false === ($password = Validate::userPassword($password))) { |
|
| 47 | + return 'USER_ERROR_PASSWORD_INVALID'; |
|
| 48 | + } |
|
| 43 | 49 | |
| 44 | - if (0 !== strcmp($password, $password_retype)) return 'USER_ERROR_PASSWORD_MISMATCH'; |
|
| 50 | + if (0 !== strcmp($password, $password_retype)) { |
|
| 51 | + return 'USER_ERROR_PASSWORD_MISMATCH'; |
|
| 52 | + } |
|
| 45 | 53 | } |
| 46 | 54 | |
| 47 | 55 | # Check name exists |
| 48 | 56 | |
| 49 | - if (false === ($check_name = $this->user->check('name', $name))) return 'USER_ERROR_MODIFY'; |
|
| 57 | + if (false === ($check_name = $this->user->check('name', $name))) { |
|
| 58 | + return 'USER_ERROR_MODIFY'; |
|
| 59 | + } |
|
| 50 | 60 | |
| 51 | - if ($check_name === 1) return 'USER_ERROR_NAME_DUPLICATE'; |
|
| 61 | + if ($check_name === 1) { |
|
| 62 | + return 'USER_ERROR_NAME_DUPLICATE'; |
|
| 63 | + } |
|
| 52 | 64 | |
| 53 | 65 | # Check email exists |
| 54 | 66 | |
| 55 | - if (false === ($check_email = $this->user->check('email', $email))) return 'USER_ERROR_MODIFY'; |
|
| 67 | + if (false === ($check_email = $this->user->check('email', $email))) { |
|
| 68 | + return 'USER_ERROR_MODIFY'; |
|
| 69 | + } |
|
| 56 | 70 | |
| 57 | - if ($check_email === 1) return 'USER_ERROR_EMAIL_DUPLICATE'; |
|
| 71 | + if ($check_email === 1) { |
|
| 72 | + return 'USER_ERROR_EMAIL_DUPLICATE'; |
|
| 73 | + } |
|
| 58 | 74 | |
| 59 | 75 | # Modify user |
| 60 | 76 | |
@@ -84,7 +100,9 @@ discard block |
||
| 84 | 100 | |
| 85 | 101 | $modifier = ((0 === $this->user->id) ? 'create' : 'edit'); |
| 86 | 102 | |
| 87 | - if (!$this->user->$modifier($data)) return 'USER_ERROR_MODIFY'; |
|
| 103 | + if (!$this->user->$modifier($data)) { |
|
| 104 | + return 'USER_ERROR_MODIFY'; |
|
| 105 | + } |
|
| 88 | 106 | |
| 89 | 107 | # ------------------------ |
| 90 | 108 | |
@@ -2,122 +2,122 @@ |
||
| 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 | # Page |
| 21 | 21 | |
| 22 | -define('CONFIG_PAGE_TITLE_MAX_LENGTH', 255); |
|
| 23 | -define('CONFIG_PAGE_NAME_MAX_LENGTH', 60); |
|
| 24 | -define('CONFIG_PAGE_DESCRIPTION_MAX_LENGTH', 512); |
|
| 25 | -define('CONFIG_PAGE_KEYWORDS_MAX_LENGTH', 512); |
|
| 22 | +define('CONFIG_PAGE_TITLE_MAX_LENGTH', 255); |
|
| 23 | +define('CONFIG_PAGE_NAME_MAX_LENGTH', 60); |
|
| 24 | +define('CONFIG_PAGE_DESCRIPTION_MAX_LENGTH', 512); |
|
| 25 | +define('CONFIG_PAGE_KEYWORDS_MAX_LENGTH', 512); |
|
| 26 | 26 | |
| 27 | 27 | # Menuitem |
| 28 | 28 | |
| 29 | -define('CONFIG_MENUITEM_TEXT_MAX_LENGTH', 255); |
|
| 30 | -define('CONFIG_MENUITEM_SLUG_MAX_LENGTH', 255); |
|
| 31 | -define('CONFIG_MENUITEM_POSITION_MAX_LENGTH', 2); |
|
| 29 | +define('CONFIG_MENUITEM_TEXT_MAX_LENGTH', 255); |
|
| 30 | +define('CONFIG_MENUITEM_SLUG_MAX_LENGTH', 255); |
|
| 31 | +define('CONFIG_MENUITEM_POSITION_MAX_LENGTH', 2); |
|
| 32 | 32 | |
| 33 | 33 | # Variables |
| 34 | 34 | |
| 35 | -define('CONFIG_VARIABLE_TITLE_MAX_LENGTH', 64); |
|
| 36 | -define('CONFIG_VARIABLE_NAME_MAX_LENGTH', 32); |
|
| 37 | -define('CONFIG_VARIABLE_VALUE_MAX_LENGTH', 255); |
|
| 35 | +define('CONFIG_VARIABLE_TITLE_MAX_LENGTH', 64); |
|
| 36 | +define('CONFIG_VARIABLE_NAME_MAX_LENGTH', 32); |
|
| 37 | +define('CONFIG_VARIABLE_VALUE_MAX_LENGTH', 255); |
|
| 38 | 38 | |
| 39 | 39 | # Widgets |
| 40 | 40 | |
| 41 | -define('CONFIG_WIDGET_TITLE_MAX_LENGTH', 64); |
|
| 42 | -define('CONFIG_WIDGET_NAME_MAX_LENGTH', 32); |
|
| 41 | +define('CONFIG_WIDGET_TITLE_MAX_LENGTH', 64); |
|
| 42 | +define('CONFIG_WIDGET_NAME_MAX_LENGTH', 32); |
|
| 43 | 43 | |
| 44 | 44 | # Filemanager |
| 45 | 45 | |
| 46 | -define('CONFIG_FILEMANAGER_NAME_MAX_LENGTH', 128); |
|
| 46 | +define('CONFIG_FILEMANAGER_NAME_MAX_LENGTH', 128); |
|
| 47 | 47 | |
| 48 | 48 | # User |
| 49 | 49 | |
| 50 | -define('CONFIG_USER_SESSION_LIFETIME', 604800); # 7 days |
|
| 51 | -define('CONFIG_USER_SECRET_LIFETIME', 86400); # 1 day |
|
| 50 | +define('CONFIG_USER_SESSION_LIFETIME', 604800); # 7 days |
|
| 51 | +define('CONFIG_USER_SECRET_LIFETIME', 86400); # 1 day |
|
| 52 | 52 | |
| 53 | -define('CONFIG_USER_NAME_MIN_LENGTH', 4); |
|
| 54 | -define('CONFIG_USER_NAME_MAX_LENGTH', 16); |
|
| 53 | +define('CONFIG_USER_NAME_MIN_LENGTH', 4); |
|
| 54 | +define('CONFIG_USER_NAME_MAX_LENGTH', 16); |
|
| 55 | 55 | |
| 56 | -define('CONFIG_USER_PASSWORD_MIN_LENGTH', 4); |
|
| 57 | -define('CONFIG_USER_PASSWORD_MAX_LENGTH', 32); |
|
| 56 | +define('CONFIG_USER_PASSWORD_MIN_LENGTH', 4); |
|
| 57 | +define('CONFIG_USER_PASSWORD_MAX_LENGTH', 32); |
|
| 58 | 58 | |
| 59 | -define('CONFIG_USER_EMAIL_MAX_LENGTH', 128); |
|
| 59 | +define('CONFIG_USER_EMAIL_MAX_LENGTH', 128); |
|
| 60 | 60 | |
| 61 | -define('CONFIG_USER_FIRST_NAME_MAX_LENGTH', 32); |
|
| 62 | -define('CONFIG_USER_LAST_NAME_MAX_LENGTH', 32); |
|
| 61 | +define('CONFIG_USER_FIRST_NAME_MAX_LENGTH', 32); |
|
| 62 | +define('CONFIG_USER_LAST_NAME_MAX_LENGTH', 32); |
|
| 63 | 63 | |
| 64 | -define('CONFIG_USER_CITY_MAX_LENGTH', 32); |
|
| 64 | +define('CONFIG_USER_CITY_MAX_LENGTH', 32); |
|
| 65 | 65 | |
| 66 | -define('CONFIG_USER_CAPTCHA_MAX_LENGTH', 16); |
|
| 66 | +define('CONFIG_USER_CAPTCHA_MAX_LENGTH', 16); |
|
| 67 | 67 | |
| 68 | 68 | # Captcha |
| 69 | 69 | |
| 70 | -define('CONFIG_CAPTCHA_LENGTH', 5); |
|
| 70 | +define('CONFIG_CAPTCHA_LENGTH', 5); |
|
| 71 | 71 | |
| 72 | -define('CONFIG_CAPTCHA_WIDTH', 150); |
|
| 73 | -define('CONFIG_CAPTCHA_HEIGHT', 40); |
|
| 72 | +define('CONFIG_CAPTCHA_WIDTH', 150); |
|
| 73 | +define('CONFIG_CAPTCHA_HEIGHT', 40); |
|
| 74 | 74 | |
| 75 | -define('CONFIG_CAPTCHA_FONT', 'Fonts/airstrip.ttf'); |
|
| 76 | -define('CONFIG_CAPTCHA_FONT_SIZE', 20); |
|
| 75 | +define('CONFIG_CAPTCHA_FONT', 'Fonts/airstrip.ttf'); |
|
| 76 | +define('CONFIG_CAPTCHA_FONT_SIZE', 20); |
|
| 77 | 77 | |
| 78 | -define('CONFIG_CAPTCHA_TEXT_INDENT', 15); |
|
| 79 | -define('CONFIG_CAPTCHA_TEXT_STEP', 25); |
|
| 78 | +define('CONFIG_CAPTCHA_TEXT_INDENT', 15); |
|
| 79 | +define('CONFIG_CAPTCHA_TEXT_STEP', 25); |
|
| 80 | 80 | |
| 81 | 81 | # Admin |
| 82 | 82 | |
| 83 | -define('CONFIG_ADMIN_LANGUAGE_DEFAULT', 'en-US'); |
|
| 84 | -define('CONFIG_ADMIN_TEMPLATE_DEFAULT', 'Default'); |
|
| 83 | +define('CONFIG_ADMIN_LANGUAGE_DEFAULT', 'en-US'); |
|
| 84 | +define('CONFIG_ADMIN_TEMPLATE_DEFAULT', 'Default'); |
|
| 85 | 85 | |
| 86 | -define('CONFIG_ADMIN_PAGES_DISPLAY', 50); |
|
| 87 | -define('CONFIG_ADMIN_MENUITEMS_DISPLAY', 50); |
|
| 88 | -define('CONFIG_ADMIN_VARIABLES_DISPLAY', 50); |
|
| 89 | -define('CONFIG_ADMIN_WIDGETS_DISPLAY', 50); |
|
| 90 | -define('CONFIG_ADMIN_USERS_DISPLAY', 50); |
|
| 86 | +define('CONFIG_ADMIN_PAGES_DISPLAY', 50); |
|
| 87 | +define('CONFIG_ADMIN_MENUITEMS_DISPLAY', 50); |
|
| 88 | +define('CONFIG_ADMIN_VARIABLES_DISPLAY', 50); |
|
| 89 | +define('CONFIG_ADMIN_WIDGETS_DISPLAY', 50); |
|
| 90 | +define('CONFIG_ADMIN_USERS_DISPLAY', 50); |
|
| 91 | 91 | |
| 92 | -define('CONFIG_ADMIN_FILEMANAGER_ITEMS_DISPLAY', 50); |
|
| 92 | +define('CONFIG_ADMIN_FILEMANAGER_ITEMS_DISPLAY', 50); |
|
| 93 | 93 | |
| 94 | 94 | # Site |
| 95 | 95 | |
| 96 | -define('CONFIG_SITE_LANGUAGE_DEFAULT', 'en-US'); |
|
| 97 | -define('CONFIG_SITE_TEMPLATE_DEFAULT', 'Default'); |
|
| 96 | +define('CONFIG_SITE_LANGUAGE_DEFAULT', 'en-US'); |
|
| 97 | +define('CONFIG_SITE_TEMPLATE_DEFAULT', 'Default'); |
|
| 98 | 98 | |
| 99 | -define('CONFIG_SITE_TITLE_DEFAULT', 'Demo Site'); |
|
| 100 | -define('CONFIG_SITE_SLOGAN_DEFAULT', 'A place for site slogan'); |
|
| 99 | +define('CONFIG_SITE_TITLE_DEFAULT', 'Demo Site'); |
|
| 100 | +define('CONFIG_SITE_SLOGAN_DEFAULT', 'A place for site slogan'); |
|
| 101 | 101 | |
| 102 | -define('CONFIG_SITE_TITLE_MAX_LENGTH', 128); |
|
| 103 | -define('CONFIG_SITE_SLOGAN_MAX_LENGTH', 255); |
|
| 104 | -define('CONFIG_SITE_DESCRIPTION_MAX_LENGTH', 512); |
|
| 105 | -define('CONFIG_SITE_KEYWORDS_MAX_LENGTH', 512); |
|
| 102 | +define('CONFIG_SITE_TITLE_MAX_LENGTH', 128); |
|
| 103 | +define('CONFIG_SITE_SLOGAN_MAX_LENGTH', 255); |
|
| 104 | +define('CONFIG_SITE_DESCRIPTION_MAX_LENGTH', 512); |
|
| 105 | +define('CONFIG_SITE_KEYWORDS_MAX_LENGTH', 512); |
|
| 106 | 106 | |
| 107 | 107 | # System |
| 108 | 108 | |
| 109 | -define('CONFIG_SYSTEM_URL_MAX_LENGTH', 128); |
|
| 110 | -define('CONFIG_SYSTEM_EMAIL_MAX_LENGTH', 128); |
|
| 109 | +define('CONFIG_SYSTEM_URL_MAX_LENGTH', 128); |
|
| 110 | +define('CONFIG_SYSTEM_EMAIL_MAX_LENGTH', 128); |
|
| 111 | 111 | |
| 112 | -define('CONFIG_SYSTEM_TIMEZONE_DEFAULT', 'UTC'); |
|
| 112 | +define('CONFIG_SYSTEM_TIMEZONE_DEFAULT', 'UTC'); |
|
| 113 | 113 | |
| 114 | 114 | # Database |
| 115 | 115 | |
| 116 | -define('CONFIG_DATABASE_SERVER_MAX_LENGTH', 128); |
|
| 117 | -define('CONFIG_DATABASE_USER_MAX_LENGTH', 64); |
|
| 118 | -define('CONFIG_DATABASE_PASSWORD_MAX_LENGTH', 64); |
|
| 119 | -define('CONFIG_DATABASE_NAME_MAX_LENGTH', 64); |
|
| 116 | +define('CONFIG_DATABASE_SERVER_MAX_LENGTH', 128); |
|
| 117 | +define('CONFIG_DATABASE_USER_MAX_LENGTH', 64); |
|
| 118 | +define('CONFIG_DATABASE_PASSWORD_MAX_LENGTH', 64); |
|
| 119 | +define('CONFIG_DATABASE_NAME_MAX_LENGTH', 64); |
|
| 120 | 120 | |
| 121 | 121 | # Other |
| 122 | 122 | |
| 123 | -define('CONFIG_UPLOADS_MAX_SIZE', 104857600); # 100 MB |
|
| 123 | +define('CONFIG_UPLOADS_MAX_SIZE', 104857600); # 100 MB |
|
@@ -2,15 +2,15 @@ |
||
| 2 | 2 | |
| 3 | 3 | # Regular expressions |
| 4 | 4 | |
| 5 | -define('REGEX_MAP_PATH_ITEM_NAME', '/^[a-zA-Z0-9_\-\+\.\,\'\*\(\)\[\]:;!$%~]+$/'); |
|
| 6 | -define('REGEX_MAP_HANDLER_ITEM_NAME', '/^[A-Z][a-zA-Z0-9]*$/'); |
|
| 5 | +define('REGEX_MAP_PATH_ITEM_NAME', '/^[a-zA-Z0-9_\-\+\.\,\'\*\(\)\[\]:;!$%~]+$/'); |
|
| 6 | +define('REGEX_MAP_HANDLER_ITEM_NAME', '/^[A-Z][a-zA-Z0-9]*$/'); |
|
| 7 | 7 | |
| 8 | -define('REGEX_LANGUAGE_NAME', '/^[a-z][a-z]-[A-Z][A-Z]$/'); |
|
| 9 | -define('REGEX_TEMPLATE_NAME', '/^[A-Z0-9][a-zA-Z0-9]*$/'); |
|
| 8 | +define('REGEX_LANGUAGE_NAME', '/^[a-z][a-z]-[A-Z][A-Z]$/'); |
|
| 9 | +define('REGEX_TEMPLATE_NAME', '/^[A-Z0-9][a-zA-Z0-9]*$/'); |
|
| 10 | 10 | |
| 11 | -define('REGEX_USER_AUTH_CODE', '/^[a-zA-Z0-9]{40}$/'); |
|
| 11 | +define('REGEX_USER_AUTH_CODE', '/^[a-zA-Z0-9]{40}$/'); |
|
| 12 | 12 | |
| 13 | -define('REGEX_USER_NAME', '/^(?!_)(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/'); |
|
| 14 | -define('REGEX_USER_PASSWORD', '/^.+$/'); |
|
| 13 | +define('REGEX_USER_NAME', '/^(?!_)(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/'); |
|
| 14 | +define('REGEX_USER_PASSWORD', '/^.+$/'); |
|
| 15 | 15 | |
| 16 | -define('REGEX_FILE_NAME', '/^[^\/?%*:|"<>\\\]+$/'); |
|
| 16 | +define('REGEX_FILE_NAME', '/^[^\/?%*:|"<>\\\]+$/'); |
|
@@ -29,23 +29,31 @@ |
||
| 29 | 29 | |
| 30 | 30 | # Check for demo mode |
| 31 | 31 | |
| 32 | - if (Informer::isDemoMode()) return 'DEMO_MODE_RESTRICTION'; |
|
| 32 | + if (Informer::isDemoMode()) { |
|
| 33 | + return 'DEMO_MODE_RESTRICTION'; |
|
| 34 | + } |
|
| 33 | 35 | |
| 34 | 36 | # Validate name |
| 35 | 37 | |
| 36 | - if (false === ($name = Validate::fileName($name))) return 'FILEMANAGER_ERROR_NAME_INVALID'; |
|
| 38 | + if (false === ($name = Validate::fileName($name))) { |
|
| 39 | + return 'FILEMANAGER_ERROR_NAME_INVALID'; |
|
| 40 | + } |
|
| 37 | 41 | |
| 38 | 42 | # Check if item exists |
| 39 | 43 | |
| 40 | 44 | if ((0 !== strcasecmp($this->entity->name(), $name)) && |
| 41 | 45 | |
| 42 | - @file_exists($this->entity->parent()->pathFull() . $name)) return 'FILEMANAGER_ERROR_EXISTS'; |
|
| 46 | + @file_exists($this->entity->parent()->pathFull() . $name)) { |
|
| 47 | + return 'FILEMANAGER_ERROR_EXISTS'; |
|
| 48 | + } |
|
| 43 | 49 | |
| 44 | 50 | # Rename item |
| 45 | 51 | |
| 46 | - if (!$this->entity->rename($name)) return (($this->entity->type() === FILEMANAGER_TYPE_DIR) ? |
|
| 52 | + if (!$this->entity->rename($name)) { |
|
| 53 | + return (($this->entity->type() === FILEMANAGER_TYPE_DIR) ? |
|
| 47 | 54 | |
| 48 | 55 | 'FILEMANAGER_ERROR_DIR_RENAME' : 'FILEMANAGER_ERROR_FILE_RENAME'); |
| 56 | + } |
|
| 49 | 57 | |
| 50 | 58 | # ------------------------ |
| 51 | 59 | |
@@ -29,23 +29,31 @@ |
||
| 29 | 29 | |
| 30 | 30 | # Check for demo mode |
| 31 | 31 | |
| 32 | - if (Informer::isDemoMode()) return 'DEMO_MODE_RESTRICTION'; |
|
| 32 | + if (Informer::isDemoMode()) { |
|
| 33 | + return 'DEMO_MODE_RESTRICTION'; |
|
| 34 | + } |
|
| 33 | 35 | |
| 34 | 36 | # Validate name |
| 35 | 37 | |
| 36 | - if (false === ($name = Validate::fileName($name))) return 'FILEMANAGER_ERROR_NAME_INVALID'; |
|
| 38 | + if (false === ($name = Validate::fileName($name))) { |
|
| 39 | + return 'FILEMANAGER_ERROR_NAME_INVALID'; |
|
| 40 | + } |
|
| 37 | 41 | |
| 38 | 42 | # Check if item exists |
| 39 | 43 | |
| 40 | - if (@file_exists($this->parent->pathFull() . $name)) return 'FILEMANAGER_ERROR_EXISTS'; |
|
| 44 | + if (@file_exists($this->parent->pathFull() . $name)) { |
|
| 45 | + return 'FILEMANAGER_ERROR_EXISTS'; |
|
| 46 | + } |
|
| 41 | 47 | |
| 42 | 48 | # Create item |
| 43 | 49 | |
| 44 | 50 | $entity = Filemanager::get($type, $this->parent); |
| 45 | 51 | |
| 46 | - if (!$entity->create($name)) return (($entity->type() === FILEMANAGER_TYPE_DIR) ? |
|
| 52 | + if (!$entity->create($name)) { |
|
| 53 | + return (($entity->type() === FILEMANAGER_TYPE_DIR) ? |
|
| 47 | 54 | |
| 48 | 55 | 'FILEMANAGER_ERROR_DIR_CREATE' : 'FILEMANAGER_ERROR_FILE_CREATE'); |
| 56 | + } |
|
| 49 | 57 | |
| 50 | 58 | # ------------------------ |
| 51 | 59 | |
@@ -20,13 +20,19 @@ discard block |
||
| 20 | 20 | |
| 21 | 21 | # Validate values |
| 22 | 22 | |
| 23 | - if (false === ($email = Validate::userEmail($email))) return 'USER_ERROR_EMAIL_INVALID'; |
|
| 23 | + if (false === ($email = Validate::userEmail($email))) { |
|
| 24 | + return 'USER_ERROR_EMAIL_INVALID'; |
|
| 25 | + } |
|
| 24 | 26 | |
| 25 | 27 | # Check email exists |
| 26 | 28 | |
| 27 | - if (false === ($check_email = Auth::user()->check('email', $email))) return 'USER_ERROR_EDIT_PERSONAL'; |
|
| 29 | + if (false === ($check_email = Auth::user()->check('email', $email))) { |
|
| 30 | + return 'USER_ERROR_EDIT_PERSONAL'; |
|
| 31 | + } |
|
| 28 | 32 | |
| 29 | - if ($check_email === 1) return 'USER_ERROR_EMAIL_DUPLICATE'; |
|
| 33 | + if ($check_email === 1) { |
|
| 34 | + return 'USER_ERROR_EMAIL_DUPLICATE'; |
|
| 35 | + } |
|
| 30 | 36 | |
| 31 | 37 | # Update user |
| 32 | 38 | |
@@ -40,7 +46,9 @@ discard block |
||
| 40 | 46 | $data['country'] = $country; |
| 41 | 47 | $data['timezone'] = $timezone; |
| 42 | 48 | |
| 43 | - if (!Auth::user()->edit($data)) return 'USER_ERROR_EDIT_PERSONAL'; |
|
| 49 | + if (!Auth::user()->edit($data)) { |
|
| 50 | + return 'USER_ERROR_EDIT_PERSONAL'; |
|
| 51 | + } |
|
| 44 | 52 | |
| 45 | 53 | # ------------------------ |
| 46 | 54 | |
@@ -20,17 +20,25 @@ discard block |
||
| 20 | 20 | |
| 21 | 21 | # Validate values |
| 22 | 22 | |
| 23 | - if (false === ($password = Validate::userPassword($password))) return 'USER_ERROR_PASSWORD_INVALID'; |
|
| 23 | + if (false === ($password = Validate::userPassword($password))) { |
|
| 24 | + return 'USER_ERROR_PASSWORD_INVALID'; |
|
| 25 | + } |
|
| 24 | 26 | |
| 25 | - if (false === ($password_new = Validate::userPassword($password_new))) return 'USER_ERROR_PASSWORD_NEW_INVALID'; |
|
| 27 | + if (false === ($password_new = Validate::userPassword($password_new))) { |
|
| 28 | + return 'USER_ERROR_PASSWORD_NEW_INVALID'; |
|
| 29 | + } |
|
| 26 | 30 | |
| 27 | - if (0 !== strcmp($password_new, $password_retype)) return 'USER_ERROR_PASSWORD_MISMATCH'; |
|
| 31 | + if (0 !== strcmp($password_new, $password_retype)) { |
|
| 32 | + return 'USER_ERROR_PASSWORD_MISMATCH'; |
|
| 33 | + } |
|
| 28 | 34 | |
| 29 | 35 | # Check password |
| 30 | 36 | |
| 31 | 37 | $password = Str::encode(Auth::user()->auth_key, $password); |
| 32 | 38 | |
| 33 | - if (0 !== strcmp(Auth::user()->password, $password)) return 'USER_ERROR_PASSWORD_INCORRECT'; |
|
| 39 | + if (0 !== strcmp(Auth::user()->password, $password)) { |
|
| 40 | + return 'USER_ERROR_PASSWORD_INCORRECT'; |
|
| 41 | + } |
|
| 34 | 42 | |
| 35 | 43 | # Encode password |
| 36 | 44 | |
@@ -43,7 +51,9 @@ discard block |
||
| 43 | 51 | $data['auth_key'] = $auth_key; |
| 44 | 52 | $data['password'] = $password; |
| 45 | 53 | |
| 46 | - if (!Auth::user()->edit($data)) return 'USER_ERROR_EDIT_PASSWORD'; |
|
| 54 | + if (!Auth::user()->edit($data)) { |
|
| 55 | + return 'USER_ERROR_EDIT_PASSWORD'; |
|
| 56 | + } |
|
| 47 | 57 | |
| 48 | 58 | # ------------------------ |
| 49 | 59 | |
@@ -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 'USER_ERROR_NAME_INVALID'; |
|
| 27 | + if (false === ($name = Validate::userName($name))) { |
|
| 28 | + return 'USER_ERROR_NAME_INVALID'; |
|
| 29 | + } |
|
| 26 | 30 | |
| 27 | - if (false === ($password = Validate::userPassword($password))) return 'USER_ERROR_PASSWORD_INVALID'; |
|
| 31 | + if (false === ($password = Validate::userPassword($password))) { |
|
| 32 | + return 'USER_ERROR_PASSWORD_INVALID'; |
|
| 33 | + } |
|
| 28 | 34 | |
| 29 | - if (false === ($email = Validate::userEmail($email))) return 'USER_ERROR_EMAIL_INVALID'; |
|
| 35 | + if (false === ($email = Validate::userEmail($email))) { |
|
| 36 | + return 'USER_ERROR_EMAIL_INVALID'; |
|
| 37 | + } |
|
| 30 | 38 | |
| 31 | - if (0 !== strcmp($password, $password_retype)) return 'USER_ERROR_PASSWORD_MISMATCH'; |
|
| 39 | + if (0 !== strcmp($password, $password_retype)) { |
|
| 40 | + return 'USER_ERROR_PASSWORD_MISMATCH'; |
|
| 41 | + } |
|
| 32 | 42 | |
| 33 | - if (false === Security::checkCaptcha($captcha)) return 'USER_ERROR_CAPTCHA_INCORRECT'; |
|
| 43 | + if (false === Security::checkCaptcha($captcha)) { |
|
| 44 | + return '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 'USER_ERROR_NAME_DUPLICATE'; |
|
| 57 | + if ($check_name === 1) { |
|
| 58 | + return '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 'USER_ERROR_EMAIL_DUPLICATE'; |
|
| 67 | + if ($check_email === 1) { |
|
| 68 | + return '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 | |
@@ -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,9 +24,13 @@ discard block |
||
| 22 | 24 | |
| 23 | 25 | # Validate values |
| 24 | 26 | |
| 25 | - if (false === ($password_new = Validate::userPassword($password_new))) return 'USER_ERROR_PASSWORD_NEW_INVALID'; |
|
| 27 | + if (false === ($password_new = Validate::userPassword($password_new))) { |
|
| 28 | + return 'USER_ERROR_PASSWORD_NEW_INVALID'; |
|
| 29 | + } |
|
| 26 | 30 | |
| 27 | - if (0 !== strcmp($password_new, $password_retype)) return 'USER_ERROR_PASSWORD_MISMATCH'; |
|
| 31 | + if (0 !== strcmp($password_new, $password_retype)) { |
|
| 32 | + return 'USER_ERROR_PASSWORD_MISMATCH'; |
|
| 33 | + } |
|
| 28 | 34 | |
| 29 | 35 | # Encode password |
| 30 | 36 | |
@@ -34,7 +40,9 @@ discard block |
||
| 34 | 40 | |
| 35 | 41 | $data = ['auth_key' => $auth_key, 'password' => $password]; |
| 36 | 42 | |
| 37 | - if (!Auth::user()->edit($data)) return 'USER_ERROR_AUTH_RECOVER'; |
|
| 43 | + if (!Auth::user()->edit($data)) { |
|
| 44 | + return 'USER_ERROR_AUTH_RECOVER'; |
|
| 45 | + } |
|
| 38 | 46 | |
| 39 | 47 | # Remove secret |
| 40 | 48 | |
