'lib' rewritten.
This commit is contained in:
@@ -1,10 +1,9 @@
|
||||
<?php
|
||||
/**
|
||||
* @copyright Copyright (c)
|
||||
* Nextcloud - user_sql
|
||||
*
|
||||
* @author
|
||||
*
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
* @copyright 2018 Marcin Łojewski <dev@mlojewski.me>
|
||||
* @author Marcin Łojewski <dev@mlojewski.me>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
@@ -17,87 +16,64 @@
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
namespace OCA\user_sql\Settings;
|
||||
namespace OCA\UserSQL\Settings;
|
||||
|
||||
use OCA\UserSQL\Properties;
|
||||
use OCP\AppFramework\Http\TemplateResponse;
|
||||
use OCP\Defaults;
|
||||
use OCP\IConfig;
|
||||
use OCP\IL10N;
|
||||
use OCP\Settings\ISettings;
|
||||
|
||||
/**
|
||||
* The administrator's settings page.
|
||||
*
|
||||
* @author Marcin Łojewski <dev@mlojewski.me>
|
||||
*/
|
||||
class Admin implements ISettings
|
||||
{
|
||||
/** @var IL10N */
|
||||
private $l10n;
|
||||
/** @var Defaults */
|
||||
private $defaults;
|
||||
/** @var IConfig */
|
||||
private $config;
|
||||
/**
|
||||
* @var string The application name.
|
||||
*/
|
||||
private $appName;
|
||||
/**
|
||||
* @var Properties The properties array.
|
||||
*/
|
||||
private $properties;
|
||||
|
||||
/**
|
||||
* @param IL10N $l10n
|
||||
* @param Defaults $defaults
|
||||
* @param IConfig $config
|
||||
* The class constructor,
|
||||
*
|
||||
* @param string $AppName The application name.
|
||||
* @param Properties $properties The properties array.
|
||||
*/
|
||||
public function __construct(
|
||||
IL10N $l10n,
|
||||
Defaults $defaults,
|
||||
IConfig $config
|
||||
) {
|
||||
$this->l10n = $l10n;
|
||||
$this->defaults = $defaults;
|
||||
$this->config = $config;
|
||||
$this->helper = new \OCA\user_sql\lib\Helper();
|
||||
$this->params = $this->helper->getParameterArray();
|
||||
$this->settings = $this->helper->loadSettingsForDomain('default');
|
||||
public function __construct($AppName, Properties $properties)
|
||||
{
|
||||
$this->appName = $AppName;
|
||||
$this->properties = $properties;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return TemplateResponse
|
||||
* @inheritdoc
|
||||
*/
|
||||
public function getForm()
|
||||
{
|
||||
|
||||
$type = $this->config->getAppValue('user_sql', 'type');
|
||||
$trusted_domains = \OC::$server->getConfig()->getSystemValue('trusted_domains');
|
||||
$inserted = array('default');
|
||||
array_splice($trusted_domains, 0, 0, $inserted);
|
||||
|
||||
$params = [
|
||||
'type' => $type,
|
||||
];
|
||||
$params['allowed_domains'] = array_unique($trusted_domains);
|
||||
|
||||
foreach ($this->params as $key) {
|
||||
$value = $this->settings[$key];
|
||||
$params[$key] = $value;
|
||||
}
|
||||
|
||||
$params["config"] = $this->config;
|
||||
return new TemplateResponse('user_sql', 'admin', $params);
|
||||
return new TemplateResponse($this->appName, "admin", $this->properties->getArray());
|
||||
}
|
||||
|
||||
/**
|
||||
* @return string the section ID, e.g. 'sharing'
|
||||
* @inheritdoc
|
||||
*/
|
||||
public function getSection()
|
||||
{
|
||||
return 'user_sql';
|
||||
return $this->appName;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return int whether the form should be rather on the top or bottom of
|
||||
* the admin section. The forms are arranged in ascending order of the
|
||||
* priority values. It is required to return a value between 0 and 100.
|
||||
*
|
||||
* keep the server setting at the top, right after "server settings"
|
||||
* @inheritdoc
|
||||
*/
|
||||
public function getPriority()
|
||||
{
|
||||
return 0;
|
||||
return 25;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
<?php
|
||||
/**
|
||||
* @copyright Copyright (c)
|
||||
* Nextcloud - user_sql
|
||||
*
|
||||
* @author
|
||||
*
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
* @copyright 2018 Marcin Łojewski <dev@mlojewski.me>
|
||||
* @author Marcin Łojewski <dev@mlojewski.me>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
@@ -17,59 +16,79 @@
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
namespace OCA\user_sql\Settings;
|
||||
namespace OCA\UserSQL\Settings;
|
||||
|
||||
use OCP\IL10N;
|
||||
use OCP\Settings\IIconSection;
|
||||
use OCP\IURLGenerator;
|
||||
use OCP\Settings\IIconSection;
|
||||
|
||||
/**
|
||||
* The section item.
|
||||
*
|
||||
* @author Marcin Łojewski <dev@mlojewski.me>
|
||||
*/
|
||||
class Section implements IIconSection
|
||||
{
|
||||
/** @var IL10N */
|
||||
private $l;
|
||||
/**
|
||||
* @var string The application name.
|
||||
*/
|
||||
private $appName;
|
||||
/**
|
||||
* @var IURLGenerator The URL generator.
|
||||
*/
|
||||
private $urlGenerator;
|
||||
/**
|
||||
* @var IL10N The localization service.
|
||||
*/
|
||||
private $localization;
|
||||
|
||||
/**
|
||||
* @param IL10N $l
|
||||
* The class constructor.
|
||||
*
|
||||
* @param string $AppName The application name.
|
||||
* @param IURLGenerator $urlGenerator The URL generator.
|
||||
* @param IL10N $localization The localization service.
|
||||
*/
|
||||
public function __construct(IURLGenerator $url, IL10N $l)
|
||||
{
|
||||
$this->l = $l;
|
||||
$this->url = $url;
|
||||
public function __construct(
|
||||
$AppName, IURLGenerator $urlGenerator, IL10N $localization
|
||||
) {
|
||||
$this->appName = $AppName;
|
||||
$this->urlGenerator = $urlGenerator;
|
||||
$this->localization = $localization;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
* @inheritdoc
|
||||
*/
|
||||
public function getID()
|
||||
{
|
||||
return 'user_sql';
|
||||
return $this->appName;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
* @inheritdoc
|
||||
*/
|
||||
public function getName()
|
||||
{
|
||||
return $this->l->t('User SQL');
|
||||
return $this->localization->t("SQL Backends");
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
* @inheritdoc
|
||||
*/
|
||||
public function getPriority()
|
||||
{
|
||||
return 75;
|
||||
return 25;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
* @inheritdoc
|
||||
*/
|
||||
public function getIcon()
|
||||
{
|
||||
return $this->url->imagePath('user_sql', 'app-dark.svg');
|
||||
return $this->urlGenerator->imagePath($this->appName, "app-dark.svg");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user