nextcloud / server

lib/public/Activity/IManager.php

Indentation +258 added lines, -258 removed lines

@@ -39,262 +39,262 @@
  * @since 6.0.0
  */
 interface IManager {
-	/**
-	 * Generates a new IEvent object
-	 *
-	 * Make sure to call at least the following methods before sending it to the
-	 * app with via the publish() method:
-	 *  - setApp()
-	 *  - setType()
-	 *  - setAffectedUser()
-	 *  - setSubject()
-	 *
-	 * @return IEvent
-	 * @since 8.2.0
-	 */
-	public function generateEvent();
-
-	/**
-	 * Publish an event to the activity consumers
-	 *
-	 * Make sure to call at least the following methods before sending an Event:
-	 *  - setApp()
-	 *  - setType()
-	 *  - setAffectedUser()
-	 *  - setSubject()
-	 *
-	 * @param IEvent $event
-	 * @throws \BadMethodCallException if required values have not been set
-	 * @since 8.2.0
-	 */
-	public function publish(IEvent $event);
-
-	/**
-	 * @param string $app           The app where this event is associated with
-	 * @param string $subject       A short description of the event
-	 * @param array  $subjectParams Array with parameters that are filled in the subject
-	 * @param string $message       A longer description of the event
-	 * @param array  $messageParams Array with parameters that are filled in the message
-	 * @param string $file          The file including path where this event is associated with
-	 * @param string $link          A link where this event is associated with
-	 * @param string $affectedUser  Recipient of the activity
-	 * @param string $type          Type of the notification
-	 * @param int    $priority      Priority of the notification
-	 * @since 6.0.0
-	 * @deprecated 8.2.0 Grab an IEvent from generateEvent() instead and use the publish() method
-	 */
-	public function publishActivity($app, $subject, $subjectParams, $message, $messageParams, $file, $link, $affectedUser, $type, $priority);
-
-	/**
-	 * In order to improve lazy loading a closure can be registered which will be called in case
-	 * activity consumers are actually requested
-	 *
-	 * $callable has to return an instance of \OCP\Activity\IConsumer
-	 *
-	 * @param \Closure $callable
-	 * @return void
-	 * @since 6.0.0
-	 */
-	public function registerConsumer(\Closure $callable);
-
-	/**
-	 * In order to improve lazy loading a closure can be registered which will be called in case
-	 * activity consumers are actually requested
-	 *
-	 * $callable has to return an instance of \OCP\Activity\IExtension
-	 *
-	 * @param \Closure $callable
-	 * @return void
-	 * @since 8.0.0
-	 */
-	public function registerExtension(\Closure $callable);
-
-	/**
-	 * @param string $filter Class must implement OCA\Activity\IFilter
-	 * @return void
-	 * @since 11.0.0
-	 */
-	public function registerFilter($filter);
-
-	/**
-	 * @return IFilter[]
-	 * @since 11.0.0
-	 */
-	public function getFilters();
-
-	/**
-	 * @param string $id
-	 * @return IFilter
-	 * @throws \InvalidArgumentException when the filter was not found
-	 * @since 11.0.0
-	 */
-	public function getFilterById($id);
-
-	/**
-	 * @param string $setting Class must implement OCA\Activity\ISetting
-	 * @return void
-	 * @since 11.0.0
-	 */
-	public function registerSetting($setting);
-
-	/**
-	 * @return ISetting[]
-	 * @since 11.0.0
-	 */
-	public function getSettings();
-
-	/**
-	 * @param string $provider Class must implement OCA\Activity\IProvider
-	 * @return void
-	 * @since 11.0.0
-	 */
-	public function registerProvider($provider);
-
-	/**
-	 * @return IProvider[]
-	 * @since 11.0.0
-	 */
-	public function getProviders();
-
-	/**
-	 * @param string $id
-	 * @return ISetting
-	 * @throws \InvalidArgumentException when the setting was not found
-	 * @since 11.0.0
-	 */
-	public function getSettingById($id);
-
-	/**
-	 * Will return additional notification types as specified by other apps
-	 *
-	 * @param string $languageCode
-	 * @return array Array "stringID of the type" => "translated string description for the setting"
-	 * 				or Array "stringID of the type" => [
-	 * 					'desc' => "translated string description for the setting"
-	 * 					'methods' => [\OCP\Activity\IExtension::METHOD_*],
-	 * 				]
-	 * @since 8.0.0 - 8.2.0: Added support to allow limiting notifications to certain methods
-	 * @deprecated 11.0.0 - Use getSettings() instead
-	 */
-	public function getNotificationTypes($languageCode);
-
-	/**
-	 * @param string $method
-	 * @return array
-	 * @since 8.0.0
-	 * @deprecated 11.0.0 - Use getSettings()->isDefaulEnabled<method>() instead
-	 */
-	public function getDefaultTypes($method);
-
-	/**
-	 * @param string $type
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getTypeIcon($type);
-
-	/**
-	 * @param string $type
-	 * @param int $id
-	 * @since 8.2.0
-	 */
-	public function setFormattingObject($type, $id);
-
-	/**
-	 * @return bool
-	 * @since 8.2.0
-	 */
-	public function isFormattingFilteredObject();
-
-	/**
-	 * @param bool $status Set to true, when parsing events should not use SVG icons
-	 * @since 12.0.1
-	 */
-	public function setRequirePNG($status);
-
-	/**
-	 * @return bool
-	 * @since 12.0.1
-	 */
-	public function getRequirePNG();
-
-	/**
-	 * @param string $app
-	 * @param string $text
-	 * @param array $params
-	 * @param boolean $stripPath
-	 * @param boolean $highlightParams
-	 * @param string $languageCode
-	 * @return string|false
-	 * @since 8.0.0
-	 */
-	public function translate($app, $text, $params, $stripPath, $highlightParams, $languageCode);
-
-	/**
-	 * @param string $app
-	 * @param string $text
-	 * @return array|false
-	 * @since 8.0.0
-	 */
-	public function getSpecialParameterList($app, $text);
-
-	/**
-	 * @param array $activity
-	 * @return integer|false
-	 * @since 8.0.0
-	 */
-	public function getGroupParameter($activity);
-
-
-	/**
-	 * Set the user we need to use
-	 *
-	 * @param string|null $currentUserId
-	 * @throws \UnexpectedValueException If the user is invalid
-	 * @since 9.0.1
-	 */
-	public function setCurrentUserId($currentUserId);
-
-	/**
-	 * Get the user we need to use
-	 *
-	 * Either the user is logged in, or we try to get it from the token
-	 *
-	 * @return string
-	 * @throws \UnexpectedValueException If the token is invalid, does not exist or is not unique
-	 * @since 8.1.0
-	 */
-	public function getCurrentUserId();
-
-	/**
-	 * @return array
-	 * @since 8.0.0
-	 * @deprecated 11.0.0 - Use getFilters() instead
-	 */
-	public function getNavigation();
-
-	/**
-	 * @param string $filterValue
-	 * @return boolean
-	 * @since 8.0.0
-	 * @deprecated 11.0.0 - Use getFilterById() instead
-	 */
-	public function isFilterValid($filterValue);
-
-	/**
-	 * @param array $types
-	 * @param string $filter
-	 * @return array
-	 * @since 8.0.0
-	 * @deprecated 11.0.0 - Use getFilterById()->filterTypes() instead
-	 */
-	public function filterNotificationTypes($types, $filter);
-
-	/**
-	 * @param string $filter
-	 * @return array
-	 * @since 8.0.0
-	 * @deprecated 11.0.0 - Use getFilterById() instead
-	 */
-	public function getQueryForFilter($filter);
+    /**
+     * Generates a new IEvent object
+     *
+     * Make sure to call at least the following methods before sending it to the
+     * app with via the publish() method:
+     *  - setApp()
+     *  - setType()
+     *  - setAffectedUser()
+     *  - setSubject()
+     *
+     * @return IEvent
+     * @since 8.2.0
+     */
+    public function generateEvent();
+
+    /**
+     * Publish an event to the activity consumers
+     *
+     * Make sure to call at least the following methods before sending an Event:
+     *  - setApp()
+     *  - setType()
+     *  - setAffectedUser()
+     *  - setSubject()
+     *
+     * @param IEvent $event
+     * @throws \BadMethodCallException if required values have not been set
+     * @since 8.2.0
+     */
+    public function publish(IEvent $event);
+
+    /**
+     * @param string $app           The app where this event is associated with
+     * @param string $subject       A short description of the event
+     * @param array  $subjectParams Array with parameters that are filled in the subject
+     * @param string $message       A longer description of the event
+     * @param array  $messageParams Array with parameters that are filled in the message
+     * @param string $file          The file including path where this event is associated with
+     * @param string $link          A link where this event is associated with
+     * @param string $affectedUser  Recipient of the activity
+     * @param string $type          Type of the notification
+     * @param int    $priority      Priority of the notification
+     * @since 6.0.0
+     * @deprecated 8.2.0 Grab an IEvent from generateEvent() instead and use the publish() method
+     */
+    public function publishActivity($app, $subject, $subjectParams, $message, $messageParams, $file, $link, $affectedUser, $type, $priority);
+
+    /**
+     * In order to improve lazy loading a closure can be registered which will be called in case
+     * activity consumers are actually requested
+     *
+     * $callable has to return an instance of \OCP\Activity\IConsumer
+     *
+     * @param \Closure $callable
+     * @return void
+     * @since 6.0.0
+     */
+    public function registerConsumer(\Closure $callable);
+
+    /**
+     * In order to improve lazy loading a closure can be registered which will be called in case
+     * activity consumers are actually requested
+     *
+     * $callable has to return an instance of \OCP\Activity\IExtension
+     *
+     * @param \Closure $callable
+     * @return void
+     * @since 8.0.0
+     */
+    public function registerExtension(\Closure $callable);
+
+    /**
+     * @param string $filter Class must implement OCA\Activity\IFilter
+     * @return void
+     * @since 11.0.0
+     */
+    public function registerFilter($filter);
+
+    /**
+     * @return IFilter[]
+     * @since 11.0.0
+     */
+    public function getFilters();
+
+    /**
+     * @param string $id
+     * @return IFilter
+     * @throws \InvalidArgumentException when the filter was not found
+     * @since 11.0.0
+     */
+    public function getFilterById($id);
+
+    /**
+     * @param string $setting Class must implement OCA\Activity\ISetting
+     * @return void
+     * @since 11.0.0
+     */
+    public function registerSetting($setting);
+
+    /**
+     * @return ISetting[]
+     * @since 11.0.0
+     */
+    public function getSettings();
+
+    /**
+     * @param string $provider Class must implement OCA\Activity\IProvider
+     * @return void
+     * @since 11.0.0
+     */
+    public function registerProvider($provider);
+
+    /**
+     * @return IProvider[]
+     * @since 11.0.0
+     */
+    public function getProviders();
+
+    /**
+     * @param string $id
+     * @return ISetting
+     * @throws \InvalidArgumentException when the setting was not found
+     * @since 11.0.0
+     */
+    public function getSettingById($id);
+
+    /**
+     * Will return additional notification types as specified by other apps
+     *
+     * @param string $languageCode
+     * @return array Array "stringID of the type" => "translated string description for the setting"
+     * 				or Array "stringID of the type" => [
+     * 					'desc' => "translated string description for the setting"
+     * 					'methods' => [\OCP\Activity\IExtension::METHOD_*],
+     * 				]
+     * @since 8.0.0 - 8.2.0: Added support to allow limiting notifications to certain methods
+     * @deprecated 11.0.0 - Use getSettings() instead
+     */
+    public function getNotificationTypes($languageCode);
+
+    /**
+     * @param string $method
+     * @return array
+     * @since 8.0.0
+     * @deprecated 11.0.0 - Use getSettings()->isDefaulEnabled<method>() instead
+     */
+    public function getDefaultTypes($method);
+
+    /**
+     * @param string $type
+     * @return string
+     * @since 8.0.0
+     */
+    public function getTypeIcon($type);
+
+    /**
+     * @param string $type
+     * @param int $id
+     * @since 8.2.0
+     */
+    public function setFormattingObject($type, $id);
+
+    /**
+     * @return bool
+     * @since 8.2.0
+     */
+    public function isFormattingFilteredObject();
+
+    /**
+     * @param bool $status Set to true, when parsing events should not use SVG icons
+     * @since 12.0.1
+     */
+    public function setRequirePNG($status);
+
+    /**
+     * @return bool
+     * @since 12.0.1
+     */
+    public function getRequirePNG();
+
+    /**
+     * @param string $app
+     * @param string $text
+     * @param array $params
+     * @param boolean $stripPath
+     * @param boolean $highlightParams
+     * @param string $languageCode
+     * @return string|false
+     * @since 8.0.0
+     */
+    public function translate($app, $text, $params, $stripPath, $highlightParams, $languageCode);
+
+    /**
+     * @param string $app
+     * @param string $text
+     * @return array|false
+     * @since 8.0.0
+     */
+    public function getSpecialParameterList($app, $text);
+
+    /**
+     * @param array $activity
+     * @return integer|false
+     * @since 8.0.0
+     */
+    public function getGroupParameter($activity);
+
+
+    /**
+     * Set the user we need to use
+     *
+     * @param string|null $currentUserId
+     * @throws \UnexpectedValueException If the user is invalid
+     * @since 9.0.1
+     */
+    public function setCurrentUserId($currentUserId);
+
+    /**
+     * Get the user we need to use
+     *
+     * Either the user is logged in, or we try to get it from the token
+     *
+     * @return string
+     * @throws \UnexpectedValueException If the token is invalid, does not exist or is not unique
+     * @since 8.1.0
+     */
+    public function getCurrentUserId();
+
+    /**
+     * @return array
+     * @since 8.0.0
+     * @deprecated 11.0.0 - Use getFilters() instead
+     */
+    public function getNavigation();
+
+    /**
+     * @param string $filterValue
+     * @return boolean
+     * @since 8.0.0
+     * @deprecated 11.0.0 - Use getFilterById() instead
+     */
+    public function isFilterValid($filterValue);
+
+    /**
+     * @param array $types
+     * @param string $filter
+     * @return array
+     * @since 8.0.0
+     * @deprecated 11.0.0 - Use getFilterById()->filterTypes() instead
+     */
+    public function filterNotificationTypes($types, $filter);
+
+    /**
+     * @param string $filter
+     * @return array
+     * @since 8.0.0
+     * @deprecated 11.0.0 - Use getFilterById() instead
+     */
+    public function getQueryForFilter($filter);
 }

apps/federatedfilesharing/lib/Settings/Personal.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 	 */
 	public function getForm() {
 		$cloudID = $this->userSession->getUser()->getCloudId();
-		$url = 'https://nextcloud.com/federation#' . $cloudID;
+		$url = 'https://nextcloud.com/federation#'.$cloudID;
 
 		$parameters = [
 			'outgoingServer2serverShareEnabled' => $this->federatedShareProvider->isOutgoingServer2serverShareEnabled(),

Indentation +60 added lines, -60 removed lines

@@ -33,69 +33,69 @@
 
 class Personal implements ISettings {
 
-	/** @var FederatedShareProvider */
-	private $federatedShareProvider;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var IL10N */
-	private $l;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var \OC_Defaults */
-	private $defaults;
+    /** @var FederatedShareProvider */
+    private $federatedShareProvider;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var IL10N */
+    private $l;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var \OC_Defaults */
+    private $defaults;
 
-	public function __construct(
-		FederatedShareProvider $federatedShareProvider, #
-		IUserSession $userSession,
-		IL10N $l,
-		IURLGenerator $urlGenerator,
-		\OC_Defaults $defaults
-	) {
-		$this->federatedShareProvider = $federatedShareProvider;
-		$this->userSession = $userSession;
-		$this->l = $l;
-		$this->urlGenerator = $urlGenerator;
-		$this->defaults = $defaults;
-	}
+    public function __construct(
+        FederatedShareProvider $federatedShareProvider, #
+        IUserSession $userSession,
+        IL10N $l,
+        IURLGenerator $urlGenerator,
+        \OC_Defaults $defaults
+    ) {
+        $this->federatedShareProvider = $federatedShareProvider;
+        $this->userSession = $userSession;
+        $this->l = $l;
+        $this->urlGenerator = $urlGenerator;
+        $this->defaults = $defaults;
+    }
 
-	/**
-	 * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
-	 * @since 9.1
-	 */
-	public function getForm() {
-		$cloudID = $this->userSession->getUser()->getCloudId();
-		$url = 'https://nextcloud.com/federation#' . $cloudID;
+    /**
+     * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
+     * @since 9.1
+     */
+    public function getForm() {
+        $cloudID = $this->userSession->getUser()->getCloudId();
+        $url = 'https://nextcloud.com/federation#' . $cloudID;
 
-		$parameters = [
-			'outgoingServer2serverShareEnabled' => $this->federatedShareProvider->isOutgoingServer2serverShareEnabled(),
-			'message_with_URL' => $this->l->t('Share with me through my #Nextcloud Federated Cloud ID, see %s', [$url]),
-			'message_without_URL' => $this->l->t('Share with me through my #Nextcloud Federated Cloud ID', [$cloudID]),
-			'logoPath' => $this->urlGenerator->imagePath('core', 'logo.svg'),
-			'reference' => $url,
-			'cloudId' => $cloudID,
-			'color' => $this->defaults->getColorPrimary(),
-			'textColor' => "#ffffff",
-		];
-		return new TemplateResponse('federatedfilesharing', 'settings-personal', $parameters, '');
-	}
+        $parameters = [
+            'outgoingServer2serverShareEnabled' => $this->federatedShareProvider->isOutgoingServer2serverShareEnabled(),
+            'message_with_URL' => $this->l->t('Share with me through my #Nextcloud Federated Cloud ID, see %s', [$url]),
+            'message_without_URL' => $this->l->t('Share with me through my #Nextcloud Federated Cloud ID', [$cloudID]),
+            'logoPath' => $this->urlGenerator->imagePath('core', 'logo.svg'),
+            'reference' => $url,
+            'cloudId' => $cloudID,
+            'color' => $this->defaults->getColorPrimary(),
+            'textColor' => "#ffffff",
+        ];
+        return new TemplateResponse('federatedfilesharing', 'settings-personal', $parameters, '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 * @since 9.1
-	 */
-	public function getSection() {
-		return 'sharing';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     * @since 9.1
+     */
+    public function getSection() {
+        return 'sharing';
+    }
 
-	/**
-	 * @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 40;
-	}
+    /**
+     * @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 40;
+    }
 }

settings/templates/settings/empty.php

Indentation +1 added lines, -1 removed lines

@@ -21,5 +21,5 @@
  *
  */
 
-	# used for Personal/Additional settings as fallback for legacy settings
+    # used for Personal/Additional settings as fallback for legacy settings
 ?>

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/twofactor_backupcodes/lib/Settings/Personal.php

Indentation +42 added lines, -42 removed lines

@@ -32,51 +32,51 @@
 
 class Personal implements ISettings {
 
-	/** @var Application */
-	private $app;
-	/** @var BackupCodesProvider */
-	private $provider;
-	/** @var IUserSession */
-	private $userSession;
+    /** @var Application */
+    private $app;
+    /** @var BackupCodesProvider */
+    private $provider;
+    /** @var IUserSession */
+    private $userSession;
 
-	public function __construct(Application $app, BackupCodesProvider $provider, IUserSession $userSession) {
-		$this->app = $app;
-		$this->provider = $provider;
-		$this->userSession = $userSession;
-	}
+    public function __construct(Application $app, BackupCodesProvider $provider, IUserSession $userSession) {
+        $this->app = $app;
+        $this->provider = $provider;
+        $this->userSession = $userSession;
+    }
 
-	/**
-	 * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
-	 * @since 9.1
-	 */
-	public function getForm() {
-		$templateOwner = 'settings';
-		$templateName = 'settings/empty';
-		if ($this->provider->isActive($this->userSession->getUser())) {
-			$templateOwner = $this->app->getContainer()->getAppName();
-			$templateName = 'personal';
-		}
+    /**
+     * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
+     * @since 9.1
+     */
+    public function getForm() {
+        $templateOwner = 'settings';
+        $templateName = 'settings/empty';
+        if ($this->provider->isActive($this->userSession->getUser())) {
+            $templateOwner = $this->app->getContainer()->getAppName();
+            $templateName = 'personal';
+        }
 
-		return new TemplateResponse($templateOwner, $templateName, [], '');
-	}
+        return new TemplateResponse($templateOwner, $templateName, [], '');
+    }
 
-	/**
-	 * @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 40;
-	}
+    /**
+     * @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 40;
+    }
 }

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;
+    }
 }

settings/templates/settings/admin/additional-mail.php

Braces +24 added lines, -6 removed lines

@@ -72,11 +72,17 @@ 
 			</select>
 
 			<label id="mail_smtpsecure_label" for="mail_smtpsecure"
-				<?php if ($_['mail_smtpmode'] !== 'smtp') print_unescaped(' class="hidden"'); ?>>
+				<?php if ($_['mail_smtpmode'] !== 'smtp') {
+    print_unescaped(' class="hidden"');
+}
+?>>
 				<?php p($l->t('Encryption')); ?>
 			</label>
 			<select name="mail_smtpsecure" id="mail_smtpsecure"
-				<?php if ($_['mail_smtpmode'] !== 'smtp') print_unescaped(' class="hidden"'); ?>>
+				<?php if ($_['mail_smtpmode'] !== 'smtp') {
+    print_unescaped(' class="hidden"');
+}
+?>>
 				<?php foreach ($mail_smtpsecure as $secure => $name):
 					$selected = '';
 					if ($secure == $_['mail_smtpsecure']):
@@ -95,7 +101,10 @@ 
 				   value="<?php p($_['mail_domain']) ?>" />
 		</p>
 
-		<p id="setting_smtpauth" <?php if ($_['mail_smtpmode'] !== 'smtp') print_unescaped(' class="hidden"'); ?>>
+		<p id="setting_smtpauth" <?php if ($_['mail_smtpmode'] !== 'smtp') {
+    print_unescaped(' class="hidden"');
+}
+?>>
 			<label for="mail_smtpauthtype"><?php p($l->t('Authentication method')); ?></label>
 			<select name="mail_smtpauthtype" id="mail_smtpauthtype'>
 				<?php foreach ($mail_smtpauthtype as $authtype => $name):
@@ -108,11 +117,17 @@ 
 			</select>
 
 			<input type="checkbox" name="mail_smtpauth" id="mail_smtpauth" class="checkbox" value="1"
-				<?php if ($_['mail_smtpauth']) print_unescaped('checked="checked"'); ?> />
+				<?php if ($_['mail_smtpauth']) {
+    print_unescaped('checked="checked"');
+}
+?> />
 			<label for="mail_smtpauth"><?php p($l->t('Authentication required')); ?></label>
 		</p>
 
-		<p id="setting_smtphost" <?php if ($_['mail_smtpmode'] !== 'smtp') print_unescaped(' class="hidden"'); ?>>
+		<p id="setting_smtphost" <?php if ($_['mail_smtpmode'] !== 'smtp') {
+    print_unescaped(' class="hidden"');
+}
+?>>
 			<label for="mail_smtphost"><?php p($l->t('Server address')); ?></label>
 			<input type="text" name="mail_smtphost" id="mail_smtphost" placeholder="smtp.example.com"
 				   value="<?php p($_['mail_smtphost']) ?>" />
@@ -122,7 +137,10 @@ 
 		</p>
 	</form>
 	<form class="mail_settings" id="mail_credentials_settings">
-		<p id="mail_credentials" <?php if (!$_['mail_smtpauth'] || $_['mail_smtpmode'] !== 'smtp') print_unescaped(' class="hidden"'); ?>>
+		<p id="mail_credentials" <?php if (!$_['mail_smtpauth'] || $_['mail_smtpmode'] !== 'smtp') {
+    print_unescaped(' class="hidden"');
+}
+?>>
 			<label for="mail_smtpname"><?php p($l->t('Credentials')); ?></label>
 			<input type="text" name="mail_smtpname" id="mail_smtpname" placeholder="<?php p($l->t('SMTP Username'))?>"
 				   value="<?php p($_['mail_smtpname']) ?>" />

Spacing +5 added lines, -5 removed lines

@@ -52,9 +52,9 @@ 
 
 <div class="section" id="mail_general_settings">
 	<form id="mail_general_settings_form" class="mail_settings">
-		<h2><?php p($l->t('Email server'));?></h2>
+		<h2><?php p($l->t('Email server')); ?></h2>
 		<a target="_blank" rel="noreferrer noopener" class="icon-info"
-		   title="<?php p($l->t('Open documentation'));?>"
+		   title="<?php p($l->t('Open documentation')); ?>"
 		   href="<?php p(link_to_docs('admin-email')); ?>"></a>
 		<p class="settings-hint"><?php p($l->t('It is important to set up this server to be able to send emails, like for password reset and notifications.')); ?></p>
 		<p><span id="mail_settings_msg" class="msg"></span></p>
@@ -68,7 +68,7 @@ 
 						$selected = 'selected="selected"';
 					endif; ?>
 					<option value="<?php p($smtpmode[0])?>" <?php p($selected) ?>><?php p($smtpmode[1]) ?></option>
-				<?php endforeach;?>
+				<?php endforeach; ?>
 			</select>
 
 			<label id="mail_smtpsecure_label" for="mail_smtpsecure"
@@ -83,7 +83,7 @@ 
 						$selected = 'selected="selected"';
 					endif; ?>
 					<option value="<?php p($secure)?>" <?php p($selected) ?>><?php p($name) ?></option>
-				<?php endforeach;?>
+				<?php endforeach; ?>
 			</select>
 		</p>
 
@@ -104,7 +104,7 @@ 
 						$selected = 'selected="selected"';
 					endif; ?>
 					<option value="<?php p($authtype)?>" <?php p($selected) ?>><?php p($name) ?></option>
-				<?php endforeach;?>
+				<?php endforeach; ?>
 			</select>
 
 			<input type="checkbox" name="mail_smtpauth" id="mail_smtpauth" class="checkbox" value="1"

Indentation +22 added lines, -22 removed lines

@@ -25,26 +25,26 @@ 
 /** @var array $_ */
 
 $mail_smtpauthtype = [
-	''	=> $l->t('None'),
-	'LOGIN'	=> $l->t('Login'),
-	'PLAIN'	=> $l->t('Plain'),
-	'NTLM'	=> $l->t('NT LAN Manager'),
+    ''	=> $l->t('None'),
+    'LOGIN'	=> $l->t('Login'),
+    'PLAIN'	=> $l->t('Plain'),
+    'NTLM'	=> $l->t('NT LAN Manager'),
 ];
 
 $mail_smtpsecure = [
-	''		=> $l->t('None'),
-	'ssl'	=> $l->t('SSL/TLS'),
-	'tls'	=> $l->t('STARTTLS'),
+    ''		=> $l->t('None'),
+    'ssl'	=> $l->t('SSL/TLS'),
+    'tls'	=> $l->t('STARTTLS'),
 ];
 
 $mail_smtpmode = [
-	['smtp', 'SMTP'],
+    ['smtp', 'SMTP'],
 ];
 if ($_['sendmail_is_available']) {
-	$mail_smtpmode[] = ['sendmail', 'Sendmail'];
+    $mail_smtpmode[] = ['sendmail', 'Sendmail'];
 }
 if ($_['mail_smtpmode'] === 'qmail') {
-	$mail_smtpmode[] = ['qmail', 'qmail'];
+    $mail_smtpmode[] = ['qmail', 'qmail'];
 }
 
 ?>
@@ -62,10 +62,10 @@ 
 			<label for="mail_smtpmode"><?php p($l->t('Send mode')); ?></label>
 			<select name="mail_smtpmode" id="mail_smtpmode">
 				<?php foreach ($mail_smtpmode as $smtpmode):
-					$selected = '';
-					if ($smtpmode[0] == $_['mail_smtpmode']):
-						$selected = 'selected="selected"';
-					endif; ?>
+                    $selected = '';
+                    if ($smtpmode[0] == $_['mail_smtpmode']):
+                        $selected = 'selected="selected"';
+                    endif; ?>
 					<option value="<?php p($smtpmode[0])?>" <?php p($selected) ?>><?php p($smtpmode[1]) ?></option>
 				<?php endforeach;?>
 			</select>
@@ -77,10 +77,10 @@ 
 			<select name="mail_smtpsecure" id="mail_smtpsecure"
 				<?php if ($_['mail_smtpmode'] !== 'smtp') print_unescaped(' class="hidden"'); ?>>
 				<?php foreach ($mail_smtpsecure as $secure => $name):
-					$selected = '';
-					if ($secure == $_['mail_smtpsecure']):
-						$selected = 'selected="selected"';
-					endif; ?>
+                    $selected = '';
+                    if ($secure == $_['mail_smtpsecure']):
+                        $selected = 'selected="selected"';
+                    endif; ?>
 					<option value="<?php p($secure)?>" <?php p($selected) ?>><?php p($name) ?></option>
 				<?php endforeach;?>
 			</select>
@@ -98,10 +98,10 @@ 
 			<label for="mail_smtpauthtype"><?php p($l->t('Authentication method')); ?></label>
 			<select name="mail_smtpauthtype" id="mail_smtpauthtype'>
 				<?php foreach ($mail_smtpauthtype as $authtype => $name):
-					$selected = '';
-					if ($authtype == $_['mail_smtpauthtype']):
-						$selected = 'selected="selected"';
-					endif; ?>
+                    $selected = '';
+                    if ($authtype == $_['mail_smtpauthtype']):
+                        $selected = 'selected="selected"';
+                    endif; ?>
 					<option value="<?php p($authtype)?>" <?php p($selected) ?>><?php p($name) ?></option>
 				<?php endforeach;?>
 			</select>

settings/templates/settings/admin/encryption.php

Indentation +9 added lines, -9 removed lines

@@ -57,9 +57,9 @@ 
 	<div id="EncryptionSettingsArea" class="<?php if (!$_['encryptionEnabled']) p('hidden'); ?>">
 		<div id='selectEncryptionModules' class="<?php if (!$_['encryptionReady']) p('hidden'); ?>">
 			<?php
-			if (empty($_['encryptionModules'])) {
-				p($l->t('No encryption module loaded, please enable an encryption module in the app menu.'));
-			} else { ?>
+            if (empty($_['encryptionModules'])) {
+                p($l->t('No encryption module loaded, please enable an encryption module in the app menu.'));
+            } else { ?>
 				<h3><?php p($l->t('Select default encryption module:')) ?></h3>
 				<fieldset id='encryptionModules'>
 					<?php foreach ($_['encryptionModules'] as $id => $module): ?>
@@ -67,8 +67,8 @@ 
 							   name="default_encryption_module"
 							   value="<?php p($id) ?>"
 							<?php if ($module['default']) {
-								p('checked');
-							} ?>>
+                                p('checked');
+                            } ?>>
 						<label
 							for="<?php p($id) ?>"><?php p($module['displayName']) ?></label>
 						<br/>
@@ -78,10 +78,10 @@ 
 		</div>
 		<div id="migrationWarning" class="<?php if ($_['encryptionReady']) p('hidden'); ?>">
 			<?php
-			if ($_['encryptionReady'] === false && $_['externalBackendsEnabled'] === true) {
-				p($l->t('You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the "Default encryption module" and run \'occ encryption:migrate\''));
-			} elseif ($_['encryptionReady'] === false && $_['externalBackendsEnabled'] === false) {
-				p($l->t('You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one.')); ?>
+            if ($_['encryptionReady'] === false && $_['externalBackendsEnabled'] === true) {
+                p($l->t('You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the "Default encryption module" and run \'occ encryption:migrate\''));
+            } elseif ($_['encryptionReady'] === false && $_['externalBackendsEnabled'] === false) {
+                p($l->t('You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one.')); ?>
 				<input type="submit" name="startmigration" id="startmigration"
 					   value="<?php p($l->t('Start migration')); ?>"/>
 			<?php } ?>

Braces +16 added lines, -4 removed lines

@@ -35,7 +35,10 @@ 
 	<p id="enable">
 		<input type="checkbox"
 			   id="enableEncryption" class="checkbox"
-			   value="1" <?php if ($_['encryptionEnabled']) print_unescaped('checked="checked" disabled="disabled"'); ?> />
+			   value="1" <?php if ($_['encryptionEnabled']) {
+    print_unescaped('checked="checked" disabled="disabled"');
+}
+?> />
 		<label
 			for="enableEncryption"><?php p($l->t('Enable server-side encryption')); ?> <span id="startmigration_msg" class="msg"></span> </label><br/>
 	</p>
@@ -54,8 +57,14 @@ 
 																										   value="<?php p($l->t("Enable encryption")); ?>" /></p>
 	</div>
 
-	<div id="EncryptionSettingsArea" class="<?php if (!$_['encryptionEnabled']) p('hidden'); ?>">
-		<div id='selectEncryptionModules' class="<?php if (!$_['encryptionReady']) p('hidden'); ?>">
+	<div id="EncryptionSettingsArea" class="<?php if (!$_['encryptionEnabled']) {
+    p('hidden');
+}
+?>">
+		<div id='selectEncryptionModules' class="<?php if (!$_['encryptionReady']) {
+    p('hidden');
+}
+?>">
 			<?php
 			if (empty($_['encryptionModules'])) {
 				p($l->t('No encryption module loaded, please enable an encryption module in the app menu.'));
@@ -76,7 +85,10 @@ 
 				</fieldset>
 			<?php } ?>
 		</div>
-		<div id="migrationWarning" class="<?php if ($_['encryptionReady']) p('hidden'); ?>">
+		<div id="migrationWarning" class="<?php if ($_['encryptionReady']) {
+    p('hidden');
+}
+?>">
 			<?php
 			if ($_['encryptionReady'] === false && $_['externalBackendsEnabled'] === true) {
 				p($l->t('You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the "Default encryption module" and run \'occ encryption:migrate\''));

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 <div class="section" id='encryptionAPI'>
 	<h2><?php p($l->t('Server-side encryption')); ?></h2>
 	<a target="_blank" rel="noreferrer noopener" class="icon-info"
-	   title="<?php p($l->t('Open documentation'));?>"
+	   title="<?php p($l->t('Open documentation')); ?>"
 	   href="<?php p(link_to_docs('admin-encryption')); ?>"></a>
 	<p class="settings-hint"><?php p($l->t('Server-side encryption makes it possible to encrypt files which are uploaded to this server. This comes with limitations like a performance penalty, so enable this only if needed.')); ?></p>
 	<p id="enable">

apps/files_external/lib/Lib/Auth/PublicKey/RSA.php

Doc Comments +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
 	/**
 	 * Generate a keypair
 	 *
-	 * @param int $keyLenth
+	 * @param integer $keyLength
 	 * @return array ['privatekey' => $privateKey, 'publickey' => $publicKey]
 	 */
 	public function createKey($keyLength) {

Indentation +40 added lines, -40 removed lines

@@ -36,51 +36,51 @@
  */
 class RSA extends AuthMechanism {
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	public function __construct(IL10N $l, IConfig $config) {
-		$this->config = $config;
+    public function __construct(IL10N $l, IConfig $config) {
+        $this->config = $config;
 
-		$this
-			->setIdentifier('publickey::rsa')
-			->setScheme(self::SCHEME_PUBLICKEY)
-			->setText($l->t('RSA public key'))
-			->addParameters([
-				new DefinitionParameter('user', $l->t('Username')),
-				new DefinitionParameter('public_key', $l->t('Public key')),
-				(new DefinitionParameter('private_key', 'private_key'))
-					->setType(DefinitionParameter::VALUE_HIDDEN),
-			])
-			->addCustomJs('public_key')
-		;
-	}
+        $this
+            ->setIdentifier('publickey::rsa')
+            ->setScheme(self::SCHEME_PUBLICKEY)
+            ->setText($l->t('RSA public key'))
+            ->addParameters([
+                new DefinitionParameter('user', $l->t('Username')),
+                new DefinitionParameter('public_key', $l->t('Public key')),
+                (new DefinitionParameter('private_key', 'private_key'))
+                    ->setType(DefinitionParameter::VALUE_HIDDEN),
+            ])
+            ->addCustomJs('public_key')
+        ;
+    }
 
-	public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
-		$auth = new RSACrypt();
-		$auth->setPassword($this->config->getSystemValue('secret', ''));
-		if (!$auth->loadKey($storage->getBackendOption('private_key'))) {
-			throw new \RuntimeException('unable to load private key');
-		}
-		$storage->setBackendOption('public_key_auth', $auth);
-	}
+    public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
+        $auth = new RSACrypt();
+        $auth->setPassword($this->config->getSystemValue('secret', ''));
+        if (!$auth->loadKey($storage->getBackendOption('private_key'))) {
+            throw new \RuntimeException('unable to load private key');
+        }
+        $storage->setBackendOption('public_key_auth', $auth);
+    }
 
-	/**
-	 * Generate a keypair
-	 *
-	 * @param int $keyLenth
-	 * @return array ['privatekey' => $privateKey, 'publickey' => $publicKey]
-	 */
-	public function createKey($keyLength) {
-		$rsa = new RSACrypt();
-		$rsa->setPublicKeyFormat(RSACrypt::PUBLIC_FORMAT_OPENSSH);
-		$rsa->setPassword($this->config->getSystemValue('secret', ''));
+    /**
+     * Generate a keypair
+     *
+     * @param int $keyLenth
+     * @return array ['privatekey' => $privateKey, 'publickey' => $publicKey]
+     */
+    public function createKey($keyLength) {
+        $rsa = new RSACrypt();
+        $rsa->setPublicKeyFormat(RSACrypt::PUBLIC_FORMAT_OPENSSH);
+        $rsa->setPassword($this->config->getSystemValue('secret', ''));
 
-		if ($keyLength !== 1024 && $keyLength !== 2048 && $keyLength !== 4096) {
-			$keyLength = 1024;
-		}
+        if ($keyLength !== 1024 && $keyLength !== 2048 && $keyLength !== 4096) {
+            $keyLength = 1024;
+        }
 
-		return $rsa->createKey($keyLength);
-	}
+        return $rsa->createKey($keyLength);
+    }
 
 }