';
+ }
+ return $result;
+ }
+
+ private function clearCache()
+ {
+ NexusDB::redis()->del("nexus_is_ip_seed_box");
+ }
+
+
+
}
diff --git a/app/Repositories/TrackerRepository.php b/app/Repositories/TrackerRepository.php
index cb6c5dd3..8e502c6d 100644
--- a/app/Repositories/TrackerRepository.php
+++ b/app/Repositories/TrackerRepository.php
@@ -88,16 +88,23 @@ class TrackerRepository extends BaseRepository
} elseif ($isReAnnounce == self::ANNOUNCE_FIRST) {
$this->checkMinInterval($peerSelf, $queries);
}
+
+ $snatch = Snatch::query()
+ ->where('torrentid', $torrent->id)
+ ->where('userid', $user->id)
+ ->orderBy('id', 'desc')
+ ->first();
/**
* Note: Must get before update peer!
*/
- $dataTraffic = $this->getDataTraffic($torrent, $queries, $user, $peerSelf);
+ $dataTraffic = $this->getDataTraffic($torrent, $queries, $user, $peerSelf, $snatch);
/**
* Note: Only check in old session
*/
if ($peerSelf->exists) {
- $this->checkCheater($torrent, $dataTraffic, $user, $peerSelf);
+ $this->checkCheater($torrent, $queries, $dataTraffic, $user, $peerSelf);
+ $this->checkSeedBox($torrent, $queries, $dataTraffic, $user, $peerSelf);
}
/**
@@ -113,7 +120,7 @@ class TrackerRepository extends BaseRepository
/**
* Note: Must update snatch first, otherwise peer `last_action` already change
*/
- $snatch = $this->updateSnatch($peerSelf, $queries, $dataTraffic);
+ $snatch = $this->updateSnatch($peerSelf, $queries, $dataTraffic, $snatch);
if ($queries['event'] == 'completed') {
$this->handleHitAndRun($user, $torrent, $snatch);
}
@@ -420,6 +427,7 @@ class TrackerRepository extends BaseRepository
if ($user->class >= User::CLASS_VIP) {
return;
}
+
$gigs = $user->downloaded / (1024*1024*1024);
if ($gigs < 10) {
return;
@@ -485,7 +493,7 @@ class TrackerRepository extends BaseRepository
}
}
- protected function checkCheater(Torrent $torrent, $dataTraffic, User $user, Peer $peer)
+ protected function checkCheater(Torrent $torrent, $queries, $dataTraffic, User $user, Peer $peer)
{
$settingSecurity = Setting::get('security');
$level = $settingSecurity['cheaterdet'];
@@ -560,6 +568,33 @@ class TrackerRepository extends BaseRepository
}
+ private function checkSeedBox(Torrent $torrent, $queries, $dataTraffic, User $user, Peer $peer)
+ {
+ if ($user->class >= User::CLASS_VIP || $user->isDonating()) {
+ return;
+ }
+ $isSeedBoxRuleEnabled = Setting::get('seed_box.enabled') == 'yes';
+ if (!$isSeedBoxRuleEnabled) {
+ return;
+ }
+ $isIPSeedBox = isIPSeedBox($queries['ip'], $user->id);
+ if ($isIPSeedBox) {
+ return;
+ }
+ if (!$peer->isValidDate('last_action')) {
+ //no last action
+ return;
+ }
+ $duration = Carbon::now()->diffInSeconds($peer->last_action);
+ $upSpeedMbps = ($dataTraffic['uploaded_increment'] / $duration) * 8;
+ $notSeedBoxMaxSpeedMbps = Setting::get('seed_box.not_seed_box_max_speed');
+ if ($upSpeedMbps > $notSeedBoxMaxSpeedMbps) {
+ $user->update(['downloadpos' => 'no']);
+ do_log("user: {$user->id} downloading privileges have been disabled! (over speed)", 'error');
+ throw new TrackerException("Your downloading privileges have been disabled! (over speed)");
+ }
+ }
+
private function createOrUpdateCheater(Torrent $torrent, User $user, array $createData)
{
$existsCheater = Cheater::query()
@@ -671,7 +706,7 @@ class TrackerRepository extends BaseRepository
return $real_annnounce_interval;
}
- private function getDataTraffic(Torrent $torrent, $queries, User $user, Peer $peer): array
+ private function getDataTraffic(Torrent $torrent, $queries, User $user, Peer $peer, $snatch): array
{
$log = sprintf(
"torrent: %s, user: %s, peer: %s, queriesUploaded: %s, queriesDownloaded: %s",
@@ -720,12 +755,32 @@ class TrackerRepository extends BaseRepository
$downRatio = 0;
$log .= ", [PEER_NOT_EXISTS], realUploaded: $realUploaded, realDownloaded: $realDownloaded, upRatio: $upRatio, downRatio: $downRatio";
}
+ $uploadedIncrementForUser = $realUploaded * $upRatio;
+ $downloadedIncrementForUser = $realDownloaded * $downRatio;
+
+ /**
+ * check seed box rule
+ */
+ $isSeedBoxRuleEnabled = Setting::get('seed_box.enabled') == 'yes';
+ if ($isSeedBoxRuleEnabled) {
+ $isIPSeedBox = isIPSeedBox($queries['ip'], $user->id);
+ if ($isIPSeedBox) {
+ $uploadedIncrementForUser = $realUploaded;
+ $downloadedIncrementForUser = $realDownloaded;
+ $log .= ", isIPSeedBox, increment for user = real";
+ $maxUploadedTimes = Setting::get('seed_box.max_uploaded');
+ if ($snatch && $snatch->uploaded >= $torrent->size * $maxUploadedTimes) {
+ $log .= ", uploaded >= torrentSize * times($maxUploadedTimes), uploadedIncrementForUser = 0";
+ $uploadedIncrementForUser = 0;
+ }
+ }
+ }
$result = [
'uploaded_increment' => $realUploaded,
- 'uploaded_increment_for_user' => $realUploaded * $upRatio,
+ 'uploaded_increment_for_user' => $uploadedIncrementForUser,
'downloaded_increment' => $realDownloaded,
- 'downloaded_increment_for_user' => $realDownloaded * $downRatio,
+ 'downloaded_increment_for_user' => $downloadedIncrementForUser,
];
do_log("$log, result: " . json_encode($result), 'info');
return $result;
@@ -938,15 +993,10 @@ class TrackerRepository extends BaseRepository
* @param $queries
* @param $dataTraffic
*/
- private function updateSnatch(Peer $peer, $queries, $dataTraffic)
+ private function updateSnatch(Peer $peer, $queries, $dataTraffic, $snatch)
{
$nowStr = Carbon::now()->toDateTimeString();
- $snatch = Snatch::query()
- ->where('torrentid', $peer->torrent)
- ->where('userid', $peer->userid)
- ->first();
-
//torrentid, userid, ip, port, uploaded, downloaded, to_go, ,seedtime, leechtime, last_action, startdat, completedat, finished
if (!$snatch) {
$snatch = new Snatch();
diff --git a/composer.json b/composer.json
index 75e22fd0..b0429985 100644
--- a/composer.json
+++ b/composer.json
@@ -78,6 +78,9 @@
],
"post-create-project-cmd": [
"@php artisan key:generate --ansi"
+ ],
+ "post-update-cmd": [
+ "@php artisan filament:upgrade"
]
},
"extra": {
diff --git a/database/migrations/2022_07_20_194152_create_seedbox_records_table.php b/database/migrations/2022_07_20_194152_create_seedbox_records_table.php
index 359f365c..be35c84d 100644
--- a/database/migrations/2022_07_20_194152_create_seedbox_records_table.php
+++ b/database/migrations/2022_07_20_194152_create_seedbox_records_table.php
@@ -13,10 +13,11 @@ return new class extends Migration
*/
public function up()
{
- Schema::create('seedbox_records', function (Blueprint $table) {
+ Schema::create('seed_box_records', function (Blueprint $table) {
$table->id();
$table->integer('type');
$table->integer('uid');
+ $table->integer('status')->default(0);
$table->string('operator')->nullable();
$table->integer('bandwidth')->nullable();
$table->string('ip')->nullable();
@@ -24,6 +25,7 @@ return new class extends Migration
$table->string('ip_end')->nullable();
$table->string('ip_begin_numeric', 128)->index();
$table->string('ip_end_numeric', 128)->index();
+ $table->integer('version');
$table->string('comment')->nullable();
$table->timestamps();
});
@@ -36,6 +38,6 @@ return new class extends Migration
*/
public function down()
{
- Schema::dropIfExists('seedbox_records');
+ Schema::dropIfExists('seed_box_records');
}
};
diff --git a/include/constants.php b/include/constants.php
index 943dd226..1389c04f 100644
--- a/include/constants.php
+++ b/include/constants.php
@@ -1,6 +1,6 @@
'en',
];
$locale = $langMap[$lang] ?? $lang;
- $result = [];
- foreach (explode(',', $ip) as $__ip) {
- if (empty($__ip)) {
- continue;
- }
- $locationInfo = \Nexus\Database\NexusDB::remember("locations_{$__ip}", 3600, function () use ($locale, $__ip, $reader) {
- $info = [
- 'ip' => $__ip,
- 'version' => '',
- 'country' => '',
- 'city' => '',
- ];
- try {
- $record = $reader->city($__ip);
- $countryName = $record->country->names[$locale] ?? $record->country->names['en'] ?? '';
- $cityName = $record->city->names[$locale] ?? $record->city->names['en'] ?? '';
- if (isIPV4($__ip)) {
- $info['version'] = 4;
- } elseif (isIPV6($__ip)) {
- $info['version'] = 6;
- }
- $info['country'] = $countryName;
- $info['city'] = $cityName;
- } catch (\Exception $exception) {
- do_log($exception->getMessage() . $exception->getTraceAsString(), 'error');
+ $locationInfo = \Nexus\Database\NexusDB::remember("locations_{$ip}", 3600, function () use ($locale, $ip, $reader) {
+ $info = [
+ 'ip' => $ip,
+ 'version' => '',
+ 'country' => '',
+ 'city' => '',
+ ];
+ try {
+ $record = $reader->city($ip);
+ $countryName = $record->country->names[$locale] ?? $record->country->names['en'] ?? '';
+ $cityName = $record->city->names[$locale] ?? $record->city->names['en'] ?? '';
+ if (isIPV4($ip)) {
+ $info['version'] = 4;
+ } elseif (isIPV6($ip)) {
+ $info['version'] = 6;
}
- return $info;
- });
- $result[] = $locationInfo;
- }
- usort($result, function ($a, $b) {
- if ($a['version'] == $b['version']) {
- return 0;
+ $info['country'] = $countryName;
+ $info['city'] = $cityName;
+ } catch (\Exception $exception) {
+ do_log($exception->getMessage() . $exception->getTraceAsString(), 'error');
}
- return $a['version'] > $b['version'] ? 1 : -1;
+ return $info;
});
- do_log("ip: $ip, locale: $locale, result: " . nexus_json_encode($result));
- $names = [];
- foreach ($result as $item) {
- $names[] = sprintf('%s[v%s]', $item['city'] ? ($item['city'] . "·" . $item['country']) : $item['country'], $item['version']);
- }
+ do_log("ip: $ip, locale: $locale, result: " . nexus_json_encode($locationInfo));
+ $name = sprintf('%s[v%s]', $locationInfo['city'] ? ($locationInfo['city'] . "·" . $locationInfo['country']) : $locationInfo['country'], $locationInfo['version']);
return [
- 'name' => implode(" + ", $names),
+ 'name' => $name,
'location_main' => '',
'location_sub' => '',
'flagpic' => '',
diff --git a/include/globalfunctions.php b/include/globalfunctions.php
index 79d7de0b..c6888daf 100644
--- a/include/globalfunctions.php
+++ b/include/globalfunctions.php
@@ -767,4 +767,45 @@ function do_action($name, ...$args)
return $hook->doAction(...func_get_args());
}
-
+function isIPSeedBox($ip, $uid = null, $withoutCache = false): bool
+{
+ $redis = \Nexus\Database\NexusDB::redis();
+ $key = "nexus_is_ip_seed_box";
+ $hashKey = "ip:$ip:uid:$uid";
+ $cacheData = $redis->hGet($key, $hashKey);
+ if ($cacheData && !$withoutCache) {
+ $cacheDataOriginal = unserialize($cacheData);
+ if ($cacheDataOriginal['deadline'] > time()) {
+ do_log("$hashKey, get result from cache: " . json_encode($cacheDataOriginal));
+ return $cacheDataOriginal['data'];
+ }
+ }
+ $ipObject = \PhpIP\IP::create($ip);
+ $ipNumeric = $ipObject->numeric();
+ $ipVersion = $ipObject->getVersion();
+ $checkSeedBoxAdminSql = sprintf(
+ 'select id from seed_box_records where `ip_begin_numeric` <= "%s" and `ip_end_numeric` >= "%s" and `type` = %s and `version` = %s and `status` = %s limit 1',
+ $ipNumeric, $ipNumeric, \App\Models\SeedBoxRecord::TYPE_ADMIN, $ipVersion, \App\Models\SeedBoxRecord::STATUS_ALLOWED
+ );
+ $res = \Nexus\Database\NexusDB::select($checkSeedBoxAdminSql);
+ if (!empty($res)) {
+ $redis->hSet($key, $hashKey, serialize(['data' => true, 'deadline' => time() + 3600]));
+ do_log("$hashKey, get result from admin, true");
+ return true;
+ }
+ if ($uid !== null) {
+ $checkSeedBoxUserSql = sprintf(
+ 'select id from seed_box_records where `ip_begin_numeric` <= "%s" and `ip_end_numeric` >= "%s" and `uid` = %s and `type` = %s and `version` = %s and `status` = %s limit 1',
+ $ipNumeric, $ipNumeric, $uid, \App\Models\SeedBoxRecord::TYPE_USER, $ipVersion, \App\Models\SeedBoxRecord::STATUS_ALLOWED
+ );
+ $res = \Nexus\Database\NexusDB::select($checkSeedBoxUserSql);
+ if (!empty($res)) {
+ $redis->hSet($key, $hashKey, serialize(['data' => true, 'deadline' => time() + 3600]));
+ do_log("$hashKey, get result from user, true");
+ return true;
+ }
+ }
+ $redis->hSet($key, $hashKey, serialize(['data' => false, 'deadline' => time() + 3600]));
+ do_log("$hashKey, no result, false");
+ return false;
+}
diff --git a/nexus/Install/settings.default.php b/nexus/Install/settings.default.php
index 2d4590b3..03cd5f54 100644
--- a/nexus/Install/settings.default.php
+++ b/nexus/Install/settings.default.php
@@ -407,4 +407,10 @@ return array (
'ignore_when_ratio_reach' => '',
'ban_user_when_counts_reach' => '',
],
+ 'seed_box' => [
+ 'enabled' => 'no',
+ 'no_promotion' => 'yes',
+ 'max_uploaded' => 3,
+ 'not_seed_box_max_speed' => 10240,
+ ],
);
diff --git a/public/ajax.php b/public/ajax.php
index 94dc2a9f..793db6b3 100644
--- a/public/ajax.php
+++ b/public/ajax.php
@@ -99,6 +99,7 @@ function addSeedBoxRecord($params)
$rep = new \App\Repositories\SeedBoxRepository();
$params['uid'] = $CURUSER['id'];
$params['type'] = \App\Models\SeedBoxRecord::TYPE_USER;
+ $params['status'] = \App\Models\SeedBoxRecord::STATUS_UNAUDITED;
return $rep->store($params);
}
diff --git a/public/announce.php b/public/announce.php
index 7fbf33e1..ea202f01 100644
--- a/public/announce.php
+++ b/public/announce.php
@@ -120,6 +120,7 @@ if (!$az) err("Invalid passkey! Re-download the .torrent from $BASEURL");
$userid = intval($az['id'] ?? 0);
unset($GLOBALS['CURUSER']);
$CURUSER = $GLOBALS["CURUSER"] = $az;
+$isDonor = $az['donor'] == 'yes' && ($az['donoruntil'] === null || $az['donoruntil'] == '0000-00-00 00:00:00' || $az['donoruntil'] > date('Y-m-d H:i:s'));
//3. CHECK IF CLIENT IS ALLOWED
//$clicheck_res = check_client($peer_id,$agent,$client_familyid);
@@ -152,7 +153,7 @@ elseif ($az['showclienterror'] == 'yes'){
}
// check torrent based on info_hash
-$checkTorrentSql = "SELECT id, owner, sp_state, seeders, leechers, UNIX_TIMESTAMP(added) AS ts, banned, hr, approval_status FROM torrents WHERE " . hash_where("info_hash", $info_hash);
+$checkTorrentSql = "SELECT id, size, owner, sp_state, seeders, leechers, UNIX_TIMESTAMP(added) AS ts, banned, hr, approval_status FROM torrents WHERE " . hash_where("info_hash", $info_hash);
if (!$torrent = $Cache->get_value('torrent_hash_'.$info_hash.'_content')){
$res = sql_query($checkTorrentSql);
$torrent = mysql_fetch_array($res);
@@ -284,6 +285,12 @@ if(isset($self) && empty($_GET['event']) && $self['prevts'] > (TIMENOW - $announ
}
+$isSeedBoxRuleEnabled = get_setting('seed_box.enabled') == 'yes';
+$isIPSeedBox = false;
+if ($isSeedBoxRuleEnabled && !($az['class'] >= \App\Models\User::CLASS_VIP || $isDonor)) {
+ $isIPSeedBox = isIPSeedBox($ip, $userid);
+}
+
// current peer_id, or you could say session with tracker not found in table peers
if (!isset($self))
{
@@ -296,7 +303,7 @@ if (!isset($self))
elseif ($az["parked"] == "yes")
err("Your account is parked! (Read the FAQ)");
elseif ($az["downloadpos"] == "no")
- err("Your downloading priviledges have been disabled! (Read the rules)");
+ err("Your downloading privileges have been disabled! (Read the rules)");
if ($az["class"] < UC_VIP)
{
@@ -336,10 +343,18 @@ if (!isset($self))
}
else // continue an existing session
{
+ $snatchInfo = mysql_fetch_assoc(sql_query(sprintf('select * from snatched where torrentid = %s and userid = %s order by id desc limit 1', $torrentid, $userid)));
$upthis = $trueupthis = max(0, $uploaded - $self["uploaded"]);
$downthis = $truedownthis = max(0, $downloaded - $self["downloaded"]);
$announcetime = ($self["seeder"] == "yes" ? "seedtime = seedtime + {$self['announcetime']}" : "leechtime = leechtime + {$self['announcetime']}");
$is_cheater = false;
+ $notSeedBoxMaxSpeedMbps = get_setting('seed_box.not_seed_box_max_speed');
+ $upSpeedMbps = ($trueupthis / $self['announcetime']) * 8;
+ if ($isSeedBoxRuleEnabled && !$isIPSeedBox && $upSpeedMbps > $notSeedBoxMaxSpeedMbps) {
+ sql_query("update users set downloadpos = 'no' where id = $userid");
+ do_log("user: $userid downloading privileges have been disabled! (over speed)", 'error');
+ err("Your downloading privileges have been disabled! (over speed)");
+ }
if ($cheaterdet_security){
if ($az['class'] < $nodetect_security && $self['announcetime'] > 10)
@@ -352,92 +367,106 @@ else // continue an existing session
if (!$is_cheater && ($trueupthis > 0 || $truedownthis > 0))
{
- $global_promotion_state = get_global_sp_state();
- if (isset($torrent['__ignore_global_sp_state']) && $torrent['__ignore_global_sp_state']) {
- do_log("[IGNORE_GLOBAL_SP_STATE], sp_state: {$torrent['sp_state']}");
- $global_promotion_state = 1;
- }
- if($global_promotion_state == 1)// Normal, see individual torrent
- {
- if($torrent['sp_state']==3) //2X
- {
- $USERUPDATESET[] = "uploaded = uploaded + 2*$trueupthis";
- $USERUPDATESET[] = "downloaded = downloaded + $truedownthis";
- }
- elseif($torrent['sp_state']==4) //2X Free
- {
- $USERUPDATESET[] = "uploaded = uploaded + 2*$trueupthis";
- }
- elseif($torrent['sp_state']==6) //2X 50%
- {
- $USERUPDATESET[] = "uploaded = uploaded + 2*$trueupthis";
- $USERUPDATESET[] = "downloaded = downloaded + $truedownthis/2";
- }
- else{
- if ($torrent['owner'] == $userid && $uploaderdouble_torrent > 0)
- $upthis = $trueupthis * $uploaderdouble_torrent;
+ if ($isSeedBoxRuleEnabled && $isIPSeedBox) {
+ $tmpLog = "[SEED_BOX_RULE_ENABLED_AND_IS_IP_SEED_BOX]";
+ $maxUploadedTimes = get_setting('seed_box.max_uploaded');
+ $userUploadedIncrement = $trueupthis;
+ $userDownloadedIncrement = $truedownthis;
+ if (!empty($snatchInfo) && isset($torrent['size']) && $snatchInfo['uploaded'] >= $torrent['size'] * $maxUploadedTimes) {
+ $tmpLog .= ", uploaded >= torrentSize * times($maxUploadedTimes), userUploadedIncrement = 0";
+ $userUploadedIncrement = 0;
+ }
+ $USERUPDATESET[] = "uploaded = uploaded + $userUploadedIncrement";
+ $USERUPDATESET[] = "downloaded = downloaded + $userDownloadedIncrement";
+ do_log($tmpLog);
+ } else {
+ $global_promotion_state = get_global_sp_state();
+ if (isset($torrent['__ignore_global_sp_state']) && $torrent['__ignore_global_sp_state']) {
+ do_log("[IGNORE_GLOBAL_SP_STATE], sp_state: {$torrent['sp_state']}");
+ $global_promotion_state = 1;
+ }
+ if($global_promotion_state == 1)// Normal, see individual torrent
+ {
+ if($torrent['sp_state']==3) //2X
+ {
+ $USERUPDATESET[] = "uploaded = uploaded + 2*$trueupthis";
+ $USERUPDATESET[] = "downloaded = downloaded + $truedownthis";
+ }
+ elseif($torrent['sp_state']==4) //2X Free
+ {
+ $USERUPDATESET[] = "uploaded = uploaded + 2*$trueupthis";
+ }
+ elseif($torrent['sp_state']==6) //2X 50%
+ {
+ $USERUPDATESET[] = "uploaded = uploaded + 2*$trueupthis";
+ $USERUPDATESET[] = "downloaded = downloaded + $truedownthis/2";
+ }
+ else{
+ if ($torrent['owner'] == $userid && $uploaderdouble_torrent > 0)
+ $upthis = $trueupthis * $uploaderdouble_torrent;
- if($torrent['sp_state']==2) //Free
- {
- $USERUPDATESET[] = "uploaded = uploaded + $upthis";
- }
- elseif($torrent['sp_state']==5) //50%
- {
- $USERUPDATESET[] = "uploaded = uploaded + $upthis";
- $USERUPDATESET[] = "downloaded = downloaded + $truedownthis/2";
- }
- elseif($torrent['sp_state']==7) //30%
- {
- $USERUPDATESET[] = "uploaded = uploaded + $upthis";
- $USERUPDATESET[] = "downloaded = downloaded + $truedownthis*3/10";
- }
- elseif($torrent['sp_state']==1) //Normal
- {
- $USERUPDATESET[] = "uploaded = uploaded + $upthis";
- $USERUPDATESET[] = "downloaded = downloaded + $truedownthis";
- }
- }
- }
- elseif($global_promotion_state == 2) //Free
- {
- if ($torrent['owner'] == $userid && $uploaderdouble_torrent > 0)
- $upthis = $trueupthis * $uploaderdouble_torrent;
- $USERUPDATESET[] = "uploaded = uploaded + $upthis";
- }
- elseif($global_promotion_state == 3) //2X
- {
- if ($uploaderdouble_torrent > 2 && $torrent['owner'] == $userid && $uploaderdouble_torrent > 0)
- $upthis = $trueupthis * $uploaderdouble_torrent;
- else $upthis = 2*$trueupthis;
- $USERUPDATESET[] = "uploaded = uploaded + $upthis";
- $USERUPDATESET[] = "downloaded = downloaded + $truedownthis";
- }
- elseif($global_promotion_state == 4) //2X Free
- {
- if ($uploaderdouble_torrent > 2 && $torrent['owner'] == $userid && $uploaderdouble_torrent > 0)
- $upthis = $trueupthis * $uploaderdouble_torrent;
- else $upthis = 2*$trueupthis;
- $USERUPDATESET[] = "uploaded = uploaded + $upthis";
- }
- elseif($global_promotion_state == 5){ // 50%
- if ($torrent['owner'] == $userid && $uploaderdouble_torrent > 0)
- $upthis = $trueupthis * $uploaderdouble_torrent;
- $USERUPDATESET[] = "uploaded = uploaded + $upthis";
- $USERUPDATESET[] = "downloaded = downloaded + $truedownthis/2";
- }
- elseif($global_promotion_state == 6){ //2X 50%
- if ($uploaderdouble_torrent > 2 && $torrent['owner'] == $userid && $uploaderdouble_torrent > 0)
- $upthis = $trueupthis * $uploaderdouble_torrent;
- else $upthis = 2*$trueupthis;
- $USERUPDATESET[] = "uploaded = uploaded + $upthis";
- $USERUPDATESET[] = "downloaded = downloaded + $truedownthis/2";
- }
- elseif($global_promotion_state == 7){ //30%
- if ($torrent['owner'] == $userid && $uploaderdouble_torrent > 0)
- $upthis = $trueupthis * $uploaderdouble_torrent;
- $USERUPDATESET[] = "uploaded = uploaded + $upthis";
- $USERUPDATESET[] = "downloaded = downloaded + $truedownthis*3/10";
- }
+ if($torrent['sp_state']==2) //Free
+ {
+ $USERUPDATESET[] = "uploaded = uploaded + $upthis";
+ }
+ elseif($torrent['sp_state']==5) //50%
+ {
+ $USERUPDATESET[] = "uploaded = uploaded + $upthis";
+ $USERUPDATESET[] = "downloaded = downloaded + $truedownthis/2";
+ }
+ elseif($torrent['sp_state']==7) //30%
+ {
+ $USERUPDATESET[] = "uploaded = uploaded + $upthis";
+ $USERUPDATESET[] = "downloaded = downloaded + $truedownthis*3/10";
+ }
+ elseif($torrent['sp_state']==1) //Normal
+ {
+ $USERUPDATESET[] = "uploaded = uploaded + $upthis";
+ $USERUPDATESET[] = "downloaded = downloaded + $truedownthis";
+ }
+ }
+ }
+ elseif($global_promotion_state == 2) //Free
+ {
+ if ($torrent['owner'] == $userid && $uploaderdouble_torrent > 0)
+ $upthis = $trueupthis * $uploaderdouble_torrent;
+ $USERUPDATESET[] = "uploaded = uploaded + $upthis";
+ }
+ elseif($global_promotion_state == 3) //2X
+ {
+ if ($uploaderdouble_torrent > 2 && $torrent['owner'] == $userid && $uploaderdouble_torrent > 0)
+ $upthis = $trueupthis * $uploaderdouble_torrent;
+ else $upthis = 2*$trueupthis;
+ $USERUPDATESET[] = "uploaded = uploaded + $upthis";
+ $USERUPDATESET[] = "downloaded = downloaded + $truedownthis";
+ }
+ elseif($global_promotion_state == 4) //2X Free
+ {
+ if ($uploaderdouble_torrent > 2 && $torrent['owner'] == $userid && $uploaderdouble_torrent > 0)
+ $upthis = $trueupthis * $uploaderdouble_torrent;
+ else $upthis = 2*$trueupthis;
+ $USERUPDATESET[] = "uploaded = uploaded + $upthis";
+ }
+ elseif($global_promotion_state == 5){ // 50%
+ if ($torrent['owner'] == $userid && $uploaderdouble_torrent > 0)
+ $upthis = $trueupthis * $uploaderdouble_torrent;
+ $USERUPDATESET[] = "uploaded = uploaded + $upthis";
+ $USERUPDATESET[] = "downloaded = downloaded + $truedownthis/2";
+ }
+ elseif($global_promotion_state == 6){ //2X 50%
+ if ($uploaderdouble_torrent > 2 && $torrent['owner'] == $userid && $uploaderdouble_torrent > 0)
+ $upthis = $trueupthis * $uploaderdouble_torrent;
+ else $upthis = 2*$trueupthis;
+ $USERUPDATESET[] = "uploaded = uploaded + $upthis";
+ $USERUPDATESET[] = "downloaded = downloaded + $truedownthis/2";
+ }
+ elseif($global_promotion_state == 7){ //30%
+ if ($torrent['owner'] == $userid && $uploaderdouble_torrent > 0)
+ $upthis = $trueupthis * $uploaderdouble_torrent;
+ $USERUPDATESET[] = "uploaded = uploaded + $upthis";
+ $USERUPDATESET[] = "downloaded = downloaded + $truedownthis*3/10";
+ }
+ }
}
}
@@ -476,23 +505,14 @@ elseif(isset($self))
// $updateset[] = ($seeder == "yes" ? "seeders = seeders + 1, leechers = leechers - 1" : "seeders = seeders - 1, leechers = leechers + 1");
$hasChangeSeederLeecher = true;
}
- $snatchInfo = \App\Models\Snatch::query()
- ->where('torrentid', $torrentid)
- ->where('userid', $userid)
- ->orderBy('id', 'desc')
- ->first();
- if ($snatchInfo) {
+ if (!empty($snatchInfo)) {
sql_query("UPDATE snatched SET uploaded = uploaded + $trueupthis, downloaded = downloaded + $truedownthis, to_go = $left, $announcetime, last_action = ".$dt." $finished_snatched WHERE torrentid = $torrentid AND userid = $userid") or err("SL Err 2");
- do_action('snatched_saved', $torrent, $snatchInfo->toArray());
- if (
- $event == 'completed'
- && $az['class'] < \App\Models\HitAndRun::MINIMUM_IGNORE_USER_CLASS
- && ($az['donor'] == 'no' || (!empty($az['donoruntil']) && $az['donoruntil'] != '0000-00-00 00:00:00' && $az['donoruntil'] < date("Y-m-d H:i:s")))
- ) {
+ do_action('snatched_saved', $torrent, $snatchInfo);
+ if ($event == 'completed' && $az['class'] < \App\Models\HitAndRun::MINIMUM_IGNORE_USER_CLASS && !$isDonor) {
//think about H&R
$hrMode = get_setting('hr.mode');
if ($hrMode == \App\Models\HitAndRun::MODE_GLOBAL || ($hrMode == \App\Models\HitAndRun::MODE_MANUAL && $torrent['hr'] == \App\Models\Torrent::HR_YES)) {
- $sql = "insert into hit_and_runs (uid, torrent_id, snatched_id) values ($userid, $torrentid, {$snatchInfo->id}) on duplicate key update updated_at = " . sqlesc(date('Y-m-d H:i:s'));
+ $sql = "insert into hit_and_runs (uid, torrent_id, snatched_id) values ($userid, $torrentid, {$snatchInfo['id']}) on duplicate key update updated_at = " . sqlesc(date('Y-m-d H:i:s'));
$affectedRows = sql_query($sql);
do_log("[INSERT_H&R], $sql, affectedRows: $affectedRows");
}
@@ -504,21 +524,20 @@ else
{
if ($event != 'stopped') {
$isPeerExistResultSet = sql_query("select id from peers where $selfwhere limit 1");
- if ($isPeerExistResultSet && !mysqli_fetch_assoc($isPeerExistResultSet)) {
- if (strlen($ip) > 15) {
- $sockres = @pfsockopen("tcp://[".$ip."]",$port,$errno,$errstr,1);
- } else {
- $sockres = @pfsockopen($ip, $port, $errno, $errstr, 1);
- }
- if (!$sockres)
- {
- $connectable = "no";
- }
- else
- {
- $connectable = "yes";
- @fclose($sockres);
- }
+ if (mysql_num_rows($isPeerExistResultSet) == 0) {
+ $cacheKey = 'peers:connectable:'.$ip.'-'.$port.'-'.$agent;
+ $connectable = \Nexus\Database\NexusDB::remember($cacheKey, 3600, function () use ($ip, $port) {
+ if (isIPV6($ip)) {
+ $sockres = @fsockopen("tcp://[".$ip."]",$port,$errno,$errstr,1);
+ } else {
+ $sockres = @fsockopen($ip, $port, $errno, $errstr, 1);
+ }
+ if (is_resource($sockres)) {
+ fclose($sockres);
+ return 'yes';
+ }
+ return 'no';
+ });
$insertPeerSql = "INSERT INTO peers (torrent, userid, peer_id, ip, port, connectable, uploaded, downloaded, to_go, started, last_action, seeder, agent, downloadoffset, uploadoffset, passkey, ipv4, ipv6) VALUES ($torrentid, $userid, ".sqlesc($peer_id).", ".sqlesc($ip).", $port, '$connectable', $uploaded, $downloaded, $left, $dt, $dt, '$seeder', ".sqlesc($agent).", $downloaded, $uploaded, ".sqlesc($passkey).",".sqlesc($ipv4).",".sqlesc($ipv6).")";
do_log("[INSERT PEER] peer not exists for $selfwhere, do insert with $insertPeerSql");
diff --git a/public/pic/misc/seed-box.png b/public/pic/misc/seed-box.png
new file mode 100644
index 00000000..bae1bfec
Binary files /dev/null and b/public/pic/misc/seed-box.png differ
diff --git a/public/usercp.php b/public/usercp.php
index 116b31ef..1e02fc44 100644
--- a/public/usercp.php
+++ b/public/usercp.php
@@ -923,12 +923,13 @@ if ($forumposts)
renderIcon($CURUSER['ip'], $CURUSER['id']);
if ($enablelocation_tweak == 'yes'){
list($loc_pub, $loc_mod) = get_ip_location($CURUSER["ip"]);
- tr_small($lang_usercp['row_ip_location'], $CURUSER["ip"]." | ID | {$columnOperator} | {$columnBandwidth} | {$columnIP} | {$columnComment} | {$columnStatus} | ||||||
| %s | ', $arr['operator']); - $seedBox .= sprintf('%s | ', $arr['bandwidth'] ?: ''); - $seedBox .= sprintf('%s | ', $arr['ip'] ?: sprintf('%s ~ %s', $arr['ip_begin'], $arr['ip_end'])); - $seedBox .= sprintf('%s | ', $arr['comment']); - $seedBox .= sprintf(' | ', $lang_functions['text_delete'], $arr['id']);
+ $seedBox .= sprintf('%s | ', $seedBoxRecord->id); + $seedBox .= sprintf('%s | ', $seedBoxRecord->operator); + $seedBox .= sprintf('%s | ', $seedBoxRecord->bandwidth ?: ''); + $seedBox .= sprintf('%s | ', $seedBoxRecord->ip ?: sprintf('%s ~ %s', $seedBoxRecord->ip_begin, $seedBoxRecord->ip_end)); + $seedBox .= sprintf('%s | ', $seedBoxRecord->comment); + $seedBox .= sprintf('%s | ', $seedBoxRecord->statusText); + $seedBox .= sprintf(' | ', $lang_functions['text_delete'], $seedBoxRecord->id);
$seedBox .= "
" . $loc_pub . "
" : $loc_pub;
+ $address = $ips = [];
+ if (!empty($e['ipv4'])) {
+ list($loc_pub, $loc_mod) = get_ip_location($e['ipv4']);
+ $seedBoxIcon = $seedBoxRep->renderIcon($e['ipv4'], $e['userid']);
+ $address[] = $loc_pub . $seedBoxIcon;
+ $ips[] = $e['ipv4'];
+ }
+ if (!empty($e['ipv6'])) {
+ list($loc_pub, $loc_mod) = get_ip_location($e['ipv6']);
+ $seedBoxIcon = $seedBoxRep->renderIcon($e['ipv6'], $e['userid']);
+ $address[] = $loc_pub . $seedBoxIcon;
+ $ips[] = $e['ipv6'];
+ }
+ $title = sprintf('%s%s%s', $lang_functions['text_user_ip'], ': ', implode(', ', $ips));
+ $addressStr = implode(' + ', $address);
+ $location = get_user_class() >= $userprofile_class ? "" . $addressStr . "
" : $addressStr;
$s .= "