Skip to content

Fix for parameter "%n" on shared folders #64

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

Merged
merged 4 commits into from
Nov 25, 2020
Merged

Fix for parameter "%n" on shared folders #64

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e7a4ee1
Update Operation.php
k1l1 Oct 16, 2020
0e676a3
IConfig fix
k1l1 Oct 28, 2020
af47c72
indention fix
k1l1 Oct 28, 2020
ba30955
fix indentation
blizzz Nov 24, 2020
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
19 changes: 17 additions & 2 deletions lib/Operation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

namespace OCA\WorkflowScript;

use OC\Files\Filesystem;
use OC\Files\View;
use OCA\WorkflowEngine\Entity\File;
use OCA\WorkflowScript\BackgroundJobs\Launcher;
Expand All @@ -34,6 +35,7 @@
use OCP\Files\IRootFolder;
use OCP\Files\Node;
use OCP\Files\NotFoundException;
use OCP\IConfig;
use OCP\IL10N;
use OCP\IUser;
use OCP\IUserSession;
Expand All @@ -55,13 +57,16 @@ class Operation implements ISpecificOperation {
private $session;
/** @var IRootFolder */
private $rootFolder;
/** @var IConfig */
private $config;

public function __construct(IManager $workflowEngineManager, IJobList $jobList, IL10N $l, IUserSession $session, IRootFolder $rootFolder) {
public function __construct(IManager $workflowEngineManager, IJobList $jobList, IL10N $l, IUserSession $session, IRootFolder $rootFolder, IConfig $config) {
$this->workflowEngineManager = $workflowEngineManager;
$this->jobList = $jobList;
$this->l = $l;
$this->session = $session;
$this->rootFolder = $rootFolder;
$this->config = $config;
}

protected function buildCommand(string $template, Node $node, string $event, array $extra = []) {
Expand All @@ -73,7 +78,17 @@ protected function buildCommand(string $template, Node $node, string $event, arr

if (strpos($command, '%n')) {
// Nextcloud relative-path
$command = str_replace('%n', escapeshellarg($node->getPath()), $command);
$nodeID = -1;
try {
$nodeID = $node->getId();
} catch (InvalidPathException $e) {
} catch (NotFoundException $e) {
}

$base_path = $this->config->getSystemValue('datadirectory');

$path = Filesystem::getLocalFile(Filesystem::getPath($nodeID));
$command = str_replace('%n', escapeshellarg(str_replace($base_path . '/', '', $path)), $command);
}

if (false && strpos($command, '%f')) {
Expand Down