diff --git a/README-EN.md b/README-EN.md
index d98bcb55..711f7c2c 100644
--- a/README-EN.md
+++ b/README-EN.md
@@ -12,6 +12,7 @@ Complete PT website building solution. Based on NexusPHP + Laravel Framework + E
- H&R
- Attendance
- Medal
+- Custom tags
- Forum
- Multi-language
- Automatic backup
diff --git a/README.md b/README.md
index 0d9496d0..6759d0b1 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,7 @@
- H&R
- 签到
- 勋章
+- 自定义标签
- 论坛
- 多语言
- 自动备份
diff --git a/app/Repositories/AttendanceRepository.php b/app/Repositories/AttendanceRepository.php
index b0a7a49c..6abac622 100644
--- a/app/Repositories/AttendanceRepository.php
+++ b/app/Repositories/AttendanceRepository.php
@@ -3,6 +3,7 @@ namespace App\Repositories;
use App\Models\Attendance;
use App\Models\Setting;
+use App\Models\User;
use Carbon\Carbon;
class AttendanceRepository extends BaseRepository
@@ -55,6 +56,7 @@ class AttendanceRepository extends BaseRepository
}
do_log("[DO_UPDATE]: " . nexus_json_encode($update));
$attendance->update($update);
+ User::query()->where('id', $uid)->increment('seedbonus', $update['points']);
}
}
$attendance->added_time = $now->toTimeString();
diff --git a/include/cleanup.php b/include/cleanup.php
index d3ec342a..e4788969 100644
--- a/include/cleanup.php
+++ b/include/cleanup.php
@@ -308,8 +308,9 @@ function docleanup($forceAll = 0, $printProgress = false) {
$row = mysql_fetch_array($res);
if (!$row) {
sql_query("INSERT INTO avps (arg, value_u) VALUES ('lastcleantime2',".sqlesc($now).")") or sqlerr(__FILE__, __LINE__);
- do_log("no value for arg: 'lastcleantime2', return");
- return;
+ $log = "no value for arg: 'lastcleantime2', return";
+ do_log($log);
+ return $log;
}
$ts = $row[0];
if ($ts + $autoclean_interval_two > $now && !$forceAll) {
@@ -333,8 +334,9 @@ function docleanup($forceAll = 0, $printProgress = false) {
$row = mysql_fetch_array($res);
if (!$row) {
sql_query("INSERT INTO avps (arg, value_u) VALUES ('lastcleantime3',$now)") or sqlerr(__FILE__, __LINE__);
- do_log("no value for arg: 'lastcleantime3', return");
- return;
+ $log = "no value for arg: 'lastcleantime3', return";
+ do_log($log);
+ return $log;
}
$ts = $row[0];
if ($ts + $autoclean_interval_three > $now && !$forceAll) {
@@ -492,8 +494,9 @@ function docleanup($forceAll = 0, $printProgress = false) {
$row = mysql_fetch_array($res);
if (!$row) {
sql_query("INSERT INTO avps (arg, value_u) VALUES ('lastcleantime4',$now)") or sqlerr(__FILE__, __LINE__);
- do_log("no value for arg: 'lastcleantime4', return");
- return;
+ $log = "no value for arg: 'lastcleantime4', return";
+ do_log($log);
+ return $log;
}
$ts = $row[0];
if ($ts + $autoclean_interval_four > $now && !$forceAll) {
@@ -818,8 +821,9 @@ function docleanup($forceAll = 0, $printProgress = false) {
$row = mysql_fetch_array($res);
if (!$row) {
sql_query("INSERT INTO avps (arg, value_u) VALUES ('lastcleantime5',$now)") or sqlerr(__FILE__, __LINE__);
- do_log("no value for arg: 'lastcleantime5', return");
- return;
+ $log = "no value for arg: 'lastcleantime5', return";
+ do_log($log);
+ return $log;
}
$ts = $row[0];
if ($ts + $autoclean_interval_five > $now && !$forceAll) {
diff --git a/include/cleanup_cli.php b/include/cleanup_cli.php
index 30686d8e..1118c783 100644
--- a/include/cleanup_cli.php
+++ b/include/cleanup_cli.php
@@ -6,6 +6,7 @@
*/
require "bittorrent.php";
+require 'cleanup.php';
$fd = fopen(sprintf('%s/nexus_cleanup_cli.lock', sys_get_temp_dir()), 'w+');
if (!flock($fd, LOCK_EX|LOCK_NB)) {
@@ -21,19 +22,18 @@ $force = 0;
if (isset($_SERVER['argv'][1])) {
$force = $_SERVER['argv'][1] ? 1 : 0;
}
-
+$logPrefix = "[CLEANUP_CLI]";
try {
if ($force) {
- require_once(ROOT_PATH . 'include/cleanup.php');
$result = docleanup(1, true);
} else {
- $result = autoclean();
+ $result = autoclean(true);
}
- $log = "[CLEANUP_CLI DONE!] $result";
+ $log = "$logPrefix, DONE: $result";
do_log($log);
printProgress($log);
} catch (\Exception $exception) {
- $log = "ERROR: " . $exception->getMessage();
+ $log = "$logPrefix, ERROR: " . $exception->getMessage();
do_log($log);
printProgress($log);
throw new \RuntimeException($exception->getMessage());
diff --git a/include/functions.php b/include/functions.php
index 46d7750d..1058fafc 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1902,7 +1902,7 @@ function userlogin() {
return $loginResult = true;
}
-function autoclean() {
+function autoclean($printProgress = false) {
global $autoclean_interval_one, $rootpath;
$now = TIMENOW;
$res = sql_query("SELECT value_u FROM avps WHERE arg = 'lastcleantime'");
@@ -1923,7 +1923,7 @@ function autoclean() {
return false;
}
require_once($rootpath . 'include/cleanup.php');
- return docleanup();
+ return docleanup(0, $printProgress);
}
function unesc($x) {
diff --git a/public/details.php b/public/details.php
index fb1aa580..c72706cf 100644
--- a/public/details.php
+++ b/public/details.php
@@ -168,7 +168,7 @@ if (!$row) {
}
}
}
- print(" | | \n");
+ print(" | | \n");
print("");
print("\n");
// ---------------- end subtitle block -------------------//