From e1a787427342dfcc5929f119f41f9a91c1f83eae Mon Sep 17 00:00:00 2001
From: xiaomlove <i353856593@163.com>
Date: Sun, 18 Jun 2023 17:37:06 +0800
Subject: [PATCH] add lacking of trans

---
 include/constants.php          | 2 +-
 include/functions.php          | 2 +-
 nexus/Install/Install.php      | 8 ++++----
 resources/lang/en/admin.php    | 1 +
 resources/lang/zh_TW/admin.php | 1 +
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/include/constants.php b/include/constants.php
index eade72e8..44b8a6dd 100644
--- a/include/constants.php
+++ b/include/constants.php
@@ -1,6 +1,6 @@
 <?php
 defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.8.4');
-defined('RELEASE_DATE') || define('RELEASE_DATE', '2023-06-16');
+defined('RELEASE_DATE') || define('RELEASE_DATE', '2023-06-18');
 defined('IN_TRACKER') || define('IN_TRACKER', false);
 defined('PROJECTNAME') || define("PROJECTNAME","NexusPHP");
 defined('NEXUSPHPURL') || define("NEXUSPHPURL","https://nexusphp.org");
diff --git a/include/functions.php b/include/functions.php
index 3499d70e..0ad6b847 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -277,7 +277,7 @@ function formatSpoiler($content, $title = '', $defaultCollapsed = true): string
     if (!$title) {
         $title = $lang_functions['spoiler_default_title'];
     }
-    $content = str_replace(['<br>', '<br />'], '', $content);
+//    $content = str_replace(['<br>', '<br />'], '', $content);
     $contentClass = "spoiler-content";
     if ($defaultCollapsed) {
         $contentClass .= " collapse";
diff --git a/nexus/Install/Install.php b/nexus/Install/Install.php
index 1276ba30..d95fd5bc 100644
--- a/nexus/Install/Install.php
+++ b/nexus/Install/Install.php
@@ -38,7 +38,7 @@ class Install
     ];
     protected array $requiredFunctions = [
         'symlink', 'putenv', 'proc_open', 'proc_get_status', 'exec',
-//        'pcntl_signal', 'pcntl_alarm', 'pcntl_async_signals'
+        'pcntl_signal', 'pcntl_alarm', 'pcntl_async_signals'
     ];
 
     protected string $lockFile = 'install.lock';
@@ -169,10 +169,10 @@ class Install
         $disabledFunctions = [];
         foreach ($this->requiredFunctions as $fn) {
             if (str_starts_with($fn, "pcntl_") && function_exists('exec')) {
+                $output = [];
                 $command = "php -r 'var_export(function_exists(\"$fn\"));'";
                 $result = exec($command, $output, $result_code);
-                $outputString = implode("\n", $output);
-                $exists = $outputString == 'true';
+                $exists = $output[0] == 'true';
                 if (!$exists) {
                     $disabledFunctions[] = $fn;
                 }
@@ -190,7 +190,7 @@ class Install
 
         foreach ($this->requiredExtensions as $extension) {
             if ($extension == 'pcntl' && function_exists('exec')) {
-//                $loadedStr = executeCommand("php -m");
+                $output = [];
                 $result = exec("php -m", $output, $result_code);
                 $outputString = implode("\n", $output);
                 $loadedStr = $outputString;
diff --git a/resources/lang/en/admin.php b/resources/lang/en/admin.php
index 5b94585d..23f78647 100644
--- a/resources/lang/en/admin.php
+++ b/resources/lang/en/admin.php
@@ -37,6 +37,7 @@ return [
         'login_log' => 'Login logs',
         'bonus_log' => 'Bonus logs',
         'torrent_buy_log' => 'Torrent buy logs',
+        'attendance_log' => 'Attendance logs',
     ],
     'resources' => [
         'agent_allow' => [
diff --git a/resources/lang/zh_TW/admin.php b/resources/lang/zh_TW/admin.php
index dab2091a..c6ffe422 100644
--- a/resources/lang/zh_TW/admin.php
+++ b/resources/lang/zh_TW/admin.php
@@ -37,6 +37,7 @@ return [
         'login_log' => '登錄記錄',
         'bonus_log' => '魔力記錄',
         'torrent_buy_log' => '種子購買',
+        'attendance_log' => '簽到記錄',
     ],
     'resources' => [
         'agent_allow' => [