Bläddra i källkod

Set the class of form elements through an array

Visman 3 år sedan
förälder
incheckning
e730e9ce1e

+ 10 - 10
app/Models/Pages/Admin/Bans.php

@@ -166,18 +166,18 @@ class Bans extends Admin
             'value'     => $data['message'] ?? null,
         ];
         $fields['between1'] = [
-            'class' => 'between',
+            'class' => ['between'],
             'type'  => 'wrap',
         ];
         $fields['expire_1'] = [
-            'class'     => 'bstart',
+            'class'     => ['bstart'],
             'type'      => 'text',
             'maxlength' => '100',
             'value'     => $data['expire_1'] ?? null,
             'caption'   => 'Expire date label',
         ];
         $fields['expire_2'] = [
-            'class'     => 'bend',
+            'class'     => ['bend'],
             'type'      => 'text',
             'maxlength' => '100',
             'value'     => $data['expire_2'] ?? null,
@@ -192,11 +192,11 @@ class Bans extends Admin
 
         $fields = [];
         $fields['between5'] = [
-            'class' => 'between',
+            'class' => ['between'],
             'type'  => 'wrap',
         ];
         $fields['order_by'] = [
-            'class'   => 'bstart',
+            'class'   => ['bstart'],
             'type'    => 'select',
             'options' => [
                 'id'       => __('Order by id'),
@@ -209,7 +209,7 @@ class Bans extends Admin
             'caption' => 'Order by label',
         ];
         $fields['direction'] = [
-            'class'   => 'bend',
+            'class'   => ['bend'],
             'type'    => 'select',
             'options' => [
                 'ASC'  => __('Ascending'),
@@ -421,11 +421,11 @@ class Bans extends Admin
 
             $fields = [];
             $fields["l{$number}-wrap1"] = [
-                'class' => 'main-result',
+                'class' => ['main-result'],
                 'type'  => 'wrap',
             ];
             $fields["l{$number}-wrap2"] = [
-                'class' => 'user-result',
+                'class' => ['user-result'],
                 'type'  => 'wrap',
             ];
             $fields["l{$number}-username"] = [
@@ -478,7 +478,7 @@ class Bans extends Admin
                 'type' => 'endwrap',
             ];
             $fields["l{$number}-wrap3"] = [
-                'class' => 'btns-result',
+                'class' => ['btns-result'],
                 'type'  => 'wrap',
             ];
 
@@ -514,7 +514,7 @@ class Bans extends Admin
             ];
 
             $form['sets']["l{$number}"] = [
-                'class'  => 'result',
+                'class'  => ['result'],
                 'legend' => $number,
                 'fields' => $fields,
             ];

+ 2 - 2
app/Models/Pages/Admin/Categories.php

@@ -116,7 +116,7 @@ class Categories extends Admin
                 ),
             ];
             $form['sets']["category{$key}"] = [
-                'class'  => 'category',
+                'class'  => ['category'],
                 'legend' => $row['cat_name'],
                 'fields' => $fields,
             ];
@@ -125,7 +125,7 @@ class Categories extends Admin
         $form['sets']['new-cat'] = [
             'fields' => [
                 'new' => [
-                    'class'     => 'new',
+                    'class'     => ['new'],
                     'type'      => 'text',
                     'maxlength' => '80',
                     'caption'   => 'Add category label',

+ 1 - 1
app/Models/Pages/Admin/Censoring.php

@@ -129,7 +129,7 @@ class Censoring extends Admin
         ];
 
         $form['sets']['censtable'] = [
-            'class'  => 'censor',
+            'class'  => ['censor'],
             'fields' => $fieldset,
         ];
 

+ 3 - 3
app/Models/Pages/Admin/Forums.php

@@ -209,7 +209,7 @@ class Forums extends Admin
                     'disabled' => $disabled,
                 ];
                 $form['sets']["forum{$forum->id}"] = [
-                    'class'  => 'forum',
+                    'class'  => ['forum'],
                     'legend' => $forum->cat_name . ' / ' . $forum->forum_name,
                     'fields' => $fields,
                 ];
@@ -447,7 +447,7 @@ class Forums extends Admin
             $form['btns']['reset'] = [
                 'type'  => 'submit',
                 'value' => __('Revert to default'),
-                'class' => 'f-opacity',
+                'class' => ['f-opacity'],
             ];
         }
 
@@ -548,7 +548,7 @@ class Forums extends Admin
             ];
 
             $form['sets']["perms{$id}"] = [
-                'class'  => 'permission',
+                'class'  => ['permission'],
                 'legend' => \ForkBB\e($group->g_title),
                 'fields' => $fields,
             ];

+ 1 - 1
app/Models/Pages/Admin/Options.php

@@ -675,7 +675,7 @@ class Options extends Admin
                     'help'    => 'Rules help',
                 ],
                 'i_default_email_setting' => [
-                    'class'   => 'block',
+                    'class'   => ['block'],
                     'type'    => 'radio',
                     'value'   => $config->i_default_email_setting,
                     'values'  => [

+ 10 - 10
app/Models/Pages/Admin/Parser/BBCode.php

@@ -119,7 +119,7 @@ class BBCode extends Parser
             ],
             'sets' => [
                 'bbcode-legend' => [
-                    'class'  => 'bbcode-legend',
+                    'class'  => ['bbcode-legend'],
                     'legend' => __('BBCode list subhead'),
                     'fields' => [],
                 ],
@@ -189,7 +189,7 @@ class BBCode extends Parser
             ];
 
             $form['sets']["bbcode{$id}"] = [
-                'class'  => 'bbcode',
+                'class'  => ['bbcode'],
                 'legend' => __(['BBCode %s', $tag]),
                 'fields' => $fields,
             ];
@@ -408,7 +408,7 @@ class BBCode extends Parser
             'sets' => [],
             'btns'   => [
                 'reset' => [
-                    'class' => 'f-opacity',
+                    'class' => ['f-opacity'],
                     'type'  => 'btn',
                     'value' => __('Default structure'),
                     'link'  => $this->c->Router->link(
@@ -432,7 +432,7 @@ class BBCode extends Parser
         $yn = [1 => __('Yes'), 0 => __('No')];
 
         $form['sets']['structure'] = [
-            'class'  => 'structure',
+            'class'  => ['structure'],
 //            'legend' => ,
             'fields' => [
                 'tag' => [
@@ -469,14 +469,14 @@ class BBCode extends Parser
                     'required'  => true,
                 ],
                 'handler' => [
-                    'class'     => 'handler',
+                    'class'     => ['handler'],
                     'type'      => 'textarea',
                     'value'     => $structure->handler,
                     'caption'   => 'Handler label',
                     'help'      => 'Handler info',
                 ],
                 'text_handler' => [
-                    'class'     => 'handler',
+                    'class'     => ['handler'],
                     'type'      => 'textarea',
                     'value'     => $structure->text_handler,
                     'caption'   => 'Text handler label',
@@ -542,7 +542,7 @@ class BBCode extends Parser
             'no_attr',
             'no_attr',
             __(['No attr subhead', $tagStr]),
-            __('Allowed no_attr info')
+            'Allowed no_attr info'
         );
 
         $form['sets']['def_attr'] = $this->formEditSub(
@@ -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])
             );
         }
 
@@ -611,7 +611,7 @@ class BBCode extends Parser
                 'help'    => 'Required info',
             ];
             $fields["{$key}[format]"] = [
-                'class'     => 'format',
+                'class'     => ['format'],
                 'type'      => 'text',
                 'value'     => $data['format'] ?? '',
                 'caption'   => 'Format label',
@@ -619,7 +619,7 @@ class BBCode extends Parser
             ];
         }
         $fields["{$key}[body_format]"] = [
-            'class'     => 'format',
+            'class'     => ['format'],
             'type'      => 'text',
             'value'     => $data['body_format'] ?? '',
             'caption'   => 'Body format label',

+ 6 - 6
app/Models/Pages/Admin/Parser/Smilies.php

@@ -143,7 +143,7 @@ class Smilies extends Parser
             ],
             'sets' => [
                 'smilies-legend' => [
-                    'class'  => 'smilies-legend',
+                    'class'  => ['smilies-legend'],
                     'legend' => __('Smilies list subhead'),
                     'fields' => [],
                 ],
@@ -210,7 +210,7 @@ class Smilies extends Parser
             ];
 
             $form['sets']["smile{$id}"] = [
-                'class'  => 'smile',
+                'class'  => ['smile'],
                 'legend' => __(['Smiley number %s', $i]),
                 'fields' => $fields,
             ];
@@ -219,7 +219,7 @@ class Smilies extends Parser
         }
 
         $form['sets']['new-smile'] = [
-            'class'  => 'new-smile',
+            'class'  => ['new-smile'],
             'legend' => __('New smile subhead'),
             'fields' => [
                 'new_sm_code' => [
@@ -259,7 +259,7 @@ class Smilies extends Parser
         $form = [
             'sets' => [
                 'image-legend' => [
-                    'class'  => 'image-legend',
+                    'class'  => ['image-legend'],
                     'legend' => __('Available images subhead'),
                     'fields' => [],
                 ],
@@ -296,7 +296,7 @@ class Smilies extends Parser
             ];
 
             $form['sets']["image{$key}"] = [
-                'class'  => 'image',
+                'class'  => ['image'],
                 'legend' => $name,
                 'fields' => $fields,
             ];
@@ -319,7 +319,7 @@ class Smilies extends Parser
             ],
             'sets'    => [
                 'upload' => [
-                    'class'  => 'upload_smile',
+                    'class'  => ['upload_smile'],
                     'legend' => __('Upload image subhead'),
                     'fields' => [
                         'upload_image' => [

+ 1 - 1
app/Models/Pages/Admin/Reports.php

@@ -109,7 +109,7 @@ class Reports extends Admin
                 ];
             }
             $cur['fields']['reason' . $report->id] = [
-                'class'   => 'reason',
+                'class'   => ['reason'],
                 'type'    => 'str',
                 'value'   => $report->message,
                 'caption' => 'Reason',

+ 3 - 3
app/Models/Pages/Admin/Users/Result.php

@@ -267,11 +267,11 @@ class Result extends Users
 
             $fields = [];
             $fields["l{$number}-wrap1"] = [
-                'class' => 'main-result',
+                'class' => ['main-result'],
                 'type'  => 'wrap',
             ];
             $fields["l{$number}-wrap2"] = [
-                'class' => 'user-result',
+                'class' => ['user-result'],
                 'type'  => 'wrap',
             ];
             $fields["l{$number}-username"] = [
@@ -345,7 +345,7 @@ class Result extends Users
                 'checked' => false,
             ];
             $form['sets']["l{$number}"] = [
-                'class'  => 'result',
+                'class'  => ['result'],
                 'legend' => -1 === $user->id ? null : $number,
                 'fields' => $fields,
             ];

+ 16 - 16
app/Models/Pages/Admin/Users/View.php

@@ -213,7 +213,7 @@ class View extends Users
             2 => __('Female'),
         ];
         $fields['gender'] = [
-#            'class'   => 'block',
+#            'class'   => ['block'],
             'type'    => 'radio',
             'value'   => $data['gender'] ?? -1,
             'values'  => $genders,
@@ -245,12 +245,12 @@ class View extends Users
             'value'     => $data['admin_note'] ?? null,
         ];
         $fields['between1'] = [
-            'class' => 'between',
+            'class' => ['between'],
             'type'  => 'wrap',
         ];
         $fields['num_posts_1'] = [
             'type'    => 'number',
-            'class'   => 'bstart',
+            'class'   => ['bstart'],
             'min'     => '0',
             'max'     => '9999999999',
             'value'   => $data['num_posts_1'] ?? null,
@@ -258,7 +258,7 @@ class View extends Users
         ];
         $fields['num_posts_2'] = [
             'type'    => 'number',
-            'class'   => 'bend',
+            'class'   => ['bend'],
             'min'     => '0',
             'max'     => '9999999999',
             'value'   => $data['num_posts_2'] ?? null,
@@ -267,18 +267,18 @@ class View extends Users
             'type' => 'endwrap',
         ];
         $fields['between2'] = [
-            'class' => 'between',
+            'class' => ['between'],
             'type'  => 'wrap',
         ];
         $fields['last_post_1'] = [
-            'class'     => 'bstart',
+            'class'     => ['bstart'],
             'type'      => 'text',
             'maxlength' => '100',
             'value'     => $data['last_post_1'] ?? null,
             'caption'   => 'Last post label',
         ];
         $fields['last_post_2'] = [
-            'class'     => 'bend',
+            'class'     => ['bend'],
             'type'      => 'text',
             'maxlength' => '100',
             'value'     => $data['last_post_2'] ?? null,
@@ -287,18 +287,18 @@ class View extends Users
             'type' => 'endwrap',
         ];
         $fields['between3'] = [
-            'class' => 'between',
+            'class' => ['between'],
             'type'  => 'wrap',
         ];
         $fields['last_visit_1'] = [
-            'class'     => 'bstart',
+            'class'     => ['bstart'],
             'type'      => 'text',
             'maxlength' => '100',
             'value'     => $data['last_visit_1'] ?? null,
             'caption'   => 'Last visit label',
         ];
         $fields['last_visit_2'] = [
-            'class'     => 'bend',
+            'class'     => ['bend'],
             'type'      => 'text',
             'maxlength' => '100',
             'value'     => $data['last_visit_2'] ?? null,
@@ -307,18 +307,18 @@ class View extends Users
             'type' => 'endwrap',
         ];
         $fields['between4'] = [
-            'class' => 'between',
+            'class' => ['between'],
             'type'  => 'wrap',
         ];
         $fields['registered_1'] = [
-            'class'     => 'bstart',
+            'class'     => ['bstart'],
             'type'      => 'text',
             'maxlength' => '100',
             'value'     => $data['registered_1'] ?? null,
             'caption'   => 'Registered label',
         ];
         $fields['registered_2'] = [
-            'class'     => 'bend',
+            'class'     => ['bend'],
             'type'      => 'text',
             'maxlength' => '100',
             'value'     => $data['registered_2'] ?? null,
@@ -333,11 +333,11 @@ class View extends Users
 
         $fields = [];
         $fields['between5'] = [
-            'class' => 'between',
+            'class' => ['between'],
             'type'  => 'wrap',
         ];
         $fields['order_by'] = [
-            'class'   => 'bstart',
+            'class'   => ['bstart'],
             'type'    => 'select',
             'options' => [
                 'username'   => __('Order by username'),
@@ -351,7 +351,7 @@ class View extends Users
             'caption' => 'Order by label',
         ];
         $fields['direction'] = [
-            'class'   => 'bend',
+            'class'   => ['bend'],
             'type'    => 'select',
             'options' => [
                 'ASC'  => __('Ascending'),

+ 1 - 1
app/Models/Pages/Email.php

@@ -180,7 +180,7 @@ class Email extends Page
                     'type'  => 'btn',
                     'value' => __('Go back'),
                     'link'  => $data['redirect'],
-                    'class' => 'f-opacity f-go-back',
+                    'class' => ['f-opacity', 'f-go-back'],
                 ],
             ],
         ];

+ 5 - 5
app/Models/Pages/Forum.php

@@ -94,27 +94,27 @@ class Forum extends Page
             'sets'   => [],
             'btns'   => [
                 'open' => [
-                    'class'     => 'origin',
+                    'class'     => ['origin'],
                     'type'      => 'submit',
                     'value'     => __('Open'),
                 ],
                 'close' => [
-                    'class'     => 'origin',
+                    'class'     => ['origin'],
                     'type'      => 'submit',
                     'value'     => __('Close'),
                 ],
                 'delete' => [
-                    'class'     => 'origin',
+                    'class'     => ['origin'],
                     'type'      => 'submit',
                     'value'     => __('Delete'),
                 ],
                 'move' => [
-                    'class'     => 'origin',
+                    'class'     => ['origin'],
                     'type'      => 'submit',
                     'value'     => __('Move'),
                 ],
                 'merge' => [
-                    'class'     => 'origin',
+                    'class'     => ['origin'],
                     'type'      => 'submit',
                     'value'     => __('Merge'),
                 ],

+ 2 - 2
app/Models/Pages/PM/PMView.php

@@ -226,14 +226,14 @@ class PMView extends AbstractPM
 
         if (Cnst::ACTION_ARCHIVE !== $this->pms->area) {
             $form['btns'][Cnst::ACTION_ARCHIVE] = [
-                'class' => 'origin',
+                'class' => ['origin'],
                 'type'  => 'submit',
                 'value' => __('To archive'),
             ];
         }
 
         $form['btns'][Cnst::ACTION_DELETE] = [
-            'class' => 'origin',
+            'class' => ['origin'],
             'type'  => 'submit',
             'value' => __('Delete'),
         ];

+ 5 - 5
app/Models/Pages/PostFormTrait.php

@@ -40,7 +40,7 @@ trait PostFormTrait
                 'preview' => [
                     'type'  => 'submit',
                     'value' => __('Preview'),
-                    'class' => 'f-opacity',
+                    'class' => ['f-opacity'],
                 ],
             ],
         ];
@@ -49,7 +49,7 @@ trait PostFormTrait
 
         if ($this->user->isGuest) {
             $fieldset['username'] = [
-                'class'     => 'w1',
+                'class'     => ['w1'],
                 'type'      => 'text',
                 'maxlength' => '25',
                 'caption'   => 'Username',
@@ -59,7 +59,7 @@ trait PostFormTrait
                 'autofocus' => $autofocus,
             ];
             $fieldset['email'] = [
-                'class'     => 'w2',
+                'class'     => ['w2'],
                 'type'      => 'text',
                 'maxlength' => '80',
                 'caption'   => 'Email',
@@ -72,7 +72,7 @@ trait PostFormTrait
 
         if ($first) {
             $fieldset['subject'] = [
-                'class'     => 'w0',
+                'class'     => ['w0'],
                 'type'      => 'text',
                 'maxlength' => '70',
                 'caption'   => 'Subject',
@@ -84,7 +84,7 @@ trait PostFormTrait
         }
 
         $fieldset['message'] = [
-            'class'    => 'w0',
+            'class'    => ['w0'],
             'type'     => 'textarea',
             'caption'  => 'Message',
             'required' => true,

+ 5 - 5
app/Models/Pages/Profile/Config.php

@@ -169,7 +169,7 @@ class Config extends Profile
 
         $form['sets']['essentials'] = [
             'legend' => __('Essentials'),
-            'class'  => 'data-edit',
+            'class'  => ['data-edit'],
             'fields' => [
                 'language' => [
                     'type'    => 'select',
@@ -254,7 +254,7 @@ class Config extends Profile
         ];
         $form['sets']['viewing-posts'] = [
             'legend' => __('Viewing posts'),
-            'class'  => 'data-edit',
+            'class'  => ['data-edit'],
             'fields' => [
                 'show_smilies' => [
                     'type'    => 'radio',
@@ -295,7 +295,7 @@ class Config extends Profile
         ];
         $form['sets']['pagination'] = [
             'legend' => __('Pagination'),
-            'class'  => 'data-edit',
+            'class'  => ['data-edit'],
             'fields' => [
                 'disp_topics' => [
                     'type'    => 'number',
@@ -317,7 +317,7 @@ class Config extends Profile
         ];
         $form['sets']['security'] = [
             'legend' => __('Security'),
-            'class'  => 'data-edit',
+            'class'  => ['data-edit'],
             'fields' => [
                 'ip_check_type' => [
                     'type'     => 'select',
@@ -337,7 +337,7 @@ class Config extends Profile
         if ($this->rules->viewSubscription) { // ???? модераторы?
             $form['sets']['subscriptions'] = [
                 'legend' => __('Subscription options'),
-                'class'  => 'data-edit',
+                'class'  => ['data-edit'],
                 'fields' => [
                     'notify_with_post' => [
                         'type'    => 'radio',

+ 13 - 13
app/Models/Pages/Profile/Edit.php

@@ -242,7 +242,7 @@ class Edit extends Profile
             ];
         } else {
             $fields['username'] = [
-                'class'   => 'pline',
+                'class'   => ['pline'],
                 'type'    => 'str',
                 'caption' => 'Username',
                 'value'   => $this->curUser->username,
@@ -258,7 +258,7 @@ class Edit extends Profile
             ];
         } else {
             $fields['group'] = [
-                'class'   => 'pline',
+                'class'   => ['pline'],
                 'type'    => 'str',
                 'caption' => 'Group',
                 'value'   => $this->curUser->group_id ? $this->curUser->g_title : '-',
@@ -282,7 +282,7 @@ class Edit extends Profile
             ];
         } else {
             $fields['title'] = [
-                'class'   => 'pline',
+                'class'   => ['pline'],
                 'type'    => 'str',
                 'caption' => 'Title',
                 'value'   => $this->curUser->title(),
@@ -298,7 +298,7 @@ class Edit extends Profile
         if ($this->rules->useAvatar) {
             if (! $this->curUser->avatar) {
                 $fields['avatar'] = [
-                    'class'   => 'pline',
+                    'class'   => ['pline'],
                     'type'    => 'str',
                     'caption' => 'Avatar',
                     'value'   => __('Not uploaded'),
@@ -336,7 +336,7 @@ class Edit extends Profile
             ];
         }
         $form['sets']['header'] = [
-            'class'  => 'header-edit',
+            'class'  => ['header-edit'],
 #            'legend' => __('Options'),
             'fields' => $fields,
         ];
@@ -344,7 +344,7 @@ class Edit extends Profile
         // примечание администрации
         if ($this->user->isAdmMod) {
             $form['sets']['note'] = [
-                'class'  => 'data-edit',
+                'class'  => ['data-edit'],
                 'legend' => __('Admin note'),
                 'fields' => [
                     'admin_note' => [
@@ -371,7 +371,7 @@ class Edit extends Profile
             2 => __('Female'),
         ];
         $fields['gender'] = [
-            'class'   => 'block',
+            'class'   => ['block'],
             'type'    => 'radio',
             'value'   => $this->curUser->gender,
             'values'  => $genders,
@@ -384,7 +384,7 @@ class Edit extends Profile
             'value'     => $this->curUser->location,
         ];
         $form['sets']['personal'] = [
-            'class'  => 'data-edit',
+            'class'  => ['data-edit'],
             'legend' => __('Personal information'),
             'fields' => $fields,
         ];
@@ -393,7 +393,7 @@ class Edit extends Profile
         $fields = [];
         if ($this->rules->viewOEmail) {
             $fields['open-email'] = [
-                'class'   => 'pline',
+                'class'   => ['pline'],
                 'type'    => 'str',
                 'caption' => 'Email info',
                 'value'   => $this->curUser->censorEmail,
@@ -407,7 +407,7 @@ class Edit extends Profile
             ];
         }
         $fields['email_setting'] = [
-            'class'   => 'block',
+            'class'   => ['block'],
             'type'    => 'radio',
             'value'   => $this->curUser->email_setting,
             'values'  => [
@@ -432,7 +432,7 @@ class Edit extends Profile
         ) {
             $fields['url'] = [
                 'id'      => 'website',
-                'class'   => 'pline',
+                'class'   => ['pline'],
                 'type'    => 'link',
                 'caption' => 'Website',
                 'value'   => $this->curUser->censorUrl,
@@ -440,7 +440,7 @@ class Edit extends Profile
             ];
         }
         $form['sets']['contacts'] = [
-            'class'  => 'data-edit',
+            'class'  => ['data-edit'],
             'legend' => __('Contact details'),
             'fields' => $fields,
         ];
@@ -455,7 +455,7 @@ class Edit extends Profile
                 'help'    => ['Sig max size', \ForkBB\num($this->curUser->g_sig_length), \ForkBB\num($this->curUser->g_sig_lines)],
             ];
             $form['sets']['signature'] = [
-                'class'  => 'data-edit',
+                'class'  => ['data-edit'],
                 'legend' => __('Signature'),
                 'fields' => $fields,
             ];

+ 1 - 1
app/Models/Pages/Profile/Email.php

@@ -224,7 +224,7 @@ class Email extends Profile
             ],
             'sets'   => [
                 'new-email' => [
-                    'class'  => 'data-edit',
+                    'class'  => ['data-edit'],
                     'fields' => [
                         'new_email' => [
                             'autofocus' => true,

+ 1 - 1
app/Models/Pages/Profile/Mod.php

@@ -147,7 +147,7 @@ class Mod extends Profile
                     'caption'  => 'Moderator label',
                 ];
                 $form['sets']["forum{$forum->id}"] = [
-                    'class'  => 'modforum',
+                    'class'  => ['modforum'],
                     'legend' => $forum->cat_name . ' / ' . $forum->forum_name,
                     'fields' => $fields,
                 ];

+ 1 - 1
app/Models/Pages/Profile/Pass.php

@@ -100,7 +100,7 @@ class Pass extends Profile
             ],
             'sets'   => [
                 'new-pass' => [
-                    'class'  => 'data-edit',
+                    'class'  => ['data-edit'],
                     'fields' => [
                         'new_pass' => [
                             'autofocus' => true,

+ 29 - 29
app/Models/Pages/Profile/View.php

@@ -51,17 +51,17 @@ class View extends Profile
         // имя, титул и аватара
         $fields = [];
         $fields['usertitle'] = [
-            'class' => 'usertitle',
+            'class' => ['usertitle'],
             'type'  => 'wrap',
         ];
         $fields['username'] = [
-            'class'   => 'pline',
+            'class'   => ['pline'],
             'type'    => 'str',
             'caption' => 'Username',
             'value'   => $this->curUser->username,
         ];
         $fields['title'] = [
-            'class'   => 'pline',
+            'class'   => ['pline'],
             'type'    => 'str',
             'caption' => 'Title',
             'value'   => $this->curUser->title(),
@@ -80,7 +80,7 @@ class View extends Profile
             ];
         }
         $form['sets']['header'] = [
-            'class'  => 'header',
+            'class'  => ['header'],
 #            'legend' => __('Options'),
             'fields' => $fields,
         ];
@@ -91,11 +91,11 @@ class View extends Profile
             && '' != $this->curUser->admin_note
         ) {
             $form['sets']['note'] = [
-                'class'  => 'data',
+                'class'  => ['data'],
                 'legend' => __('Admin note'),
                 'fields' => [
                     'admin_note' => [
-                        'class'     => 'pline',
+                        'class'     => ['pline'],
                         'type'      => 'str',
                         'caption'   => 'Admin note',
                         'value'     => $this->curUser->admin_note,
@@ -108,7 +108,7 @@ class View extends Profile
         $fields = [];
         if ('' != $this->curUser->realname) {
             $fields['realname'] = [
-                'class'   => 'pline',
+                'class'   => ['pline'],
                 'type'    => 'str',
                 'caption' => 'Realname',
                 'value'   => $this->curUser->censorRealname,
@@ -120,7 +120,7 @@ class View extends Profile
         ];
         if (isset($genders[$this->curUser->gender])) {
             $fields['gender'] = [
-                'class'   => 'pline',
+                'class'   => ['pline'],
                 'type'    => 'str',
                 'value'   => $genders[$this->curUser->gender],
                 'caption' => 'Gender',
@@ -128,7 +128,7 @@ class View extends Profile
         }
         if ('' != $this->curUser->location) {
             $fields['location'] = [
-                'class'   => 'pline',
+                'class'   => ['pline'],
                 'type'    => 'str',
                 'caption' => 'Location',
                 'value'   => $this->curUser->censorLocation,
@@ -136,7 +136,7 @@ class View extends Profile
         }
         if (! empty($fields)) {
             $form['sets']['personal'] = [
-                'class'  => 'data',
+                'class'  => ['data'],
                 'legend' => __('Personal information'),
                 'fields' => $fields,
             ];
@@ -156,7 +156,7 @@ class View extends Profile
             ];
 
             $fields['pm'] = [
-                'class'   => 'pline',
+                'class'   => ['pline'],
                 'type'    => 'link',
                 'caption' => 'PM',
                 'value'   => __('Send PM'),
@@ -166,7 +166,7 @@ class View extends Profile
         if ($this->rules->viewEmail) {
             if (0 === $this->curUser->email_setting) {
                 $fields['email'] = [
-                    'class'   => 'pline',
+                    'class'   => ['pline'],
                     'type'    => 'link',
                     'caption' => 'Email info',
                     'value'   => $this->curUser->censorEmail,
@@ -176,7 +176,7 @@ class View extends Profile
                 $this->c->Csrf->setHashExpiration(3600);
 
                 $fields['email'] = [
-                    'class'   => 'pline',
+                    'class'   => ['pline'],
                     'type'    => 'link',
                     'caption' => 'Email info',
                     'value'   => __('Send email'),
@@ -190,7 +190,7 @@ class View extends Profile
         ) {
             $fields['url'] = [
                 'id'      => 'website',
-                'class'   => 'pline',
+                'class'   => ['pline'],
                 'type'    => 'link',
                 'caption' => 'Website',
                 'value'   => $this->curUser->censorUrl,
@@ -200,7 +200,7 @@ class View extends Profile
         }
         if (! empty($fields)) {
             $form['sets']['contacts'] = [
-                'class'  => 'data',
+                'class'  => ['data'],
                 'legend' => __('Contact details'),
                 'fields' => $fields,
             ];
@@ -220,7 +220,7 @@ class View extends Profile
             }
             if (! empty($fields)) {
                 $form['sets']['signature'] = [
-                    'class'  => 'data',
+                    'class'  => ['data'],
                     'legend' => __('Signature'),
                     'fields' => $fields,
                 ];
@@ -230,13 +230,13 @@ class View extends Profile
         // активность
         $fields = [];
         $fields['registered'] = [
-            'class'   => 'pline',
+            'class'   => ['pline'],
             'type'    => 'str',
             'value'   => \ForkBB\dt($this->curUser->registered, true),
             'caption' => 'Registered info',
         ];
         $fields['lastpost'] = [
-            'class'   => 'pline',
+            'class'   => ['pline'],
             'type'    => 'str',
             'value'   => \ForkBB\dt($this->curUser->last_post, true),
             'caption' => 'Last post info',
@@ -244,7 +244,7 @@ class View extends Profile
         if ($this->curUser->last_post > 0) {
             if ('1' == $this->user->g_search) {
                 $fields['posts'] = [
-                    'class'   => 'pline',
+                    'class'   => ['pline'],
                     'type'    => 'link',
                     'caption' => 'Posts info',
                     'value'   => $this->user->showPostCount ? \ForkBB\num($this->curUser->num_posts) : __('Show posts'),
@@ -258,7 +258,7 @@ class View extends Profile
                     'title'   => __('Show posts'),
                 ];
                 $fields['topics'] = [
-                    'class'   => 'pline',
+                    'class'   => ['pline'],
                     'type'    => 'link',
                     'caption' => 'Topics info',
                     'value'   => $this->user->showPostCount ? \ForkBB\num($this->curUser->num_topics) : __('Show topics'),
@@ -273,13 +273,13 @@ class View extends Profile
                 ];
             } elseif ($this->user->showPostCount) {
                 $fields['posts'] = [
-                    'class'   => 'pline',
+                    'class'   => ['pline'],
                     'type'    => 'str',
                     'caption' => 'Posts info',
                     'value'   => \ForkBB\num($this->curUser->num_posts),
                 ];
                 $fields['topics'] = [
-                    'class'   => 'pline',
+                    'class'   => ['pline'],
                     'type'    => 'str',
                     'caption' => 'Topics info',
                     'value'   => \ForkBB\num($this->curUser->num_topics),
@@ -292,7 +292,7 @@ class View extends Profile
             $isLink     = '1' == $this->user->g_search;
             if (! empty($subscrInfo[$subscr::FORUMS_DATA])) {
                 $fields['forums_subscr'] = [
-                    'class'   => 'pline',
+                    'class'   => ['pline'],
                     'type'    => $isLink ? 'link' : 'str',
                     'caption' => 'Total forums subscriptions',
                     'value'   => \ForkBB\num(\count($subscrInfo[$subscr::FORUMS_DATA])),
@@ -308,7 +308,7 @@ class View extends Profile
             }
             if (! empty($subscrInfo[$subscr::TOPICS_DATA])) {
                 $fields['topics_subscr'] = [
-                    'class'   => 'pline',
+                    'class'   => ['pline'],
                     'type'    => $isLink ? 'link' : 'str',
                     'caption' => 'Total topics subscriptions',
                     'value'   => \ForkBB\num(\count($subscrInfo[$subscr::TOPICS_DATA])),
@@ -324,7 +324,7 @@ class View extends Profile
             }
         }
         $form['sets']['activity'] = [
-            'class'  => 'data',
+            'class'  => ['data'],
             'legend' => __('User activity'),
             'fields' => $fields,
         ];
@@ -333,7 +333,7 @@ class View extends Profile
         $fields = [];
         if ($this->rules->viewLastVisit) {
             $fields['lastvisit'] = [
-                'class'   => 'pline',
+                'class'   => ['pline'],
                 'type'    => 'str',
                 'value'   => $this->rules->my
                     ? \ForkBB\dt($this->curUser->last_visit)
@@ -343,7 +343,7 @@ class View extends Profile
         }
         if ($this->rules->viewOEmail) {
             $fields['open-email'] = [
-                'class'   => 'pline',
+                'class'   => ['pline'],
                 'type'    => 2 === $this->curUser->email_setting ? 'str' : 'link',
                 'caption' => 'Email info',
                 'value'   => $this->curUser->censorEmail,
@@ -355,7 +355,7 @@ class View extends Profile
             && false !== \filter_var($this->curUser->registration_ip, \FILTER_VALIDATE_IP)
         ) {
             $fields['ip'] = [
-                'class'   => 'pline',
+                'class'   => ['pline'],
                 'type'    => 'link',
                 'caption' => 'IP',
                 'value'   => $this->curUser->registration_ip,
@@ -369,7 +369,7 @@ class View extends Profile
             ];
         }
         $form['sets']['private'] = [
-            'class'  => 'data',
+            'class'  => ['data'],
             'legend' => __('Private information'),
             'fields' => $fields,
         ];

+ 3 - 3
app/Models/Pages/Register.php

@@ -105,7 +105,7 @@ class Register extends Page
                     'fields' => [
                         'email' => [
                             'autofocus' => true,
-                            'class'     => 'hint',
+                            'class'     => ['hint'],
                             'type'      => 'text',
                             'maxlength' => '80',
                             'value'     => $v->email,
@@ -115,7 +115,7 @@ class Register extends Page
                             'pattern'   => '.+@.+',
                         ],
                         'username' => [
-                            'class'     => 'hint',
+                            'class'     => ['hint'],
                             'type'      => 'text',
                             'maxlength' => '25',
                             'value'     => $v->username,
@@ -125,7 +125,7 @@ class Register extends Page
                             'pattern'   => '^.{2,25}$',
                         ],
                         'password' => [
-                            'class'     => 'hint',
+                            'class'     => ['hint'],
                             'type'      => 'password',
                             'caption'   => 'Passphrase',
                             'help'      => 'Passphrase help',

+ 1 - 1
app/Models/Pages/Report.php

@@ -149,7 +149,7 @@ class Report extends Page
                     'type'  => 'btn',
                     'value' => __('Go back'),
                     'link'  => $this->c->Router->link('ViewPost', ['id' => $args['id']]),
-                    'class' => 'f-opacity f-go-back',
+                    'class' => ['f-opacity', 'f-go-back'],
                 ],
             ],
         ];

+ 8 - 8
app/Models/Pages/Search.php

@@ -163,7 +163,7 @@ class Search extends Page
                             'html'  => true,
                         ],
                         'keywords' => [
-                            'class'     => 'w0',
+                            'class'     => ['w0'],
                             'type'      => 'text',
                             'maxlength' => '100',
                             'caption'   => 'Keyword search',
@@ -202,7 +202,7 @@ class Search extends Page
                             'html'  => true,
                         ],
                         'keywords' => [
-                            'class'     => 'w2',
+                            'class'     => ['w2'],
                             'type'      => 'text',
                             'maxlength' => '100',
                             'caption'   => 'Keyword search',
@@ -211,7 +211,7 @@ class Search extends Page
                             'autofocus' => true,
                         ],
                         'author' => [
-                            'class'     => 'w1',
+                            'class'     => ['w1'],
                             'type'      => 'text',
                             'maxlength' => '25',
                             'caption'   => 'Author search',
@@ -228,7 +228,7 @@ class Search extends Page
                     'legend' => __('Search in legend'),
                     'fields' => [
                         'forums' => [
-                            'class'   => 'w3',
+                            'class'   => ['w3'],
                             'type'    => 'multiselect',
                             'options' => $this->listForOptions,
                             'value'   => $v ? \explode('.', $v->forums) : null,
@@ -236,7 +236,7 @@ class Search extends Page
                             'size'    => \min(\count($this->listForOptions), 10),
                         ],
                         'serch_in' => [
-                            'class'   => 'w3',
+                            'class'   => ['w3'],
                             'type'    => 'select',
                             'options' => [
                                 0 => __('Message and subject'),
@@ -261,7 +261,7 @@ class Search extends Page
                     'legend' => __('Search results legend'),
                     'fields' => [
                         'sort_by' => [
-                            'class'   => 'w4',
+                            'class'   => ['w4'],
                             'type'    => 'select',
                             'options' => [
                                 0 => __('Sort by post time'),
@@ -273,7 +273,7 @@ class Search extends Page
                             'caption' => 'Sort by',
                         ],
                         'sort_dir' => [
-                            'class'   => 'w4',
+                            'class'   => ['w4'],
                             'type'    => 'radio',
                             'values'  => [
                                 0 => __('Descending'),
@@ -283,7 +283,7 @@ class Search extends Page
                             'caption' => 'Sort order',
                         ],
                         'show_as' => [
-                            'class'   => 'w4',
+                            'class'   => ['w4'],
                             'type'    => 'radio',
                             'values'  => [
                                 0 => __('Show as posts'),

+ 7 - 7
app/Models/Pages/Topic.php

@@ -209,13 +209,13 @@ class Topic extends Page
 
         if ($topic->closed) {
             $form['btns']['open'] = [
-                'class'     => 'origin',
+                'class'     => ['origin'],
                 'type'      => 'submit',
                 'value'     => __('Open topic'),
             ];
         } else {
             $form['btns']['close'] = [
-                'class'     => 'origin',
+                'class'     => ['origin'],
                 'type'      => 'submit',
                 'value'     => __('Close topic'),
             ];
@@ -223,13 +223,13 @@ class Topic extends Page
 
         if ($topic->sticky) {
             $form['btns']['unstick'] = [
-                'class'     => 'origin',
+                'class'     => ['origin'],
                 'type'      => 'submit',
                 'value'     => __('Unstick topic'),
             ];
         } else {
             $form['btns']['stick'] = [
-                'class'     => 'origin',
+                'class'     => ['origin'],
                 'type'      => 'submit',
                 'value'     => __('Stick topic'),
             ];
@@ -237,17 +237,17 @@ class Topic extends Page
 
         $form['btns'] += [
             'move' => [
-                'class'     => 'origin',
+                'class'     => ['origin'],
                 'type'      => 'submit',
                 'value'     => __('Move topic'),
             ],
             'delete' => [
-                'class'     => 'origin',
+                'class'     => ['origin'],
                 'type'      => 'submit',
                 'value'     => __('Delete'),
             ],
             'split' => [
-                'class'     => 'origin',
+                'class'     => ['origin'],
                 'type'      => 'submit',
                 'value'     => __('Split'),
             ],

+ 4 - 4
app/Models/Pages/Userlist.php

@@ -175,7 +175,7 @@ class Userlist extends Page
 
         if ($this->user->searchUsers) {
             $fields['name'] = [
-                'class'     => 'w0',
+                'class'     => ['w0'],
                 'type'      => 'text',
                 'maxlength' => '25',
                 'value'     => $v->name ?: '*',
@@ -188,14 +188,14 @@ class Userlist extends Page
             $form['hidden']['name'] = '*';
         }
         $fields['group'] = [
-            'class'   => 'w4',
+            'class'   => ['w4'],
             'type'    => 'select',
             'options' => $this->groupList,
             'value'   => $v->group,
             'caption' => 'User group',
         ];
         $fields['sort'] = [
-            'class'   => 'w4',
+            'class'   => ['w4'],
             'type'    => 'select',
             'options' => [
                 ['username', __('Sort by name')],
@@ -206,7 +206,7 @@ class Userlist extends Page
             'caption' => 'Sort users by',
         ];
         $fields['dir'] = [
-            'class'   => 'w4',
+            'class'   => ['w4'],
             'type'    => 'radio',
             'value'   => $v->dir ?: 'ASC',
             'values'  => [

+ 5 - 5
app/templates/layouts/form.forkbb.php

@@ -7,7 +7,7 @@
           <p class="f-finform"> @if ($cur['html']){!! $cur['value'] !!} @else{{ $cur['value'] }} @endif</p>
         @endforeach
     @elseif (isset($setVal['fields']))
-          <fieldset id="id-fs-{{ $setKey }}" @if ($setVal['class']) class="f-fs-{{ \implode(' f-fs-', (array) $setVal['class']) }}" @endif>
+          <fieldset id="id-fs-{{ $setKey }}" @if ($setVal['class']) class="f-fs-{{ \implode(' f-fs-', $setVal['class']) }}" @endif>
         @if ($setVal['legend'])
             <legend class="f-fleg">{!! $setVal['legend'] !!}</legend>
         @endif
@@ -15,11 +15,11 @@
             @if ('info' === $cur['type'])
             <p id="id-{{ $cur['id'] or $key }}" class="f-yinfo"> @if ($cur['html']){!! $cur['value'] !!} @else{{ $cur['value'] }} @endif</p>
             @elseif ('wrap' === $cur['type'])
-            <div id="id-{{ $cur['id'] or $key }}" @if ($cur['class']) class="f-wrap-{{ \implode(' f-wrap-', (array) $cur['class']) }}" @endif>
+            <div id="id-{{ $cur['id'] or $key }}" @if ($cur['class']) class="f-wrap-{{ \implode(' f-wrap-', $cur['class']) }}" @endif>
             @elseif ('endwrap' === $cur['type'])
             </div>
             @else
-            <dl id="id-dl-{{ $cur['id'] or $key }}" @if ($cur['class']) class="f-field-{{ \implode(' f-field-', (array) $cur['class']) }}" @endif>
+            <dl id="id-dl-{{ $cur['id'] or $key }}" @if ($cur['class']) class="f-field-{{ \implode(' f-field-', $cur['class']) }}" @endif>
               <dt> @if ($cur['caption'])<label class="f-ycaption @if ($cur['required']) f-req @endif" @if (false === \strpos('.radio.yield.str.btn.link.', ".{$cur['type']}.")) for="id-{{ $key }}" @endif>{!! __($cur['caption']) !!}</label> @endif</dt>
               <dd>
                 @if ('text' === $cur['type'])
@@ -121,9 +121,9 @@
           <p class="f-btns">
     @foreach ($form['btns'] as $key => $cur)
         @if ('submit' === $cur['type'])
-            <button class="f-btn f-fbtn @if($cur['class']) {{ $cur['class'] }} @endif" name="{{ $key }}" value="{{ $cur['value'] }}" @isset ($cur['accesskey']) accesskey="{{ $cur['accesskey'] }}" @endisset title="{{ $cur['value'] }}"><span>{{ $cur['value'] }}</span></button>
+            <button class="f-btn f-fbtn @if($cur['class']) {{ \implode(' ', $cur['class']) }} @endif" name="{{ $key }}" value="{{ $cur['value'] }}" @isset ($cur['accesskey']) accesskey="{{ $cur['accesskey'] }}" @endisset title="{{ $cur['value'] }}"><span>{{ $cur['value'] }}</span></button>
         @elseif ('btn'=== $cur['type'])
-            <a class="f-btn f-fbtn @if($cur['class']) {{ $cur['class'] }} @endif" data-name="{{ $key }}" href="{{ $cur['link'] }}" @isset ($cur['accesskey']) accesskey="{{ $cur['accesskey'] }}" @endisset title="{{ $cur['value'] }}"><span>{{ $cur['value'] }}</span></a>
+            <a class="f-btn f-fbtn @if($cur['class']) {{ \implode(' ', $cur['class']) }} @endif" data-name="{{ $key }}" href="{{ $cur['link'] }}" @isset ($cur['accesskey']) accesskey="{{ $cur['accesskey'] }}" @endisset title="{{ $cur['value'] }}"><span>{{ $cur['value'] }}</span></a>
         @endif
     @endforeach
           </p>