Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91cb61a3 authored by Ronak Patel's avatar Ronak Patel
Browse files

util added with declared variable

parent c627e50b

lib/Settings/BetaUserSetting.php

+6 −1
Original line number Diff line number Diff line
@@ -18,18 +18,23 @@ class BetaUserSetting implements ISettings { 
	/** @var IGroupManager */

	protected $groupManager;



	/** @var Util */

	protected $util;



	private $appName;



	public function __construct(

		$appName,

		IUserSession $userSession,

		IGroupManager $groupManager,

		Util $util,

		IConfig $config

	) {

		$this->userSession = $userSession;

		$this->groupManager = $groupManager;

		$this->appName = $appName;

		$this->config = $config;

		$this->util = $util;

	}



	public function getForm(): TemplateResponse {
@@ -40,7 +45,7 @@ class BetaUserSetting implements ISettings { 
		if ($groupExists) {

			$isBeta = $this->groupManager->isInGroup($uid, $betaGroupName);

		}

		Util::addScript($this->appName, $this->appName . '-beta-user-setting');

		$this->util->addScript($this->appName, $this->appName . '-beta-user-setting');

		$parameters = ['isBeta' => $isBeta, 'groupExists' => $groupExists];

		return new TemplateResponse($this->appName, 'beta_user_setting', $parameters, '');

	}

lib/Settings/Personal.php

+7 −3
Original line number Diff line number Diff line
@@ -31,7 +31,10 @@ class Personal implements ISettings { 


	private IUserManager $userManager;



	public function __construct($appName, IUserSession $userSession, IInitialState $initialState, ShopAccountService $shopAccountService, IAppManager $appManager, IGroupManager $groupManager, IUserManager $userManager) {

	/** @var Util */

	protected $util;



	public function __construct($appName, IUserSession $userSession, IInitialState $initialState, ShopAccountService $shopAccountService, IAppManager $appManager, IGroupManager $groupManager, IUserManager $userManager, Util $util) {

		$this->userSession = $userSession;

		$this->initialState = $initialState;

		$this->appName = $appName;
@@ -39,6 +42,7 @@ class Personal implements ISettings { 
		$this->appManager = $appManager;

		$this->userManager = $userManager;

		$this->groupManager = $groupManager;

		$this->util = $util;

	}



	/**
@@ -51,8 +55,8 @@ class Personal implements ISettings { 
			$onlyUser = $this->userManager->countUsers() < 2;

			$adminGroup = $this->groupManager->get('admin');

			$onlyAdmin = $adminGroup && $adminGroup->count() < 2 && $this->groupManager->isAdmin($user->getUID());

			Util::addScript($this->appName, 'ecloud-accounts-personal-settings');

			Util::addScript($this->appName, 'ecloud-accounts-delete-account-listeners');

			$this->util->addScript($this->appName, $this->appName.'-personal-settings');

			$this->util->addScript($this->appName, $this->appName.'-delete-account-listeners');

			$deleteShopAccount = $this->shopAccountService->getShopDeletePreference($user->getUID());

			$shopEmailPostDelete = $this->shopAccountService->getShopEmailPostDeletePreference($user->getUID());