0ct0pu5/forkbb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update the structure of arrays for creating forms

Browse source
This commit is contained in:
Visman 2021-03-12 17:48:30 +07:00
parent 7960a2199a
commit a0ca0d2541
29 changed files with 212 additions and 212 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/Models/Pages/Admin/Bans.php
View file

@ -135,7 +135,7 @@ class Bans extends Admin
];
$form['sets']['search-info'] = [
'info' => [
'info1' => [
[
'value' => __('Ban search info'),
],
],
@ -253,21 +253,21 @@ class Bans extends Admin
'type' => $this->banCount < 1 ? 'text' : 'str',
'maxlength' => '25',
'caption' => __('Username label'),
'info' => $this->banCount < 1 ? __('Username help') : null,
'help' => $this->banCount < 1 ? 'Username help' : null,
'value' => $data['username'] ?? null,
];
$fields['ip'] = [
'type' => 'text',
'maxlength' => '255',
'caption' => __('IP label'),
'info' => __('IP help'),
'help' => 'IP help',
'value' => $data['ip'] ?? null,
];
$fields['email'] = [
'type' => 'text',
'maxlength' => '80',
'caption' => __('E-mail label'),
'info' => __('E-mail help'),
'help' => 'E-mail help',
'value' => $data['email'] ?? null,
];
$form['sets']['ban-attrs'] = [
@ -281,14 +281,14 @@ class Bans extends Admin
'type' => 'text',
'maxlength' => '255',
'caption' => __('Ban message label'),
'info' => __('Ban message help'),
'help' => 'Ban message help',
'value' => $data['message'] ?? null,
];
$fields['expire'] = [
'type' => 'text',
'maxlength' => '100',
'caption' => __('Expire date label'),
'info' => __('Expire date help'),
'help' => 'Expire date help',
'value' => $data['expire'] ?? null,
];
$form['sets']['ban-exp'] = [

4
app/Models/Pages/Admin/Categories.php
View file

@ -129,7 +129,7 @@ class Categories extends Admin
'type' => 'text',
'maxlength' => '80',
'caption' => __('Add category label'),
'info' => __(['Add category help', $this->c->Router->link('AdminForums'), __('Forums')]),
'help' => ['Add category help', $this->c->Router->link('AdminForums'), __('Forums')],
],
],
];
@ -214,7 +214,7 @@ class Categories extends Admin
],
'del-info' => [
'info' => [
'info1' => [
[
'value' => __('Delete category warn'),
'html' => true,
],

4
app/Models/Pages/Admin/Censoring.php
View file

@ -75,13 +75,13 @@ class Censoring extends Admin
'value' => $this->c->config->o_censoring,
'values' => [1 => __('Yes'), 0 => __('No')],
'caption' => __('Censor words label'),
'info' => __('Censor words help'),
'help' => 'Censor words help',
],
],
],
'onoff-info' => [
'info' => [
'info1' => [
[
'value' => __('Censoring info'),
'html' => true,
],

12
app/Models/Pages/Admin/Forums.php
View file

@ -162,7 +162,7 @@ class Forums extends Admin
if ($cid !== $forum->cat_id) {
$form['sets']["category{$forum->cat_id}-info"] = [
'info' => [
'info1' => [
[
'value' => $forum->cat_name,
],
],
@ -303,7 +303,7 @@ class Forums extends Admin
],
[
'info' => [
'info1' => [
[
'value' => __('Delete forum warn'),
'html' => true,
],
@ -475,7 +475,7 @@ class Forums extends Admin
'options' => $this->listForOptions,
'value' => $forum->parent_forum_id ? $forum->parent_forum_id : -$forum->cat_id,
'caption' => __('Parent label'),
'info' => __('Parent help'),
'help' => 'Parent help',
'required' => true,
],
'sort_by' => [
@ -493,7 +493,7 @@ class Forums extends Admin
'maxlength' => '255',
'value' => $forum->redirect_url,
'caption' => __('Redirect label'),
'info' => __('Redirect help'),
'help' => 'Redirect help',
'disabled' => $forum->num_topics || $forum->subforums ? true : null,
],
'no_sum_mess' => [
@ -501,14 +501,14 @@ class Forums extends Admin
'value' => $forum->no_sum_mess,
'values' => [0 => __('Yes'), 1 => __('No')],
'caption' => __('Count messages label'),
'info' => __(['Count messages help', $this->c->Router->link('AdminUsers'), __('Users')]),
'help' => ['Count messages help', $this->c->Router->link('AdminUsers'), __('Users')],
],
],
];
$form['sets']['forum-info'] = [
'info' => [
'info1' => [
[
'value' => __(['Group permissions info', $this->c->Router->link('AdminGroups'), __('User groups')]),
'html' => true,
],

70
app/Models/Pages/Admin/Groups.php
View file

@ -82,7 +82,7 @@ class Groups extends Admin
'options' => $this->groupsNew,
'value' => $this->c->config->i_default_user_group,
'caption' => __('New group label'),
'info' => __('New group help'),
'help' => 'New group help',
# 'autofocus' => true,
],
],
@ -116,7 +116,7 @@ class Groups extends Admin
'options' => $this->groupsDefault,
'value' => $this->c->config->i_default_user_group,
'caption' => __('Default group label'),
'info' => __('Default group help'),
'help' => 'Default group help',
],
],
],
@ -385,7 +385,7 @@ class Groups extends Admin
'maxlength' => '50',
'value' => $group->g_user_title,
'caption' => __('User title label'),
'info' => __(['User title help', $group->groupGuest ? __('Guest') : __('Member')]),
'help' => ['User title help', $group->groupGuest ? __('Guest') : __('Member')],
];
$form['sets']['group-titles'] = [
'legend' => __('Titles subhead'),
@ -414,7 +414,7 @@ class Groups extends Admin
'options' => $options,
'value' => $group->g_promote_next_group,
'caption' => __('Promote users label'),
'info' => __(['Promote users help', __('Disable promotion')]),
'help' => ['Promote users help', __('Disable promotion')],
];
$fieldset['g_promote_min_posts'] = [
'type' => 'number',
@ -422,7 +422,7 @@ class Groups extends Admin
'max' => '9999999999',
'value' => $group->g_promote_min_posts,
'caption' => __('Number for promotion label'),
'info' => __('Number for promotion help'),
'help' => 'Number for promotion help',
];
$form['sets']['group-promote'] = [
'legend' => __('Promotion subhead'),
@ -444,42 +444,42 @@ class Groups extends Admin
'value' => $group->g_moderator,
'values' => $yn,
'caption' => __('Mod privileges label'),
'info' => __('Mod privileges help'),
'help' => 'Mod privileges help',
];
$fieldset['g_mod_edit_users'] = [
'type' => 'radio',
'value' => $group->g_mod_edit_users,
'values' => $yn,
'caption' => __('Edit profile label'),
'info' => __('Edit profile help'),
'help' => 'Edit profile help',
];
$fieldset['g_mod_rename_users'] = [
'type' => 'radio',
'value' => $group->g_mod_rename_users,
'values' => $yn,
'caption' => __('Rename users label'),
'info' => __('Rename users help'),
'help' => 'Rename users help',
];
$fieldset['g_mod_change_passwords'] = [
'type' => 'radio',
'value' => $group->g_mod_change_passwords,
'values' => $yn,
'caption' => __('Change passwords label'),
'info' => __('Change passwords help'),
'help' => 'Change passwords help',
];
$fieldset['g_mod_promote_users'] = [
'type' => 'radio',
'value' => $group->g_mod_promote_users,
'values' => $yn,
'caption' => __('Mod promote users label'),
'info' => __('Mod promote users help'),
'help' => 'Mod promote users help',
];
$fieldset['g_mod_ban_users'] = [
'type' => 'radio',
'value' => $group->g_mod_ban_users,
'values' => $yn,
'caption' => __('Ban users label'),
'info' => __('Ban users help'),
'help' => 'Ban users help',
];
$form['sets']['group-mod'] = [
'legend' => __('Moderation subhead'),
@ -487,7 +487,7 @@ class Groups extends Admin
];
$form['sets']['mod-info'] = [
'info' => [
'info1' => [
[
'value' => __('Moderator info'),
],
],
@ -500,28 +500,28 @@ class Groups extends Admin
'value' => $group->g_read_board,
'values' => $yn,
'caption' => __('Read board label'),
'info' => __('Read board help'),
'help' => 'Read board help',
];
$fieldset['g_view_users'] = [
'type' => 'radio',
'value' => $group->g_view_users,
'values' => $yn,
'caption' => __('View user info label'),
'info' => __('View user info help'),
'help' => 'View user info help',
];
$fieldset['g_post_replies'] = [
'type' => 'radio',
'value' => $group->g_post_replies,
'values' => $yn,
'caption' => __('Post replies label'),
'info' => __('Post replies help'),
'help' => 'Post replies help',
];
$fieldset['g_post_topics'] = [
'type' => 'radio',
'value' => $group->g_post_topics,
'values' => $yn,
'caption' => __('Post topics label'),
'info' => __('Post topics help'),
'help' => 'Post topics help',
];
if (! $group->groupGuest) {
@ -530,28 +530,28 @@ class Groups extends Admin
'value' => $group->g_edit_posts,
'values' => $yn,
'caption' => __('Edit posts label'),
'info' => __('Edit posts help'),
'help' => 'Edit posts help',
];
$fieldset['g_delete_posts'] = [
'type' => 'radio',
'value' => $group->g_delete_posts,
'values' => $yn,
'caption' => __('Delete posts label'),
'info' => __('Delete posts help'),
'help' => 'Delete posts help',
];
$fieldset['g_delete_topics'] = [
'type' => 'radio',
'value' => $group->g_delete_topics,
'values' => $yn,
'caption' => __('Delete topics label'),
'info' => __('Delete topics help'),
'help' => 'Delete topics help',
];
$fieldset['g_set_title'] = [
'type' => 'radio',
'value' => $group->g_set_title,
'values' => $yn,
'caption' => __('Set own title label'),
'info' => __('Set own title help'),
'help' => 'Set own title help',
];
}
@ -560,21 +560,21 @@ class Groups extends Admin
'value' => $group->g_post_links,
'values' => $yn,
'caption' => __('Post links label'),
'info' => __('Post links help'),
'help' => 'Post links help',
];
$fieldset['g_search'] = [
'type' => 'radio',
'value' => $group->g_search,
'values' => $yn,
'caption' => __('User search label'),
'info' => __('User search help'),
'help' => 'User search help',
];
$fieldset['g_search_users'] = [
'type' => 'radio',
'value' => $group->g_search_users,
'values' => $yn,
'caption' => __('User list search label'),
'info' => __('User list search help'),
'help' => 'User list search help',
];
if (! $group->groupGuest) {
@ -583,7 +583,7 @@ class Groups extends Admin
'value' => $group->g_send_email,
'values' => $yn,
'caption' => __('Send e-mails label'),
'info' => __('Send e-mails help'),
'help' => 'Send e-mails help',
];
}
@ -593,7 +593,7 @@ class Groups extends Admin
];
$form['sets']['def-info'] = [
'info' => [
'info1' => [
[
'value' => __('Group settings info'),
],
],
@ -606,7 +606,7 @@ class Groups extends Admin
'max' => '999999',
'value' => $group->g_post_flood,
'caption' => __('Post flood label'),
'info' => __('Post flood help'),
'help' => 'Post flood help',
];
$fieldset['g_search_flood'] = [
'type' => 'number',
@ -614,7 +614,7 @@ class Groups extends Admin
'max' => '999999',
'value' => $group->g_search_flood,
'caption' => __('Search flood label'),
'info' => __('Search flood help'),
'help' => 'Search flood help',
];
if (! $group->groupGuest) {
@ -624,7 +624,7 @@ class Groups extends Admin
'max' => '999999',
'value' => $group->g_deledit_interval,
'caption' => __('Delete-edit interval label'),
'info' => __('Delete-edit interval help'),
'help' => 'Delete-edit interval help',
];
$fieldset['g_email_flood'] = [
'type' => 'number',
@ -632,7 +632,7 @@ class Groups extends Admin
'max' => '999999',
'value' => $group->g_email_flood,
'caption' => __('E-mail flood label'),
'info' => __('E-mail flood help'),
'help' => 'E-mail flood help',
];
$fieldset['g_report_flood'] = [
'type' => 'number',
@ -640,7 +640,7 @@ class Groups extends Admin
'max' => '999999',
'value' => $group->g_report_flood,
'caption' => __('Report flood label'),
'info' => __('Report flood help'),
'help' => 'Report flood help',
];
}
@ -658,7 +658,7 @@ class Groups extends Admin
'max' => '16000',
'value' => $group->g_sig_length,
'caption' => __('Max sig length label'),
'info' => __('Max sig length help'),
'help' => 'Max sig length help',
];
$fieldset['g_sig_lines'] = [
'type' => 'number',
@ -666,7 +666,7 @@ class Groups extends Admin
'max' => '100',
'value' => $group->g_sig_lines,
'caption' => __('Max sig lines label'),
'info' => __('Max sig lines help'),
'help' => 'Max sig lines help',
];
$form['sets']['group-signature'] = [
'legend' => __('Signature subhead'),
@ -687,7 +687,7 @@ class Groups extends Admin
'max' => '999999',
'value' => $group->g_pm_limit,
'caption' => __('PM limit label'),
'info' => __('PM limit help'),
'help' => 'PM limit help',
];
$form['sets']['group-pm'] = [
'legend' => __('PM subhead'),
@ -804,7 +804,7 @@ class Groups extends Admin
'options' => $groups,
'value' => $this->c->config->i_default_user_group,
'caption' => __('Move users label'),
'info' => __(['Move users info', $group->g_title, $count]),
'help' => ['Move users info', $group->g_title, $count],
],
],
];
@ -823,7 +823,7 @@ class Groups extends Admin
];
$form['sets']['conf-info'] = [
'info' => [
'info1' => [
[
'value' => __('Confirm delete warn'),
'html' => true,
],

40
app/Models/Pages/Admin/Install.php
View file

@ -213,7 +213,7 @@ class Install extends Admin
'options' => $langs,
'value' => $this->user->language,
'caption' => __('Install language'),
'info' => __('Choose install language info'),
'help' => 'Choose install language info',
],
],
],
@ -236,11 +236,11 @@ class Install extends Admin
'sets' => [
'db-info' => [
'info' => [
'info1' => [
[
'value' => __('Database setup'),
'html' => true,
],
'info2' => [
[
'value' => __('Info 1'),
],
],
@ -252,20 +252,20 @@ class Install extends Admin
'options' => $this->dbTypes,
'value' => $v ? $v->dbtype : 'mysql_innodb',
'caption' => __('Database type'),
'info' => __('Info 2'),
'help' => 'Info 2',
],
'dbhost' => [
'type' => 'text',
'value' => $v ? $v->dbhost : 'localhost',
'caption' => __('Database server hostname'),
'info' => __('Info 3'),
'help' => 'Info 3',
'required' => true,
],
'dbname' => [
'type' => 'text',
'value' => $v ? $v->dbname : '',
'caption' => __('Database name'),
'info' => __('Info 4'),
'help' => 'Info 4',
'required' => true,
],
'dbuser' => [
@ -277,25 +277,25 @@ class Install extends Admin
'type' => 'password',
'value' => '',
'caption' => __('Database password'),
'info' => __('Info 5'),
'help' => 'Info 5',
],
'dbprefix' => [
'type' => 'text',
'maxlength' => '40',
'value' => $v ? $v->dbprefix : '',
'caption' => __('Table prefix'),
'info' => __('Info 6'),
'help' => 'Info 6',
'required' => true,
],
],
],
'adm-info' => [
'info' => [
'info1' => [
[
'value' => __('Administration setup'),
'html' => true,
],
'info2' => [
[
'value' => __('Info 7'),
],
],
@ -308,7 +308,7 @@ class Install extends Admin
'pattern' => '^.{2,25}$',
'value' => $v ? $v->username : '',
'caption' => __('Administrator username'),
'info' => __('Info 8'),
'help' => 'Info 8',
'required' => true,
],
'password' => [
@ -316,7 +316,7 @@ class Install extends Admin
'pattern' => '^.{16,}$',
'value' => '',
'caption' => __('Administrator passphrase'),
'info' => __('Info 9'),
'help' => 'Info 9',
'required' => true,
],
'email' => [
@ -325,7 +325,7 @@ class Install extends Admin
'pattern' => '.+@.+',
'value' => $v ? $v->email : '',
'caption' => __('Administrator email'),
'info' => __('Info 10'),
'help' => 'Info 10',
'required' => true,
],
@ -333,11 +333,11 @@ class Install extends Admin
],
'board-info' => [
'info' => [
'info1' => [
[
'value' => __('Board setup'),
'html' => true,
],
'info2' => [
[
'value' => __('Info 11'),
],
],
@ -380,11 +380,11 @@ class Install extends Admin
],
'cookie-info' => [
'info' => [
'info1' => [
[
'value' => __('Cookie setup'),
'html' => true,
],
'info2' => [
[
'value' => __('Info 12'),
],
],
@ -396,7 +396,7 @@ class Install extends Admin
'maxlength' => '128',
'value' => $v ? $v->cookie_domain : '',
'caption' => __('Cookie Domain'),
'info' => __('Cookie Domain info'),
'help' => 'Cookie Domain info',
],
'cookie_path' => [
'type' => 'text',
@ -405,7 +405,7 @@ class Install extends Admin
? $v->cookie_path
: \rtrim((string) \parse_url($this->c->BASE_URL, \PHP_URL_PATH), '/') . '/',
'caption' => __('Cookie Path'),
'info' => __('Cookie Path info'),
'help' => 'Cookie Path info',
'required' => true,
],
'cookie_secure' => [
@ -419,7 +419,7 @@ class Install extends Admin
),
'values' => [1 => __('Yes '), 0 => __('No ')],
'caption' => __('Cookie Secure'),
'info' => __('Cookie Secure info'),
'help' => 'Cookie Secure info',
],
],

12
app/Models/Pages/Admin/Maintenance.php
View file

@ -79,13 +79,13 @@ class Maintenance extends Admin
'value' => $config->o_maintenance,
'values' => [1 => __('Yes'), 0 => __('No')],
'caption' => __('Maintenance mode label'),
'info' => __('Maintenance mode help'),
'help' => 'Maintenance mode help',
],
'o_maintenance_message' => [
'type' => 'textarea',
'value' => $config->o_maintenance_message,
'caption' => __('Maintenance message label'),
'info' => __('Maintenance message help'),
'help' => 'Maintenance message help',
],
],
],
@ -112,7 +112,7 @@ class Maintenance extends Admin
'sets' => [
'indx-info' => [
'info' => [
'info1' => [
[
'value' => __('Rebuild index info'),
'html' => true,
],
@ -127,7 +127,7 @@ class Maintenance extends Admin
'max' => '9999',
'value' => '100',
'caption' => __('Posts per cycle label'),
'info' => __('Posts per cycle help'),
'help' => 'Posts per cycle help',
],
'start' => [
'type' => 'number',
@ -135,7 +135,7 @@ class Maintenance extends Admin
'max' => '9999999999',
'value' => '1',
'caption' => __('Starting post label'),
'info' => __('Starting post help'),
'help' => 'Starting post help',
],
'clear' => [
'type' => 'checkbox',
@ -148,7 +148,7 @@ class Maintenance extends Admin
],
'indx-info2' => [
'info' => [
'info1' => [
[
'value' => __('Rebuild completed info'),
'html' => true,
],

116
app/Models/Pages/Admin/Options.php
View file

@ -209,7 +209,7 @@ class Options extends Admin
'maxlength' => '255',
'value' => $config->o_board_title,
'caption' => __('Board title label'),
'info' => __('Board title help'),
'help' => 'Board title help',
'required' => true,
# 'autofocus' => true,
],
@ -217,7 +217,7 @@ class Options extends Admin
'type' => 'textarea',
'value' => $config->o_board_desc,
'caption' => __('Board desc label'),
'info' => __('Board desc help'),
'help' => 'Board desc help',
],
'o_default_timezone' => [
'type' => 'select',
@ -265,28 +265,28 @@ class Options extends Admin
],
'value' => $config->o_default_timezone,
'caption' => __('Timezone label'),
'info' => __('Timezone help'),
'help' => 'Timezone help',
],
'o_default_dst' => [
'type' => 'radio',
'value' => $config->o_default_dst,
'values' => $yn,
'caption' => __('DST label'),
'info' => __('DST help'),
'help' => 'DST help',
],
'o_default_lang' => [
'type' => 'select',
'options' => $langs,
'value' => $config->o_default_lang,
'caption' => __('Language label'),
'info' => __('Language help'),
'help' => 'Language help',
],
'o_default_style' => [
'type' => 'select',
'options' => $styles,
'value' => $config->o_default_style,
'caption' => __('Default style label'),
'info' => __('Default style help'),
'help' => 'Default style help',
],
],
];
@ -302,7 +302,7 @@ class Options extends Admin
'max' => '99999',
'value' => $config->o_timeout_visit,
'caption' => __('Visit timeout label'),
'info' => __('Visit timeout help'),
'help' => 'Visit timeout help',
],
'o_timeout_online' => [
'type' => 'number',
@ -310,7 +310,7 @@ class Options extends Admin
'max' => '99999',
'value' => $config->o_timeout_online,
'caption' => __('Online timeout label'),
'info' => __('Online timeout help'),
'help' => 'Online timeout help',
],
'o_redirect_delay' => [
'type' => 'number',
@ -318,7 +318,7 @@ class Options extends Admin
'max' => '99999',
'value' => $config->o_redirect_delay,
'caption' => __('Redirect time label'),
'info' => __('Redirect time help'),
'help' => 'Redirect time help',
],
],
];
@ -331,14 +331,14 @@ class Options extends Admin
'value' => $config->o_show_user_info,
'values' => $yn,
'caption' => __('Info in posts label'),
'info' => __('Info in posts help'),
'help' => 'Info in posts help',
],
'o_show_post_count' => [
'type' => 'radio',
'value' => $config->o_show_post_count,
'values' => $yn,
'caption' => __('Post count label'),
'info' => __('Post count help'),
'help' => 'Post count help',
],
'i_disp_topics_default' => [
'type' => 'number',
@ -346,7 +346,7 @@ class Options extends Admin
'max' => '50',
'value' => $config->i_disp_topics_default,
'caption' => __('Topics per page label'),
'info' => __('Topics per page help'),
'help' => 'Topics per page help',
],
'i_disp_posts_default' => [
'type' => 'number',
@ -354,7 +354,7 @@ class Options extends Admin
'max' => '50',
'value' => $config->i_disp_posts_default,
'caption' => __('Posts per page label'),
'info' => __('Posts per page help'),
'help' => 'Posts per page help',
],
'i_disp_users' => [
'type' => 'number',
@ -362,7 +362,7 @@ class Options extends Admin
'max' => '50',
'value' => $config->i_disp_users,
'caption' => __('Users per page label'),
'info' => __('Users per page help'),
'help' => 'Users per page help',
],
'i_topic_review' => [
'type' => 'number',
@ -370,35 +370,35 @@ class Options extends Admin
'max' => '50',
'value' => $config->i_topic_review,
'caption' => __('Topic review label'),
'info' => __('Topic review help'),
'help' => 'Topic review help',
],
'p_message_all_caps' => [
'type' => 'radio',
'value' => $config->p_message_all_caps,
'values' => $yn,
'caption' => __('All caps message label'),
'info' => __('All caps message help'),
'help' => 'All caps message help',
],
'p_subject_all_caps' => [
'type' => 'radio',
'value' => $config->p_subject_all_caps,
'values' => $yn,
'caption' => __('All caps subject label'),
'info' => __('All caps subject help'),
'help' => 'All caps subject help',
],
'p_sig_all_caps' => [
'type' => 'radio',
'value' => $config->p_sig_all_caps,
'values' => $yn,
'caption' => __('All caps sigs label'),
'info' => __('All caps sigs help'),
'help' => 'All caps sigs help',
],
'p_force_guest_email' => [
'type' => 'radio',
'value' => $config->p_force_guest_email,
'values' => $yn,
'caption' => __('Require e-mail label'),
'info' => __('Require e-mail help'),
'help' => 'Require e-mail help',
],
],
];
@ -411,48 +411,48 @@ class Options extends Admin
'value' => $config->o_quickpost,
'values' => $yn,
'caption' => __('Quick post label'),
'info' => __('Quick post help'),
'help' => 'Quick post help',
],
'o_users_online' => [
'type' => 'radio',
'value' => $config->o_users_online,
'values' => $yn,
'caption' => __('Users online label'),
'info' => __('Users online help'),
'help' => 'Users online help',
],
'o_show_dot' => [
'type' => 'radio',
'value' => $config->o_show_dot,
'values' => $yn,
'caption' => __('User has posted label'),
'info' => __('User has posted help'),
'help' => 'User has posted help',
],
'o_topic_views' => [
'type' => 'radio',
'value' => $config->o_topic_views,
'values' => $yn,
'caption' => __('Topic views label'),
'info' => __('Topic views help'),
'help' => 'Topic views help',
],
'o_quickjump' => [
'type' => 'radio',
'value' => $config->o_quickjump,
'values' => $yn,
'caption' => __('Quick jump label'),
'info' => __('Quick jump help'),
'help' => 'Quick jump help',
],
'o_search_all_forums' => [ //????
'type' => 'radio',
'value' => $config->o_search_all_forums,
'values' => $yn,
'caption' => __('Search all label'),
'info' => __('Search all help'),
'help' => 'Search all help',
],
'o_additional_navlinks' => [
'type' => 'textarea',
'value' => $config->o_additional_navlinks,
'caption' => __('Menu items label'),
'info' => __('Menu items help'),
'help' => 'Menu items help',
],
],
@ -470,7 +470,7 @@ class Options extends Admin
2 => __('Atom'),
],
'caption' => __('Default feed label'),
'info' => __('Default feed help'),
'help' => 'Default feed help',
],
'i_feed_ttl' => [
'type' => 'select',
@ -483,7 +483,7 @@ class Options extends Admin
],
'value' => $config->i_feed_ttl,
'caption' => __('Feed TTL label'),
'info' => __('Feed TTL help'),
'help' => 'Feed TTL help',
],
],
@ -501,13 +501,13 @@ class Options extends Admin
2 => __('Both'),
],
'caption' => __('Reporting method label'),
'info' => __('Reporting method help'),
'help' => 'Reporting method help',
],
'o_mailing_list' => [
'type' => 'textarea',
'value' => $config->o_mailing_list,
'caption' => __('Mailing list label'),
'info' => __('Mailing list help'),
'help' => 'Mailing list help',
],
],
];
@ -520,14 +520,14 @@ class Options extends Admin
'value' => $config->o_avatars,
'values' => $yn,
'caption' => __('Use avatars label'),
'info' => __('Use avatars help'),
'help' => 'Use avatars help',
],
'o_avatars_dir' => [ //????
'type' => 'text',
'maxlength' => '255',
'value' => $config->o_avatars_dir,
'caption' => __('Upload directory label'),
'info' => __(['Upload directory help', $this->c->PUBLIC_URL]),
'help' => ['Upload directory help', $this->c->PUBLIC_URL],
'required' => true,
],
'i_avatars_width' => [
@ -536,7 +536,7 @@ class Options extends Admin
'max' => '999',
'value' => $config->i_avatars_width,
'caption' => __('Max width label'),
'info' => __('Max width help'),
'help' => 'Max width help',
],
'i_avatars_height' => [
'type' => 'number',
@ -544,7 +544,7 @@ class Options extends Admin
'max' => '999',
'value' => $config->i_avatars_height,
'caption' => __('Max height label'),
'info' => __('Max height help'),
'help' => 'Max height help',
],
'i_avatars_size' => [
'type' => 'number',
@ -552,7 +552,7 @@ class Options extends Admin
'max' => '9999999',
'value' => $config->i_avatars_size,
'caption' => __('Max size label'),
'info' => __('Max size help'),
'help' => 'Max size help',
],
],
];
@ -565,7 +565,7 @@ class Options extends Admin
'maxlength' => '80',
'value' => $config->o_admin_email,
'caption' => __('Admin e-mail label'),
'info' => __('Admin e-mail help'),
'help' => 'Admin e-mail help',
'required' => true,
'pattern' => '.+@.+',
],
@ -574,7 +574,7 @@ class Options extends Admin
'maxlength' => '80',
'value' => $config->o_webmaster_email,
'caption' => __('Webmaster e-mail label'),
'info' => __('Webmaster e-mail help'),
'help' => 'Webmaster e-mail help',
'required' => true,
'pattern' => '.+@.+',
],
@ -583,14 +583,14 @@ class Options extends Admin
'value' => $config->o_forum_subscriptions,
'values' => $yn,
'caption' => __('Forum subscriptions label'),
'info' => __('Forum subscriptions help'),
'help' => 'Forum subscriptions help',
],
'o_topic_subscriptions' => [
'type' => 'radio',
'value' => $config->o_topic_subscriptions,
'values' => $yn,
'caption' => __('Topic subscriptions label'),
'info' => __('Topic subscriptions help'),
'help' => 'Topic subscriptions help',
],
'i_email_max_recipients' => [
'type' => 'number',
@ -598,28 +598,28 @@ class Options extends Admin
'max' => '99999',
'value' => $config->i_email_max_recipients,
'caption' => __('Email max recipients label'),
'info' => __('Email max recipients help'),
'help' => 'Email max recipients help',
],
'o_smtp_host' => [
'type' => 'text',
'maxlength' => '255',
'value' => $config->o_smtp_host,
'caption' => __('SMTP address label'),
'info' => __('SMTP address help'),
'help' => 'SMTP address help',
],
'o_smtp_user' => [
'type' => 'text',
'maxlength' => '255',
'value' => $config->o_smtp_user,
'caption' => __('SMTP username label'),
'info' => __('SMTP username help'),
'help' => 'SMTP username help',
],
'o_smtp_pass' => [
'type' => 'password',
'maxlength' => '255',
'value' => $config->o_smtp_pass ? ' ' : null,
'caption' => __('SMTP password label'),
'info' => __('SMTP password help'),
'help' => 'SMTP password help',
],
'changeSmtpPassword' => [
'type' => 'checkbox',
@ -632,7 +632,7 @@ class Options extends Admin
'value' => $config->o_smtp_ssl,
'values' => $yn,
'caption' => __('SMTP SSL label'),
'info' => __('SMTP SSL help'),
'help' => 'SMTP SSL help',
],
],
];
@ -645,34 +645,34 @@ class Options extends Admin
'value' => $config->o_regs_allow,
'values' => $yn,
'caption' => __('Allow new label'),
'info' => __('Allow new help'),
'help' => 'Allow new help',
],
'o_regs_verify' => [
'type' => 'radio',
'value' => $config->o_regs_verify,
'values' => $yn,
'caption' => __('Verify label'),
'info' => __('Verify help'),
'help' => 'Verify help',
],
'o_regs_report' => [
'type' => 'radio',
'value' => $config->o_regs_report,
'values' => $yn,
'caption' => __('Report new label'),
'info' => __('Report new help'),
'help' => 'Report new help',
],
'o_rules' => [
'type' => 'radio',
'value' => $config->o_rules,
'values' => $yn,
'caption' => __('Use rules label'),
'info' => __('Use rules help'),
'help' => 'Use rules help',
],
'o_rules_message' => [
'type' => 'textarea',
'value' => $config->o_rules_message,
'caption' => __('Rules label'),
'info' => __('Rules help'),
'help' => 'Rules help',
],
'i_default_email_setting' => [
'class' => 'block',
@ -684,7 +684,7 @@ class Options extends Admin
2 => __('Hide both label'),
],
'caption' => __('E-mail default label'),
'info' => __('E-mail default help'),
'help' => 'E-mail default help',
],
],
];
@ -697,13 +697,13 @@ class Options extends Admin
'value' => $config->o_announcement,
'values' => $yn,
'caption' => __('Display announcement label'),
'info' => __('Display announcement help'),
'help' => 'Display announcement help',
],
'o_announcement_message' => [
'type' => 'textarea',
'value' => $config->o_announcement_message,
'caption' => __('Announcement message label'),
'info' => __('Announcement message help'),
'help' => 'Announcement message help',
],
],
@ -724,7 +724,7 @@ class Options extends Admin
'max' => '99',
'value' => $config->i_poll_max_questions,
'caption' => __('Max questions label'),
'info' => __('Max questions help'),
'help' => 'Max questions help',
],
'i_poll_max_fields' => [
'type' => 'number',
@ -732,7 +732,7 @@ class Options extends Admin
'max' => '99',
'value' => $config->i_poll_max_fields,
'caption' => __('Max options label'),
'info' => __('Max options help'),
'help' => 'Max options help',
],
'i_poll_time' => [
'type' => 'number',
@ -740,7 +740,7 @@ class Options extends Admin
'max' => '999999',
'value' => $config->i_poll_time,
'caption' => __('Poll edit time label'),
'info' => __('Poll edit time help'),
'help' => 'Poll edit time help',
],
'i_poll_term' => [
'type' => 'number',
@ -748,14 +748,14 @@ class Options extends Admin
'max' => '99',
'value' => $config->i_poll_term,
'caption' => __('Hidden voices label'),
'info' => __('Hidden voices help'),
'help' => 'Hidden voices help',
],
'b_poll_guest' => [
'type' => 'radio',
'value' => $config->b_poll_guest,
'values' => $yn,
'caption' => __('Result for guest label'),
'info' => __('Result for guest help'),
'help' => 'Result for guest help',
],
],
];
@ -768,7 +768,7 @@ class Options extends Admin
'value' => $config->b_pm,
'values' => $yn,
'caption' => __('Allow PM label'),
'info' => __(['Allow PM help', __('User groups'), $this->c->Router->link('AdminGroups')]),
'help' => ['Allow PM help', __('User groups'), $this->c->Router->link('AdminGroups')],
],
],
];

44
app/Models/Pages/Admin/Parser/BBCode.php
View file

@ -439,7 +439,7 @@ class BBCode extends Parser
'type' => $id > 0 ? 'str' : 'text',
'value' => $structure->tag,
'caption' => __('Tag label'),
'info' => __('Tag info'),
'help' => 'Tag info',
'maxlength' => '11',
'pattern' => '^[a-z\*][a-z\d-]{0,10}$',
'required' => true,
@ -449,13 +449,13 @@ class BBCode extends Parser
'options' => $this->bbTypes,
'value' => $structure->type,
'caption' => __('Type label'),
'info' => __('Type info'),
'help' => 'Type info',
],
'type_new' => [
'type' => 'text',
'value' => isset($this->bbTypes[$structure->type]) ? '' : $structure->type,
'caption' => __('Type label'),
'info' => __('New type info'),
'help' => 'New type info',
'maxlength' => '20',
'pattern' => '^[a-z][a-z\d-]{0,19}$',
],
@ -464,7 +464,7 @@ class BBCode extends Parser
'options' => $this->bbTypes,
'value' => $structure->parents,
'caption' => __('Parents label'),
'info' => __('Parents info'),
'help' => 'Parents info',
'size' => \min(15, \count($this->bbTypes)),
'required' => true,
],
@ -473,56 +473,56 @@ class BBCode extends Parser
'type' => 'textarea',
'value' => $structure->handler,
'caption' => __('Handler label'),
'info' => __('Handler info'),
'help' => 'Handler info',
],
'text_handler' => [
'class' => 'handler',
'type' => 'textarea',
'value' => $structure->text_handler,
'caption' => __('Text handler label'),
'info' => __('Text handler info'),
'help' => 'Text handler info',
],
'recursive' => [
'type' => 'radio',
'value' => true === $structure->recursive ? 1 : 0,
'values' => $yn,
'caption' => __('Recursive label'),
'info' => __('Recursive info'),
'help' => 'Recursive info',
],
'text_only' => [
'type' => 'radio',
'value' => true === $structure->text_only ? 1 : 0,
'values' => $yn,
'caption' => __('Text only label'),
'info' => __('Text only info'),
'help' => 'Text only info',
],
'tags_only' => [
'type' => 'radio',
'value' => true === $structure->tags_only ? 1 : 0,
'values' => $yn,
'caption' => __('Tags only label'),
'info' => __('Tags only info'),
'help' => 'Tags only info',
],
'pre' => [
'type' => 'radio',
'value' => true === $structure->pre ? 1 : 0,
'values' => $yn,
'caption' => __('Pre label'),
'info' => __('Pre info'),
'help' => 'Pre info',
],
'single' => [
'type' => 'radio',
'value' => true === $structure->single ? 1 : 0,
'values' => $yn,
'caption' => __('Single label'),
'info' => __('Single info'),
'help' => 'Single info',
],
'auto' => [
'type' => 'radio',
'value' => true === $structure->auto ? 1 : 0,
'values' => $yn,
'caption' => __('Auto label'),
'info' => __('Auto info'),
'help' => 'Auto info',
],
'self_nesting' => [
'type' => 'number',
@ -530,7 +530,7 @@ class BBCode extends Parser
'min' => '0',
'max' => '10',
'caption' => __('Self nesting label'),
'info' => __('Self nesting info'),
'help' => 'Self nesting info',
],
],
];
@ -550,7 +550,7 @@ class BBCode extends Parser
'def_attr',
'def_attr',
__(['Def attr subhead', $tagStr]),
__('Allowed def_attr info')
'Allowed def_attr info'
);
foreach ($structure->other_attrs as $name => $attr) {
@ -559,7 +559,7 @@ class BBCode extends Parser
$name,
"{$name}_attr",
__(['Other attr subhead', $tagStr, $name]),
__(['Allowed %s attr info', $name])
['Allowed %s attr info', $name]
);
}
@ -568,7 +568,7 @@ class BBCode extends Parser
'new_attr',
'new_attr',
__('New attr subhead'),
__('Allowed new_attr info')
'Allowed new_attr info'
);
return $form;
@ -589,7 +589,7 @@ class BBCode extends Parser
'type' => 'text',
'value' => $data['name'] ?? '',
'caption' => __('Attribute name label'),
'info' => __('Attribute name info'),
'help' => 'Attribute name info',
'maxlength' => '15',
'pattern' => '^[a-z-]{2,15}$',
];
@ -600,7 +600,7 @@ class BBCode extends Parser
'value' => null === $data ? 0 : 1,
'values' => $yn,
'caption' => __('Allowed label'),
'info' => $info,
'help' => $info,
];
if ('no_attr' !== $name) {
$fields["{$key}[required]"] = [
@ -608,14 +608,14 @@ class BBCode extends Parser
'value' => empty($data['required']) ? 0 : 1,
'values' => $yn,
'caption' => __('Required label'),
'info' => __('Required info'),
'help' => 'Required info',
];
$fields["{$key}[format]"] = [
'class' => 'format',
'type' => 'text',
'value' => $data['format'] ?? '',
'caption' => __('Format label'),
'info' => __('Format info'),
'help' => 'Format info',
];
}
$fields["{$key}[body_format]"] = [
@ -623,14 +623,14 @@ class BBCode extends Parser
'type' => 'text',
'value' => $data['body_format'] ?? '',
'caption' => __('Body format label'),
'info' => __('Body format info'),
'help' => 'Body format info',
];
$fields["{$key}[text_only]"] = [
'type' => 'radio',
'value' => empty($data['text_only']) ? 0 : 1,
'values' => $yn,
'caption' => __('Text only label'),
'info' => __('Text only info'),
'help' => 'Text only info',
];
return [

10
app/Models/Pages/Admin/Parser/Edit.php
View file

@ -95,21 +95,21 @@ class Edit extends Parser
'value' => $config->p_message_bbcode,
'values' => $yn,
'caption' => __('BBCode label'),
'info' => __('BBCode help'),
'help' => 'BBCode help',
],
'p_sig_bbcode' => [
'type' => 'radio',
'value' => $config->p_sig_bbcode,
'values' => $yn,
'caption' => __('BBCode sigs label'),
'info' => __('BBCode sigs help'),
'help' => 'BBCode sigs help',
],
'o_make_links' => [
'type' => 'radio',
'value' => $config->o_make_links,
'values' => $yn,
'caption' => __('Clickable links label'),
'info' => __('Clickable links help'),
'help' => 'Clickable links help',
],
'bbcode_management' => [
'type' => 'btn',
@ -129,14 +129,14 @@ class Edit extends Parser
'value' => $config->o_smilies,
'values' => $yn,
'caption' => __('Smilies mess label'),
'info' => __('Smilies mess help'),
'help' => 'Smilies mess help',
],
'o_smilies_sig' => [
'type' => 'radio',
'value' => $config->o_smilies_sig,
'values' => $yn,
'caption' => __('Smilies sigs label'),
'info' => __('Smilies sigs help'),
'help' => 'Smilies sigs help',
],
'smilies_management' => [
'type' => 'btn',

2
app/Models/Pages/Admin/Parser/Smilies.php
View file

@ -325,7 +325,7 @@ class Smilies extends Parser
'upload_image' => [
'type' => 'file',
'caption' => __('Upload image label'),
'info' => __('Upload image info'),
'help' => 'Upload image info',
'accept' => $this->accept,
],
],

2
app/Models/Pages/Admin/Reports.php
View file

@ -128,7 +128,7 @@ class Reports extends Admin
if (empty($form['sets'])) {
$form['sets'][] = [
'info' => [
'info1' => [
[
'value' => $noZapped ? __('No new reports') : __('No zapped reports'),
],
],

8
app/Models/Pages/Admin/Update.php
View file

@ -289,7 +289,7 @@ class Update extends Admin
'sets' => [
'update-info' => [
'info' => [
'info1' => [
[
'value' => __('Update message'),
],
],
@ -301,21 +301,21 @@ class Update extends Admin
'type' => 'password',
'value' => '',
'caption' => __('Database password'),
'info' => __('Database password note'),
'help' => 'Database password note',
'required' => true,
],
'o_maintenance_message' => [
'type' => 'textarea',
'value' => $v ? $v->o_maintenance_message : $this->c->config->o_maintenance_message,
'caption' => __('Maintenance message'),
'info' => __('Maintenance message info'),
'help' => 'Maintenance message info',
'required' => true,
],
],
],
'member-info' => [
'info' => [
'info1' => [
[
'value' => __('Members message'),
],
],

6
app/Models/Pages/Admin/Users/Action.php
View file

@ -173,7 +173,7 @@ class Action extends Users
'value' => 0,
'values' => $yn,
'caption' => __('Delete users'),
'info' => __(['Confirm delete info', $names]),
'help' => ['Confirm delete info', $names],
],
'delete_posts' => [
'type' => 'radio',
@ -185,7 +185,7 @@ class Action extends Users
],
'info2' => [
'info' => [
'info2' => [
[
'value' => __('Delete warning'),
'html' => true,
],
@ -340,7 +340,7 @@ class Action extends Users
'options' => $this->groupListForChange($profile),
'value' => $this->c->config->i_default_user_group,
'caption' => __('New group label'),
'info' => __(['New group help', $names]),
'help' => ['New group help', $names],
],
'confirm' => [
'type' => 'radio',

6
app/Models/Pages/Admin/Users/NewUser.php
View file

@ -103,7 +103,7 @@ class NewUser extends Users
'maxlength' => '25',
'value' => $data['username'] ?? null,
'caption' => __('Username'),
'info' => __('Login format'),
'help' => 'Login format',
'required' => true,
'pattern' => '^.{2,25}$',
],
@ -112,14 +112,14 @@ class NewUser extends Users
'maxlength' => '80',
'value' => $data['email'] ?? null,
'caption' => __('Email'),
'info' => __('Email info'),
'help' => 'Email info',
'required' => true,
'pattern' => '.+@.+',
],
'password' => [
'type' => 'text',
'caption' => __('Passphrase'),
'info' => __('Pass format') . ' ' . __('Pass info'),
'help' => __('Pass format') . ' ' . __('Pass info'), // ????
'required' => true,
'pattern' => '^.{16,}$',
],

2
app/Models/Pages/Admin/Users/View.php
View file

@ -177,7 +177,7 @@ class View extends Users
];
$form['sets']['search-info'] = [
'info' => [
'info1' => [
[
'value' => __('User search info'),
],
],

6
app/Models/Pages/Auth.php
View file

@ -155,7 +155,7 @@ class Auth extends Page
'id' => 'passinlogin',
'type' => 'password',
'caption' => __('Passphrase'),
'info' => __(['<a href="%s">Forgotten?</a>', $this->c->Router->link('Forget')]),
'help' => ['<a href="%s">Forgotten?</a>', $this->c->Router->link('Forget')],
'required' => true,
],
'save' => [
@ -340,7 +340,7 @@ class Auth extends Page
'maxlength' => '80',
'value' => $email,
'caption' => __('Email'),
'info' => __('Passphrase reset info'),
'help' => 'Passphrase reset info',
'required' => true,
'pattern' => '.+@.+',
],
@ -471,7 +471,7 @@ class Auth extends Page
'password2' => [
'type' => 'password',
'caption' => __('Confirm new pass'),
'info' => __('Pass format') . ' ' . __('Pass info'),
'help' => __('Pass format') . ' ' . __('Pass info'), // ????
'required' => true,
'pattern' => '^.{16,}$',
],

4
app/Models/Pages/Delete.php
View file

@ -105,10 +105,10 @@ class Delete extends Page
'sets' => [
'info' => [
'info' => [
'info1' => [
[
'value' => __('Topic') . ' «' . $post->parent->censorSubject . '»',
],
'info2' => [
[
'value' => __([$deleteTopic ? 'Topic by' : 'Reply by', $post->poster, \ForkBB\dt($post->posted)]),
'html' => true,
],

2
app/Models/Pages/Email.php
View file

@ -165,7 +165,7 @@ class Email extends Page
],
'email-info' => [
'info' => [
'info1' => [
[
'value' => __('Email disclosure note'),
],
],

4
app/Models/Pages/Moderate.php
View file

@ -558,7 +558,7 @@ class Moderate extends Page
$form['sets']['info'] = [
'info' => [
'info1' => [
[
'value' => \implode('<br>', $headers),
'html' => true,
],
@ -566,7 +566,7 @@ class Moderate extends Page
];
if ($this->firstTopic instanceof Topic) {
$form['sets']['info']['info']['info2'] = [
$form['sets']['info']['info'][] = [
'value' => __(['All posts will be posted in the «%s» topic', $this->firstTopic->censorSubject]),
];
}

4
app/Models/Pages/PostFormTrait.php
View file

@ -208,7 +208,7 @@ trait PostFormTrait
'max' => '366',
'value' => $vars['poll']['duration'] ?? 0,
'caption' => __('Poll duration label'),
'info' => __('Poll duration help'),
'help' => 'Poll duration help',
'disabled' => $vars['pollNoEdit'] ?? null,
];
$fieldset['poll[hide_result]'] = [
@ -240,7 +240,7 @@ trait PostFormTrait
'max' => (string) $this->c->config->i_poll_max_fields,
'value' => $vars['poll']['type'][$qid] ?? 1,
'caption' => __('Answer type label'),
'info' => __('Answer type help'),
'help' => 'Answer type help',
'disabled' => $vars['pollNoEdit'] ?? null,
];

22
app/Models/Pages/Profile/Config.php
View file

@ -235,7 +235,7 @@ class Config extends Profile
'value' => $this->curUser->dst,
'values' => $yn,
'caption' => __('DST label'),
'info' => __('DST help'),
'help' => 'DST help',
],
'time_format' => [
'type' => 'select',
@ -261,35 +261,35 @@ class Config extends Profile
'value' => $this->curUser->show_smilies,
'values' => $yn,
'caption' => __('Smilies label'),
'info' => __('Smilies info'),
'help' => 'Smilies info',
],
'show_sig' => [
'type' => 'radio',
'value' => $this->curUser->show_sig,
'values' => $yn,
'caption' => __('Sigs label'),
'info' => __('Sigs info'),
'help' => 'Sigs info',
],
'show_avatars' => [
'type' => 'radio',
'value' => $this->curUser->show_avatars,
'values' => $yn,
'caption' => __('Avatars label'),
'info' => __('Avatars info'),
'help' => 'Avatars info',
],
'show_img' => [
'type' => 'radio',
'value' => $this->curUser->show_img,
'values' => $yn,
'caption' => __('Images label'),
'info' => __('Images info'),
'help' => 'Images info',
],
'show_img_sig' => [
'type' => 'radio',
'value' => $this->curUser->show_img_sig,
'values' => $yn,
'caption' => __('Images sigs label'),
'info' => __('Images sigs info'),
'help' => 'Images sigs info',
],
],
];
@ -303,7 +303,7 @@ class Config extends Profile
'max' => '50',
'value' => $this->curUser->__disp_topics,
'caption' => __('Topics per page label'),
'info' => __('For default'),
'help' => 'For default',
],
'disp_posts' => [
'type' => 'number',
@ -311,7 +311,7 @@ class Config extends Profile
'max' => '50',
'value' => $this->curUser->__disp_posts,
'caption' => __('Posts per page label'),
'info' => __('For default'),
'help' => 'For default',
],
],
];
@ -328,7 +328,7 @@ class Config extends Profile
],
'value' => $this->curUser->ip_check_type,
'caption' => __('IP check'),
'info' => __('IP check info'),
'help' => 'IP check info',
'disabled' => $this->rules->editIpCheckType ? null : true,
],
],
@ -344,14 +344,14 @@ class Config extends Profile
'value' => $this->curUser->notify_with_post,
'values' => $yn,
'caption' => __('Notify label'),
'info' => __('Notify info'),
'help' => 'Notify info',
],
'auto_notify' => [
'type' => 'radio',
'value' => $this->curUser->auto_notify,
'values' => $yn,
'caption' => __('Auto notify label'),
'info' => __('Auto notify info'),
'help' => 'Auto notify info',
],
],
];

14
app/Models/Pages/Profile/Edit.php
View file

@ -278,7 +278,7 @@ class Edit extends Profile
'maxlength' => '50',
'caption' => __('Title'),
'value' => $this->curUser->title,
'info' => __('Leave blank'),
'help' => 'Leave blank',
];
} else {
$fields['title'] = [
@ -324,15 +324,15 @@ class Edit extends Profile
}
$fields['upload_avatar'] = [
'type' => 'file',
'caption' => __('New avatar'),
'info' => __(['New avatar info',
'type' => 'file',
'caption' => __('New avatar'),
'help' => ['New avatar info',
\ForkBB\num($this->c->config->i_avatars_width),
\ForkBB\num($this->c->config->i_avatars_height),
\ForkBB\num($this->c->config->i_avatars_size),
\ForkBB\size($this->c->config->i_avatars_size)
]),
'accept' => $this->accept,
],
'accept' => $this->accept,
];
}
$form['sets']['header'] = [
@ -452,7 +452,7 @@ class Edit extends Profile
'type' => 'textarea',
'value' => $this->curUser->signature,
'caption' => __('Signature'),
'info' => __(['Sig max size', \ForkBB\num($this->curUser->g_sig_length), \ForkBB\num($this->curUser->g_sig_lines)]),
'help' => ['Sig max size', \ForkBB\num($this->curUser->g_sig_length), \ForkBB\num($this->curUser->g_sig_lines)],
];
$form['sets']['signature'] = [
'class' => 'data-edit',

2
app/Models/Pages/Profile/Email.php
View file

@ -234,7 +234,7 @@ class Email extends Profile
'required' => true,
'pattern' => '.+@.+',
'value' => $this->curUser->email,
'info' => $this->rules->my ? __('Email instructions') : null,
'help' => $this->rules->my ? 'Email instructions' : null,
],
'password' => [
'type' => 'password',

2
app/Models/Pages/Profile/Mod.php
View file

@ -123,7 +123,7 @@ class Mod extends Profile
if ($cid !== $forum->cat_id) {
$form['sets']["category{$forum->cat_id}-info"] = [
'info' => [
'info1' => [
[
'value' => $forum->cat_name,
],
],

2
app/Models/Pages/Profile/Pass.php
View file

@ -108,7 +108,7 @@ class Pass extends Profile
'caption' => __('New pass'),
'required' => true,
'pattern' => '^.{16,}$',
'info' => __('Pass format') . ' ' . __('Pass info'),
'help' => __('Pass format') . ' ' . __('Pass info'), // ????
],
'password' => [
'type' => 'password',

6
app/Models/Pages/Register.php
View file

@ -110,7 +110,7 @@ class Register extends Page
'maxlength' => '80',
'value' => $v->email,
'caption' => __('Email'),
'info' => __('Email info'),
'help' => 'Email info',
'required' => true,
'pattern' => '.+@.+',
],
@ -120,7 +120,7 @@ class Register extends Page
'maxlength' => '25',
'value' => $v->username,
'caption' => __('Username'),
'info' => __('Login format'),
'help' => 'Login format',
'required' => true,
'pattern' => '^.{2,25}$',
],
@ -128,7 +128,7 @@ class Register extends Page
'class' => 'hint',
'type' => 'password',
'caption' => __('Passphrase'),
'info' => __('Pass format') . ' ' . __('Pass info'),
'help' => __('Pass format') . ' ' . __('Pass info'), // ????
'required' => true,
'pattern' => '^.{16,}$',
],

2
app/Models/Pages/Userlist.php
View file

@ -180,7 +180,7 @@ class Userlist extends Page
'maxlength' => '25',
'value' => $v->name ?: '*',
'caption' => __('Username'),
'info' => __('User search info'),
'help' => 'User search info',
'required' => true,
# 'autofocus' => true,
];

4
app/templates/layouts/form.forkbb.php
View file

@ -96,8 +96,8 @@
@elseif ('file' === $cur['type'])
<input @if ($cur['required']) required @endif @if ($cur['disabled']) disabled @endif @if ($cur['autofocus']) autofocus @endif class="f-ctrl" id="id-{{ $key }}" name="{{ $key }}" type="file" @if ($cur['accept']) accept="{{ $cur['accept'] }}" @endif>
@endif
@if ($cur['info'])
<p class="f-yhint">{!! $cur['info'] !!}</p>
@if ($cur['help'])
<p class="f-yhint">{!! __($cur['help']) !!}</p>
@endif
</dd>
</dl>