From 5a187540b1d1732ea5042a2d3a326535cad96963 Mon Sep 17 00:00:00 2001
From: xiaomlove <i353856593@163.com>
Date: Sun, 25 Sep 2022 16:49:56 +0800
Subject: [PATCH] show official addition only when had set official tag

---
 include/functions.php | 2 +-
 public/mybonus.php    | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/include/functions.php b/include/functions.php
index 0533b6a6..6cf786f5 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -5837,7 +5837,7 @@ function calculate_seed_bonus($uid, $torrentIdArr = null): array
             $tagGrouped[$tagItem['torrent_id']][$tagItem['tag_id']] = 1;
         }
     }
-    $officialTag = \App\Models\Setting::get('system.official_tag');
+    $officialTag = \App\Models\Setting::get('bonus.official_tag');
     $officialAdditionalFactor = \App\Models\Setting::get('bonus.official_addition');
     $zeroBonusTag = \App\Models\Setting::get('bonus.zero_bonus_tag');
     $zeroBonusFactor = \App\Models\Setting::get('bonus.zero_bonus_factor');
diff --git a/public/mybonus.php b/public/mybonus.php
index 9d78b7cc..926648ce 100644
--- a/public/mybonus.php
+++ b/public/mybonus.php
@@ -461,8 +461,9 @@ $A = $seedBonusResult['A'];
 	$width = $percent * 4;
 	print("<img class=\"".$loadpic."\" src=\"pic/trans.gif\" style=\"width: ".$width."px;\" alt=\"".$percent."%\" /></td></tr></table>");
 
-	$officialAdditionalFactor = get_setting('bonus.official_addition');
-	if ($officialAdditionalFactor > 0) {
+	$officialAdditionalFactor = get_setting('bonus.official_addition', 0);
+	$officialTag = get_setting('bonus.official_tag');
+	if ($officialAdditionalFactor > 0 && $officialTag) {
         print("<h1>".$lang_mybonus['text_get_by_seeding_official']."</h1>");
         print("<ul>");
         print("<li>".$lang_mybonus['official_calculate_method']."</li>");
@@ -482,7 +483,7 @@ $rowSpan = 1;
 if ($haremFactor > 0) {
     $rowSpan++;
 }
-if ($officialAdditionalFactor > 0) {
+if ($officialAdditionalFactor > 0 && $officialTag) {
     $rowSpan++;
 }
 $summaryTable = '<table cellspacing="4" cellpadding="4" style="width: 50%"><tbody>';
@@ -505,7 +506,7 @@ if ($haremFactor > 0) {
         number_format($haremAddition * $haremFactor, 3)
     );
 }
-if ($officialAdditionalFactor > 0) {
+if ($officialAdditionalFactor > 0 && $officialTag) {
     $summaryTable .= sprintf(
         '<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>',
         $lang_mybonus['reward_type_official_addition'],