Merge branch 'rhymix:master' into master

This commit is contained in:
Lastorder 2025-03-03 10:47:47 +09:00 committed by GitHub
commit e5b729f8e9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
152 changed files with 2348 additions and 792 deletions

View file

@ -1,19 +1,19 @@
<?php
$lang->ncenterlite = 'Notification Center';
$lang->ncenterlite_notify = 'notification';
$lang->ncenterlite_install_version = 'Installed version';
$lang->ncenterlite_install_version = 'Installed Version';
$lang->ncenterlite_advenced_config = 'Advenced Setting';
$lang->ncenterlite_document = 'post';
$lang->ncenterlite_comment = 'comment';
$lang->ncenterlite_type_document = 'New document';
$lang->ncenterlite_type_comment = 'New comment';
$lang->ncenterlite_type_comment_comment = 'Reply on comment';
$lang->ncenterlite_type_document = 'New Post';
$lang->ncenterlite_type_comment = 'New Comment';
$lang->ncenterlite_type_comment_comment = 'Reply on Comments';
$lang->ncenterlite_type_mention = 'Mention';
$lang->ncenterlite_type_vote = 'Vote';
$lang->ncenterlite_type_scrap = 'Scrap';
$lang->ncenterlite_type_message = 'Direct message';
$lang->ncenterlite_type_test = 'Test notification';
$lang->ncenterlite_type_admin_content = 'Admin notification';
$lang->ncenterlite_type_message = 'Direct Message';
$lang->ncenterlite_type_test = 'Dummy Notification';
$lang->ncenterlite_type_admin_content = 'Admin Notification';
$lang->ncenterlite_type_custom = 'Other';
$lang->ncenterlite_comment_noti = $lang->ncenterlite_type_comment;
$lang->ncenterlite_comment_comment_noti = $lang->ncenterlite_type_comment_comment;
@ -24,15 +24,20 @@ $lang->ncenterlite_message_noti = $lang->ncenterlite_type_message;
$lang->ncenterlite_sender = 'Sender';
$lang->ncenterlite_addressee = 'Recipient';
$lang->ncenterlite_noti_contents = 'Contents';
$lang->ncenterlite_read = 'Have read';
$lang->ncenterlite_notify_setting = 'Turn Off Notifications at:';
$lang->ncenterlite_about_notify_setting = 'You can turn off notifications in the selected pages and modules. Please select the pages and modules to turn off notifications in the following list.';
$lang->ncenterlite_notify_mid_all = 'Forwarding Notifications to the Administrators';
$lang->ncenterlite_about_mid_all = "You can listen to all the notifications from the selected pages and modules. Please select the pages and modules to receive forwarded notifications in the following list. (Caution: This setting may let you know the other members' activities in the selected pages.)";
$lang->ncenterlite_read = 'Have Read';
$lang->ncenterlite_read_y = 'Read';
$lang->ncenterlite_read_n = 'Not read';
$lang->ncenterlite_read_n = 'Not Read';
$lang->ncenterlite_no_target = 'no target';
$lang->ncenterlite_my_list = 'My notification list';
$lang->ncenterlite_my_settings = 'My notification settings';
$lang->ncenterlite_user_settings = 'User notification settings';
$lang->ncenterlite_my_list = 'Received Notifications';
$lang->ncenterlite_my_settings = 'My Notification Settings';
$lang->ncenterlite_user_settings = 'User Notification Settings';
$lang->ncenterlite_notify_settings = 'Notification Settings';
$lang->ncenterlite_userconfig_title = 'Notification Center Settings of %s';
$lang->ncenterlite_userconfig_about = 'Personalized settings of notification center can be controlled by you.';
$lang->ncenterlite_userconfig_about = 'Please manage your notification settings here.';
$lang->ncenterlite_comment_noti_about = 'Receive notifications for new comments on my posts.';
$lang->ncenterlite_comment_comment_noti_about = 'Receive notifications for replies to my comments.';
$lang->ncenterlite_mention_noti_about = 'Receive notifications for mentions (@%s).';
@ -41,9 +46,15 @@ $lang->ncenterlite_vote_noti_about = 'Receive notifications when someone votes o
$lang->ncenterlite_scrap_noti_about = 'Receive notifications when someone scraps my post.';
$lang->ncenterlite_admin_content_noti_about = 'Receive administrator notifications.';
$lang->ncenterlite_custom_noti_about = 'Receive all other notifications.';
$lang->ncneterlite_block_individual = 'Turn off notifications from each post/comment';
$lang->ncneterlite_block_individual_about = 'You can turn off notifications from a particular post or comment.';
$lang->ncenterlite_activate = 'Activate';
$lang->ncenterlite_inactivate = 'Inactivate';
$lang->ncenterlite_userconfig_about_warning = 'Watch out! You are controlling other user\'s settings via this page.';
$lang->ncenterlite_comment_all = 'Let every commenter know';
$lang->ncenterlite_comment_all_setting = 'Notification settings for comment authors';
$lang->ncenterlite_comment_all_select_mid = 'Modules with notifications for commenters';
$lang->ncenterlite_about_comment_all_select_mid = 'Select pages and modules to turn on the notifications for commenters. If there are no selected modules, this function will be inactive.';
$lang->ncenterlite_article = '<strong>%1$s</strong> wrote "%2$s".';
$lang->ncenterlite_board = '<strong>%1$s</strong> wrote "%3$s" on <strong>%2$s</strong>.';
$lang->ncenterlite_commented = '<strong>%1$s</strong> commented "%3$s" on your %2$s.';
@ -52,15 +63,15 @@ $lang->ncenterlite_mentioned = '<strong>%1$s</strong> mentioned you in a %4$s, "
$lang->ncenterlite_message_string = 'You have <strong>%d</strong> unread message.';
$lang->ncenterlite_message_string_plural = 'You have <strong>%d</strong> unread messages.';
$lang->ncenterlite_message_mention = '<strong>%1$s</strong> sent you a message, "%2$s".';
$lang->ncenterlite_test_noti = 'Hello, <strong>%s</strong>! This is a test notification.';
$lang->ncenterlite_test_noti = 'Hi <strong>%s</strong>! This is a dummy notification.';
$lang->ncenterlite_vote = '<strong>%1$s</strong> liked your %3$s, "%2$s".';
$lang->ncenterlite_vote_anonymous = 'Your %2$s, "%1$s" was liked.';
$lang->ncenterlite_scrap = '<strong>%1$s</strong> scrapped your %3$s, "%2$s".';
$lang->ncenterlite_scrap_anonymous = 'Your %2$s, "%1$s" was scrapped.';
$lang->ncenterlite_admin_content_message = '<strong>%1$s</strong> wrote "%3$s" on <strong>%2$s</strong>.';
$lang->ncenterlite_insert_member_message = '<strong>%s!</strong> Welcome to the <strong>membership!!</strong>';
$lang->ncenterlite_insert_member_message = '<strong>%s!</strong> Welcome to join us!';
$lang->ncenterlite_content_image = '(Image)';
$lang->ncenterlite_content_empty = '(No Content)';
$lang->ncenterlite_content_empty = '(No content to display)';
$lang->ncenterlite_ago = 'ago';
$lang->ncenterlite_date['0'] = 'year';
$lang->ncenterlite_date['1'] = 'month';
@ -71,12 +82,13 @@ $lang->ncenterlite_date['5'] = 'second';
$lang->ncenterlite_sir = ' ';
$lang->ncenterlite_message = 'You have <strong class="num">%s</strong> new notification.';
$lang->ncenterlite_messages = 'You have <strong class="num">%s</strong> new notifications.';
$lang->ncenterlite_not_have_message = 'You have no new notifications.';
$lang->ncenterlite_thisistest = '[*] This is a test notice.';
$lang->ncenterlite_delete_all = 'delete all';
$lang->ncenterlite_not_have_message = 'There is no new notification for you.';
$lang->ncenterlite_thisistest = '[*] This is a dummy notification.';
$lang->ncenterlite_delete_all = 'Delete All';
$lang->ncenterlite_more = 'More';
$lang->ncenterlite_stop_no_permission_other_user = 'You don\'t have the authority to read settings of other members.';
$lang->ncenterlite_stop_no_permission_other_user_settings = 'You don\'t have the authority to control settings of other members.';
$lang->ncenterlite_stop_no_permission_other_user_block_settings = 'You are not allowed to change the other member\'s notification settings.';
$lang->ncenterlite_message_delete_notification_before = 'Notifications before %s are deleted.';
$lang->ncenterlite_message_delete_notification_all = 'Every notification is deleted.';
$lang->ncenterlite_click_to_open = 'Click here to open';
@ -86,6 +98,7 @@ $lang->ncenterlite_warning = 'Watch out!';
$lang->ncenterlite_io = 'Activate Notifications';
$lang->ncenterlite_io_about = 'You can activate or inactivate every function of Notification Center Lite module.';
$lang->ncenterlite_on = 'Active';
$lang->ncenterlite_only_message = 'For direct messages only';
$lang->ncenterlite_off = 'Inactive';
$lang->ncenterlite_display = 'Display Notifications';
$lang->ncenterlite_display_all = 'All display';
@ -106,41 +119,61 @@ $lang->ncenterlite_test_mention = 'Web page notification test';
$lang->ncenterlite_test_mention_about = 'Create dummy data for module and/or skin test.';
$lang->ncenterlite_test_push = 'Push notification test';
$lang->ncenterlite_test_push_about = 'Create dummy data for mobile push notification test.';
$lang->ncenterlite_document_event_settings = 'Document event notification';
$lang->ncenterlite_document_event_vote = 'Recommendation';
$lang->ncenterlite_document_event_vote_about = 'When someone recommend document, the author of it can get notifying.';
$lang->ncenterlite_document_event_settings = 'Post Event Notification';
$lang->ncenterlite_document_event_vote = 'Vote';
$lang->ncenterlite_document_event_vote_about = 'When someone vote up or down a post, its author can get notifying.';
$lang->ncenterlite_document_event_read = 'Delete notifying after read the article';
$lang->ncenterlite_document_event_read_preserve = 'Preserve notification';
$lang->ncenterlite_document_event_read_delete = 'Delete notification';
$lang->ncenterlite_document_event_read_preserve = 'Preserve Notification';
$lang->ncenterlite_document_event_read_delete = 'Delete Notification';
$lang->ncenterlite_document_event_read_about = 'Delete every notification after read the article. Default is do not delete (preserve).';
$lang->ncenterlite_commnet_event = 'Comments';
$lang->ncenterlite_commnet_event_noti_all = 'Notice every comments to the author';
$lang->ncenterlite_commnet_event_noti_some = 'Notice only direct replies to the author';
$lang->ncenterlite_message_event = 'Notify message';
$lang->ncenterlite_message_event_about = 'Do not notify message (Use XE Core message notification system).';
$lang->ncenterlite_message_event = 'Notify direct message';
$lang->ncenterlite_message_event_about = 'Do not notify direct messages via this module (Use notifications via the direct message module only).';
$lang->ncenterlite_mid_use = 'Module specific settings';
$lang->ncenterlite_to_unsubscribe = 'Disable notification';
$lang->ncenterlite_subscribe = 'Activate notification';
$lang->ncenterlite_cmd_unsubscribe_settings = 'Notification settings';
$lang->ncenterlite_notify_count = 'Notification count';
$lang->ncenterlite_notify_count_about = 'Set the number of notifications per page.';
$lang->this_message_unsubscribe = 'Unsubscribe from this post';
$lang->about_this_message_unsubscribe = 'Stop receiving notifications abou this post.';
$lang->this_message_unsubscribe = 'Unsubscribe notifications from this post';
$lang->about_this_message_unsubscribe = 'Stop receiving notifications about this post.';
$lang->unsubscribe_list = 'Unsubscribe List';
$lang->unsubscribe = 'Unsubscribe individually';
$lang->about_unsubscribe = 'Allow users to unsubscribe from individual posts.';
$lang->about_unsubscribe = 'Allow users to unsubscribe notifications from individual posts.';
$lang->fcm_push_format = 'Push notification format';
$lang->fcm_push_format_notification = 'Use notification';
$lang->fcm_push_format_data = 'Use data';
$lang->about_fcm_push_format = 'Select where to place the notification data when sending push notifications with Google FCM.<br>This setting should match the requirements of your client application or frontend code.';
$lang->member_menu_view = 'Display personalized notification panel';
$lang->member_menu_on = 'Display';
$lang->member_menu_off = 'Hide';
$lang->about_member_menu_view = 'Each member may have their own settings panel for their notification center. They can manipulate the notification settings in their panel. Please select if you will allow them to have their panel or not.';
$lang->user_notify_setting = 'User notification settings';
$lang->about_user_notify_setting = 'Each member can set a notify settings. Warning! If a member setting not use notifications, they will not be notified regardless of their default settings.';
$lang->ncenterlite_push_before_sms = 'Try a push notification before sending an SMS';
$lang->ncenterlite_push_before_sms_about = 'Don\'t send an SMS if the recipient has at least one device to which a push notification has been successfully sent.';
$lang->ncenterlite_no_notify = 'There is no notification to present.';
$lang->ncenterlite_all_delete = 'Delete all';
$lang->ncenterlite_month_before_delete = 'Delete older than 1 month';
$lang->dont_check_notify_delete = 'Unread notifications will be deleted, too.';
$lang->user_notify_setting = 'User notify setting.';
$lang->about_user_notify_setting = 'Each member can set a notify settings. Warning! If a member setting not use notifications, they will not be notified regardless of their default settings.';
$lang->msg_not_use_user_setting = 'user setting\'s not use. Please contact your administrator.';
$lang->ncenterlite_push_before_sms = 'Try Push before SMS';
$lang->ncenterlite_push_before_sms_about = 'Don\'t send SMS if the recipient has at least one device to which a push notification has been successfully sent.';
$lang->anonymous_nick_name_setting = 'Alternative nickname for anonymous';
$lang->about_anonymous_nick_name = 'Defining an alternative nickname for notifications from anonymous.';
$lang->mention_suffixes = 'Common name suffixes';
$lang->about_mention_suffixes = 'Please define common suffixes for names. This notification system will identify the name with and without the defined suffixes. For instance, if " Doe" is defined as a suffix, both "@John Doe" and "@John" will point to "@John" in this system. Please separate multiple suffixes with a comma (,) between each.';
$lang->mention_suffix_always_cut = 'Handling nicknames with the defined suffixes';
$lang->mention_suffix_always_cut_y = 'Prioritize members\' nicknames withOUT the suffixes';
$lang->mention_suffix_always_cut_n = 'Prioritize members\' nicknames WITH the suffixes';
$lang->about_mention_suffix_always_cut = 'Decide which one should receive a notification for "@John Doe" when both John Doe and John are in your database.';
$lang->mention_limit = 'Maximum numbers of notifications';
$lang->about_mention_limit = 'To prevent a server-side overload, you can limit the maximum numbers of notifications in a single post or comment.';
$lang->ncenterlite_msg_setting_error = 'There are errors in your settings. Please check your inputs.';
$lang->ncenterlite_use_help = 'Select which kinds of notifications can be sent to the members via selected methods. Your members can personalize their settings in their own settings panel among your selections here.';
$lang->ncenterlite_use_othercomment_help = 'Send notifications to every commenter when the author of the original post leaves a comment.';
$lang->member_phone_variable = 'Variable of member\'s phone number';
$lang->member_phone_variable_about = 'Define where the phone number will be referred. Either member\'s account information or the extended variable of the post can be selected.<br />If there is only one extended variable in the form of a phone number, the settings are automatically saved on installation.';
$lang->member_phone_builtin_field = 'Phone number in the member\'s account information';
$lang->anonymous_voter = 'anonymous voter';
$lang->about_anonymous_voter = 'anonymize voter in vote notification';
$lang->anonymous_scrap = 'anonymous scrap';
@ -152,6 +185,16 @@ $lang->cmd_web_notify = 'Web';
$lang->cmd_mail_notify = 'Email';
$lang->cmd_sms_notify = 'SMS';
$lang->cmd_push_notify = 'Push';
$lang->msg_denger_rhymix_user = '<strong>Warning!</strong> Rhymix includes notification center by default.<br />Please remove this XE-only module and reinstall the Rhymix native version.';
$lang->ncenterlite_content_type = 'Type of the contents';
$lang->msg_unsubscribe_not_in_list = 'This contents is not in the unsubscribed list.';
$lang->ncenterlite_type_id = 'Notification Type ID';
$lang->ncenterlite_type_objects = 'Value of Notification Type Variable';
$lang->ncenterlite_type_content = 'Content of Notification Type';
$lang->ncenterlite_notify_type = 'List of Notification Type';
$lang->msg_do_not_notify_type = 'There is no matched type for generating a notification.';
$lang->ncenterlite_custom_list = 'Tailored list';
$lang->msg_not_use_user_setting = 'You cannot change your notification settings. Please contact your administrator.';
$lang->msg_denger_rhymix_user = '<strong>Warning!</strong> Rhymix already includes the notification center as a default module.<br />Please remove this XE-only module and reinstall the Rhymix bundled version.';
$lang->msg_test_notifycation_success = 'A dummy notification was successfully generated.';
$lang->msg_unsubscribe_block_not_support = 'You are not allowed to turn off your notification. Please refer to the website administrator.';
$lang->msg_unsubscribe_not_permission = 'You are not allowed to see the other members\' subscription lists.';
$lang->msg_unsubscribe_not_in_list = 'This content is not on the unsubscribed list.';

View file

@ -57,12 +57,9 @@ class NcenterliteAdminController extends Ncenterlite
}
}
if ($obj->disp_act == 'dispNcenterliteAdminNotifyConfig')
if ($obj->disp_act === 'dispNcenterliteAdminConfig')
{
if (!$obj->use)
{
$config->use = array();
}
$config->{'use'} = $obj->{'use'} ?? [];
}
if ($obj->disp_act == 'dispNcenterliteAdminAdvancedconfig')

View file

@ -1918,7 +1918,7 @@ class NcenterliteController extends Ncenterlite
*/
protected static function _createSummary($str): string
{
$str = escape(utf8_normalize_spaces(trim(strip_tags($str)), false));
$str = escape(utf8_normalize_spaces(trim(strip_tags($str))), false);
if (function_exists('mb_strimwidth'))
{
return mb_strimwidth($str, 0, 50, '...', 'UTF-8');
@ -1937,7 +1937,7 @@ class NcenterliteController extends Ncenterlite
*/
protected static function _createContent($str): string
{
$str = escape(utf8_normalize_spaces(trim(strip_tags($str)), false));
$str = escape(utf8_normalize_spaces(trim(strip_tags($str))), false);
if (function_exists('mb_strimwidth'))
{
return mb_strimwidth($str, 0, 200, '...', 'UTF-8');