pisto/ncdownloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

guard against internal errors when user is not logged in

Browse Source
This commit is contained in:
huangjx
2022-04-23 00:16:24 +08:00
parent 384cd08330
commit 31b7068b75
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Controller/MainController.php
View File

@@ -27,6 +27,7 @@ class MainController extends Controller
public function __construct($appName, IRequest $request, $UserId, IL10N $IL10N, Aria2 $aria2, Youtube $youtube) public function __construct($appName, IRequest $request, $UserId, IL10N $IL10N, Aria2 $aria2, Youtube $youtube)
{ {
parent::__construct($appName, $request); parent::__construct($appName, $request);
$this->appName = $appName; $this->appName = $appName;
$this->uid = $UserId; $this->uid = $UserId;

14
lib/Tools/Helper.php
View File

@@ -392,14 +392,16 @@ class Helper
public static function getLocalFolder(string $path): string public static function getLocalFolder(string $path): string
{ {
//without calling this, filesystem::getLocalFolder doesn't work if (self::getUID()) {
OC_Util::setupFS(); OC_Util::setupFS();
return Filesystem::getLocalFolder($path); return Filesystem::getLocalFolder($path);
}
return "";
} }
public static function getRealDownloadDir($uid = null): string public static function getRealDownloadDir($uid = null): string
{ {
$dlDir = self::getDownloadDir();; $dlDir = self::getDownloadDir();
return self::getLocalFolder($dlDir); return self::getLocalFolder($dlDir);
} }
public static function getRealTorrentsDir($uid = null): string public static function getRealTorrentsDir($uid = null): string
@@ -415,7 +417,9 @@ class Helper
public static function getUID(): string public static function getUID(): string
{ {
return self::getUser()->getUID(); $user = self::getUser();
$uid = $user ? $user->getUID() : "";
return $uid;
} }
public static function getSettings($key, $default = null, int $type = Settings::TYPE['USER']) public static function getSettings($key, $default = null, int $type = Settings::TYPE['USER'])