Merge branch 'download_allow_passkey' into php8

lang/chs/lang_settings.php

@@ -710,6 +710,8 @@ $lang_settings = array
     'text_sticky_first_level_background_color_note' => '一级置顶背景颜色，不设置则无背景色。',
     'row_sticky_second_level_background_color' => '二级置顶背景颜色',
     'text_sticky_second_level_background_color_note' => '二级置顶背景颜色，不设置则无背景色。',
+    'row_download_support_passkey' => '支持 passkey 下载种子',
+    'text_download_support_passkey_note' => '是否支持通过 passkey 下载种子（同时也需要种子 ID）。',
 );
 
 ?>

lang/cht/lang_settings.php

@@ -710,6 +710,8 @@ $lang_settings = array
     'text_sticky_first_level_background_color_note' => '一級置頂背景顏色，不設置則無背景色。',
     'row_sticky_second_level_background_color' => '二級置頂背景顏色',
     'text_sticky_second_level_background_color_note' => '二級置頂背景顏色，不設置則無背景色。',
+    'row_download_support_passkey' => '支持 passkey 下載種子',
+    'text_download_support_passkey_note' => '是否支持通過 passkey 下載種子（同時也需要種子 ID）。',
 );
 
 ?>

lang/en/lang_settings.php

@@ -710,6 +710,8 @@ $lang_settings = array
     'text_sticky_first_level_background_color_note' => 'Sticky first level bg color, it will be none if not set.',
     'row_sticky_second_level_background_color' => 'Sticky second level bg color',
     'text_sticky_second_level_background_color_note' => 'Sticky second level bg color, it will be none if not set.',
+    'row_download_support_passkey' => 'Support download by passkey',
+    'text_download_support_passkey_note' => 'Support download torrent file by passkey or not(also require torrent id).',
 );
 
 ?>

public/download.php

@@ -2,7 +2,7 @@
 require_once("../include/bittorrent.php");
 dbconn();
 $torrentRep = new \App\Repositories\TorrentRepository();
-if (!empty($_REQUEST['downhash'])){
+if (!empty($_REQUEST['downhash'])) {
     $params = explode('|', $_REQUEST['downhash']);
     if (empty($params[0]) || empty($params[1])) {
         die("invalid downhash, format error");
@@ -24,9 +24,18 @@ if (!empty($_REQUEST['downhash'])){
         die("invalid downhash, decrpyt fail");
     }
     $id = $decrypted[0];
-}
+} elseif (get_setting('torrent.download_support_passkey') == 'yes' && !empty($_REQUEST['passkey']) && !empty($_REQUEST['id'])) {
-else
+    $res = sql_query("SELECT * FROM users WHERE passkey=". sqlesc($_REQUEST['passkey'])." LIMIT 1");
-{
+    $user = mysql_fetch_array($res);
+    if (!$user)
+        die("invalid passkey");
+    elseif ($user['enabled'] == 'no' || $user['parked'] == 'yes')
+        die("account disabed or parked");
+    $oldip = $user['ip'];
+    $user['ip'] = getip();
+    $CURUSER = $user;
+    $id = $_REQUEST['id'];
+} else {
     $id = (int)$_GET["id"];
     if (!$id)
         httperr();

public/settings.php

@@ -132,7 +132,8 @@ elseif($action == 'savesettings_torrent') 	// save account
 	    'prorules', 'randomhalfleech','randomfree','randomtwoup','randomtwoupfree','randomtwouphalfdown','largesize', 'largepro','expirehalfleech',
         'expirefree','expiretwoup','expiretwoupfree','expiretwouphalfleech', 'expirenormal','hotdays','hotseeder','halfleechbecome','freebecome',
         'twoupbecome','twoupfreebecome', 'twouphalfleechbecome','normalbecome','uploaderdouble','deldeadtorrent', 'randomthirtypercentdown',
-        'thirtypercentleechbecome', 'expirethirtypercentleech', 'sticky_first_level_background_color', 'sticky_second_level_background_color'
+        'thirtypercentleechbecome', 'expirethirtypercentleech', 'sticky_first_level_background_color', 'sticky_second_level_background_color',
+        'download_support_passkey'
     );
 	GetVar($validConfig);
 	$TORRENT = [];
@@ -595,7 +596,8 @@ elseif ($action == 'torrentsettings')
 
     tr($lang_settings['row_sticky_first_level_background_color'],"<input type='text' name=sticky_first_level_background_color style=\"width: 100px\" value={$TORRENT['sticky_first_level_background_color']}> ".$lang_settings['text_sticky_first_level_background_color_note'], 1);
     tr($lang_settings['row_sticky_second_level_background_color'],"<input type='text' name=sticky_second_level_background_color style=\"width: 100px\" value={$TORRENT['sticky_second_level_background_color']}> ".$lang_settings['text_sticky_second_level_background_color_note'], 1);
-	yesorno($lang_settings['row_promotion_rules'], 'prorules', $TORRENT["prorules"], $lang_settings['text_promotion_rules_note']);
+    yesorno($lang_settings['row_download_support_passkey'], 'download_support_passkey', $TORRENT["download_support_passkey"], $lang_settings['text_download_support_passkey_note']);
+    yesorno($lang_settings['row_promotion_rules'], 'prorules', $TORRENT["prorules"], $lang_settings['text_promotion_rules_note']);
 	tr($lang_settings['row_random_promotion'], $lang_settings['text_random_promotion_note_one']."<ul><li><input type='text' style=\"width: 50px\" name=randomhalfleech value='".(isset($TORRENT["randomhalfleech"]) ? $TORRENT["randomhalfleech"] : 5 )."'>".$lang_settings['text_halfleech_chance_becoming']."</li><li><input type='text' style=\"width: 50px\" name=randomfree value='".(isset($TORRENT["randomfree"]) ? $TORRENT["randomfree"] : 2 )."'>".$lang_settings['text_free_chance_becoming']."</li><li><input type='text' style=\"width: 50px\" name=randomtwoup value='".(isset($TORRENT["randomtwoup"]) ? $TORRENT["randomtwoup"] : 2 )."'>".$lang_settings['text_twoup_chance_becoming']."</li><li><input type='text' style=\"width: 50px\" name=randomtwoupfree value='".(isset($TORRENT["randomtwoupfree"]) ? $TORRENT["randomtwoupfree"] : 1 )."'>".$lang_settings['text_freetwoup_chance_becoming']."</li><li><input type='text' style=\"width: 50px\" name=randomtwouphalfdown value='".(isset($TORRENT["randomtwouphalfdown"]) ? $TORRENT["randomtwouphalfdown"] : 0 )."'>".$lang_settings['text_twouphalfleech_chance_becoming']."</li><li><input type='text' style=\"width: 50px\" name=randomthirtypercentdown value='".(isset($TORRENT["randomthirtypercentdown"]) ? $TORRENT["randomthirtypercentdown"] : 0 )."'>".$lang_settings['text_thirtypercentleech_chance_becoming']."</li></ul>".$lang_settings['text_random_promotion_note_two'], 1);
 	tr($lang_settings['row_large_torrent_promotion'], $lang_settings['text_torrent_larger_than']."<input type='text' style=\"width: 50px\" name=largesize value='".(isset($TORRENT["largesize"]) ? $TORRENT["largesize"] : 20 )."'>".$lang_settings['text_gb_promoted_to']."<select name=largepro>".promotion_selection((isset($TORRENT['largepro']) ? $TORRENT['largepro'] : 2), 1)."</select>".$lang_settings['text_by_system_upon_uploading']."<br />".$lang_settings['text_large_torrent_promotion_note'], 1);
 	tr($lang_settings['row_promotion_timeout'], $lang_settings['text_promotion_timeout_note_one']."<ul>

public/viewrequests.php

@@ -2,6 +2,7 @@
 require "../include/bittorrent.php";
 dbconn();
 require_once(get_langfile_path());
+require_once(get_langfile_path('details.php'));
 loggedinorreturn();
 parked();
 
@@ -135,7 +136,7 @@ else {
                     while ($row = mysql_fetch_array($res)) {
                         $each = mysql_fetch_assoc(sql_query("SELECT * FROM torrents WHERE id = '" . $row["torrentid"] . "'"));
                         if (mysql_num_rows(sql_query("SELECT * FROM torrents WHERE id = '" . $row["torrentid"] . "'")) == 1)
-                            $ress .= (($arr['userid'] == $CURUSER['id'] || get_user_class() >= UC_UPLOADER) && $arr['finish'] == "no" ? "<input type=checkbox name=torrentid[] value=" . $each["id"] . ">" : "") . "<a href='details.php?id=" . $each["id"] . "&hit=1' >" . $each["name"] . "</a> " . ($arr['finish'] == "no" ? "" : "by " . get_username($each[owner])) . "<br/>\n";
+                            $ress .= (($arr['userid'] == $CURUSER['id'] || get_user_class() >= UC_UPLOADER) && $arr['finish'] == "no" ? "<input type=checkbox name=torrentid[] value=" . $each["id"] . ">" : "") . "<a href='details.php?id=" . $each["id"] . "&hit=1' >" . $each["name"] . "</a> " . ($arr['finish'] == "no" ? "" : "by " . get_username($each['owner'])) . "<br/>\n";
                     }
                     $ress .= "";
 
@@ -175,7 +176,7 @@ else {
 
 
                 print ("
-	
+
 <a class=\"index\" href='comment.php?action=add&pid=$id&type=request'>{$lang_functions['title_add_comments']}</a></td></tr></table>");
 
                 stdfoot();
@@ -328,7 +329,7 @@ else {
 	<form action=viewrequests.php method=post>
 	<input type=hidden name=action value=takeres />
 	<input type=hidden name=reqid value=\"" . $_GET["id"] . "\" />
-	{$lang_viewrequests['type_in_torrent_id']}:http://$BASEURL/details.php?id=<input type=text name=torrentid size=11/>
+	{$lang_viewrequests['type_in_torrent_id']}:" . getSchemeAndHttpHost() . "/details.php?id=<input type=text name=torrentid size=11/>
 	<input type=submit value={$lang_functions['submit_submit']}></form><a href='viewrequests.php?action=view&id=" . $_GET["id"] . "'>{$lang_functions['std_click_here_to_goback']}</a>", 0);
             stdfoot();
             die;
@@ -346,7 +347,7 @@ else {
             $res = sql_query("SELECT * FROM torrents WHERE id ='" . $_POST["torrentid"] . "'") or sqlerr(__FILE__, __LINE__);
             if (mysql_num_rows($res) == 0) stderr($lang_functions['std_error'], "{$lang_functions['std_target_not_exists']}<a href='viewrequests.php?action=res&id=" . $_POST["reqid"] . "'>{$lang_functions['std_click_here_to_goback']}</a>", 0);
             $tor = mysql_fetch_assoc($res);
-            if ($tor[last_seed] == "0000-00-00 00:00:00") stderr($lang_functions['std_error'], "{$lang_viewrequests['torrent_not_release_yet']}<a href='viewrequests.php?action=res&id=" . $_POST["reqid"] . "'>{$lang_functions['std_click_here_to_goback']}</a>", 0);
+//            if ($tor['last_seed'] == "0000-00-00 00:00:00" || is_null(($tor['last_seed']))) stderr($lang_functions['std_error'], "{$lang_viewrequests['torrent_not_release_yet']}<a href='viewrequests.php?action=res&id=" . $_POST["reqid"] . "'>{$lang_functions['std_click_here_to_goback']}</a>", 0);
             if (get_row_count('resreq', "where reqid ='" . $_POST["reqid"] . "' and torrentid='" . $_POST["torrentid"] . "'"))
                 stderr($lang_functions['std_error'], "{$lang_viewrequests['supply_already_exists']}<a href='viewrequests.php?action=res&id=" . $_POST["reqid"] . "'>{$lang_functions['std_click_here_to_goback']}</a>", 0);
             sql_query("INSERT resreq (reqid , torrentid) VALUES ( '" . $_POST["reqid"] . "' , '" . $_POST["torrentid"] . "')");
@@ -462,4 +463,4 @@ else {
 die;
 
 
-?>
+?>