add tags init + fix shoutbox in login page

app/Console/Commands/Test.php

@@ -18,6 +18,7 @@ use App\Repositories\AttendanceRepository;
 use App\Repositories\ExamRepository;
 use App\Repositories\HitAndRunRepository;
 use App\Repositories\SearchBoxRepository;
+use App\Repositories\TagRepository;
 use App\Repositories\TorrentRepository;
 use App\Repositories\UserRepository;
 use Carbon\Carbon;
@@ -62,11 +63,7 @@ class Test extends Command
      */
     public function handle()
     {
-        $tzlist = \DateTimeZone::listIdentifiers(\DateTimeZone::ALL);
+
-        foreach($tzlist as $value)
-        {
-            echo $value ."\n";
-        }
     }
 
 }

database/seeders/DatabaseSeeder.php

@@ -41,5 +41,6 @@ class DatabaseSeeder extends Seeder
         $this->call(TeamsTableSeeder::class);
         $this->call(TorrentsStateTableSeeder::class);
         $this->call(UploadspeedTableSeeder::class);
+        $this->call(TagsTableSeeder::class);
     }
 }

database/seeders/TagsTableSeeder.php

@@ -0,0 +1,89 @@
+<?php
+
+namespace Database\Seeders;
+
+use Illuminate\Database\Seeder;
+
+class TagsTableSeeder extends Seeder
+{
+
+    /**
+     * Auto generated seed file
+     *
+     * @return void
+     */
+    public function run()
+    {
+        
+
+        \DB::table('tags')->delete();
+        
+        \DB::table('tags')->insert(array (
+            0 => 
+            array (
+                'id' => 1,
+                'name' => '禁转',
+                'color' => '#ff0000',
+                'priority' => 7,
+                'created_at' => '2022-03-10 01:46:44',
+                'updated_at' => '2022-03-10 01:46:44',
+            ),
+            1 => 
+            array (
+                'id' => 2,
+                'name' => '首发',
+                'color' => '#8F77B5',
+                'priority' => 6,
+                'created_at' => '2022-03-10 01:46:44',
+                'updated_at' => '2022-03-10 01:46:44',
+            ),
+            2 => 
+            array (
+                'id' => 3,
+                'name' => '官方',
+                'color' => '#0000ff',
+                'priority' => 5,
+                'created_at' => '2022-03-10 01:46:44',
+                'updated_at' => '2022-03-10 01:46:44',
+            ),
+            3 => 
+            array (
+                'id' => 4,
+                'name' => 'DIY',
+                'color' => '#46d5ff',
+                'priority' => 4,
+                'created_at' => '2022-03-10 01:46:44',
+                'updated_at' => '2022-03-10 01:46:44',
+            ),
+            4 => 
+            array (
+                'id' => 5,
+                'name' => '国语',
+                'color' => '#6a3906',
+                'priority' => 3,
+                'created_at' => '2022-03-10 01:46:44',
+                'updated_at' => '2022-03-10 01:46:44',
+            ),
+            5 => 
+            array (
+                'id' => 6,
+                'name' => '中字',
+                'color' => '#006400',
+                'priority' => 2,
+                'created_at' => '2022-03-10 01:46:44',
+                'updated_at' => '2022-03-10 01:46:44',
+            ),
+            6 => 
+            array (
+                'id' => 7,
+                'name' => 'HDR',
+                'color' => '#38b03f',
+                'priority' => 1,
+                'created_at' => '2022-03-10 01:46:44',
+                'updated_at' => '2022-03-10 01:46:44',
+            ),
+        ));
+        
+        
+    }
+}

nexus/Client/Client.php

@@ -1,463 +0,0 @@
-<?php
-
-namespace Nexus\Client;
-
-use Nexus\Core\Management;
-use Nexus\Database\NexusDB;
-
-class Client extends Management
-{
-
-    const TYPE_ALLOW = 'allow';
-    const TYPE_DENY = 'deny';
-
-    private static $types = [
-        self::TYPE_ALLOW => [
-            'table' => 'agent_allowed_family',
-            'table_columns' => [
-                'id', 'family', 'start_name',
-//                'peer_id_pattern', 'peer_id_match_num', 'peer_id_matchtype', 'peer_id_start',
-                'agent_pattern', 'agent_match_num', 'agent_matchtype', 'agent_start',
-            ],
-            'form_fields' => [
-                'family', 'start_name',
-                'peer_id_pattern', 'peer_id_match_num', 'peer_id_matchtype', 'peer_id_start',
-                'agent_pattern', 'agent_match_num', 'agent_matchtype', 'agent_start',
-                'exception', 'allowhttps', 'comment',
-            ],
-        ],
-    ];
-
-    private $type;
-
-    public function __construct($type)
-    {
-        if (!isset(self::$types[$type])) {
-            throw new \InvalidArgumentException("Invalid type: $type");
-        }
-        $this->type = $type;
-    }
-
-    public function getTypeHuman($type)
-    {
-        global $lang_fields;
-        $map = [
-            self::TYPE_TEXT => $lang_fields['field_type_text'],
-            self::TYPE_TEXTAREA => $lang_fields['field_type_textarea'],
-            self::TYPE_RADIO => $lang_fields['field_type_radio'],
-            self::TYPE_CHECKBOX => $lang_fields['field_type_checkbox'],
-            self::TYPE_SELECT => $lang_fields['field_type_select'],
-            self::TYPE_IMAGE => $lang_fields['field_type_image'],
-        ];
-        return $map[$type] ?? '';
-    }
-
-    public function getTypeRadioOptions()
-    {
-        $out = [];
-        foreach (self::$types as $key => $value) {
-            $out[$key] = sprintf('%s(%s)', $value['text'], $this->getTypeHuman($key));
-        }
-        return $out;
-    }
-
-
-    public function radio($name, $options, $current = null)
-    {
-        $arr = [];
-        foreach ($options as $value => $label) {
-            $arr[] = sprintf(
-                '<label style="margin-right: 4px;"><input type="radio" name="%s" value="%s"%s />%s</label>',
-                $name, $value, (string)$current === (string)$value ? ' checked' : '', $label
-            );
-        }
-        return implode('', $arr);
-    }
-
-    function buildFieldForm(array $row = [])
-    {
-        global $lang_fields, $lang_functions;
-        $trName = tr($lang_fields['col_name'] . '<font color="red">*</font>', '<input type="text" name="name" value="' . ($row['name'] ?? '') . '" style="width: 300px" />&nbsp;&nbsp;' . $lang_fields['col_name_help'], 1, '', true);
-        $trLabel = tr($lang_fields['col_label'] . '<font color="red">*</font>', '<input type="text" name="label" value="' . ($row['label'] ?? '') . '"  style="width: 300px" />', 1, '', true);
-        $trType = tr($lang_fields['col_type'] . '<font color="red">*</font>', $this->radio('type', $this->getTypeRadioOptions(), $row['type'] ?? null), 1, '', true);
-        $trRequired = tr($lang_fields['col_required'] . '<font color="red">*</font>', $this->radio('required', ['0' => $lang_functions['text_no'], '1' => $lang_functions['text_yes']], $row['required'] ?? null), 1, '', true);
-        $trHelp = tr($lang_fields['col_help'], '<textarea name="help" rows="4" cols="80">' . ($row['help'] ?? '') . '</textarea>', 1, '', true);
-        $trOptions = tr($lang_fields['col_options'], '<textarea name="options" rows="6" cols="80">' . ($row['options'] ?? '') . '</textarea><br/>' . $lang_fields['col_options_help'], 1, '', true);
-        $trIsSingleRow = tr($lang_fields['col_is_single_row'] . '<font color="red">*</font>', $this->radio('is_single_row', ['0' => $lang_functions['text_no'], '1' => $lang_functions['text_yes']], $row['is_single_row'] ?? null), 1, '', true);
-        $id = $row['id'] ?? 0;
-        $form = <<<HTML
-<div>
-<h1 align="center"><a class="faqlink" href="?action=view">{$lang_fields['text_field']}</a></h1>
-<form method="post" action="fields.php?action=submit">
-<div>
-    <table border="1" cellspacing="0" cellpadding="10" width="100%">
-            <input type="hidden" name="id" value="{$id}"/>
-            {$trName}
-            {$trLabel}
-            {$trType}
-            {$trRequired}
-            {$trHelp}
-            {$trOptions}
-            {$trIsSingleRow}
-    </table>
-</div>
-<div style="text-align: center; margin-top: 10px;">
-    <input type="submit" value="{$lang_fields['submit_submit']}" />
-</div>
-</form>
-</div>
-HTML;
-        return $form;
-    }
-
-    private function getHeader()
-    {
-        global $lang_clients;
-        $header = [];
-        foreach (self::$types[$this->type]['table_columns'] as $column) {
-            $header[$column] = $lang_clients['col_' . $column] ?? ucfirst($column);
-        }
-        $header['action'] = $lang_clients['col_action'];
-        return $header;
-    }
-
-    function buildClientTable()
-    {
-        global $lang_clients, $lang_functions;
-        $tableName = self::$types[$this->type]['table'];
-        $perPage = 10;
-        $total = get_row_count($tableName);
-        list($paginationTop, $paginationBottom, $limit) = pager($perPage, $total, "?");
-        $sql = "select * from $tableName order by family asc $limit";
-        $res = sql_query($sql);
-        $header = $this->getHeader();
-        $rows = [];
-        while ($row = mysql_fetch_assoc($res)) {
-            $row['action'] = sprintf(
-                "<a href=\"javascript:confirm_delete('%s', '%s', '');\">%s</a> | <a href=\"?action=edit&id=%s\">%s</a>",
-                $row['id'], $lang_clients['js_sure_to_delete_this'], $lang_clients['text_delete'], $row['id'], $lang_clients['text_edit']
-            );
-            $rows[] = $row;
-        }
-        $head = <<<HEAD
-<h1 align="center">{$lang_clients['client_management']}</h1>
-<div style="margin-bottom: 8px;">
-    <span id="add">
-        <a href="?action=add" class="big"><b>{$lang_clients['text_add']}</b></a>
-    </span>
-</div>
-HEAD;
-        $table = $this->buildTable($header, $rows);
-        return $head . $table . $paginationBottom;
-    }
-
-    public function save($data)
-    {
-        global $lang_functions, $lang_fields;
-        $attributes = [];
-        if (empty($data['name'])) {
-            throw new \InvalidArgumentException("{$lang_fields['col_name']} {$lang_functions['text_required']}");
-        }
-        if (!preg_match('/^\w+$/', $data['name'])) {
-            throw new \InvalidArgumentException("{$lang_fields['col_name']} {$lang_functions['text_invalid']}");
-        }
-        $attributes['name'] = $data['name'];
-
-        if (empty($data['label'])) {
-            throw new \InvalidArgumentException("{$lang_fields['col_label']} {$lang_functions['text_required']}");
-        }
-        $attributes['label'] = $data['label'];
-
-        if (empty($data['type'])) {
-            throw new \InvalidArgumentException("{$lang_fields['col_type']} {$lang_functions['text_required']}");
-        }
-        if (!isset(self::$types[$data['type']])) {
-            throw new \InvalidArgumentException("{$lang_fields['col_type']} {$lang_functions['text_invalid']}");
-        }
-        $attributes['type'] = $data['type'];
-
-        if (!isset($data['required'])) {
-            throw new \InvalidArgumentException("{$lang_fields['col_required']} {$lang_functions['text_required']}");
-        }
-        if (!in_array($data['required'], ["0", "1"], true)) {
-            throw new \InvalidArgumentException("{$lang_fields['col_name']} {$lang_functions['text_invalid']}");
-        }
-        $attributes['required'] = $data['required'];
-
-        if (!isset($data['is_single_row'])) {
-            throw new \InvalidArgumentException("{$lang_fields['col_is_single_row']} {$lang_functions['text_required']}");
-        }
-        if (!in_array($data['is_single_row'], ["0", "1"], true)) {
-            throw new \InvalidArgumentException("{$lang_fields['col_is_single_row']} {$lang_functions['text_invalid']}");
-        }
-        $attributes['is_single_row'] = $data['is_single_row'];
-
-        $attributes['help'] = $data['help'] ?? '';
-        $attributes['options'] = trim($data['options'] ?? '');
-        $now = date('Y-m-d H:i:s');
-        $attributes['updated_at'] = $now;
-        $table = 'torrents_custom_fields';
-        if (!empty($data['id'])) {
-            $result = DB::update($table, $attributes, "id = " . sqlesc($data['id']));
-        } else {
-            $attributes['created_at'] = $now;
-            $result = DB::insert($table, $attributes);
-        }
-        return $result;
-    }
-
-
-    public function buildFieldCheckbox($name, $current = [])
-    {
-        $sql = 'select * from torrents_custom_fields';
-        $res = sql_query($sql);
-        if (!is_array($current)) {
-            $current = explode(',', $current);
-        }
-        $checkbox = '';
-        while ($row = mysql_fetch_assoc($res)) {
-            $checkbox .= sprintf(
-                '<label style="margin-right: 4px;"><input type="checkbox" name="%s" value="%s"%s>%s</label>',
-                $name, $row['id'], in_array($row['id'], $current) ? ' checked' : '', "{$row['name']}[{$row['label']}]"
-            );
-        }
-        $checkbox .= '';
-        return $checkbox;
-
-    }
-
-    public function renderOnUploadPage($torrentId = 0)
-    {
-        global $browsecatmode;
-        $searchBox = DB::getOne('searchbox', "id = $browsecatmode");
-        if (empty($searchBox)) {
-            throw new \RuntimeException("Invalid search box: $browsecatmode");
-        }
-        $customValues = $this->listTorrentCustomField($torrentId);
-        $sql = sprintf('select * from torrents_custom_fields where id in (%s)', $searchBox['custom_fields'] ?: 0);
-        $res = sql_query($sql);
-        $html = '';
-        while ($row = mysql_fetch_assoc($res)) {
-            $name = "custom_fields[{$row['id']}]";
-            $currentValue = $customValues[$row['id']]['custom_field_value'] ?? '';
-            if ($row['type'] == self::TYPE_TEXT) {
-                $html .= tr($row['label'], sprintf('<input type="text" name="%s" value="%s" style="width: 650px"/>', $name, $currentValue), 1);
-            } elseif ($row['type'] == self::TYPE_TEXTAREA) {
-                $html .= tr($row['label'], sprintf('<textarea name="%s" rows="4" style="width: 650px">%s</textarea>', $name, $currentValue), 1);
-            } elseif ($row['type'] == self::TYPE_RADIO || $row['type'] == self::TYPE_CHECKBOX) {
-                if ($row['type'] == self::TYPE_CHECKBOX) {
-                    $name .= '[]';
-                }
-                $part = "";
-                foreach (preg_split('/[\r\n]+/', trim($row['options'])) as $option) {
-                    if (empty($option) || ($pos = strpos($option, '|')) === false) {
-                        continue;
-                    }
-                    $value = substr($option, 0, $pos);
-                    $label = substr($option, $pos + 1);
-                    $checked = "";
-                    if ($row['type'] == self::TYPE_RADIO && (string)$currentValue === (string)$value) {
-                        $checked = " checked";
-                    }
-                    if ($row['type'] == self::TYPE_CHECKBOX && in_array($value, (array)$currentValue)) {
-                        $checked = " checked";
-                    }
-                    $part .= sprintf(
-                        '<label style="margin-right: 4px"><input type="%s" name="%s" value="%s"%s />%s</label>',
-                        $row['type'], $name, $value, $checked, $label
-                    );
-                }
-                $html .= tr($row['label'], $part, 1);
-            } elseif ($row['type'] == self::TYPE_SELECT) {
-                $part = '<select name="' . $name . '">';
-                foreach (preg_split('/[\r\n]+/', trim($row['options'])) as $option) {
-                    if (empty($option) || ($pos = strpos($option, '|')) === false) {
-                        continue;
-                    }
-                    $value = substr($option, 0, $pos);
-                    $label = substr($option, $pos + 1);
-                    $selected = "";
-                    if (in_array($value, (array)$currentValue)) {
-                        $selected = " selected";
-                    }
-                    $part .= sprintf(
-                        '<option value="%s"%s>%s</option>',
-                        $value, $selected, $label
-                    );
-                }
-                $part .= '</select>';
-                $html .= tr($row['label'], $part, 1);
-            } elseif ($row['type'] == self::TYPE_IMAGE) {
-                $callbackFunc = "preview_custom_field_image_" . $row['id'];
-                $iframeId = "iframe_$callbackFunc";
-                $inputId = "input_$callbackFunc";
-                $imgId = "attach" . $row['id'];
-                $previewBoxId = "preview_$callbackFunc";
-                $y = '<iframe id="' . $iframeId . '" src="' . getSchemeAndHttpHost() . '/attachment.php?callback_func=' . $callbackFunc . '" width="100%" height="24" frameborder="0" scrolling="no" marginheight="0" marginwidth="0"></iframe>';
-                $y .= sprintf('<input id="%s" type="text" name="%s" value="%s" style="width: 650px;margin: 10px 0">', $inputId, $name, $currentValue);
-                $y .= '<div id="' . $previewBoxId . '">';
-                if (!empty($currentValue)) {
-                    if (substr($currentValue, 0, 4) == 'http') {
-                        $y .= formatImg($currentValue, true, 700, 0, $imgId);
-                    } else {
-                        $y .= format_comment($currentValue);
-                    }
-                }
-                $y .= '</div>';
-                $y .= <<<JS
-<script>
-    function {$callbackFunc}(delkey, url)
-    {
-        var previewBox = $('$previewBoxId')
-        var existsImg = $('$imgId')
-        var input = $('$inputId')
-        if (existsImg) {
-            previewBox.removeChild(existsImg)
-            input.value = ''
-        }
-        var img = document.createElement('img')
-        img.src=url
-        img.setAttribute('onload', 'Scale(this, 700, 0);')
-        img.setAttribute('onclick', 'Preview(this);')
-        input.value = '[attach]' + delkey + '[/attach]'
-        img.id='$imgId'
-        previewBox.appendChild(img)
-    }
-</script>
-JS;
-                $html .= tr($row['label'], $y, 1);
-            }
-        }
-        return $html;
-    }
-
-    public function listTorrentCustomField($torrentId, $searchBoxId = 0)
-    {
-        global $browsecatmode;
-        if ($searchBoxId <= 0) {
-            $searchBoxId = $browsecatmode;
-        }
-        //suppose torrentId is array
-        $isArray = true;
-        $torrentIdArr = $torrentId;
-        if (!is_array($torrentId)) {
-            $isArray = false;
-            $torrentIdArr = [$torrentId];
-        }
-        $torrentIdStr = implode(',', $torrentIdArr);
-        $res = sql_query("select f.*, v.custom_field_value, v.torrent_id from torrents_custom_field_values v inner join torrents_custom_fields f on v.custom_field_id = f.id inner join searchbox box on box.id = $searchBoxId and find_in_set(f.id, box.custom_fields) where torrent_id in ($torrentIdStr)");
-        $values = [];
-        $result = [];
-        while ($row = mysql_fetch_assoc($res)) {
-            $typeInfo = self::$types[$row['type']];
-            if ($typeInfo['has_option']) {
-                $options = preg_split('/[\r\n]+/', trim($row['options']));
-                $optionsArr = [];
-                foreach ($options as $option) {
-                    $pos = strpos($option, '|');
-                    $value = substr($option, 0, $pos);
-                    $label = substr($option, $pos + 1);
-                    $optionsArr[$value] = $label;
-                }
-                $row['options'] = $optionsArr;
-            }
-            $result[$row['torrent_id']][$row['id']] = $row;
-            if ($typeInfo['is_value_multiple']) {
-                $values[$row['torrent_id']][$row['id']][] = $row['custom_field_value'];
-            } else {
-                $values[$row['torrent_id']][$row['id']] = $row['custom_field_value'];
-            }
-        }
-        foreach ($result as $tid => &$fields) {
-            foreach ($fields as &$field) {
-                $field['custom_field_value'] = $values[$tid][$field['id']];
-            }
-        }
-        return $isArray ? $result : ($result[$torrentId] ?? []);
-    }
-
-    public function renderOnTorrentDetailsPage($torrentId)
-    {
-        global $browsecatmode;
-        $displayName = get_searchbox_value($browsecatmode, 'custom_fields_display_name');
-        $display = get_searchbox_value($browsecatmode, 'custom_fields_display');
-        $customFields = $this->listTorrentCustomField($torrentId);
-//        dd($displayName, $display, $customFields);
-        $mixedRowContent = nl2br($display);
-        $rowByRowHtml = '';
-        foreach ($customFields as $field) {
-            $content = $this->formatCustomFieldValue($field);
-            $mixedRowContent = str_replace("<%{$field['name']}.label%>", $field['label'], $mixedRowContent);
-            $mixedRowContent = str_replace("<%{$field['name']}.value%>", $content, $mixedRowContent);
-            if ($field['is_single_row']) {
-                $rowByRowHtml .= tr($field['label'], $content, 1);
-            }
-        }
-        $result = $rowByRowHtml;
-        if (!empty($mixedRowContent)) {
-            $result .= tr($displayName, $mixedRowContent, 1);
-        }
-        return $result;
-    }
-
-
-
-    protected function formatCustomFieldValue(array $customFieldWithValue)
-    {
-        $result = '';
-        $fieldValue = $customFieldWithValue['custom_field_value'];
-        switch ($customFieldWithValue['type']) {
-            case self::TYPE_TEXT:
-            case self::TYPE_TEXTAREA:
-                $result .= format_comment($fieldValue);
-                break;
-            case self::TYPE_IMAGE:
-                if (substr($fieldValue, 0, 4) == 'http') {
-                    $result .= formatImg($fieldValue, true, 700, 0, "attach{$customFieldWithValue['id']}");
-                } else {
-                    $result .= format_comment($fieldValue);
-                }
-                break;
-            case self::TYPE_RADIO:
-            case self::TYPE_CHECKBOX:
-            case self::TYPE_SELECT;
-                $fieldContent = [];
-                foreach ((array)$fieldValue as $item) {
-                    $fieldContent[] = $customFieldWithValue['options'][$item] ?? '';
-                }
-                $result .= implode(' ', $fieldContent);
-                break;
-            default:
-                break;
-        }
-        return $result;
-    }
-
-    public function prepareTorrents(array $torrentIdArr)
-    {
-        $customFieldValues = $this->listTorrentCustomField($torrentIdArr);
-        $result = [];
-        foreach ($customFieldValues as $tid => &$customFields) {
-            foreach ($customFields as &$field) {
-                $field['custom_field_value_formatted'] = $this->formatCustomFieldValue($field);
-                $result[$tid][$field['name']] = $field;
-            }
-        }
-        $this->preparedTorrentCustomFieldValues = $result;
-    }
-
-    public function getPreparedTorrent($torrentId = null, $fieldName = null)
-    {
-        if (is_null($torrentId)) {
-            return $this->preparedTorrentCustomFieldValues;
-        }
-        if (is_null($fieldName)) {
-            return $this->preparedTorrentCustomFieldValues[$torrentId] ?? [];
-        }
-        return $this->preparedTorrentCustomFieldValues[$torrentId][$fieldName] ?? '';
-    }
-
-
-
-
-}

nexus/Install/install/install.php

@@ -167,9 +167,8 @@ if (!empty($error)) {
                 } elseif ($currentStep == 2) {
                     echo $install->renderTable($header, $tableRows);
                     echo $install->renderForm($envFormControls);
-
                 } elseif ($currentStep == 3) {
-                    echo '<h1 class="mb-4 text-lg font-bold">The following new table will be created</h1>';
+                    echo '<h1 class="mb-4 text-lg font-bold">The following tables will be created</h1>';
                     if (empty($shouldCreateTable)) {
                         echo '<div class="text-green-600 text-center">Congratulations, all the required tables have been created!</div>';
                     } else {
@@ -181,7 +180,7 @@ if (!empty($error)) {
                     echo sprintf('This step will merge <code>%s</code> to <code>%s</code>, then insert into database', $tableRows[1]['label'], $tableRows[0]['label']);
                     echo '</div>';
                 } elseif ($currentStep == 5) {
-                    echo $install->renderForm($userFormControls, '1/3', '1/4', '3/4');
+                    echo $install->renderForm($userFormControls, '1/2', '1/4', '3/4');
                 } elseif ($currentStep > $maxStep) {
                     echo '<div class="text-green-900 text-6xl p-10">Congratulations, everything is ready!</div>';
                     echo '<div class="mb-6">For questions, consult the installation log at: <code>' . $install->getLogFile() . '</code></div>';

public/clients.php

@@ -1,58 +0,0 @@
-<?php
-require "../include/bittorrent.php";
-dbconn();
-require_once(get_langfile_path());
-loggedinorreturn();
-if (get_user_class() < UC_SYSOP) {
-    permissiondenied();
-}
-
-$type = $_GET['type'] ?? 'allow';
-
-$client = new \Nexus\Client\Client($type);
-
-
-$action = $_GET['action'] ?? 'view';
-if ($action == 'view') {
-    stdhead($lang_clients['client_management']." - ".$lang_clients['text_field']);
-    begin_main_frame();
-    $r =  $client->buildClientTable();
-    echo $r;
-    stdfoot();
-} elseif ($action == 'add') {
-    stdhead($lang_clients['field_management']." - ".$lang_clients['text_add']);
-    begin_main_frame();
-    echo $client->buildFieldForm();
-} elseif ($action == 'submit') {
-    try {
-        $result = $client->save($_REQUEST);
-        nexus_redirect('clients.php?action=view');
-    } catch (\Exception $e) {
-        stderr($lang_clients['field_management'], $e->getMessage());
-    }
-} elseif ($action == 'edit') {
-    $id = intval($_GET['id'] ?? 0);
-    if ($id == 0) {
-        stderr($lang_clients['field_management'], "Invalid id");
-    }
-    $sql = "select * from torrents_custom_fields where id = $id";
-    $res = sql_query($sql);
-    $row = mysql_fetch_assoc($res);
-    if (empty($row)) {
-        stderr('', 'Invalid id');
-    }
-    stdhead($lang_clients['field_management']." - ".$lang_clients['text_edit']);
-    begin_main_frame();
-    echo $client->buildFieldForm($row);
-} elseif ($action == 'del') {
-    $id = intval($_GET['id'] ?? 0);
-    if ($id == 0) {
-        stderr($lang_clients['field_management'], "Invalid id");
-    }
-    $sql = "delete from torrents_custom_fields where id = $id";
-    $res = sql_query($sql);
-    nexus_redirect('clients.php?action=view');
-}
-
-
-

public/download.php

@@ -80,11 +80,16 @@ $base_announce_url = $trackerSchemaAndHost['base_announce_url'];
 
 $res = sql_query("SELECT torrents.name, torrents.filename, torrents.save_as, torrents.size, torrents.owner, torrents.banned, categories.mode as search_box_id FROM torrents left join categories on torrents.category = categories.id WHERE torrents.id = ".sqlesc($id)) or sqlerr(__FILE__, __LINE__);
 $row = mysql_fetch_assoc($res);
-$fn = ROOT_PATH . "$torrent_dir/$id.torrent";
+if (!$row) {
+    do_log("[TORRENT_NOT_EXISTS] $id", 'error');
+    httperr();
+}
+$fn = getFullDirectory("$torrent_dir/$id.torrent");
 if ($CURUSER['downloadpos']=="no") {
     permissiondenied();
 }
-if (!$row || !is_file($fn) || !is_readable($fn)) {
+if (!is_file($fn) || !is_readable($fn)) {
+    do_log("[TORRENT_NOT_READABLE] $fn",'error');
     httperr();
 }
 if (($row['banned'] == 'yes' && get_user_class() < $seebanned_class) || !can_access_torrent($row)) {

public/login.php

@@ -93,13 +93,13 @@ if ($smtptype != 'none'){
 <?php
 }
 if ($showhelpbox_main != 'no'){?>
-<table width="700" class="main" border="0" cellspacing="0" cellpadding="0"><tr><td class="embedded">
+<table width="100%" class="main" border="0" cellspacing="0" cellpadding="0"><tr><td class="embedded">
 <h2><?php echo $lang_login['text_helpbox'] ?><font class="small"> - <?php echo $lang_login['text_helpbox_note'] ?><font id= "waittime" color="red"></font></h2>
 <?php
 print("<table width='100%' border='1' cellspacing='0' cellpadding='1'><tr><td class=\"text\">\n");
-print("<iframe src='" . get_protocol_prefix() . $BASEURL . "/shoutbox.php?type=helpbox' width='650' height='180' frameborder='0' name='sbox' marginwidth='0' marginheight='0'></iframe><br /><br />\n");
+print("<iframe src='" . get_protocol_prefix() . $BASEURL . "/shoutbox.php?type=helpbox' width='100%' height='180' frameborder='0' name='sbox' marginwidth='0' marginheight='0'></iframe><br /><br />\n");
 print("<form action='" . get_protocol_prefix() . $BASEURL . "/shoutbox.php' id='helpbox' method='get' target='sbox' name='shbox'>\n");
-print($lang_login['text_message']."<input type='text' id=\"hbtext\" name='shbox_text' autocomplete='off' style='width: 500px; border: 1px solid gray' ><input type='submit' id='hbsubmit' class='btn' name='shout' value=\"".$lang_login['sumbit_shout']."\" /><input type='reset' class='btn' value=".$lang_login['submit_clear']." /> <input type='hidden' name='sent' value='yes'><input type='hidden' name='type' value='helpbox' />\n");
+print("<div style='display: flex'>" . $lang_login['text_message']."<input type='text' id=\"hbtext\" name='shbox_text' autocomplete='off' style='flex-grow: 1;width: 500px; border: 1px solid gray' ><input type='submit' id='hbsubmit' class='btn' name='shout' value=\"".$lang_login['sumbit_shout']."\" /><input type='reset' class='btn' value=".$lang_login['submit_clear']." /> <input type='hidden' name='sent' value='yes'><input type='hidden' name='type' value='helpbox' /></div>\n");
 print("<div id=sbword style=\"display: none\">".$lang_login['sumbit_shout']."</div>");
 print(smile_row("shbox","shbox_text"));
 print("</td></tr></table></form></td></tr></table>");

public/torrents.php

@@ -884,10 +884,10 @@ if ($count)
 
 	list($pagertop, $pagerbottom, $limit) = pager($torrentsperpage, $count, "?" . $addparam);
 if ($allsec == 1 || $enablespecial != 'yes'){
-	$query = "SELECT torrents.id, torrents.sp_state, torrents.promotion_time_type, torrents.promotion_until, torrents.banned, torrents.picktype, torrents.pos_state, torrents.category, torrents.source, torrents.medium, torrents.codec, torrents.standard, torrents.processing, torrents.team, torrents.audiocodec, torrents.leechers, torrents.seeders, torrents.name, torrents.small_descr, torrents.times_completed, torrents.size, torrents.added, torrents.comments,torrents.anonymous,torrents.owner,torrents.url,torrents.cache_stamp,torrents.pt_gen,torrents.tags,torrents.hr FROM torrents ".($search_area == 3 || $column == "owner" ? "LEFT JOIN users ON torrents.owner = users.id " : "")." $tagFilter $where $orderby $limit";
+	$query = "SELECT torrents.id, torrents.sp_state, torrents.promotion_time_type, torrents.promotion_until, torrents.banned, torrents.picktype, torrents.pos_state, torrents.category, torrents.source, torrents.medium, torrents.codec, torrents.standard, torrents.processing, torrents.team, torrents.audiocodec, torrents.leechers, torrents.seeders, torrents.name, torrents.small_descr, torrents.times_completed, torrents.size, torrents.added, torrents.comments,torrents.anonymous,torrents.owner,torrents.url,torrents.cache_stamp,torrents.pt_gen,torrents.hr FROM torrents ".($search_area == 3 || $column == "owner" ? "LEFT JOIN users ON torrents.owner = users.id " : "")." $tagFilter $where $orderby $limit";
 }
 else{
-	$query = "SELECT torrents.id, torrents.sp_state, torrents.promotion_time_type, torrents.promotion_until, torrents.banned, torrents.picktype, torrents.pos_state, torrents.category, torrents.source, torrents.medium, torrents.codec, torrents.standard, torrents.processing, torrents.team, torrents.audiocodec, torrents.leechers, torrents.seeders, torrents.name, torrents.small_descr, torrents.times_completed, torrents.size, torrents.added, torrents.comments,torrents.anonymous,torrents.owner,torrents.url,torrents.cache_stamp,torrents.pt_gen,torrents.tags,torrents.hr FROM torrents ".($search_area == 3 || $column == "owner" ? "LEFT JOIN users ON torrents.owner = users.id " : "")." LEFT JOIN categories ON torrents.category=categories.id $tagFilter $where $orderby $limit";
+	$query = "SELECT torrents.id, torrents.sp_state, torrents.promotion_time_type, torrents.promotion_until, torrents.banned, torrents.picktype, torrents.pos_state, torrents.category, torrents.source, torrents.medium, torrents.codec, torrents.standard, torrents.processing, torrents.team, torrents.audiocodec, torrents.leechers, torrents.seeders, torrents.name, torrents.small_descr, torrents.times_completed, torrents.size, torrents.added, torrents.comments,torrents.anonymous,torrents.owner,torrents.url,torrents.cache_stamp,torrents.pt_gen,torrents.hr FROM torrents ".($search_area == 3 || $column == "owner" ? "LEFT JOIN users ON torrents.owner = users.id " : "")." LEFT JOIN categories ON torrents.category=categories.id $tagFilter $where $orderby $limit";
 }
 
 	$res = sql_query($query);