From 528d559f24dae9aae9eca7ebbdbc32c453e931d5 Mon Sep 17 00:00:00 2001
From: xiaomlove <i353856593@163.com>
Date: Wed, 3 Mar 2021 00:23:08 +0800
Subject: [PATCH] fix takeedit.php array_sum()

---
 include/functions.php |  2 +-
 nexus/Field/Field.php | 45 +++++++++++++++++++++++++++++++------------
 public/fields.php     | 28 +++------------------------
 public/takeedit.php   |  2 +-
 4 files changed, 38 insertions(+), 39 deletions(-)
diff --git a/include/functions.php b/include/functions.php
index 085a33d0..b5549e3f 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -2630,7 +2630,7 @@ function stdfoot() {
 	print (" with <b>".count($query_name)."</b> db queries, <b>".$Cache->getCacheReadTimes()."</b> reads and <b>".$Cache->getCacheWriteTimes()."</b> writes of Redis and <b>".mksize(memory_get_usage())."</b> ram]");
 	print ("</div>\n");
 	if ($enablesqldebug_tweak == 'yes' && get_user_class() >= $sqldebug_tweak) {
-		print("<div id=\"sql_debug\">SQL query list: <ul>");
+		print("<div id=\"sql_debug\" style='text-align: left;'>SQL query list: <ul>");
 		foreach($query_name as $query) {
 			print(sprintf('<li>%s [%s]</li>', htmlspecialchars($query['query']), $query['time']));
 		}
diff --git a/nexus/Field/Field.php b/nexus/Field/Field.php
index 2d70310f..405b19c5 100644
--- a/nexus/Field/Field.php
+++ b/nexus/Field/Field.php
@@ -14,20 +14,21 @@ class Field
     const TYPE_FILE = 'file';
 
     public static $types = [
-        self::TYPE_TEXT => '短文本',
-        self::TYPE_TEXTAREA => '长文本',
-        self::TYPE_RADIO => '横向单选',
-        self::TYPE_CHECKBOX => '横向多选',
-        self::TYPE_SELECT => '下拉单选',
-        self::TYPE_FILE => '文件',
+        self::TYPE_TEXT => '短文本(text)',
+        self::TYPE_TEXTAREA => '长文本(textarea)',
+        self::TYPE_RADIO => '横向单选(radio)',
+        self::TYPE_CHECKBOX => '横向多选(checkbox)',
+        self::TYPE_SELECT => '下拉单选(select)',
+        self::TYPE_FILE => '文件(file)',
     ];
 
+
     public function radio($name, $options, $current = null)
     {
         $arr = [];
         foreach ($options as $value => $label) {
             $arr[] = sprintf(
-                '<label><input type="radio" name="%s" value="%s"%s />%s</label>',
+                '<label style="margin-right: 4px;"><input type="radio" name="%s" value="%s"%s />%s</label>',
                 $name, $value, (string)$current === (string)$value ? ' checked' : '', $label
             );
         }
@@ -45,7 +46,7 @@ class Field
         $trOptions = tr($lang_fields['col_options'], '<textarea name="options" rows="6" cols="80">' . ($row['options'] ?? '') . '</textarea><br/>类型为单选、多选、下拉时必填，一行一个，格式：选项值|选项描述文本', 1, '', true);
         $id = $row['id'] ?? 0;
         $form = <<<HTML
-<div style="width: 940px">
+<div>
 <h1 align="center"><a class="faqlink" href="?action=view&type=">{$lang_fields['text_field']}</a></h1>
 <form method="post" action="fields.php?action=submit&type=">
 <div>
@@ -71,27 +72,47 @@ HTML;
     function buildFieldTable()
     {
         global $lang_fields;
-        $sql = 'select * from torrents_custom_fields';
+        $perPage = 10;
+        $total = get_row_count('torrents_custom_fields');
+        list($paginationTop, $paginationBottom, $limit) = pager($perPage, $total, "?");
+        $sql = "select * from torrents_custom_fields order by id desc $limit";
         $res = sql_query($sql);
         $header = [
             'id' => $lang_fields['col_id'],
             'name' => $lang_fields['col_name'],
             'label' => $lang_fields['col_label'],
-            'type' => $lang_fields['col_type'],
+            'type_text' => $lang_fields['col_type'],
             'required_text' => $lang_fields['col_required'],
             'action' => $lang_fields['col_action'],
         ];
         $rows = [];
         while ($row = mysql_fetch_assoc($res)) {
             $row['required_text'] = $row['required'] ? '是' : '否';
+            $row['type_text'] = self::$types[$row['type']] ?? '';
             $row['action'] = sprintf(
                 "<a href=\"javascript:confirm_delete('%s', '%s', '');\">%s</a> | <a href=\"?action=edit&type=&id=%s\">%s</a>",
                 $row['id'], $lang_fields['js_sure_to_delete_this'], $lang_fields['text_delete'], $row['id'], $lang_fields['text_edit']
             );
             $rows[] = $row;
         }
+        $head = <<<HEAD
+<h1 align="center">{$lang_fields['field_management']} - </h1>
+<div style="margin-bottom: 8px;">
+    <span id="item" onclick="dropmenu(this);">
+        <span style="cursor: pointer;" class="big"><b>{$lang_fields['text_manage']}</b></span>
+        <div id="itemlist" class="dropmenu" style="display: none">
+            <ul>
+                <li><a href="?action=view&type=field">{$lang_fields['text_field']}</a></li>
+            </ul>
+        </div>
+    </span>
+    <span id="add">
+        <a href="?action=add&type=" class="big"><b>{$lang_fields['text_add']}</b></a>
+    </span>
+</div>
+HEAD;
         $table = $this->buildTable($header, $rows);
-        return $table;
+        return $head . $table . $paginationBottom;
     }
 
     public function save($data)
@@ -154,7 +175,7 @@ HTML;
             }
             $table .= '</tr>';
         }
-        $table .= '</tbody>';
+        $table .= '</tbody></table>';
         return $table;
     }
 }
\ No newline at end of file
diff --git a/public/fields.php b/public/fields.php
index 8c2a74bc..f965c871 100644
--- a/public/fields.php
+++ b/public/fields.php
@@ -8,36 +8,14 @@ if (get_user_class() < UC_ADMINISTRATOR) {
 }
 $field = new \Nexus\Field\Field();
 
-function buildTableHead()
-{
-    global $lang_fields;
-    $head = <<<HEAD
-<h1 align="center">{$lang_fields['field_management']} - </h1>
-<div>
-    <span id="item" onclick="dropmenu(this);">
-        <span style="cursor: pointer;" class="big"><b>{$lang_fields['text_manage']}</b></span>
-        <div id="itemlist" class="dropmenu" style="display: none">
-            <ul>
-                <li><a href="?action=view&type=field">{$lang_fields['text_field']}</a></li>
-            </ul>
-        </div>
-    </span>
-    <span id="add">
-        <a href="?action=add&type=" class="big"><b>{$lang_fields['text_add']}</b></a>
-    </span>
-</div>
-HEAD;
-    return $head;
-}
-
-
 
 $action = $_GET['action'] ?? 'view';
 if ($action == 'view') {
     stdhead($lang_fields['field_management']." - ".$lang_fields['text_field']);
     begin_main_frame();
-    echo buildTableHead();
-    echo $field->buildFieldTable();
+    $r =  $field->buildFieldTable();
+    echo $r;
+    stdfoot();
 } elseif ($action == 'add') {
     stdhead($lang_fields['field_management']." - ".$lang_fields['text_add']);
     begin_main_frame();
diff --git a/public/takeedit.php b/public/takeedit.php
index b28c3f2d..3af9101f 100644
--- a/public/takeedit.php
+++ b/public/takeedit.php
@@ -55,7 +55,7 @@ if (!empty($_POST['pt_gen'])) {
     $updateset[] = "pt_gen = ''";
 }
 
-$updateset[] = "tags = " . array_sum($_POST['tags']);
+$updateset[] = "tags = " . array_sum($_POST['tags'] ?? []);
 
 if ($enablenfo_main=='yes'){
 $nfoaction = $_POST['nfoaction'];
