Browse Source

fix global issue

CauseFX 4 năm trước cách đây
mục cha
commit
8f6c88e42d
2 tập tin đã thay đổi với 4 bổ sung2 xóa
  1. 3 1
      api/classes/organizr.class.php
  2. 1 1
      api/v2/routes/root.php

+ 3 - 1
api/classes/organizr.class.php

@@ -86,6 +86,8 @@ class Organizr
 	public $paths;
 	public $updating;
 	public $groupOptions;
+	public $warnings;
+	public $errors;
 	
 	public function __construct($updating = false)
 	{
@@ -208,7 +210,7 @@ class Organizr
 		if ($disk['free'] <= $diskLevels['error']) {
 			die($this->showHTML('Low Disk Space', 'You are dangerously low on disk space.<br/>There is only ' . $disk['free']['human_readable'] . ' remaining.<br/><b>Percent Used = ' . $disk['used']['percent_used'] . '%</b>'));
 		} elseif ($disk['free'] <= $diskLevels['warn']) {
-			$GLOBALS['warnings'][] = 'You are low on disk space.  There is only ' . $disk['free']['human_readable'] . ' remaining.';
+			$this->warnings[] = 'You are low on disk space.  There is only ' . $disk['free']['human_readable'] . ' remaining.';
 		}
 		return true;
 	}

+ 1 - 1
api/v2/routes/root.php

@@ -126,7 +126,7 @@ $app->get('/launch', function ($request, $response, $args) {
 	$GLOBALS['api']['response']['data']['appearance'] = $Organizr->loadAppearance();
 	$GLOBALS['api']['response']['data']['status'] = $Organizr->status();
 	$GLOBALS['api']['response']['data']['sso'] = $Organizr->ssoCookies();
-	$GLOBALS['api']['response']['data']['warnings'] = $GLOBALS['warnings'];
+	$GLOBALS['api']['response']['data']['warnings'] = $Organizr->warnings;
 	$response->getBody()->write(jsonE($GLOBALS['api']));
 	return $response
 		->withHeader('Content-Type', 'application/json;charset=UTF-8')