diff --git a/app/Models/Pages/Admin/Install.php b/app/Models/Pages/Admin/Install.php index 46ae9c61..9543a5c3 100644 --- a/app/Models/Pages/Admin/Install.php +++ b/app/Models/Pages/Admin/Install.php @@ -1130,7 +1130,7 @@ class Install extends Admin 'u_pm_last_post' => ['INT(10) UNSIGNED', false, 0], 'warning_flag' => ['TINYINT(1)', false, 0], 'warning_all' => ['INT(10) UNSIGNED', false, 0], - 'gender' => ['TINYINT UNSIGNED', false, 0], + 'gender' => ['TINYINT UNSIGNED', false, FORK_GEN_NOT], 'u_mark_all_read' => ['INT(10) UNSIGNED', false, 0], 'last_report_id' => ['INT(10) UNSIGNED', false, 0], 'ip_check_type' => ['TINYINT UNSIGNED', false, 0], diff --git a/app/Models/Pages/Admin/Users/View.php b/app/Models/Pages/Admin/Users/View.php index e8d8def2..d0cd8e6e 100644 --- a/app/Models/Pages/Admin/Users/View.php +++ b/app/Models/Pages/Admin/Users/View.php @@ -66,7 +66,7 @@ class View extends Users 'email' => 'string:null|max:80', 'title' => 'string:null|max:50', 'realname' => 'string:null|max:40', - 'gender' => 'integer|in:0,1,2', + 'gender' => 'integer|in:' . FORK_GEN_NOT . ',' . FORK_GEN_MAN . ',' . FORK_GEN_FEM, 'url' => 'string:null|max:100', 'location' => 'string:null|max:30', 'signature' => 'string:null|max:512', @@ -208,9 +208,9 @@ class View extends Users 'value' => $data['realname'] ?? null, ]; $genders = [ - 0 => __('Do not display'), - 1 => __('Male'), - 2 => __('Female'), + FORK_GEN_NOT => __('Do not display'), + FORK_GEN_MAN => __('Male'), + FORK_GEN_FEM => __('Female'), ]; $fields['gender'] = [ # 'class' => ['block'], diff --git a/app/Models/Pages/Profile/Edit.php b/app/Models/Pages/Profile/Edit.php index 2b3bc16e..543f1ab3 100644 --- a/app/Models/Pages/Profile/Edit.php +++ b/app/Models/Pages/Profile/Edit.php @@ -92,7 +92,7 @@ class Edit extends Profile 'delete_avatar' => $ruleDelAvatar, 'admin_note' => $ruleAdminNote, 'realname' => 'exist|string:trim|max:40|noURL:1', - 'gender' => 'required|integer|in:0,1,2', + 'gender' => 'required|integer|in:' . FORK_GEN_NOT . ',' . FORK_GEN_MAN . ',' . FORK_GEN_FEM, 'location' => 'exist|string:trim|max:30|noURL:1', 'email_setting' => 'required|integer|in:0,1,2', 'url' => $ruleWebsite, @@ -374,9 +374,9 @@ class Edit extends Profile 'value' => $this->curUser->realname, ]; $genders = [ - 0 => __('Do not display'), - 1 => __('Male'), - 2 => __('Female'), + FORK_GEN_NOT => __('Do not display'), + FORK_GEN_MAN => __('Male'), + FORK_GEN_FEM => __('Female'), ]; $fields['gender'] = [ 'class' => ['block'], diff --git a/app/Models/Pages/Profile/View.php b/app/Models/Pages/Profile/View.php index 3ab952df..a8a5897c 100644 --- a/app/Models/Pages/Profile/View.php +++ b/app/Models/Pages/Profile/View.php @@ -118,8 +118,8 @@ class View extends Profile ]; } $genders = [ - 1 => __('Male'), - 2 => __('Female'), + FORK_GEN_MAN => __('Male'), + FORK_GEN_FEM => __('Female'), ]; if (isset($genders[$this->curUser->gender])) { $fields['gender'] = [ diff --git a/app/Models/Provider/Driver/GitHub.php b/app/Models/Provider/Driver/GitHub.php index 0349c9a4..396e9e56 100644 --- a/app/Models/Provider/Driver/GitHub.php +++ b/app/Models/Provider/Driver/GitHub.php @@ -145,6 +145,6 @@ class GitHub extends Driver */ protected function getuserGender(): int { - return 0; + return FORK_GEN_NOT; } } diff --git a/app/templates/pm/post.forkbb.php b/app/templates/pm/post.forkbb.php index d9a6d73e..0d0ad386 100644 --- a/app/templates/pm/post.forkbb.php +++ b/app/templates/pm/post.forkbb.php @@ -22,7 +22,7 @@

{!! __($p->postsTitle) !!}

@foreach ($p->posts as $post) @if ($post->id) -
+

@if ($post->postNumber > 1){!! __('Re') !!} @endif{{ $post->parent->name }}

diff --git a/app/templates/pm/topic.forkbb.php b/app/templates/pm/topic.forkbb.php index 2bd17e81..4bf9a162 100644 --- a/app/templates/pm/topic.forkbb.php +++ b/app/templates/pm/topic.forkbb.php @@ -44,7 +44,7 @@ @if (empty($post->id) && $iswev = [FORK_MESS_ERR => [['Message %s was not found in the database', $id]]]) @include ('layouts/iswev') @else -
+
@if ($p->enableMod && $post->postNumber > 1) @endif diff --git a/app/templates/post.forkbb.php b/app/templates/post.forkbb.php index 297b8bce..b78d370f 100644 --- a/app/templates/post.forkbb.php +++ b/app/templates/post.forkbb.php @@ -32,7 +32,7 @@

{!! __($p->postsTitle) !!}

@foreach ($p->posts as $post) @if ($post->id) -
+

@if ($post->postNumber > 1){!! __('Re') !!} @endif{{ $post->parent->name }}

diff --git a/app/templates/topic.forkbb.php b/app/templates/topic.forkbb.php index a2dcda05..c41ef4ca 100644 --- a/app/templates/topic.forkbb.php +++ b/app/templates/topic.forkbb.php @@ -51,7 +51,7 @@ @if (empty($post->id) && $iswev = [FORK_MESS_ERR => [['Message %s was not found in the database', $id]]]) @include ('layouts/iswev') @else -
+
@if ($p->enableMod && $post->postNumber > 1) @endif diff --git a/app/templates/topic_in_search.forkbb.php b/app/templates/topic_in_search.forkbb.php index d557ec3a..ba4adcef 100644 --- a/app/templates/topic_in_search.forkbb.php +++ b/app/templates/topic_in_search.forkbb.php @@ -38,7 +38,7 @@ @if (empty($post->id) && $iswev = [FORK_MESS_ERR => [['Message %s was not found in the database', $id]]]) @include ('layouts/iswev') @else -