From 328e8ef953099f7e36cf67abbf3305f23e69c9fa Mon Sep 17 00:00:00 2001
From: xiaomlove <353856593@qq.com>
Date: Fri, 29 Jan 2021 19:44:50 +0800
Subject: [PATCH] change auto clean up option to config
---
include/config.php | 2 +-
include/functions.php | 9 ++++-----
lang/chs/lang_settings.php | 2 --
lang/cht/lang_settings.php | 2 --
lang/en/lang_settings.php | 2 --
public/settings.php | 1 -
6 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/include/config.php b/include/config.php
index 33e93827..955d75c7 100644
--- a/include/config.php
+++ b/include/config.php
@@ -401,7 +401,7 @@ $SUBSPATH = "subs";
//Make sure you have wget installed on your OS
//replace "http://www.nexusphp.com/" with your own site address
-$useCronTriggerCleanUp = $MAIN['use_cron_trigger_cleanup'];
+$useCronTriggerCleanUp = config('use_cron_trigger_clean_up', false);
//some promotion rules
//$promotionrules_torrent = array(0 => array("mediumid" => array(1), "promotion" => 5), 1 => array("mediumid" => array(3), "promotion" => 5), 2 => array("catid" => array(402), "standardid" => array(3), "promotion" => 4), 3 => array("catid" => array(403), "standardid" => array(3), "promotion" => 4));
$promotionrules_torrent = array();
diff --git a/include/functions.php b/include/functions.php
index 259aabd3..579f9d1e 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1752,15 +1752,14 @@ function getExportedValue($input,$t = null) {
function dbconn($autoclean = false, $doLogin = true)
{
+ global $useCronTriggerCleanUp;
\Nexus\Database\DB::getInstance()->autoConnect();
-
if ($doLogin) {
userlogin();
}
-
-// if (!$useCronTriggerCleanUp && $autoclean) {
-// register_shutdown_function("autoclean");
-// }
+ if (!$useCronTriggerCleanUp && $autoclean) {
+ register_shutdown_function("autoclean");
+ }
}
function get_user_row($id)
{
diff --git a/lang/chs/lang_settings.php b/lang/chs/lang_settings.php
index b44820f5..18d56376 100644
--- a/lang/chs/lang_settings.php
+++ b/lang/chs/lang_settings.php
@@ -680,8 +680,6 @@ $lang_settings = array
'text_email_notification_note' => "是否允许用户在收取新短讯、评论等时候收到邮件提示。",
'text_users_get' => "首次升级至此等级的用户将获得",
'text_invitations_default' => "个邀请名额。默认",
- 'row_use_cron_trigger_cleanup' => '使用定时器进行清理',
- 'text_use_cron_trigger_cleanup_note' => '确保已经配置好定时任务',
'row_logging' => '运行日志路径',
'text_logging_note' => '请填写你的运行时日志路径',
);
diff --git a/lang/cht/lang_settings.php b/lang/cht/lang_settings.php
index 282ddaf1..8dd1745b 100644
--- a/lang/cht/lang_settings.php
+++ b/lang/cht/lang_settings.php
@@ -680,8 +680,6 @@ $lang_settings = array
'text_email_notification_note' => "是否允許用戶在收取新短訊、評論等時候收到郵件輔助說明。",
'text_users_get' => "首次升級至此等級的用戶將獲得",
'text_invitations_default' => "個邀請名額。預設",
- 'row_use_cron_trigger_cleanup' => '使用定時器進行清理',
- 'text_use_cron_trigger_cleanup_note' => '確保已經配置好定時任務',
'row_logging' => '運行日誌路徑',
'text_logging_note' => '請填寫妳的運行時日誌路徑',
);
diff --git a/lang/en/lang_settings.php b/lang/en/lang_settings.php
index 6dba6828..a03fddb8 100644
--- a/lang/en/lang_settings.php
+++ b/lang/en/lang_settings.php
@@ -680,8 +680,6 @@ $lang_settings = array
'text_email_notification_note' => "Allow users to receive email notification when he gets new pm, comment, etc.",
'text_users_get' => "Users would get ",
'text_invitations_default' => " invitations the first time he is promoted to this class. Default ",
- 'row_use_cron_trigger_cleanup' => 'Use cron trigger cleanup',
- 'text_use_cron_trigger_cleanup_note' => 'Make sure have configure crontab job',
'row_logging' => 'Runtime log path',
'text_logging_note' => 'Please enter your runtime log path',
);
diff --git a/public/settings.php b/public/settings.php
index a6f62dcf..f319dda1 100644
--- a/public/settings.php
+++ b/public/settings.php
@@ -625,7 +625,6 @@ elseif ($action == 'mainsettings') // main settings
tr($lang_settings['row_torrent_directory'], " ".$lang_settings['text_torrent_directory'], 1);
tr($lang_settings['row_bitbucket_directory']," ".$lang_settings['text_bitbucket_directory_note'], 1);
tr($lang_settings['row_torrent_name_prefix'], " ".$lang_settings['text_torrent_name_prefix_note'], 1);
- yesorno($lang_settings['row_use_cron_trigger_cleanup'],'use_cron_trigger_cleanup', $MAIN['use_cron_trigger_cleanup'], $lang_settings['text_use_cron_trigger_cleanup_note']);
tr($lang_settings['row_save_settings'],"", 1);
print ("");