Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
Kijin Sung 2022-11-22 13:34:39 +09:00
commit fb23b7da6b
10 changed files with 128 additions and 65 deletions

View file

@ -33,6 +33,7 @@ class HTMLDisplayHandler
public static $replacements = array(
'@\bcommon/xeicon/@' => 'common/css/xeicon/',
'@\beditor/skins/xpresseditor/js/xe_textarea\.(?:min\.)?js@' => 'editor/skins/ckeditor/js/xe_textarea.js',
'@/lang$@' => '/lang/lang.xml',
);
/**

View file

@ -891,13 +891,6 @@ class TemplateHandler
$relativeDir = $this->_getRelativeDir($pathinfo['dirname']);
$attr['target'] = $relativeDir . '/' . $pathinfo['basename'];
}
if(substr($attr['target'], -5) == '/lang')
{
$pathinfo['dirname'] .= '/lang';
$pathinfo['basename'] = '';
$pathinfo['extension'] = 'xml';
}
}
switch($pathinfo['extension'])

View file

@ -123,7 +123,7 @@ class DB
}
catch (\PDOException $e)
{
throw new Exceptions\DBError($e->getMessage(), 0, $e);
throw new Exceptions\DBError($e->getMessage());
}
// Get the DB version.
@ -541,7 +541,7 @@ class DB
}
catch (\PDOException $e)
{
throw new Exceptions\DBError($e->getMessage(), 0, $e);
throw new Exceptions\DBError($e->getMessage());
}
if ($result_type === 'auto' && $last_index === 0 && count($result) <= 1)

View file

@ -168,8 +168,8 @@ $lang->anonymous = 'Anonymous';
$lang->last_update = 'Last Update';
$lang->last_post = 'Last Comment';
$lang->module_title = 'Board Name';
$lang->signup_date = 'Signup Date';
$lang->last_login = 'Last Signin';
$lang->signup_date = 'Sign Up Date';
$lang->last_login = 'Last Login';
$lang->first_page = 'First Page';
$lang->last_page = 'Last Page';
$lang->search_target = 'Target for Search';

View file

@ -10,9 +10,9 @@ $lang->default_group_1 = 'Associate Member';
$lang->default_group_2 = 'Regular Member';
$lang->default_group = 'Default Group';
$lang->admin_group = 'Managing Group';
$lang->keep_signed = 'Keep me signed in.';
$lang->keep_signed = 'Keep me logged in.';
$lang->remember_user_id = 'Remember ID.';
$lang->already_logged = 'You are already signed in.';
$lang->already_logged = 'You are already logged in.';
$lang->denied_user_id = 'You have entered a prohibited ID.';
$lang->denied_nick_name = 'You have entered a prohibited nick name.';
$lang->managed_email_host['allowed'] = 'Only %s e-mail accounts are allowed. (%s)';
@ -60,16 +60,16 @@ $lang->enable_ssl = 'Enable SSL';
$lang->msg_email_confirmation_required = 'A confirmation e-mail will be sent. Please check your email address carefully.';
$lang->cmd_authmail_expires = 'Activation Email Expiry';
$lang->about_authmail_expires = 'Activation emails and password reset emails can be set to expire after a certain time.';
$lang->security_sign_in = 'Sign in using enhanced security';
$lang->security_sign_in = 'Login using enhanced security';
$lang->member_limited = 'Limited';
$lang->limit_day = 'Temporary Limit Date';
$lang->limit_day_description = 'Description for Temporary Limit Date';
$lang->limit_date = 'Limit Date';
$lang->cmd_special_phone_number = 'Verification code exception';
$lang->cmd_max_auth_sms_count = 'Verification rate limit';
$lang->after_login_url = 'URL to redirect after Sign in';
$lang->after_logout_url = 'URL to redirect after Sign out';
$lang->redirect_url = 'URL to redirect after Sign up';
$lang->after_login_url = 'URL to redirect after login';
$lang->after_logout_url = 'URL to redirect after sign out';
$lang->redirect_url = 'URL to redirect after sign up';
$lang->agreement = 'Terms of Service';
$lang->accept_agreement = 'Agree';
$lang->member_info = 'User Info';
@ -93,26 +93,26 @@ $lang->webmaster_name = 'Webmaster Name';
$lang->webmaster_email = 'Webmaster Email';
$lang->column_id = 'The column id';
$lang->options = 'Options';
$lang->about_keep_signed = 'You will be still signed in even when the browser is closed.\\n\\nIt is not recommended to use this if you are using a public computer, for your personal information could be violated.';
$lang->about_keep_warning = 'You will be still signed in even when the browser is closed. It is not recommended to use this if you are using a public computer, for your personal information could be violated';
$lang->about_keep_signed = 'You will be still logged in even when the browser is closed.\\n\\nIt is not recommended to use this if you are using a public computer, for your personal information could be violated.';
$lang->about_keep_warning = 'You will be still logged in even when the browser is closed. It is not recommended to use this if you are using a public computer, for your personal information could be violated';
$lang->about_webmaster_email = 'This setting can be changed in the <a href="index.php?module=admin&act=dispAdminConfigNotification" target="_blank">Notification Settings</a> screen.';
$lang->retroactive_application = 'retroact';
$lang->signature_html_retroact = 'also remove HTML in past inseted HTML signature. Can not be reversed.';
$lang->search_target_list['email_address'] = 'Email Address';
$lang->search_target_list['email_address'] = 'Phone Number';
$lang->search_target_list['regdate'] = 'Sign up Date';
$lang->search_target_list['regdate_more'] = 'Sign up Date (more)';
$lang->search_target_list['regdate_less'] = 'Sign up Date (less)';
$lang->search_target_list['phone_number'] = 'Phone Number';
$lang->search_target_list['regdate'] = 'Sign Up Date';
$lang->search_target_list['regdate_more'] = 'Sign Up Date (more)';
$lang->search_target_list['regdate_less'] = 'Sign Up Date (less)';
$lang->search_target_list['ipaddress'] = 'Sign up IP address';
$lang->search_target_list['last_login'] = 'Last Sign in Date';
$lang->search_target_list['last_login_more'] = 'Last Sign in Date (more)';
$lang->search_target_list['last_login_less'] = 'Last Sign in Date (less)';
$lang->search_target_list['last_login_ipaddress'] = 'Last Sign in IP address';
$lang->search_target_list['last_login'] = 'Last Login Date';
$lang->search_target_list['last_login_more'] = 'Last Login Date (more)';
$lang->search_target_list['last_login_less'] = 'Last Login Date (less)';
$lang->search_target_list['last_login_ipaddress'] = 'Last Login IP address';
$lang->search_target_list['birthday'] = 'Birthday';
$lang->search_target_list['extra_vars'] = 'User Defined';
$lang->cmd_modify_new_auth_email_address = 'New email address';
$lang->cmd_set_design_info = 'Desgin';
$lang->cmd_login = 'Sign In';
$lang->cmd_login = 'Login';
$lang->cmd_logout = 'Sign Out';
$lang->cmd_signup = 'Sign Up';
$lang->cmd_site_signup = 'Sign Up';
@ -131,25 +131,26 @@ $lang->cmd_member_list = 'Member List';
$lang->cmd_module_config = 'Default Setting';
$lang->cmd_member_group = 'Member Groups';
$lang->cmd_send_mail = 'Send Mail';
$lang->cmd_modify_nickname_log = 'Nickname Change Log';
$lang->cmd_nickname_symbols = 'Allow Symbols in Nickname';
$lang->cmd_nickname_symbols_list = 'Only Allow:';
$lang->cmd_manage_id = 'Prohibited IDs';
$lang->cmd_manage_email_host = 'E-mail provider check';
$lang->cmd_manage_nick_name = 'Prohibited NickNames';
$lang->cmd_manage_form = 'Signup Form';
$lang->cmd_view_own_document = 'My Articles';
$lang->cmd_view_own_comment = 'My Comments';
$lang->cmd_view_active_logins = 'Active Logins';
$lang->cmd_view_active_logins = 'Active login';
$lang->cmd_manage_member_info = 'Manage Member Info';
$lang->cmd_trace_document = 'Trace Written Articles';
$lang->cmd_trace_comment = 'Trace Written Comments';
$lang->cmd_view_scrapped_document = 'Scraps';
$lang->cmd_view_saved_document = 'Saved Articles';
$lang->cmd_send_email = 'Send Mail';
$lang->cmd_modify_nickname_log = 'Nickname Change Log';
$lang->cmd_nickname_symbols = 'Allow Symbols in Nickname';
$lang->cmd_nickname_symbols_list = 'Only Allow:';
$lang->cmd_member_profile_view = 'Show member profile picture';
$lang->cmd_allow_duplicate_nickname = 'Allow Duplicate Nicknames';
$lang->about_allow_duplicate_nickname = 'Allow more than one member to use the same nickname.';
$lang->msg_special_code_incorrect_format = 'The verification code must be a 6-digit number.';
$lang->msg_special_code_incorrect_format = 'The verification code should be a 6-digit number.';
$lang->msg_auth_sms_rate_limited = 'Too many verification attempts. Please try again later.';
$lang->msg_email_not_exists = 'You have entered an invalid email address.';
$lang->msg_alreay_scrapped = 'This article is already scrapped.';
@ -160,16 +161,20 @@ $lang->msg_cart_is_null = 'Please select the target.';
$lang->msg_checked_file_is_deleted = '%d attached file(s) is(are) deleted.';
$lang->msg_find_account_title = 'Account Info';
$lang->msg_find_account_info = 'This is requested account info.';
$lang->msg_find_account_comment = 'Your password will be changed to the one above if you click the link below.<br />Please change the password again as soon as possible after you are able to log in.<br />Your password will remain unchanged until you click the link below.';
$lang->msg_find_account_comment = 'Your password will be changed to the one above if you click the link below.<br />Please change the password again as soon as possible after you are able to login.<br />Your password will remain unchanged until you click the link below.';
$lang->msg_confirm_account_title = 'Rhymix Account Activation';
$lang->title_modify_email_address = 'This letter is sent for a confirmation of the changing e-mail address.';
$lang->msg_confirm_account_info = 'This is your account information:';
$lang->msg_confirm_account_comment = 'Click on the following link to complete your account activation.';
$lang->msg_confirm_email_address_change = 'The email address will be modified to %s after clicking below.';
$lang->msg_auth_mail_sent = 'The activation mail has been sent to %s. Please check your mail.';
$lang->msg_confirm_mail_sent = 'We have just sent the activation email to %s. Please check your mail.';
$lang->msg_change_mail_sent = 'The letter was sent to %s for the changing email address. Please, check your email.';
$lang->msg_invalid_modify_email_auth_key = 'Invalid request for changing the email address.<br />Please, request again or contact the website administrator.';
$lang->msg_invalid_auth_key = 'This is an invalid request of verification.<br />Please retry finding account info or contact the administrator.';
$lang->msg_expired_auth_key = 'Your verification link has expired. Please request a new verification email.';
$lang->msg_success_authed = 'Please use the password you received in the email to log in, and change it to a password of your choice as soon as possible.';
$lang->msg_success_confirmed = 'Your account has been activated. You may log in now.';
$lang->msg_success_authed = 'Please use the password you received in the email to login, and change it to a password of your choice as soon as possible.';
$lang->msg_success_confirmed = 'Your account has been activated. You may login now.';
$lang->msg_new_member = 'Add Member';
$lang->msg_rechecked_password = 'Re-checked password';
$lang->msg_update_member = 'View and Modify User Info';
@ -187,18 +192,18 @@ $lang->msg_invalid_phone_number = 'The phone number you have entered is invalid.
$lang->msg_exists_nick_name = 'This nickname already exists. Please try another one.';
$lang->msg_signup_disabled = 'You are not able to sign up';
$lang->msg_already_logged = 'You have already signed up.';
$lang->msg_not_logged = 'Please sign in first.';
$lang->msg_not_logged = 'Please login first.';
$lang->msg_insert_group_name = 'Please enter the name of group.';
$lang->msg_check_group = 'Please select the group.';
$lang->msg_not_uploaded_profile_image = 'Profile image could not be registered.';
$lang->msg_not_uploaded_image_name = 'Image name could not be registered.';
$lang->msg_not_uploaded_image_mark = 'Image mark could not be registered.';
$lang->msg_not_uploaded_group_image_mark = 'Group image mark could not be registered.';
$lang->msg_accept_agreement = 'You must accept all required agreements in order to sign up.';
$lang->msg_accept_agreement = 'You should accept all required agreements in order to sign up.';
$lang->msg_user_denied = 'You have entered a prohibited ID.';
$lang->msg_user_not_confirmed = 'Your account is not activated yet. A confirmation email has been sent to %s. Please check your email and click the activation link to continue.';
$lang->msg_user_limited = 'You have entered an ID that cannot be used before %s';
$lang->msg_admin_ip_not_allowed = 'Your IP address is not allowed to log in as an administrator.';
$lang->msg_admin_ip_not_allowed = 'Your IP address is not allowed to login as an administrator.';
$lang->about_rechecked_password = 'Confirm your password before editing account information.';
$lang->about_user_id = 'User ID should be 3~20 characters long, consist of alphanumeric and start with a letter.';
$lang->about_password = 'Password should be 6~20 characters long.';
@ -206,20 +211,20 @@ $lang->cmd_config_password_strength = 'password strength';
$lang->cmd_password_hashing_algorithm = 'Password Hashing Algorithm';
$lang->cmd_password_hashing_work_factor = 'Password Hashing Work Factor';
$lang->cmd_password_hashing_auto_upgrade = 'Auto-upgrade Hashing Algorithm';
$lang->cmd_password_change_invalidate_other_sessions = 'Log out other devices on password change';
$lang->cmd_login_invalidate_other_sessions = 'Log out other devices';
$lang->cmd_password_change_invalidate_other_sessions = 'Sign out other devices on password change';
$lang->cmd_login_invalidate_other_sessions = 'Sign out other devices';
$lang->password_strength_low = 'low';
$lang->password_strength_normal = 'normal';
$lang->password_strength_high = 'high';
$lang->about_password_strength_config = 'When members register or change the password, the password must meet the specified password strength. However, the administrator is an exception.';
$lang->about_password_strength_config = 'When members register or change the password, the password should meet the specified password strength. However, the administrator is an exception.';
$lang->about_password_hashing_algorithm = 'You can choose how to encrypt (hash) members\' passwords stored in the database.';
$lang->about_password_hashing_work_factor = 'Higher work factors are more secure, but logins may take a long time. This only applies to bcrypt and pbkdf2.';
$lang->about_password_hashing_work_factor = 'Higher work factors are more secure, but login may take a long time. This only applies to bcrypt and pbkdf2.';
$lang->about_password_hashing_auto_upgrade = 'Passwords encrypted using different algorithms will be automatically converted to the configured algorithm at next login.';
$lang->about_password_change_invalidate_other_sessions = 'Log out all other devices (browsers) when a member changes the password.';
$lang->about_login_invalidate_other_sessions = 'Only allow login from one device. Previously used devices will be logged out automatically.';
$lang->about_password_strength['low'] = 'the password must be at least 4';
$lang->about_password_strength['normal'] = 'the password must be at least 6, and must have at least one alpha character and numeric characters';
$lang->about_password_strength['high'] = 'the password must be at least 8, and must have at least one alpha character, numeric character and special character ';
$lang->about_password_change_invalidate_other_sessions = 'Sign out all other devices (browsers) when a member changes the password.';
$lang->about_login_invalidate_other_sessions = 'Allow login from only one device. Previously used machines will be signed out automatically.';
$lang->about_password_strength['low'] = 'the password should be longer, at least four characters';
$lang->about_password_strength['normal'] = 'the password should be at least six characters, and should have at least one alpha character and numeric characters';
$lang->about_password_strength['high'] = 'the password should be at least eight characters, and should have at least one alphabetic, numeric and special characters';
$lang->about_user_name = 'Name should be 2~20 letters long.';
$lang->about_nick_name = 'Nickname should be 2~20 characters long.';
$lang->about_email_address = 'Email address will be used to modify/find password after email verification.';
@ -242,13 +247,13 @@ $lang->about_required = 'Check this to make it mandatory item when signing up.';
$lang->about_enable_join = 'Please check if you want to accept new members. If you require a URL key, only those who visit with the corresponding string in the URL will be able to join.';
$lang->about_enable_confirm = 'An activation email will be sent to new members. They must click a link in the email to complete the sign up process.';
$lang->about_enable_find_account_question = 'Check if you want to allow members to recover their accounts using a security question and answer.';
$lang->about_enable_ssl = 'Personal information from Sign up/Modify Member Info/Sign in can be sent as SSL(https) mode if server provides SSL service.';
$lang->about_enable_ssl = 'Personal information from Sign up/Modify Member Info/Login can be sent as SSL(https) mode if server provides SSL service.';
$lang->about_limit_day = 'You can limit activation date after sign up';
$lang->about_limit_date = 'Users cannot sign in until the specified date';
$lang->about_limit_date = 'Users cannot login until the specified date';
$lang->about_special_phone_number = 'You can set up a special phone number that can be verified with a preconfigured code instead of sending an actual SMS.<br>The special phone number will also be allowed to sign up more than once even if this is normally disallowed.<br>This can be useful for development, testing, and app store review process.';
$lang->about_max_auth_sms_count = 'You can limit the number of time someone can try to verify the same phone number from the same IP address.';
$lang->about_after_login_url = 'You can set a URL after login. Blank means the current page.';
$lang->about_after_logout_url = 'You can set a URL after logout. Blank means the current page.';
$lang->about_after_logout_url = 'You can set a URL after sign-out. Blank means the current page.';
$lang->about_redirect_url = 'Please select a page where users will go after sign up. When this is empty, it will be set as the previous page of the sign up page.';
$lang->about_agreement = 'Sign up Agreement will be displayed if it\'s not empty';
$lang->about_image_name = 'Members will be able to use image name instead of text';
@ -261,10 +266,15 @@ $lang->about_member_default = 'It will be set as the default group on sign up';
$lang->about_find_member_account = 'Please input the email address you have entered during the registration and we will send your account info to this email address.';
$lang->about_ssl_port = 'Please enter if you are using non-default SSL port';
$lang->about_resend_auth_mail = 'You can request the activation email again if you have not received it.';
$lang->about_reset_auth_mail_submit = 'If you use the address as an identifier, a new email address would be required for the login.';
$lang->about_update_nickname_log = 'Record the nickname change history. If you use this option, you can see the nickname changing history.';
$lang->about_nickname_symbols = 'Allow or prohibit the use of special characters in nicknames.';
$lang->about_member_profile_view = 'Option to view the member\'s profile image on the admin member list page. Select No if you do not want to see your profile picture in the member panel.';
$lang->no_article = 'No articles';
$lang->find_account_question = 'Question for a temporary password.';
$lang->find_account_answer = 'Answer for a temporary password.';
$lang->about_find_account_question = 'You can get a temporary password by your ID, email address, and the answer for the question you have set.';
$lang->find_account_question_items['0'] = '';
$lang->find_account_question_items['1'] = 'What is your alternate email address?';
$lang->find_account_question_items['2'] = 'What is your favorite thing?';
$lang->find_account_question_items['3'] = 'Which elementary school did you attend?';
@ -320,7 +330,7 @@ $lang->cmd_show_site_admin_member = 'Site Admin';
$lang->approval = 'Approval';
$lang->denied = 'Denied';
$lang->refused_reason = 'Reason for account refusing';
$lang->about_refused_reason = 'Describe the reason why you refuse this account. Something you write in this field would be displayed when this user signs in.';
$lang->about_refused_reason = 'Describe the reason why you refuse this account. Something you write in this field would be displayed when this user login.';
$lang->use_group_image_mark = 'Use group image mark';
$lang->usable_group_image_mark_list = ' Usable list of group image mark';
$lang->add_group_image_mark = 'Add group image mark';
@ -342,12 +352,16 @@ $lang->use_after_save = 'Use after saved';
$lang->cmd_add_group = 'Add group';
$lang->msg_groups_exist = 'groups exist.';
$lang->cmd_member_config = 'Member Configuration';
$lang->cmd_member_sync = 'Sync member information';
$lang->about_member_sync = 'Synchronize member information and post/comment information. This can take a long time if you have a lot of data. <strong>If there are many users, be sure to stop the service before proceeding.</strong>';
$lang->msg_success_modify_email_address = 'Your email address has been successfully changed. You can login with the changed email address.';
$lang->group = 'Group';
$lang->retrieve_password = 'Retrieve password';
$lang->excess_ip_access_count = 'There was too much sign in trial from your devices in a short time. You can not sign in for %s.';
$lang->enable_login_fail_report = 'Sign in failure';
$lang->login_fail_report = 'Sign in failure report.';
$lang->login_fail_report_contents = '<h2>There is recorded sign in failures.</h2>%1$s<hr /><p>* This notification is shown once.<br />* This message contains sign in failure records, before a ID sign in success.<br />Sending: %2$s</p>';
$lang->excess_ip_access_count = 'There was too much login trial from your devices in a short time. You can not login for %s.';
$lang->enable_login_fail_report = 'Login failure';
$lang->login_fail_report = 'Login failure report.';
$lang->login_fail_report_contents = '<h2>There is recorded login failures.</h2>%1$s<hr /><p>* This notification is shown once.<br />* This message contains login failure records, before a ID login success.<br />Sending: %2$s</p>';
$lang->all_group = 'Entire Group';
$lang->msg_insert_group_name_detail = 'If group title are empty, does not apply.';
$lang->msg_exist_selected_module = 'Address information does not exist.';
@ -356,6 +370,9 @@ $lang->spammer_description = '<p>Spam user management. This function denied user
$lang->btn_spammer_delete_all = 'Delete all';
$lang->spammer_move_to_trash = 'Move to trash';
$lang->msg_spammer_complete = 'Completed.';
$lang->nick_name_before_changing = 'Old nickname';
$lang->nick_name_after_changing = 'New nickname';
$lang->cmd_login_browser_info = 'Browser Information';
$lang->cmd_login_device_info = 'Device Information';
$lang->cmd_initial_registration = 'Registered';
@ -367,3 +384,4 @@ $lang->scrap_folder_create = 'New Folder';
$lang->scrap_folder_rename = 'Rename';
$lang->scrap_folder_delete = 'Delete';
$lang->member_unauthenticated = 'Unauthenticated';
$lang->member_number = 'Member identification number';

View file

@ -106,9 +106,15 @@ class module extends ModuleObject
if(!$oDB->isColumnExists('action_forward', 'global_route')) return true;
// check additional indexes on lang table
$column_info = $oDB->getColumnInfo('lang', 'name');
if($column_info->size > 100)
{
return true;
}
if(!$oDB->isIndexExists('lang', 'idx_site_srl')) return true;
if(!$oDB->isIndexExists('lang', 'idx_name')) return true;
if(!$oDB->isIndexExists('lang', 'idx_lang_code')) return true;
if(!$oDB->isIndexExists('lang', 'idx_lang')) return true;
// check module_trigger table
if($oDB->isIndexExists('module_trigger', 'idx_trigger'))
@ -202,6 +208,11 @@ class module extends ModuleObject
}
// check additional indexes on lang table
$column_info = $oDB->getColumnInfo('lang', 'name');
if($column_info->size > 100)
{
$oDB->modifyColumn('lang', 'name', 'varchar', 100, null, true);
}
if(!$oDB->isIndexExists('lang', 'idx_site_srl'))
{
$oDB->addIndex('lang', 'idx_site_srl', array('site_srl'), false);
@ -214,6 +225,10 @@ class module extends ModuleObject
{
$oDB->addIndex('lang', 'idx_lang_code', array('lang_code'), false);
}
if(!$oDB->isIndexExists('lang', 'idx_lang'))
{
$oDB->addIndex('lang', 'idx_lang', array('site_srl', 'name', 'lang_code'), false);
}
// check module_trigger table
if($oDB->isIndexExists('module_trigger', 'idx_trigger'))

View file

@ -94,6 +94,16 @@ class ncenterlite extends ModuleObject
}
}
// #1903 #1906
foreach(['target_browser', 'target_summary'] as $column_name)
{
$column_info = $oDB->getColumnInfo('ncenterlite_notify', $column_name);
if ($column_info->size < 80)
{
return true;
}
}
// PK duplicate
if($oDB->isIndexExists('ncenterlite_notify', 'idx_notify'))
{
@ -166,7 +176,7 @@ class ncenterlite extends ModuleObject
}
if(!$oDB->isColumnExists('ncenterlite_notify','target_browser'))
{
$oDB->addColumn('ncenterlite_notify', 'target_browser', 'varchar', 50, true);
$oDB->addColumn('ncenterlite_notify', 'target_browser', 'varchar', 80, true);
}
if(!$oDB->isColumnExists('ncenterlite_notify','target_p_srl'))
{
@ -215,7 +225,17 @@ class ncenterlite extends ModuleObject
{
$oDB->addIndex('ncenterlite_notify', 'idx_member_srl_and_readed', array('member_srl', 'readed'));
}
// #1903 #1906
foreach(['target_browser', 'target_summary'] as $column_name)
{
$column_info = $oDB->getColumnInfo('ncenterlite_notify', $column_name);
if ($column_info->size < 80)
{
$oDB->modifyColumn('ncenterlite_notify', $column_name, 'varchar', 80, null, false);
}
}
// PK duplicate
if($oDB->isIndexExists('ncenterlite_notify', 'idx_notify'))
{

View file

@ -7,7 +7,9 @@
</grant>
</grants>
<actions>
<action name="dispPageIndex" type="view" standalone="false" index="true" />
<action name="dispPageIndex" type="view" standalone="false" index="true">
<route route="$document_srl:int" priority="100" />
</action>
<action name="dispPageAdminContent" type="view" admin_index="true" menu_name="page" menu_index="true" />
<action name="dispPageAdminDelete" type="view" menu_name="page" />

View file

@ -80,8 +80,18 @@ class pageView extends page
Context::set('module_info', $this->module_info);
Context::set('page_content', $page_content);
$this->setTemplatePath($this->module_path . 'tpl');
$this->setTemplateFile($this instanceof pageMobile ? 'mobile' : 'content');
// if the page type is the widget or outside, there might be usable GET entities.
$request_vars = Context::getRequestVars();
if (isset($request_vars->document_srl) && intval($request_vars->document_srl) > 0 && $page_type_name == 'article')
{
$returnUrl = getUrl(['mid' => Context::get('mid')]);
$this->setRedirectUrl($returnUrl);
}
else
{
$this->setTemplatePath($this->module_path . 'tpl');
$this->setTemplateFile($this instanceof pageMobile ? 'mobile' : 'content');
}
}
function _getWidgetContent()

View file

@ -10,7 +10,6 @@ $lang->about_max_level = 'You may set the max level. Level icons should be consi
$lang->level_icon = 'Level Icon';
$lang->about_level_icon = 'Level icons are stored in the ./modules/point/icons/NAME/ folder, and support gif, png and svg extensions.<br />Please be aware that different icon sets may support different ranges of high levels.';
$lang->msg_level_icon_not_found = 'Cannot find the selected level icon set.<br />Level icons must be stored in the ./modules/point/icons/NAME/ folder, and must contain at least one of the following files: 1.gif, 1.png, 1.svg';
$lang->about_level_icon = 'Path of level icon is "./module/point/icons/[level].gif" and max level could be different with icon set. So please be careful';
$lang->point_name = 'Point Name';
$lang->about_point_name = 'You may give a name or unit to a point';
$lang->level_point = 'Level Point';
@ -51,6 +50,8 @@ $lang->point_voter = 'Upvoting another person\'s document';
$lang->point_blamer = 'Downvoting another person\'s document';
$lang->point_voter_comment = 'Upvoting another person\'s comment';
$lang->point_blamer_comment = 'Downvoting another person\'s comment';
$lang->point_download_file_author = 'Downloaded by others (without images)';
$lang->point_read_document_author = 'Read by others';
$lang->point_voted = 'One\'s document is upvoted';
$lang->point_blamed = 'One\'s document is downvoted';
$lang->point_voted_comment = 'One\'s comment is upvoted';
@ -74,7 +75,10 @@ $lang->search_target_list['user_name'] = 'User Name';
$lang->search_target_list['regdate'] = 'Sign up Date';
$lang->search_target_list['regdate_more'] = 'Sign up Date (more)';
$lang->search_target_list['regdate_less'] = 'Sign up Date (less)';
$lang->search_target_list['last_login'] = 'Last Sign in Date';
$lang->search_target_list['last_login_more'] = 'Last Sign in Date (more)';
$lang->search_target_list['last_login_less'] = 'Last Sign in Date (less)';
$lang->search_target_list['last_login'] = 'Last Login Date';
$lang->search_target_list['last_login_more'] = 'Last Login Date (more)';
$lang->search_target_list['last_login_less'] = 'Last Login Date (less)';
$lang->search_target_list['extra_vars'] = 'User Defined';
$lang->no_point_date = 'Comment writing point period';
$lang->about_no_point_date = 'Points will not be awarded even if users write a comment on an article posted before the set date. (Unit is one unit)';
$lang->day_ago = ' days ago';