nextcloud / server

apps/systemtags/lib/Activity/Setting.php

Indentation +59 added lines, -59 removed lines

@@ -27,72 +27,72 @@
 
 class Setting implements ISetting {
 
-	/** @var IL10N */
-	protected $l;
+    /** @var IL10N */
+    protected $l;
 
-	/**
-	 * @param IL10N $l
-	 */
-	public function __construct(IL10N $l) {
-		$this->l = $l;
-	}
+    /**
+     * @param IL10N $l
+     */
+    public function __construct(IL10N $l) {
+        $this->l = $l;
+    }
 
-	/**
-	 * @return string Lowercase a-z and underscore only identifier
-	 * @since 11.0.0
-	 */
-	public function getIdentifier() {
-		return 'systemtags';
-	}
+    /**
+     * @return string Lowercase a-z and underscore only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'systemtags';
+    }
 
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('<strong>System tags</strong> for a file have been modified');
-	}
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->l->t('<strong>System tags</strong> for a file have been modified');
+    }
 
-	/**
-	 * @return int whether the filter should be rather on the top or bottom of
-	 * the admin section. The filters are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 * @since 11.0.0
-	 */
-	public function getPriority() {
-		return 50;
-	}
+    /**
+     * @return int whether the filter should be rather on the top or bottom of
+     * the admin section. The filters are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     * @since 11.0.0
+     */
+    public function getPriority() {
+        return 50;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function canChangeStream() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function canChangeStream() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledStream() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledStream() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the mail
-	 * @since 11.0.0
-	 */
-	public function canChangeMail() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the mail
+     * @since 11.0.0
+     */
+    public function canChangeMail() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledMail() {
-		return false;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledMail() {
+        return false;
+    }
 }
 

apps/systemtags/lib/Activity/Listener.php

Indentation +197 added lines, -197 removed lines

@@ -41,222 +41,222 @@
 use OCP\SystemTag\TagNotFoundException;
 
 class Listener {
-	/** @var IGroupManager */
-	protected $groupManager;
-	/** @var IManager */
-	protected $activityManager;
-	/** @var IUserSession */
-	protected $session;
-	/** @var IConfig */
-	protected $config;
-	/** @var \OCP\SystemTag\ISystemTagManager */
-	protected $tagManager;
-	/** @var \OCP\App\IAppManager */
-	protected $appManager;
-	/** @var \OCP\Files\Config\IMountProviderCollection */
-	protected $mountCollection;
-	/** @var \OCP\Files\IRootFolder */
-	protected $rootFolder;
+    /** @var IGroupManager */
+    protected $groupManager;
+    /** @var IManager */
+    protected $activityManager;
+    /** @var IUserSession */
+    protected $session;
+    /** @var IConfig */
+    protected $config;
+    /** @var \OCP\SystemTag\ISystemTagManager */
+    protected $tagManager;
+    /** @var \OCP\App\IAppManager */
+    protected $appManager;
+    /** @var \OCP\Files\Config\IMountProviderCollection */
+    protected $mountCollection;
+    /** @var \OCP\Files\IRootFolder */
+    protected $rootFolder;
 
-	/**
-	 * Listener constructor.
-	 *
-	 * @param IGroupManager $groupManager
-	 * @param IManager $activityManager
-	 * @param IUserSession $session
-	 * @param IConfig $config
-	 * @param ISystemTagManager $tagManager
-	 * @param IAppManager $appManager
-	 * @param IMountProviderCollection $mountCollection
-	 * @param IRootFolder $rootFolder
-	 */
-	public function __construct(IGroupManager $groupManager,
-								IManager $activityManager,
-								IUserSession $session,
-								IConfig $config,
-								ISystemTagManager $tagManager,
-								IAppManager $appManager,
-								IMountProviderCollection $mountCollection,
-								IRootFolder $rootFolder) {
-		$this->groupManager = $groupManager;
-		$this->activityManager = $activityManager;
-		$this->session = $session;
-		$this->config = $config;
-		$this->tagManager = $tagManager;
-		$this->appManager = $appManager;
-		$this->mountCollection = $mountCollection;
-		$this->rootFolder = $rootFolder;
-	}
+    /**
+     * Listener constructor.
+     *
+     * @param IGroupManager $groupManager
+     * @param IManager $activityManager
+     * @param IUserSession $session
+     * @param IConfig $config
+     * @param ISystemTagManager $tagManager
+     * @param IAppManager $appManager
+     * @param IMountProviderCollection $mountCollection
+     * @param IRootFolder $rootFolder
+     */
+    public function __construct(IGroupManager $groupManager,
+                                IManager $activityManager,
+                                IUserSession $session,
+                                IConfig $config,
+                                ISystemTagManager $tagManager,
+                                IAppManager $appManager,
+                                IMountProviderCollection $mountCollection,
+                                IRootFolder $rootFolder) {
+        $this->groupManager = $groupManager;
+        $this->activityManager = $activityManager;
+        $this->session = $session;
+        $this->config = $config;
+        $this->tagManager = $tagManager;
+        $this->appManager = $appManager;
+        $this->mountCollection = $mountCollection;
+        $this->rootFolder = $rootFolder;
+    }
 
-	/**
-	 * @param ManagerEvent $event
-	 */
-	public function event(ManagerEvent $event) {
-		$actor = $this->session->getUser();
-		if ($actor instanceof IUser) {
-			$actor = $actor->getUID();
-		} else {
-			$actor = '';
-		}
-		$tag = $event->getTag();
+    /**
+     * @param ManagerEvent $event
+     */
+    public function event(ManagerEvent $event) {
+        $actor = $this->session->getUser();
+        if ($actor instanceof IUser) {
+            $actor = $actor->getUID();
+        } else {
+            $actor = '';
+        }
+        $tag = $event->getTag();
 
-		$activity = $this->activityManager->generateEvent();
-		$activity->setApp('systemtags')
-			->setType('systemtags')
-			->setAuthor($actor)
-			->setObject('systemtag', $tag->getId(), $tag->getName());
-		if ($event->getEvent() === ManagerEvent::EVENT_CREATE) {
-			$activity->setSubject(Provider::CREATE_TAG, [
-				$actor,
-				$this->prepareTagAsParameter($event->getTag()),
-			]);
-		} else if ($event->getEvent() === ManagerEvent::EVENT_UPDATE) {
-			$activity->setSubject(Provider::UPDATE_TAG, [
-				$actor,
-				$this->prepareTagAsParameter($event->getTag()),
-				$this->prepareTagAsParameter($event->getTagBefore()),
-			]);
-		} else if ($event->getEvent() === ManagerEvent::EVENT_DELETE) {
-			$activity->setSubject(Provider::DELETE_TAG, [
-				$actor,
-				$this->prepareTagAsParameter($event->getTag()),
-			]);
-		} else {
-			return;
-		}
+        $activity = $this->activityManager->generateEvent();
+        $activity->setApp('systemtags')
+            ->setType('systemtags')
+            ->setAuthor($actor)
+            ->setObject('systemtag', $tag->getId(), $tag->getName());
+        if ($event->getEvent() === ManagerEvent::EVENT_CREATE) {
+            $activity->setSubject(Provider::CREATE_TAG, [
+                $actor,
+                $this->prepareTagAsParameter($event->getTag()),
+            ]);
+        } else if ($event->getEvent() === ManagerEvent::EVENT_UPDATE) {
+            $activity->setSubject(Provider::UPDATE_TAG, [
+                $actor,
+                $this->prepareTagAsParameter($event->getTag()),
+                $this->prepareTagAsParameter($event->getTagBefore()),
+            ]);
+        } else if ($event->getEvent() === ManagerEvent::EVENT_DELETE) {
+            $activity->setSubject(Provider::DELETE_TAG, [
+                $actor,
+                $this->prepareTagAsParameter($event->getTag()),
+            ]);
+        } else {
+            return;
+        }
 
-		$group = $this->groupManager->get('admin');
-		if ($group instanceof IGroup) {
-			foreach ($group->getUsers() as $user) {
-				$activity->setAffectedUser($user->getUID());
-				$this->activityManager->publish($activity);
-			}
-		}
+        $group = $this->groupManager->get('admin');
+        if ($group instanceof IGroup) {
+            foreach ($group->getUsers() as $user) {
+                $activity->setAffectedUser($user->getUID());
+                $this->activityManager->publish($activity);
+            }
+        }
 
 
-		if ($actor !== '' && ($event->getEvent() === ManagerEvent::EVENT_CREATE || $event->getEvent() === ManagerEvent::EVENT_UPDATE)) {
-			$this->updateLastUsedTags($actor, $event->getTag());
-		}
-	}
+        if ($actor !== '' && ($event->getEvent() === ManagerEvent::EVENT_CREATE || $event->getEvent() === ManagerEvent::EVENT_UPDATE)) {
+            $this->updateLastUsedTags($actor, $event->getTag());
+        }
+    }
 
-	/**
-	 * @param MapperEvent $event
-	 */
-	public function mapperEvent(MapperEvent $event) {
-		$tagIds = $event->getTags();
-		if ($event->getObjectType() !== 'files' ||empty($tagIds)
-			|| !in_array($event->getEvent(), [MapperEvent::EVENT_ASSIGN, MapperEvent::EVENT_UNASSIGN])
-			|| !$this->appManager->isInstalled('activity')) {
-			// System tags not for files, no tags, not (un-)assigning or no activity-app enabled (save the energy)
-			return;
-		}
+    /**
+     * @param MapperEvent $event
+     */
+    public function mapperEvent(MapperEvent $event) {
+        $tagIds = $event->getTags();
+        if ($event->getObjectType() !== 'files' ||empty($tagIds)
+            || !in_array($event->getEvent(), [MapperEvent::EVENT_ASSIGN, MapperEvent::EVENT_UNASSIGN])
+            || !$this->appManager->isInstalled('activity')) {
+            // System tags not for files, no tags, not (un-)assigning or no activity-app enabled (save the energy)
+            return;
+        }
 
-		try {
-			$tags = $this->tagManager->getTagsByIds($tagIds);
-		} catch (TagNotFoundException $e) {
-			// User assigned/unassigned a non-existing tag, ignore...
-			return;
-		}
+        try {
+            $tags = $this->tagManager->getTagsByIds($tagIds);
+        } catch (TagNotFoundException $e) {
+            // User assigned/unassigned a non-existing tag, ignore...
+            return;
+        }
 
-		if (empty($tags)) {
-			return;
-		}
+        if (empty($tags)) {
+            return;
+        }
 
-		// Get all mount point owners
-		$cache = $this->mountCollection->getMountCache();
-		$mounts = $cache->getMountsForFileId($event->getObjectId());
-		if (empty($mounts)) {
-			return;
-		}
+        // Get all mount point owners
+        $cache = $this->mountCollection->getMountCache();
+        $mounts = $cache->getMountsForFileId($event->getObjectId());
+        if (empty($mounts)) {
+            return;
+        }
 
-		$users = [];
-		foreach ($mounts as $mount) {
-			$owner = $mount->getUser()->getUID();
-			$ownerFolder = $this->rootFolder->getUserFolder($owner);
-			$nodes = $ownerFolder->getById($event->getObjectId());
-			if (!empty($nodes)) {
-				/** @var Node $node */
-				$node = array_shift($nodes);
-				$path = $node->getPath();
-				if (strpos($path, '/' . $owner . '/files/') === 0) {
-					$path = substr($path, strlen('/' . $owner . '/files'));
-				}
-				// Get all users that have access to the mount point
-				$users = array_merge($users, Share::getUsersSharingFile($path, $owner, true, true));
-			}
-		}
+        $users = [];
+        foreach ($mounts as $mount) {
+            $owner = $mount->getUser()->getUID();
+            $ownerFolder = $this->rootFolder->getUserFolder($owner);
+            $nodes = $ownerFolder->getById($event->getObjectId());
+            if (!empty($nodes)) {
+                /** @var Node $node */
+                $node = array_shift($nodes);
+                $path = $node->getPath();
+                if (strpos($path, '/' . $owner . '/files/') === 0) {
+                    $path = substr($path, strlen('/' . $owner . '/files'));
+                }
+                // Get all users that have access to the mount point
+                $users = array_merge($users, Share::getUsersSharingFile($path, $owner, true, true));
+            }
+        }
 
-		$actor = $this->session->getUser();
-		if ($actor instanceof IUser) {
-			$actor = $actor->getUID();
-		} else {
-			$actor = '';
-		}
+        $actor = $this->session->getUser();
+        if ($actor instanceof IUser) {
+            $actor = $actor->getUID();
+        } else {
+            $actor = '';
+        }
 
-		$activity = $this->activityManager->generateEvent();
-		$activity->setApp('systemtags')
-			->setType('systemtags')
-			->setAuthor($actor)
-			->setObject($event->getObjectType(), (int) $event->getObjectId());
+        $activity = $this->activityManager->generateEvent();
+        $activity->setApp('systemtags')
+            ->setType('systemtags')
+            ->setAuthor($actor)
+            ->setObject($event->getObjectType(), (int) $event->getObjectId());
 
-		foreach ($users as $user => $path) {
-			$activity->setAffectedUser($user);
+        foreach ($users as $user => $path) {
+            $activity->setAffectedUser($user);
 
-			foreach ($tags as $tag) {
-				// don't publish activity for non-admins if tag is invisible
-				if (!$tag->isUserVisible() && !$this->groupManager->isAdmin($user)) {
-					continue;
-				}
-				if ($event->getEvent() === MapperEvent::EVENT_ASSIGN) {
-					$activity->setSubject(Provider::ASSIGN_TAG, [
-						$actor,
-						$path,
-						$this->prepareTagAsParameter($tag),
-					]);
-				} else if ($event->getEvent() === MapperEvent::EVENT_UNASSIGN) {
-					$activity->setSubject(Provider::UNASSIGN_TAG, [
-						$actor,
-						$path,
-						$this->prepareTagAsParameter($tag),
-					]);
-				}
+            foreach ($tags as $tag) {
+                // don't publish activity for non-admins if tag is invisible
+                if (!$tag->isUserVisible() && !$this->groupManager->isAdmin($user)) {
+                    continue;
+                }
+                if ($event->getEvent() === MapperEvent::EVENT_ASSIGN) {
+                    $activity->setSubject(Provider::ASSIGN_TAG, [
+                        $actor,
+                        $path,
+                        $this->prepareTagAsParameter($tag),
+                    ]);
+                } else if ($event->getEvent() === MapperEvent::EVENT_UNASSIGN) {
+                    $activity->setSubject(Provider::UNASSIGN_TAG, [
+                        $actor,
+                        $path,
+                        $this->prepareTagAsParameter($tag),
+                    ]);
+                }
 
-				$this->activityManager->publish($activity);
-			}
-		}
+                $this->activityManager->publish($activity);
+            }
+        }
 
-		if ($actor !== '' && $event->getEvent() === MapperEvent::EVENT_ASSIGN) {
-			foreach ($tags as $tag) {
-				$this->updateLastUsedTags($actor, $tag);
-			}
-		}
-	}
+        if ($actor !== '' && $event->getEvent() === MapperEvent::EVENT_ASSIGN) {
+            foreach ($tags as $tag) {
+                $this->updateLastUsedTags($actor, $tag);
+            }
+        }
+    }
 
-	/**
-	 * @param string $actor
-	 * @param ISystemTag $tag
-	 */
-	protected function updateLastUsedTags($actor, ISystemTag $tag) {
-		$lastUsedTags = $this->config->getUserValue($actor, 'systemtags', 'last_used', '[]');
-		$lastUsedTags = json_decode($lastUsedTags, true);
+    /**
+     * @param string $actor
+     * @param ISystemTag $tag
+     */
+    protected function updateLastUsedTags($actor, ISystemTag $tag) {
+        $lastUsedTags = $this->config->getUserValue($actor, 'systemtags', 'last_used', '[]');
+        $lastUsedTags = json_decode($lastUsedTags, true);
 
-		array_unshift($lastUsedTags, $tag->getId());
-		array_unique($lastUsedTags);
-		$lastUsedTags = array_slice($lastUsedTags, 0, 10);
+        array_unshift($lastUsedTags, $tag->getId());
+        array_unique($lastUsedTags);
+        $lastUsedTags = array_slice($lastUsedTags, 0, 10);
 
-		$this->config->setUserValue($actor, 'systemtags', 'last_used', json_encode($lastUsedTags));
-	}
+        $this->config->setUserValue($actor, 'systemtags', 'last_used', json_encode($lastUsedTags));
+    }
 
-	/**
-	 * @param ISystemTag $tag
-	 * @return string
-	 */
-	protected function prepareTagAsParameter(ISystemTag $tag) {
-		return json_encode([
-			'id' => $tag->getId(),
-			'name' => $tag->getName(),
-			'assignable' => $tag->isUserAssignable(),
-			'visible' => $tag->isUserVisible(),
-		]);
-	}
+    /**
+     * @param ISystemTag $tag
+     * @return string
+     */
+    protected function prepareTagAsParameter(ISystemTag $tag) {
+        return json_encode([
+            'id' => $tag->getId(),
+            'name' => $tag->getName(),
+            'assignable' => $tag->isUserAssignable(),
+            'visible' => $tag->isUserVisible(),
+        ]);
+    }
 }

apps/systemtags/lib/Controller/LastUsedController.php

Indentation +26 added lines, -26 removed lines

@@ -30,30 +30,30 @@
 
 class LastUsedController extends Controller {
 
-	/** @var IConfig */
-	protected $config;
-
-	/** @var IUserSession */
-	protected $userSession;
-
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IConfig $config
-	 * @param IUserSession $userSession
-	 */
-	public function __construct($appName, IRequest $request, IConfig $config, IUserSession $userSession) {
-		parent::__construct($appName, $request);
-		$this->config = $config;
-		$this->userSession = $userSession;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 */
-	public function getLastUsedTagIds() {
-		$lastUsed = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'systemtags', 'last_used', '[]');
-		$tagIds = json_decode($lastUsed, true);
-		return new DataResponse(array_map(function($id) { return (string) $id; }, $tagIds));
-	}
+    /** @var IConfig */
+    protected $config;
+
+    /** @var IUserSession */
+    protected $userSession;
+
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IConfig $config
+     * @param IUserSession $userSession
+     */
+    public function __construct($appName, IRequest $request, IConfig $config, IUserSession $userSession) {
+        parent::__construct($appName, $request);
+        $this->config = $config;
+        $this->userSession = $userSession;
+    }
+
+    /**
+     * @NoAdminRequired
+     */
+    public function getLastUsedTagIds() {
+        $lastUsed = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'systemtags', 'last_used', '[]');
+        $tagIds = json_decode($lastUsed, true);
+        return new DataResponse(array_map(function($id) { return (string) $id; }, $tagIds));
+    }
 }

apps/systemtags/lib/Settings/Admin.php

Indentation +22 added lines, -22 removed lines

@@ -28,29 +28,29 @@
 
 class Admin implements ISettings {
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		return new TemplateResponse('systemtags', 'admin', [], '');
-	}
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        return new TemplateResponse('systemtags', 'admin', [], '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'workflow';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'workflow';
+    }
 
-	/**
-	 * @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.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return 70;
-	}
+    /**
+     * @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.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return 70;
+    }
 
 }

apps/systemtags/appinfo/routes.php

Indentation +3 added lines, -3 removed lines

@@ -22,7 +22,7 @@
  */
 
 return [
-	'routes' => [
-		['name' => 'LastUsed#getLastUsedTagIds', 'url' => '/lastused', 'verb' => 'GET'],
-	]
+    'routes' => [
+        ['name' => 'LastUsed#getLastUsedTagIds', 'url' => '/lastused', 'verb' => 'GET'],
+    ]
 ];

apps/files_sharing/templates/public.php

Indentation +2 added lines, -2 removed lines

@@ -48,8 +48,8 @@
 		<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
 		<div id="header-right">
 			<?php if (!isset($_['hideFileList']) || (isset($_['hideFileList']) && $_['hideFileList'] === false)) {
-				if ($_['server2serversharing']) {
-					?>
+                if ($_['server2serversharing']) {
+                    ?>
 					<span id="save" data-protected="<?php p($_['protected']) ?>"
 						  data-owner-display-name="<?php p($_['displayName']) ?>" data-owner="<?php p($_['owner']) ?>" data-name="<?php p($_['filename']) ?>">
 					<button id="save-button"><?php p($l->t('Add to your Nextcloud')) ?></button>

apps/files_sharing/templates/authenticate.php

Indentation +4 added lines, -4 removed lines

@@ -1,8 +1,8 @@
 <?php
-	/** @var $_ array */
-	/** @var $l \OCP\IL10N */
-	style('files_sharing', 'authenticate');
-	script('files_sharing', 'authenticate'); 
+    /** @var $_ array */
+    /** @var $l \OCP\IL10N */
+    style('files_sharing', 'authenticate');
+    script('files_sharing', 'authenticate'); 
 ?>
 <form method="post">
 	<fieldset>

apps/files_sharing/ajax/shareinfo.php

Indentation +27 added lines, -27 removed lines

@@ -30,28 +30,28 @@ 
 OCP\JSON::checkAppEnabled('files_sharing');
 
 if (!isset($_GET['t'])) {
-	\OC_Response::setStatus(400); //400 Bad Request
-	exit;
+    \OC_Response::setStatus(400); //400 Bad Request
+    exit;
 }
 
 $federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application();
 $federatedShareProvider = $federatedSharingApp->getFederatedShareProvider();
 
 if ($federatedShareProvider->isOutgoingServer2serverShareEnabled() === false) {
-	\OC_Response::setStatus(404); // 404 not found
-	exit;
+    \OC_Response::setStatus(404); // 404 not found
+    exit;
 }
 
 $token = $_GET['t'];
 
 $password = null;
 if (isset($_POST['password'])) {
-	$password = $_POST['password'];
+    $password = $_POST['password'];
 }
 
 $relativePath = null;
 if (isset($_GET['dir'])) {
-	$relativePath = $_GET['dir'];
+    $relativePath = $_GET['dir'];
 }
 
 $data = \OCA\Files_Sharing\Helper::setupFromToken($token, $relativePath, $password);
@@ -63,20 +63,20 @@ 
 
 $isWritable = $share->getPermissions() & (\OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_CREATE);
 if (!$isWritable) {
-	// FIXME: should not add storage wrappers outside of preSetup, need to find a better way
-	$previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
-	\OC\Files\Filesystem::addStorageWrapper('readonly', function ($mountPoint, $storage) {
-		return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => \OCP\Constants::PERMISSION_READ + \OCP\Constants::PERMISSION_SHARE));
-	});
-	\OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
+    // FIXME: should not add storage wrappers outside of preSetup, need to find a better way
+    $previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
+    \OC\Files\Filesystem::addStorageWrapper('readonly', function ($mountPoint, $storage) {
+        return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => \OCP\Constants::PERMISSION_READ + \OCP\Constants::PERMISSION_SHARE));
+    });
+    \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
 }
 
 $rootInfo = \OC\Files\Filesystem::getFileInfo($path);
 $rootView = new \OC\Files\View('');
 
 if($rootInfo === false || !($share->getPermissions() & \OCP\Constants::PERMISSION_READ)) {
-	OCP\JSON::error(array('data' => 'Share is not readable.'));
-	exit();
+    OCP\JSON::error(array('data' => 'Share is not readable.'));
+    exit();
 }
 
 /**
@@ -85,18 +85,18 @@ 
  * @return array
  */
 function getChildInfo($dir, $view, $sharePermissions) {
-	$children = $view->getDirectoryContent($dir->getPath());
-	$result = array();
-	foreach ($children as $child) {
-		$formatted = \OCA\Files\Helper::formatFileInfo($child);
-		if ($child->getType() === 'dir') {
-			$formatted['children'] = getChildInfo($child, $view, $sharePermissions);
-		}
-		$formatted['mtime'] = $formatted['mtime'] / 1000;
-		$formatted['permissions'] = $sharePermissions & (int)$formatted['permissions'];
-		$result[] = $formatted;
-	}
-	return $result;
+    $children = $view->getDirectoryContent($dir->getPath());
+    $result = array();
+    foreach ($children as $child) {
+        $formatted = \OCA\Files\Helper::formatFileInfo($child);
+        if ($child->getType() === 'dir') {
+            $formatted['children'] = getChildInfo($child, $view, $sharePermissions);
+        }
+        $formatted['mtime'] = $formatted['mtime'] / 1000;
+        $formatted['permissions'] = $sharePermissions & (int)$formatted['permissions'];
+        $result[] = $formatted;
+    }
+    return $result;
 }
 
 $result = \OCA\Files\Helper::formatFileInfo($rootInfo);
@@ -105,7 +105,7 @@ 
 
 
 if ($rootInfo->getType() === 'dir') {
-	$result['children'] = getChildInfo($rootInfo, $rootView, $share->getPermissions());
+    $result['children'] = getChildInfo($rootInfo, $rootView, $share->getPermissions());
 }
 
 OCP\JSON::success(array('data' => $result));

apps/files_sharing/lib/Scanner.php

Indentation +43 added lines, -43 removed lines

@@ -31,52 +31,52 @@
  * Scanner for SharedStorage
  */
 class Scanner extends \OC\Files\Cache\Scanner {
-	/**
-	 * @var \OCA\Files_Sharing\SharedStorage $storage
-	 */
-	protected $storage;
+    /**
+     * @var \OCA\Files_Sharing\SharedStorage $storage
+     */
+    protected $storage;
 
-	private $sourceScanner;
+    private $sourceScanner;
 
-	/**
-	 * Returns metadata from the shared storage, but
-	 * with permissions from the source storage.
-	 *
-	 * @param string $path path of the file for which to retrieve metadata
-	 *
-	 * @return array an array of metadata of the file
-	 */
-	public function getData($path) {
-		$data = parent::getData($path);
-		if ($data === null) {
-			return null;
-		}
-		$internalPath = $this->storage->getSourcePath($path);
-		$data['permissions'] = $this->storage->getSourceStorage()->getPermissions($internalPath);
-		return $data;
-	}
+    /**
+     * Returns metadata from the shared storage, but
+     * with permissions from the source storage.
+     *
+     * @param string $path path of the file for which to retrieve metadata
+     *
+     * @return array an array of metadata of the file
+     */
+    public function getData($path) {
+        $data = parent::getData($path);
+        if ($data === null) {
+            return null;
+        }
+        $internalPath = $this->storage->getSourcePath($path);
+        $data['permissions'] = $this->storage->getSourceStorage()->getPermissions($internalPath);
+        return $data;
+    }
 
-	private function getSourceScanner() {
-		if ($this->sourceScanner) {
-			return $this->sourceScanner;
-		}
-		if ($this->storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) {
-			/** @var \OC\Files\Storage\Storage $storage */
-			list($storage) = $this->storage->resolvePath('');
-			$this->sourceScanner = $storage->getScanner();
-			return $this->sourceScanner;
-		} else {
-			return null;
-		}
-	}
+    private function getSourceScanner() {
+        if ($this->sourceScanner) {
+            return $this->sourceScanner;
+        }
+        if ($this->storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) {
+            /** @var \OC\Files\Storage\Storage $storage */
+            list($storage) = $this->storage->resolvePath('');
+            $this->sourceScanner = $storage->getScanner();
+            return $this->sourceScanner;
+        } else {
+            return null;
+        }
+    }
 
-	public function scanFile($file, $reuseExisting = 0, $parentId = -1, $cacheData = null, $lock = true) {
-		$sourceScanner = $this->getSourceScanner();
-		if ($sourceScanner instanceof NoopScanner) {
-			return [];
-		} else {
-			return parent::scanFile($file, $reuseExisting, $parentId, $cacheData, $lock);
-		}
-	}
+    public function scanFile($file, $reuseExisting = 0, $parentId = -1, $cacheData = null, $lock = true) {
+        $sourceScanner = $this->getSourceScanner();
+        if ($sourceScanner instanceof NoopScanner) {
+            return [];
+        } else {
+            return parent::scanFile($file, $reuseExisting, $parentId, $cacheData, $lock);
+        }
+    }
 }