From 3cc0d364a88ae7ea8f2ae97bcfe24857408d773d Mon Sep 17 00:00:00 2001
From: xiaomlove <i353856593@163.com>
Date: Sat, 7 Jan 2023 16:27:27 +0800
Subject: [PATCH] fix management create user

---
 app/Console/Commands/NexusUpdate.php |  5 +++++
 app/Console/Commands/Test.php        |  2 +-
 app/Repositories/BaseRepository.php  | 13 +------------
 app/Repositories/BonusRepository.php |  5 ++++-
 include/constants.php                |  2 +-
 include/functions.php                |  4 ++--
 include/globalfunctions.php          | 16 ++++++++++++++++
 public/mybonus.php                   | 17 ++++++++++-------
 8 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/app/Console/Commands/NexusUpdate.php b/app/Console/Commands/NexusUpdate.php
index abad7856..409a0d59 100644
--- a/app/Console/Commands/NexusUpdate.php
+++ b/app/Console/Commands/NexusUpdate.php
@@ -157,6 +157,11 @@ class NexusUpdate extends Command
         $this->update->runExtraMigrate();
         $this->doLog("runExtraMigrate done!");
 
+        $logFile = getLogFile();
+        $command = "chmod 777 $logFile";
+        $this->doLog("$command...");
+        executeCommand($command);
+
         $this->doLog("All done!");
 
         return 0;
diff --git a/app/Console/Commands/Test.php b/app/Console/Commands/Test.php
index 9bb3ea5d..33eb8298 100644
--- a/app/Console/Commands/Test.php
+++ b/app/Console/Commands/Test.php
@@ -95,7 +95,7 @@ class Test extends Command
      */
     public function handle()
     {
-        $r = NexusDB::cache_get('category_content');
+        $r = getLogFile();
         dd($r);
     }
 
diff --git a/app/Repositories/BaseRepository.php b/app/Repositories/BaseRepository.php
index 03f7fd92..22235cc6 100644
--- a/app/Repositories/BaseRepository.php
+++ b/app/Repositories/BaseRepository.php
@@ -57,18 +57,7 @@ class BaseRepository
 
     protected function executeCommand($command, $format = 'string'): string|array
     {
-        $append = " 2>&1";
-        if (!str_ends_with($command, $append)) {
-            $command .= $append;
-        }
-        do_log("command: $command");
-        $result = exec($command, $output, $result_code);
-        $outputString = implode("\n", $output);
-        do_log(sprintf('result_code: %s, result: %s, output: %s', $result_code, $result, $outputString));
-        if ($result_code != 0) {
-            throw new \RuntimeException($outputString);
-        }
-        return $format == 'string' ? $outputString : $output;
+        return executeCommand($command, $format);
     }
 
 }
diff --git a/app/Repositories/BonusRepository.php b/app/Repositories/BonusRepository.php
index 9d13a714..a918093a 100644
--- a/app/Repositories/BonusRepository.php
+++ b/app/Repositories/BonusRepository.php
@@ -101,8 +101,11 @@ class BonusRepository extends BaseRepository
 
     public function consumeToBuyTemporaryInvite($uid, $count = 1): bool
     {
-        $user = User::query()->findOrFail($uid);
         $requireBonus = BonusLogs::getBonusForBuyTemporaryInvite();
+        if ($requireBonus <= 0) {
+            throw new \RuntimeException("Temporary invite require bonus <= 0 !");
+        }
+        $user = User::query()->findOrFail($uid);
         $toolRep = new ToolRepository();
         $hashArr = $toolRep->generateUniqueInviteHash([], $count, $count);
         NexusDB::transaction(function () use ($user, $requireBonus, $hashArr) {
diff --git a/include/constants.php b/include/constants.php
index 06ba65bf..72dbc518 100644
--- a/include/constants.php
+++ b/include/constants.php
@@ -1,6 +1,6 @@
 <?php
 defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.8.0');
-defined('RELEASE_DATE') || define('RELEASE_DATE', '2023-01-06');
+defined('RELEASE_DATE') || define('RELEASE_DATE', '2023-01-07');
 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 08b4f9dd..aad24eeb 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1485,8 +1485,8 @@ function check_email ($email) {
 	if(!preg_match('/^[A-Za-z0-9][A-Za-z0-9_.+\-]*@[A-Za-z0-9][A-Za-z0-9_+\-]*(\.[A-Za-z0-9][A-Za-z0-9_+\-]*)+$/', $email)) {
         return false;
     }
-    $bannedEmails = mysql_fetch_assoc(sql_query('select * from bannedemails'));
-    $bannedEmailsArr = preg_split('/[\s]+/', $bannedEmails['value'] ?? '');
+    $bannedEmails = \Nexus\Database\NexusDB::select('select * from bannedemails');
+    $bannedEmailsArr = preg_split('/[\s]+/', $bannedEmails[0]['value'] ?? '');
     if (empty($bannedEmailsArr)) {
         return true;
     }
diff --git a/include/globalfunctions.php b/include/globalfunctions.php
index e13b868d..9e273ee8 100644
--- a/include/globalfunctions.php
+++ b/include/globalfunctions.php
@@ -1112,3 +1112,19 @@ function get_passkey_by_authkey($authkey)
         return $userInfo->passkey;
     });
 }
+
+function executeCommand($command, $format = 'string'): string|array
+{
+    $append = " 2>&1";
+    if (!str_ends_with($command, $append)) {
+        $command .= $append;
+    }
+    do_log("command: $command");
+    $result = exec($command, $output, $result_code);
+    $outputString = implode("\n", $output);
+    do_log(sprintf('result_code: %s, result: %s, output: %s', $result_code, $result, $outputString));
+    if ($result_code != 0) {
+        throw new \RuntimeException($outputString);
+    }
+    return $format == 'string' ? $outputString : $output;
+}
diff --git a/public/mybonus.php b/public/mybonus.php
index ece8f1a0..675f68d0 100644
--- a/public/mybonus.php
+++ b/public/mybonus.php
@@ -76,13 +76,16 @@ function bonusarray($option = 0){
     $results[] = $bonus;
 
     //Tmp Invite
-    $bonus = array();
-    $bonus['points'] = \App\Models\BonusLogs::getBonusForBuyTemporaryInvite();
-    $bonus['art'] = 'tmp_invite';
-    $bonus['menge'] = 1;
-    $bonus['name'] = $lang_mybonus['text_buy_tmp_invite'];
-    $bonus['description'] = $lang_mybonus['text_buy_tmp_invite_note'];
-    $results[] = $bonus;
+    $tmpInviteBonus = \App\Models\BonusLogs::getBonusForBuyTemporaryInvite();
+    if ($tmpInviteBonus > 0) {
+        $bonus = array();
+        $bonus['points'] = $tmpInviteBonus;
+        $bonus['art'] = 'tmp_invite';
+        $bonus['menge'] = 1;
+        $bonus['name'] = $lang_mybonus['text_buy_tmp_invite'];
+        $bonus['description'] = $lang_mybonus['text_buy_tmp_invite_note'];
+        $results[] = $bonus;
+    }
 
     //Custom Title
     $bonus = array();