Skip to content

fix: #107 nc 30 compatibility #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
smarinier wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: #107 nc 30 compatibility #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<name>Piwik/Matomo Tracking</name>
<summary>Track users with Piwik/Matomo</summary>
<description>Track users with Piwik/Matomo</description>
<version>0.13.0</version>
<version>0.14.0</version>
<licence>agpl</licence>
<author>Klaus Herberth</author>
<category>tools</category>
Expand All @@ -14,7 +14,7 @@
<repository type="git">https://github.com/sualko/cloud_piwik.git</repository>

<dependencies>
<nextcloud min-version="25" max-version="29"/>
<nextcloud min-version="29" max-version="30"/>
</dependencies>

<repair-steps>
Expand Down
6 changes: 3 additions & 3 deletions lib/AppInfo/Application.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@

use OC\Security\CSP\ContentSecurityPolicyManager;
use OC\Security\CSP\ContentSecurityPolicyNonceManager;
use OCA\Piwik\Config;
use OCP\AppFramework\App;
use OCP\AppFramework\Bootstrap\IBootContext;
use OCP\AppFramework\Bootstrap\IBootstrap;
use OCP\AppFramework\Bootstrap\IRegistrationContext;
use OCP\AppFramework\Http\ContentSecurityPolicy;
use OCP\IConfig;
use OCP\IURLGenerator;
use OCP\Util;

Expand Down Expand Up @@ -38,8 +38,8 @@ public function addTrackingScript(IURLGenerator $urlGenerator, ContentSecurityPo
);
}

public function addContentSecurityPolicy(IConfig $config, ContentSecurityPolicyManager $policyManager): void {
$url = $config->getAppValue('piwik', 'url');
public function addContentSecurityPolicy(Config $config, ContentSecurityPolicyManager $policyManager): void {
$url = $config->getAppValue('url');
$allowedUrl = ' \'self\' ';
$parseUrl = parse_url($url);

Expand Down
24 changes: 15 additions & 9 deletions lib/Config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,34 @@

namespace OCA\Piwik;

use OCP\IConfig;
use OCA\Piwik\AppInfo\Application;
use OCP\IAppConfig;

class Config {
public function __construct($appName, IConfig $config) {
$this->appName = $appName;
private IAppConfig $config;

public function __construct(IAppConfig $config) {
$this->config = $config;
}

public function getAppValue($key, $default = null) {
$value = $this->config->getAppValue($this->appName, $key, $default);
public function getAppValue(string $key, $default = null) {
$value = $this->config->getValueString(Application::ID, $key, $default ?? '');
return (empty($value)) ? $default : $value;
}

public function setAppValue($key, $value) {
return $this->config->setAppValue($this->appName, $key, $value);
public function setAppValue(string $key, string $value) {
return $this->config->setValueString(Application::ID, $key, $value);
}

public function getBooleanAppValue($key) {
public function getBooleanAppValue(string $key) {
return $this->validateBoolean($this->getAppValue($key));
}

private function validateBoolean($val) {
private function validateBoolean(mixed $val) {
return $val === true || $val === 'true';
}

public function deleteAppValue(string $key) {
return $this->config->deleteKey(Application::ID, $key);
}
}
8 changes: 2 additions & 6 deletions lib/Controller/JavaScriptController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,21 @@
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\DataDownloadResponse;
use OCP\AppFramework\Http\Response;
use OCP\IConfig;
use OCP\IRequest;

class JavaScriptController extends Controller {
/** @var \OCP\IConfig */
protected $config;

/**
* constructor of the controller
*
* @param string $appName
* @param IRequest $request
* @param IConfig $config
* @param Config $config
*/
public function __construct($appName,
IRequest $request,
Config $config) {
private Config $config) {
parent::__construct($appName, $request);
$this->config = $config;
}

/**
Expand Down
5 changes: 1 addition & 4 deletions lib/Controller/SettingsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,13 @@
use OCP\IRequest;

class SettingsController extends Controller {
private $config;

public function __construct(
$appName,
IRequest $request,
Config $config
private Config $config
) {
parent::__construct($appName, $request);

$this->config = $config;
}

/**
Expand Down
19 changes: 7 additions & 12 deletions lib/Migration/Settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,13 @@

namespace OCA\Piwik\Migration;

use OCP\IConfig;
use OCA\Piwik\Config;
use OCP\Migration\IOutput;
use OCP\Migration\IRepairStep;

class Settings implements IRepairStep {
/**
* @var IConfig
*/
private $config;

public function __construct(IConfig $config) {
$this->config = $config;
public function __construct(private Config $config) {
}

/**
Expand All @@ -28,17 +23,17 @@ public function getName() {
*/
public function run(IOutput $output) {
$config = $this->config;
$oldPiwikConfig = $config->getAppValue('piwik', 'piwik');
$oldPiwikConfig = $config->getAppValue('piwik');

if (!empty($oldPiwikConfig)) {
$oldPiwikConfig = json_decode($oldPiwikConfig);
$trackDir = $oldPiwikConfig->trackDir;

$config->setAppValue('piwik', 'url', $oldPiwikConfig->url);
$config->setAppValue('piwik', 'siteId', $oldPiwikConfig->siteId);
$config->setAppValue('piwik', 'trackDir', $trackDir === 'on');
$config->setAppValue('url', $oldPiwikConfig->url);
$config->setAppValue('siteId', $oldPiwikConfig->siteId);
$config->setAppValue('trackDir', $trackDir === 'on');

$config->deleteAppValue('piwik', 'piwik');
$config->deleteAppValue('piwik');
} else {
$output->info("Migration already executed");
}
Expand Down
20 changes: 9 additions & 11 deletions lib/Settings/Admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,33 @@

namespace OCA\Piwik\Settings;

use OCA\Piwik\AppInfo\Application;
use OCA\Piwik\Config;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\IConfig;
use OCP\Settings\ISettings;

class Admin implements ISettings {
/** @var IConfig */
private $config;

/**
* Admin constructor.
*
* @param IConfig $config
* @param Config $config
*/
public function __construct(IConfig $config) {
$this->config = $config;
public function __construct(private Config $config) {
}

/**
* @return TemplateResponse
*/
public function getForm() {
$parameters = [
'url' => $this->config->getAppValue('piwik', 'url'),
'siteId' => $this->config->getAppValue('piwik', 'siteId'),
'trackDir' => $this->config->getAppValue('piwik', 'trackDir'),
'trackUser' => $this->config->getAppValue('piwik', 'trackUser'),
'url' => $this->config->getAppValue('url'),
'siteId' => $this->config->getAppValue('siteId'),
'trackDir' => $this->config->getAppValue('trackDir'),
'trackUser' => $this->config->getAppValue('trackUser'),
];

return new TemplateResponse('piwik', 'settings/admin', $parameters);
return new TemplateResponse(Application::ID, 'settings/admin', $parameters);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cloud_piwik",
"version": "0.13.0",
"version": "0.14.0",
"description": "Track Nextcloud users with piwik/matomo",
"repository": {
"type": "git",
Expand Down