nextcloud / server

apps/files_sharing/lib/Activity/Providers/Downloads.php

Indentation +93 added lines, -93 removed lines

@@ -26,97 +26,97 @@
 class Downloads extends Base {
 
 
-	const SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED = 'public_shared_file_downloaded';
-	const SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED = 'public_shared_folder_downloaded';
-
-	const SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED = 'file_shared_with_email_downloaded';
-	const SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED = 'folder_shared_with_email_downloaded';
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseShortVersion(IEvent $event) {
-		$parsedParameters = $this->getParsedParameters($event);
-
-		if ($event->getSubject() === self::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED ||
-			$event->getSubject() === self::SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED) {
-			$subject = $this->l->t('Downloaded via public link');
-		} else if ($event->getSubject() === self::SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED ||
-			$event->getSubject() === self::SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED) {
-			$subject = $this->l->t('Downloaded by {email}');
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/download.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/download.svg')));
-		}
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseLongVersion(IEvent $event) {
-		$parsedParameters = $this->getParsedParameters($event);
-
-		if ($event->getSubject() === self::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED ||
-			$event->getSubject() === self::SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED) {
-			$subject = $this->l->t('{file} downloaded via public link');
-		} else if ($event->getSubject() === self::SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED ||
-			$event->getSubject() === self::SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED) {
-			$subject = $this->l->t('{email} downloaded {file}');
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/download.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/download.svg')));
-		}
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return array
-	 * @throws \InvalidArgumentException
-	 */
-	protected function getParsedParameters(IEvent $event) {
-		$subject = $event->getSubject();
-		$parameters = $event->getSubjectParameters();
-
-		switch ($subject) {
-			case self::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED:
-			case self::SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED:
-				return [
-					'file' => $this->getFile($parameters[0], $event),
-				];
-			case self::SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED:
-			case self::SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED:
-				return [
-					'file' => $this->getFile($parameters[0], $event),
-					'email' => [
-						'type' => 'email',
-						'id' => $parameters[1],
-						'name' => $parameters[1],
-					],
-				];
-		}
-
-		throw new \InvalidArgumentException();
-	}
+    const SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED = 'public_shared_file_downloaded';
+    const SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED = 'public_shared_folder_downloaded';
+
+    const SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED = 'file_shared_with_email_downloaded';
+    const SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED = 'folder_shared_with_email_downloaded';
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseShortVersion(IEvent $event) {
+        $parsedParameters = $this->getParsedParameters($event);
+
+        if ($event->getSubject() === self::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED ||
+            $event->getSubject() === self::SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED) {
+            $subject = $this->l->t('Downloaded via public link');
+        } else if ($event->getSubject() === self::SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED ||
+            $event->getSubject() === self::SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED) {
+            $subject = $this->l->t('Downloaded by {email}');
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/download.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/download.svg')));
+        }
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseLongVersion(IEvent $event) {
+        $parsedParameters = $this->getParsedParameters($event);
+
+        if ($event->getSubject() === self::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED ||
+            $event->getSubject() === self::SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED) {
+            $subject = $this->l->t('{file} downloaded via public link');
+        } else if ($event->getSubject() === self::SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED ||
+            $event->getSubject() === self::SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED) {
+            $subject = $this->l->t('{email} downloaded {file}');
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/download.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/download.svg')));
+        }
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @return array
+     * @throws \InvalidArgumentException
+     */
+    protected function getParsedParameters(IEvent $event) {
+        $subject = $event->getSubject();
+        $parameters = $event->getSubjectParameters();
+
+        switch ($subject) {
+            case self::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED:
+            case self::SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED:
+                return [
+                    'file' => $this->getFile($parameters[0], $event),
+                ];
+            case self::SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED:
+            case self::SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED:
+                return [
+                    'file' => $this->getFile($parameters[0], $event),
+                    'email' => [
+                        'type' => 'email',
+                        'id' => $parameters[1],
+                        'name' => $parameters[1],
+                    ],
+                ];
+        }
+
+        throw new \InvalidArgumentException();
+    }
 }

apps/federatedfilesharing/lib/Settings/PersonalSection.php

Indentation +49 added lines, -49 removed lines

@@ -29,58 +29,58 @@
 use OCP\Settings\IIconSection;
 
 class PersonalSection implements IIconSection {
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var IL10N */
-	private $l;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var IL10N */
+    private $l;
 
-	public function __construct(IURLGenerator $urlGenerator, IL10N $l) {
-		$this->urlGenerator = $urlGenerator;
-		$this->l = $l;
-	}
+    public function __construct(IURLGenerator $urlGenerator, IL10N $l) {
+        $this->urlGenerator = $urlGenerator;
+        $this->l = $l;
+    }
 
-	/**
-	 * returns the relative path to an 16*16 icon describing the section.
-	 * e.g. '/core/img/places/files.svg'
-	 *
-	 * @returns string
-	 * @since 13.0.0
-	 */
-	public function getIcon() {
-		return $this->urlGenerator->imagePath('core', 'actions/share.svg');
-	}
+    /**
+     * returns the relative path to an 16*16 icon describing the section.
+     * e.g. '/core/img/places/files.svg'
+     *
+     * @returns string
+     * @since 13.0.0
+     */
+    public function getIcon() {
+        return $this->urlGenerator->imagePath('core', 'actions/share.svg');
+    }
 
-	/**
-	 * returns the ID of the section. It is supposed to be a lower case string,
-	 * e.g. 'ldap'
-	 *
-	 * @returns string
-	 * @since 9.1
-	 */
-	public function getID() {
-		return 'sharing';
-	}
+    /**
+     * returns the ID of the section. It is supposed to be a lower case string,
+     * e.g. 'ldap'
+     *
+     * @returns string
+     * @since 9.1
+     */
+    public function getID() {
+        return 'sharing';
+    }
 
-	/**
-	 * returns the translated name as it should be displayed, e.g. 'LDAP / AD
-	 * integration'. Use the L10N service to translate it.
-	 *
-	 * @return string
-	 * @since 9.1
-	 */
-	public function getName() {
-		return $this->l->t('Sharing');
-	}
+    /**
+     * returns the translated name as it should be displayed, e.g. 'LDAP / AD
+     * integration'. Use the L10N service to translate it.
+     *
+     * @return string
+     * @since 9.1
+     */
+    public function getName() {
+        return $this->l->t('Sharing');
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the settings navigation. The sections are arranged in ascending order of
-	 * the priority values. It is required to return a value between 0 and 99.
-	 *
-	 * E.g.: 70
-	 * @since 9.1
-	 */
-	public function getPriority() {
-		return 15;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the settings navigation. The sections are arranged in ascending order of
+     * the priority values. It is required to return a value between 0 and 99.
+     *
+     * E.g.: 70
+     * @since 9.1
+     */
+    public function getPriority() {
+        return 15;
+    }
 }

apps/encryption/lib/Settings/Personal.php

Indentation +52 added lines, -52 removed lines

@@ -33,63 +33,63 @@
 
 class Personal implements  ISettings {
 
-	/** @var IConfig */
-	private $config;
-	/** @var Session */
-	private $session;
-	/** @var Util */
-	private $util;
-	/** @var IUserSession */
-	private $userSession;
+    /** @var IConfig */
+    private $config;
+    /** @var Session */
+    private $session;
+    /** @var Util */
+    private $util;
+    /** @var IUserSession */
+    private $userSession;
 
-	public function __construct(IConfig $config, Session $session, Util $util, IUserSession $userSession) {
-		$this->config = $config;
-		$this->session = $session;
-		$this->util = $util;
-		$this->userSession = $userSession;
-	}
+    public function __construct(IConfig $config, Session $session, Util $util, IUserSession $userSession) {
+        $this->config = $config;
+        $this->session = $session;
+        $this->util = $util;
+        $this->userSession = $userSession;
+    }
 
-	/**
-	 * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
-	 * @since 9.1
-	 */
-	public function getForm() {
-		$recoveryAdminEnabled = $this->config->getAppValue('encryption', 'recoveryAdminEnabled');
-		$privateKeySet = $this->session->isPrivateKeySet();
+    /**
+     * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
+     * @since 9.1
+     */
+    public function getForm() {
+        $recoveryAdminEnabled = $this->config->getAppValue('encryption', 'recoveryAdminEnabled');
+        $privateKeySet = $this->session->isPrivateKeySet();
 
-		if (!$recoveryAdminEnabled && $privateKeySet) {
-			return new TemplateResponse('settings', 'settings/empty', [], '');
-		}
+        if (!$recoveryAdminEnabled && $privateKeySet) {
+            return new TemplateResponse('settings', 'settings/empty', [], '');
+        }
 
-		$userId = $this->userSession->getUser()->getUID();
-		$recoveryEnabledForUser = $this->util->isRecoveryEnabledForUser($userId);
+        $userId = $this->userSession->getUser()->getUID();
+        $recoveryEnabledForUser = $this->util->isRecoveryEnabledForUser($userId);
 
-		$parameters = [
-			'recoveryEnabled' => $recoveryAdminEnabled,
-			'recoveryEnabledForUser' => $recoveryEnabledForUser,
-			'privateKeySet' => $privateKeySet,
-			'initialized' => $this->session->getStatus(),
-		];
-		return new TemplateResponse('encryption', 'settings-personal', $parameters, '');
-	}
+        $parameters = [
+            'recoveryEnabled' => $recoveryAdminEnabled,
+            'recoveryEnabledForUser' => $recoveryEnabledForUser,
+            'privateKeySet' => $privateKeySet,
+            'initialized' => $this->session->getStatus(),
+        ];
+        return new TemplateResponse('encryption', 'settings-personal', $parameters, '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 * @since 9.1
-	 */
-	public function getSection() {
-		return 'security';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     * @since 9.1
+     */
+    public function getSection() {
+        return 'security';
+    }
 
-	/**
-	 * @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
-	 * @since 9.1
-	 */
-	public function getPriority() {
-		return 80;
-	}
+    /**
+     * @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
+     * @since 9.1
+     */
+    public function getPriority() {
+        return 80;
+    }
 }

apps/admin_audit/lib/Actions/GroupManagement.php

Indentation +64 added lines, -64 removed lines

@@ -38,71 +38,71 @@
  */
 class GroupManagement extends Action {
 
-	/**
-	 * log add user to group event
-	 *
-	 * @param IGroup $group
-	 * @param IUser $user
-	 */
-	public function addUser(IGroup $group, IUser $user) {
-		$this->log('User "%s" added to group "%s"',
-			[
-				'group' => $group->getGID(),
-				'user' => $user->getUID()
-			],
-			[
-				'user', 'group'
-			]
-		);
-	}
+    /**
+     * log add user to group event
+     *
+     * @param IGroup $group
+     * @param IUser $user
+     */
+    public function addUser(IGroup $group, IUser $user) {
+        $this->log('User "%s" added to group "%s"',
+            [
+                'group' => $group->getGID(),
+                'user' => $user->getUID()
+            ],
+            [
+                'user', 'group'
+            ]
+        );
+    }
 
-	/**
-	 * log remove user from group event
-	 *
-	 * @param IGroup $group
-	 * @param IUser $user
-	 */
-	public function removeUser(IGroup $group, IUser $user) {
-		$this->log('User "%s" removed from group "%s"',
-			[
-				'group' => $group->getGID(),
-				'user' => $user->getUID()
-			],
-			[
-				'user', 'group'
-			]
-		);
-	}
+    /**
+     * log remove user from group event
+     *
+     * @param IGroup $group
+     * @param IUser $user
+     */
+    public function removeUser(IGroup $group, IUser $user) {
+        $this->log('User "%s" removed from group "%s"',
+            [
+                'group' => $group->getGID(),
+                'user' => $user->getUID()
+            ],
+            [
+                'user', 'group'
+            ]
+        );
+    }
 	
-	/**
-	 * log create group to group event
-	 *
-	 * @param IGroup $group
-	 */
-	public function createGroup(IGroup $group) {
-		$this->log('Group created: "%s"',
-			[
-				'group' => $group->getGID()
-			],
-			[
-				'group'
-			]
-		);
-	}
+    /**
+     * log create group to group event
+     *
+     * @param IGroup $group
+     */
+    public function createGroup(IGroup $group) {
+        $this->log('Group created: "%s"',
+            [
+                'group' => $group->getGID()
+            ],
+            [
+                'group'
+            ]
+        );
+    }
 
-	/**
-	 * log delete group to group event
-	 *
-	 * @param IGroup $group
-	 */
-	public function deleteGroup(IGroup $group) {
-		$this->log('Group deleted: "%s"',
-			[
-				'group' => $group->getGID()
-			],
-			[
-				'group'
-			]
-		);
-	}
+    /**
+     * log delete group to group event
+     *
+     * @param IGroup $group
+     */
+    public function deleteGroup(IGroup $group) {
+        $this->log('Group deleted: "%s"',
+            [
+                'group' => $group->getGID()
+            ],
+            [
+                'group'
+            ]
+        );
+    }
 }

apps/admin_audit/lib/Actions/Files.php

Indentation +124 added lines, -124 removed lines

@@ -29,137 +29,137 @@
  * @package OCA\AdminAudit\Actions
  */
 class Files extends Action {
-	/**
-	 * Logs file read actions
-	 *
-	 * @param array $params
-	 */
-	public function read(array $params) {
-		$this->log(
-			'File accessed: "%s"',
-			$params,
-			[
-				'path',
-			]
-		);
-	}
+    /**
+     * Logs file read actions
+     *
+     * @param array $params
+     */
+    public function read(array $params) {
+        $this->log(
+            'File accessed: "%s"',
+            $params,
+            [
+                'path',
+            ]
+        );
+    }
 
-	/**
-	 * Logs rename actions of files
-	 *
-	 * @param array $params
-	 */
-	public function rename(array $params) {
-		$this->log(
-			'File renamed: "%s" to "%s"',
-			$params,
-			[
-				'oldpath',
-				'newpath',
-			]
-		);
-	}
+    /**
+     * Logs rename actions of files
+     *
+     * @param array $params
+     */
+    public function rename(array $params) {
+        $this->log(
+            'File renamed: "%s" to "%s"',
+            $params,
+            [
+                'oldpath',
+                'newpath',
+            ]
+        );
+    }
 
-	/**
-	 * Logs creation of files
-	 *
-	 * @param array $params
-	 */
-	public function create(array $params) {
-		if ($params['path'] === '/' || $params['path'] === '' || $params['path'] === null) {
-			return;
-		}
+    /**
+     * Logs creation of files
+     *
+     * @param array $params
+     */
+    public function create(array $params) {
+        if ($params['path'] === '/' || $params['path'] === '' || $params['path'] === null) {
+            return;
+        }
 
-		$this->log(
-			'File created: "%s"',
-			$params,
-			[
-				'path',
-			]
-		);
-	}
+        $this->log(
+            'File created: "%s"',
+            $params,
+            [
+                'path',
+            ]
+        );
+    }
 
-	/**
-	 * Logs copying of files
-	 *
-	 * @param array $params
-	 */
-	public function copy(array $params) {
-		$this->log(
-			'File copied: "%s" to "%s"',
-			$params,
-			[
-				'oldpath',
-				'newpath',
-			]
-		);
-	}
+    /**
+     * Logs copying of files
+     *
+     * @param array $params
+     */
+    public function copy(array $params) {
+        $this->log(
+            'File copied: "%s" to "%s"',
+            $params,
+            [
+                'oldpath',
+                'newpath',
+            ]
+        );
+    }
 
-	/**
-	 * Logs writing of files
-	 *
-	 * @param array $params
-	 */
-	public function write(array $params) {
-		if ($params['path'] === '/' || $params['path'] === '' || $params['path'] === null) {
-			return;
-		}
+    /**
+     * Logs writing of files
+     *
+     * @param array $params
+     */
+    public function write(array $params) {
+        if ($params['path'] === '/' || $params['path'] === '' || $params['path'] === null) {
+            return;
+        }
 
-		$this->log(
-			'File written to: "%s"',
-			$params,
-			[
-				'path',
-			]
-		);
-	}
+        $this->log(
+            'File written to: "%s"',
+            $params,
+            [
+                'path',
+            ]
+        );
+    }
 
-	/**
-	 * Logs update of files
-	 *
-	 * @param array $params
-	 */
-	public function update(array $params) {
-		$this->log(
-			'File updated: "%s"',
-			$params,
-			[
-				'path',
-			]
-		);
-	}
+    /**
+     * Logs update of files
+     *
+     * @param array $params
+     */
+    public function update(array $params) {
+        $this->log(
+            'File updated: "%s"',
+            $params,
+            [
+                'path',
+            ]
+        );
+    }
 
-	/**
-	 * Logs deletions of files
-	 *
-	 * @param array $params
-	 */
-	public function delete(array $params) {
-		$this->log(
-			'File deleted: "%s"',
-			$params,
-			[
-				'path',
-			]
-		);
-	}
+    /**
+     * Logs deletions of files
+     *
+     * @param array $params
+     */
+    public function delete(array $params) {
+        $this->log(
+            'File deleted: "%s"',
+            $params,
+            [
+                'path',
+            ]
+        );
+    }
 
-	/**
-	 * Logs preview access to a file
-	 *
-	 * @param array $params
-	 */
-	public function preview(array $params) {
-		$this->log(
-			'Preview accessed: "%s" (width: "%s", height: "%s" crop: "%s", mode: "%s")',
-			$params,
-			[
-				'path',
-				'width',
-				'height',
-				'crop',
-				'mode'
-			]
-		);
-	}
+    /**
+     * Logs preview access to a file
+     *
+     * @param array $params
+     */
+    public function preview(array $params) {
+        $this->log(
+            'Preview accessed: "%s" (width: "%s", height: "%s" crop: "%s", mode: "%s")',
+            $params,
+            [
+                'path',
+                'width',
+                'height',
+                'crop',
+                'mode'
+            ]
+        );
+    }
 }

apps/admin_audit/lib/Actions/Auth.php

Indentation +27 added lines, -27 removed lines

@@ -29,33 +29,33 @@
  * @package OCA\AdminAudit\Actions
  */
 class Auth extends Action {
-	public function loginAttempt(array $params) {
-		$this->log(
-			'Login attempt: "%s"',
-			$params,
-			[
-				'uid',
-			],
-			true
-		);
-	}
+    public function loginAttempt(array $params) {
+        $this->log(
+            'Login attempt: "%s"',
+            $params,
+            [
+                'uid',
+            ],
+            true
+        );
+    }
 
-	public function loginSuccessful(array $params) {
-		$this->log(
-			'Login successful: "%s"',
-			$params,
-			[
-				'uid',
-			],
-			true
-		);
-	}
+    public function loginSuccessful(array $params) {
+        $this->log(
+            'Login successful: "%s"',
+            $params,
+            [
+                'uid',
+            ],
+            true
+        );
+    }
 
-	public function logout(array $params) {
-		$this->log(
-			'Logout occurred',
-			[],
-			[]
-		);
-	}
+    public function logout(array $params) {
+        $this->log(
+            'Logout occurred',
+            [],
+            []
+        );
+    }
 }

apps/files_external/lib/Settings/PersonalSection.php

Indentation +18 added lines, -18 removed lines

@@ -29,25 +29,25 @@
 use OCP\IUserSession;
 
 class PersonalSection extends Section {
-	/** @var IUserSession */
-	private $userSession;
+    /** @var IUserSession */
+    private $userSession;
 
-	/** @var UserGlobalStoragesService */
-	private $userGlobalStoragesService;
+    /** @var UserGlobalStoragesService */
+    private $userGlobalStoragesService;
 
-	/** @var BackendService */
-	private $backendService;
+    /** @var BackendService */
+    private $backendService;
 
-	public function __construct(
-		IURLGenerator $url,
-		IL10N $l,
-		IUserSession $userSession,
-		UserGlobalStoragesService $userGlobalStoragesService,
-		BackendService $backendService
-	) {
-		parent::__construct($url, $l);
-		$this->userSession = $userSession;
-		$this->userGlobalStoragesService = $userGlobalStoragesService;
-		$this->backendService = $backendService;
-	}
+    public function __construct(
+        IURLGenerator $url,
+        IL10N $l,
+        IUserSession $userSession,
+        UserGlobalStoragesService $userGlobalStoragesService,
+        BackendService $backendService
+    ) {
+        parent::__construct($url, $l);
+        $this->userSession = $userSession;
+        $this->userGlobalStoragesService = $userGlobalStoragesService;
+        $this->backendService = $backendService;
+    }
 }

apps/user_ldap/lib/Controller/RenewPasswordController.php

Indentation +129 added lines, -129 removed lines

@@ -37,144 +37,144 @@
 use OCP\IUserManager;
 
 class RenewPasswordController extends Controller {
-	/** @var IUserManager */
-	private $userManager;
-	/** @var IConfig */
-	private $config;
-	/** @var IL10N */
-	protected $l10n;
-	/** @var ISession */
-	private $session;
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var IConfig */
+    private $config;
+    /** @var IL10N */
+    protected $l10n;
+    /** @var ISession */
+    private $session;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IUserManager $userManager
-	 * @param IConfig $config
-	 * @param IURLGenerator $urlGenerator
-	 */
-	function __construct($appName, IRequest $request, IUserManager $userManager, 
-		IConfig $config, IL10N $l10n, ISession $session, IURLGenerator $urlGenerator) {
-		parent::__construct($appName, $request);
-		$this->userManager = $userManager;
-		$this->config = $config;
-		$this->l10n = $l10n;
-		$this->session = $session;
-		$this->urlGenerator = $urlGenerator;
-	}
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IUserManager $userManager
+     * @param IConfig $config
+     * @param IURLGenerator $urlGenerator
+     */
+    function __construct($appName, IRequest $request, IUserManager $userManager, 
+        IConfig $config, IL10N $l10n, ISession $session, IURLGenerator $urlGenerator) {
+        parent::__construct($appName, $request);
+        $this->userManager = $userManager;
+        $this->config = $config;
+        $this->l10n = $l10n;
+        $this->session = $session;
+        $this->urlGenerator = $urlGenerator;
+    }
 
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @return RedirectResponse
-	 */
-	public function cancel() {
-		return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
-	}
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @return RedirectResponse
+     */
+    public function cancel() {
+        return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
+    }
 
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 * @UseSession
-	 *
-	 * @param string $user
-	 *
-	 * @return TemplateResponse|RedirectResponse
-	 */
-	public function showRenewPasswordForm($user) {
-		if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
-			return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
-		}
-		$parameters = [];
-		$renewPasswordMessages = $this->session->get('renewPasswordMessages');
-		$errors = [];
-		$messages = [];
-		if (is_array($renewPasswordMessages)) {
-			list($errors, $messages) = $renewPasswordMessages;
-		}
-		$this->session->remove('renewPasswordMessages');
-		foreach ($errors as $value) {
-			$parameters[$value] = true;
-		}
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     * @UseSession
+     *
+     * @param string $user
+     *
+     * @return TemplateResponse|RedirectResponse
+     */
+    public function showRenewPasswordForm($user) {
+        if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
+            return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
+        }
+        $parameters = [];
+        $renewPasswordMessages = $this->session->get('renewPasswordMessages');
+        $errors = [];
+        $messages = [];
+        if (is_array($renewPasswordMessages)) {
+            list($errors, $messages) = $renewPasswordMessages;
+        }
+        $this->session->remove('renewPasswordMessages');
+        foreach ($errors as $value) {
+            $parameters[$value] = true;
+        }
 
-		$parameters['messages'] = $messages;
-		$parameters['user'] = $user;
+        $parameters['messages'] = $messages;
+        $parameters['user'] = $user;
 
-		$parameters['canResetPassword'] = true;
-		$parameters['resetPasswordLink'] = $this->config->getSystemValue('lost_password_link', '');
-		if (!$parameters['resetPasswordLink']) {
-			$userObj = $this->userManager->get($user);
-			if ($userObj instanceof IUser) {
-				$parameters['canResetPassword'] = $userObj->canChangePassword();
-			}
-		}
-		$parameters['cancelLink'] = $this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm');
+        $parameters['canResetPassword'] = true;
+        $parameters['resetPasswordLink'] = $this->config->getSystemValue('lost_password_link', '');
+        if (!$parameters['resetPasswordLink']) {
+            $userObj = $this->userManager->get($user);
+            if ($userObj instanceof IUser) {
+                $parameters['canResetPassword'] = $userObj->canChangePassword();
+            }
+        }
+        $parameters['cancelLink'] = $this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm');
 
-		return new TemplateResponse(
-			$this->appName, 'renewpassword', $parameters, 'guest'
-		);
-	}
+        return new TemplateResponse(
+            $this->appName, 'renewpassword', $parameters, 'guest'
+        );
+    }
 
-	/**
-	 * @PublicPage
-	 * @UseSession
-	 *
-	 * @param string $user
-	 * @param string $oldPassword
-	 * @param string $newPassword
-	 *
-	 * @return RedirectResponse
-	 */
-	public function tryRenewPassword($user, $oldPassword, $newPassword) {
-		if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
-			return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
-		}
-		$args = !is_null($user) ? ['user' => $user] : [];
-		$loginResult = $this->userManager->checkPassword($user, $oldPassword);
-		if ($loginResult === false) {
-			$this->session->set('renewPasswordMessages', [
-				['invalidpassword'], []
-			]);
-			return new RedirectResponse($this->urlGenerator->linkToRoute('user_ldap.renewPassword.showRenewPasswordForm', $args));
-		}
+    /**
+     * @PublicPage
+     * @UseSession
+     *
+     * @param string $user
+     * @param string $oldPassword
+     * @param string $newPassword
+     *
+     * @return RedirectResponse
+     */
+    public function tryRenewPassword($user, $oldPassword, $newPassword) {
+        if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
+            return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
+        }
+        $args = !is_null($user) ? ['user' => $user] : [];
+        $loginResult = $this->userManager->checkPassword($user, $oldPassword);
+        if ($loginResult === false) {
+            $this->session->set('renewPasswordMessages', [
+                ['invalidpassword'], []
+            ]);
+            return new RedirectResponse($this->urlGenerator->linkToRoute('user_ldap.renewPassword.showRenewPasswordForm', $args));
+        }
 		
-		try {
-			if (!is_null($newPassword) && \OC_User::setPassword($user, $newPassword)) {
-				$this->session->set('loginMessages', [
-					[], [$this->l10n->t("Please login with the new password")]
-				]);
-				$this->config->setUserValue($user, 'user_ldap', 'needsPasswordReset', 'false');
-				return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args));
-			} else {
-				$this->session->set('renewPasswordMessages', [
-					['internalexception'], []
-				]);
-			}
-		} catch (HintException $e) {
-			$this->session->set('renewPasswordMessages', [
-				[], [$e->getHint()]
-			]);
-		}
+        try {
+            if (!is_null($newPassword) && \OC_User::setPassword($user, $newPassword)) {
+                $this->session->set('loginMessages', [
+                    [], [$this->l10n->t("Please login with the new password")]
+                ]);
+                $this->config->setUserValue($user, 'user_ldap', 'needsPasswordReset', 'false');
+                return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args));
+            } else {
+                $this->session->set('renewPasswordMessages', [
+                    ['internalexception'], []
+                ]);
+            }
+        } catch (HintException $e) {
+            $this->session->set('renewPasswordMessages', [
+                [], [$e->getHint()]
+            ]);
+        }
 
-		return new RedirectResponse($this->urlGenerator->linkToRoute('user_ldap.renewPassword.showRenewPasswordForm', $args));
-	}
+        return new RedirectResponse($this->urlGenerator->linkToRoute('user_ldap.renewPassword.showRenewPasswordForm', $args));
+    }
 
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 * @UseSession
-	 *
-	 * @return RedirectResponse
-	 */
-	public function showLoginFormInvalidPassword($user) {
-		$args = !is_null($user) ? ['user' => $user] : [];
-		$this->session->set('loginMessages', [
-			['invalidpassword'], []
-		]);
-		return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args));
-	}
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     * @UseSession
+     *
+     * @return RedirectResponse
+     */
+    public function showLoginFormInvalidPassword($user) {
+        $args = !is_null($user) ? ['user' => $user] : [];
+        $this->session->set('loginMessages', [
+            ['invalidpassword'], []
+        ]);
+        return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args));
+    }
 
 }

lib/private/Files/Cache/Wrapper/JailPropagator.php

Indentation +14 added lines, -14 removed lines

@@ -26,19 +26,19 @@
 use OC\Files\Storage\Wrapper\Jail;
 
 class JailPropagator extends Propagator {
-	/**
-	 * @var Jail
-	 */
-	protected $storage;
+    /**
+     * @var Jail
+     */
+    protected $storage;
 
-	/**
-	 * @param string $internalPath
-	 * @param int $time
-	 * @param int $sizeDifference
-	 */
-	public function propagateChange($internalPath, $time, $sizeDifference = 0) {
-		/** @var \OC\Files\Storage\Storage $storage */
-		list($storage, $sourceInternalPath) = $this->storage->resolvePath($internalPath);
-		$storage->getPropagator()->propagateChange($sourceInternalPath, $time, $sizeDifference);
-	}
+    /**
+     * @param string $internalPath
+     * @param int $time
+     * @param int $sizeDifference
+     */
+    public function propagateChange($internalPath, $time, $sizeDifference = 0) {
+        /** @var \OC\Files\Storage\Storage $storage */
+        list($storage, $sourceInternalPath) = $this->storage->resolvePath($internalPath);
+        $storage->getPropagator()->propagateChange($sourceInternalPath, $time, $sizeDifference);
+    }
 }