Completed
Pull Request — master (#6189)
by Maxence
14:32
created
apps/updatenotification/appinfo/routes.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,6 +25,6 @@
 block discarded – undo
25 25
 
26 26
 $application = new Application();
27 27
 $application->registerRoutes($this, ['routes' => [
28
-	['name' => 'Admin#createCredentials', 'url' => '/credentials', 'verb' => 'GET'],
29
-	['name' => 'Admin#setChannel', 'url' => '/channel', 'verb' => 'POST'],
28
+    ['name' => 'Admin#createCredentials', 'url' => '/credentials', 'verb' => 'GET'],
29
+    ['name' => 'Admin#setChannel', 'url' => '/channel', 'verb' => 'POST'],
30 30
 ]]);
Please login to merge, or discard this patch.
apps/updatenotification/appinfo/app.php 1 patch
Indentation   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -23,33 +23,33 @@
 block discarded – undo
23 23
  */
24 24
 
25 25
 if(\OC::$server->getConfig()->getSystemValue('updatechecker', true) === true) {
26
-	$updater = new \OC\Updater\VersionCheck(
27
-		\OC::$server->getHTTPClientService(),
28
-		\OC::$server->getConfig()
29
-	);
30
-	$updateChecker = new \OCA\UpdateNotification\UpdateChecker(
31
-		$updater
32
-	);
26
+    $updater = new \OC\Updater\VersionCheck(
27
+        \OC::$server->getHTTPClientService(),
28
+        \OC::$server->getConfig()
29
+    );
30
+    $updateChecker = new \OCA\UpdateNotification\UpdateChecker(
31
+        $updater
32
+    );
33 33
 
34
-	$userObject = \OC::$server->getUserSession()->getUser();
35
-	if($userObject !== null) {
36
-		if(\OC::$server->getGroupManager()->isAdmin($userObject->getUID()) &&
37
-			!\OC::$server->getAppManager()->isEnabledForUser('notifications')) {
38
-			if($updateChecker->getUpdateState() !== []) {
39
-				\OCP\Util::addScript('updatenotification', 'notification');
40
-				OC_Hook::connect('\OCP\Config', 'js', $updateChecker, 'getJavaScript');
41
-			}
42
-		}
43
-	}
34
+    $userObject = \OC::$server->getUserSession()->getUser();
35
+    if($userObject !== null) {
36
+        if(\OC::$server->getGroupManager()->isAdmin($userObject->getUID()) &&
37
+            !\OC::$server->getAppManager()->isEnabledForUser('notifications')) {
38
+            if($updateChecker->getUpdateState() !== []) {
39
+                \OCP\Util::addScript('updatenotification', 'notification');
40
+                OC_Hook::connect('\OCP\Config', 'js', $updateChecker, 'getJavaScript');
41
+            }
42
+        }
43
+    }
44 44
 
45
-	$manager = \OC::$server->getNotificationManager();
46
-	$manager->registerNotifier(function() use ($manager) {
47
-		return \OC::$server->query(\OCA\UpdateNotification\Notification\Notifier::class);
48
-	}, function() {
49
-		$l = \OC::$server->getL10N('updatenotification');
50
-		return [
51
-			'id' => 'updatenotification',
52
-			'name' => $l->t('Update notifications'),
53
-		];
54
-	});
45
+    $manager = \OC::$server->getNotificationManager();
46
+    $manager->registerNotifier(function() use ($manager) {
47
+        return \OC::$server->query(\OCA\UpdateNotification\Notification\Notifier::class);
48
+    }, function() {
49
+        $l = \OC::$server->getL10N('updatenotification');
50
+        return [
51
+            'id' => 'updatenotification',
52
+            'name' => $l->t('Update notifications'),
53
+        ];
54
+    });
55 55
 }
Please login to merge, or discard this patch.
apps/theming/templates/settings-admin.php 1 patch
Indentation   -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,5 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
-
4 3
  *
5 4
  * @author Bjoern Schiessle <[email protected]>
6 5
  * @author Jan-Christoph Borchardt <[email protected]>
Please login to merge, or discard this patch.
apps/theming/lib/Settings/Section.php 1 patch
Indentation   +46 added lines, -46 removed lines patch added patch discarded remove patch
@@ -28,55 +28,55 @@
 block discarded – undo
28 28
 use OCP\Settings\IIconSection;
29 29
 
30 30
 class Section implements IIconSection {
31
-	/** @var IL10N */
32
-	private $l;
33
-	/** @var IURLGenerator */
34
-	private $url;
31
+    /** @var IL10N */
32
+    private $l;
33
+    /** @var IURLGenerator */
34
+    private $url;
35 35
 
36
-	/**
37
-	 * @param IURLGenerator $url
38
-	 * @param IL10N $l
39
-	 */
40
-	public function __construct(IURLGenerator $url, IL10N $l) {
41
-		$this->url = $url;
42
-		$this->l = $l;
43
-	}
36
+    /**
37
+     * @param IURLGenerator $url
38
+     * @param IL10N $l
39
+     */
40
+    public function __construct(IURLGenerator $url, IL10N $l) {
41
+        $this->url = $url;
42
+        $this->l = $l;
43
+    }
44 44
 
45
-	/**
46
-	 * returns the ID of the section. It is supposed to be a lower case string,
47
-	 * e.g. 'ldap'
48
-	 *
49
-	 * @returns string
50
-	 */
51
-	public function getID() {
52
-		return 'theming';
53
-	}
45
+    /**
46
+     * returns the ID of the section. It is supposed to be a lower case string,
47
+     * e.g. 'ldap'
48
+     *
49
+     * @returns string
50
+     */
51
+    public function getID() {
52
+        return 'theming';
53
+    }
54 54
 
55
-	/**
56
-	 * returns the translated name as it should be displayed, e.g. 'LDAP / AD
57
-	 * integration'. Use the L10N service to translate it.
58
-	 *
59
-	 * @return string
60
-	 */
61
-	public function getName() {
62
-		return $this->l->t('Theming');
63
-	}
55
+    /**
56
+     * returns the translated name as it should be displayed, e.g. 'LDAP / AD
57
+     * integration'. Use the L10N service to translate it.
58
+     *
59
+     * @return string
60
+     */
61
+    public function getName() {
62
+        return $this->l->t('Theming');
63
+    }
64 64
 
65
-	/**
66
-	 * @return int whether the form should be rather on the top or bottom of
67
-	 * the settings navigation. The sections are arranged in ascending order of
68
-	 * the priority values. It is required to return a value between 0 and 99.
69
-	 *
70
-	 * E.g.: 70
71
-	 */
72
-	public function getPriority() {
73
-		return 30;
74
-	}
65
+    /**
66
+     * @return int whether the form should be rather on the top or bottom of
67
+     * the settings navigation. The sections are arranged in ascending order of
68
+     * the priority values. It is required to return a value between 0 and 99.
69
+     *
70
+     * E.g.: 70
71
+     */
72
+    public function getPriority() {
73
+        return 30;
74
+    }
75 75
 
76
-	/**
77
-	 * {@inheritdoc}
78
-	 */
79
-	public function getIcon() {
80
-		return $this->url->imagePath('theming', 'app-dark.svg');
81
-	}
76
+    /**
77
+     * {@inheritdoc}
78
+     */
79
+    public function getIcon() {
80
+        return $this->url->imagePath('theming', 'app-dark.svg');
81
+    }
82 82
 }
Please login to merge, or discard this patch.
apps/theming/appinfo/routes.php 1 patch
Indentation   +53 added lines, -53 removed lines patch added patch discarded remove patch
@@ -25,58 +25,58 @@
 block discarded – undo
25 25
  */
26 26
 
27 27
 return ['routes' => [
28
-	[
29
-		'name' => 'Theming#updateStylesheet',
30
-		'url' => '/ajax/updateStylesheet',
31
-		'verb' => 'POST'
32
-	],
33
-	[
34
-		'name' => 'Theming#undo',
35
-		'url' => '/ajax/undoChanges',
36
-		'verb' => 'POST'
37
-	],
38
-	[
39
-		'name' => 'Theming#updateLogo',
40
-		'url' => '/ajax/updateLogo',
41
-		'verb' => 'POST'
42
-	],
43
-	[
44
-		'name' => 'Theming#getStylesheet',
45
-		'url' => '/styles',
46
-		'verb' => 'GET',
47
-	],
48
-	[
49
-		'name' => 'Theming#getLogo',
50
-		'url' => '/logo',
51
-		'verb' => 'GET',
52
-	],
53
-	[
54
-		'name' => 'Theming#getLoginBackground',
55
-		'url' => '/loginbackground',
56
-		'verb' => 'GET',
57
-	],
58
-	[
59
-		'name' => 'Theming#getJavascript',
60
-		'url' => '/js/theming',
61
-		'verb' => 'GET',
62
-	],
63
-	[
64
-		'name'	=> 'Icon#getFavicon',
65
-		'url' => '/favicon/{app}',
66
-		'verb' => 'GET',
67
-		'defaults' => array('app' => 'core'),
68
-	],
69
-	[
70
-		'name'	=> 'Icon#getTouchIcon',
71
-		'url' => '/icon/{app}',
72
-		'verb' => 'GET',
73
-		'defaults' => array('app' => 'core'),
74
-	],
75
-	[
76
-		'name'	=> 'Icon#getThemedIcon',
77
-		'url' => '/img/{app}/{image}',
78
-		'verb' => 'GET',
79
-		'requirements' => array('image' => '.+')
80
-	],
28
+    [
29
+        'name' => 'Theming#updateStylesheet',
30
+        'url' => '/ajax/updateStylesheet',
31
+        'verb' => 'POST'
32
+    ],
33
+    [
34
+        'name' => 'Theming#undo',
35
+        'url' => '/ajax/undoChanges',
36
+        'verb' => 'POST'
37
+    ],
38
+    [
39
+        'name' => 'Theming#updateLogo',
40
+        'url' => '/ajax/updateLogo',
41
+        'verb' => 'POST'
42
+    ],
43
+    [
44
+        'name' => 'Theming#getStylesheet',
45
+        'url' => '/styles',
46
+        'verb' => 'GET',
47
+    ],
48
+    [
49
+        'name' => 'Theming#getLogo',
50
+        'url' => '/logo',
51
+        'verb' => 'GET',
52
+    ],
53
+    [
54
+        'name' => 'Theming#getLoginBackground',
55
+        'url' => '/loginbackground',
56
+        'verb' => 'GET',
57
+    ],
58
+    [
59
+        'name' => 'Theming#getJavascript',
60
+        'url' => '/js/theming',
61
+        'verb' => 'GET',
62
+    ],
63
+    [
64
+        'name'	=> 'Icon#getFavicon',
65
+        'url' => '/favicon/{app}',
66
+        'verb' => 'GET',
67
+        'defaults' => array('app' => 'core'),
68
+    ],
69
+    [
70
+        'name'	=> 'Icon#getTouchIcon',
71
+        'url' => '/icon/{app}',
72
+        'verb' => 'GET',
73
+        'defaults' => array('app' => 'core'),
74
+    ],
75
+    [
76
+        'name'	=> 'Icon#getThemedIcon',
77
+        'url' => '/img/{app}/{image}',
78
+        'verb' => 'GET',
79
+        'requirements' => array('image' => '.+')
80
+    ],
81 81
 ]];
82 82
 
Please login to merge, or discard this patch.
apps/twofactor_backupcodes/lib/Controller/SettingsController.php 1 patch
Indentation   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -30,46 +30,46 @@
 block discarded – undo
30 30
 
31 31
 class SettingsController extends Controller {
32 32
 
33
-	/** @var BackupCodeStorage */
34
-	private $storage;
33
+    /** @var BackupCodeStorage */
34
+    private $storage;
35 35
 
36
-	/** @var IUserSession */
37
-	private $userSession;
36
+    /** @var IUserSession */
37
+    private $userSession;
38 38
 
39
-	/**
40
-	 * @param string $appName
41
-	 * @param IRequest $request
42
-	 * @param BackupCodeStorage $storage
43
-	 * @param IUserSession $userSession
44
-	 */
45
-	public function __construct($appName, IRequest $request, BackupCodeStorage $storage, IUserSession $userSession) {
46
-		parent::__construct($appName, $request);
47
-		$this->userSession = $userSession;
48
-		$this->storage = $storage;
49
-	}
39
+    /**
40
+     * @param string $appName
41
+     * @param IRequest $request
42
+     * @param BackupCodeStorage $storage
43
+     * @param IUserSession $userSession
44
+     */
45
+    public function __construct($appName, IRequest $request, BackupCodeStorage $storage, IUserSession $userSession) {
46
+        parent::__construct($appName, $request);
47
+        $this->userSession = $userSession;
48
+        $this->storage = $storage;
49
+    }
50 50
 
51
-	/**
52
-	 * @NoAdminRequired
53
-	 * @return JSONResponse
54
-	 */
55
-	public function state() {
56
-		$user = $this->userSession->getUser();
57
-		return $this->storage->getBackupCodesState($user);
58
-	}
51
+    /**
52
+     * @NoAdminRequired
53
+     * @return JSONResponse
54
+     */
55
+    public function state() {
56
+        $user = $this->userSession->getUser();
57
+        return $this->storage->getBackupCodesState($user);
58
+    }
59 59
 
60
-	/**
61
-	 * @NoAdminRequired
62
-	 * @PasswordConfirmationRequired
63
-	 *
64
-	 * @return JSONResponse
65
-	 */
66
-	public function createCodes() {
67
-		$user = $this->userSession->getUser();
68
-		$codes = $this->storage->createCodes($user);
69
-		return new JSONResponse([
70
-			'codes' => $codes,
71
-			'state' => $this->storage->getBackupCodesState($user),
72
-		]);
73
-	}
60
+    /**
61
+     * @NoAdminRequired
62
+     * @PasswordConfirmationRequired
63
+     *
64
+     * @return JSONResponse
65
+     */
66
+    public function createCodes() {
67
+        $user = $this->userSession->getUser();
68
+        $codes = $this->storage->createCodes($user);
69
+        return new JSONResponse([
70
+            'codes' => $codes,
71
+            'state' => $this->storage->getBackupCodesState($user),
72
+        ]);
73
+    }
74 74
 
75 75
 }
Please login to merge, or discard this patch.
apps/twofactor_backupcodes/lib/Db/BackupCode.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -34,13 +34,13 @@
 block discarded – undo
34 34
  */
35 35
 class BackupCode extends Entity {
36 36
 
37
-	/** @var string */
38
-	protected $userId;
37
+    /** @var string */
38
+    protected $userId;
39 39
 
40
-	/** @var string */
41
-	protected $code;
40
+    /** @var string */
41
+    protected $code;
42 42
 
43
-	/** @var int */
44
-	protected $used;
43
+    /** @var int */
44
+    protected $used;
45 45
 
46 46
 }
Please login to merge, or discard this patch.
apps/twofactor_backupcodes/appinfo/routes.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -21,17 +21,17 @@
 block discarded – undo
21 21
  */
22 22
 // @codeCoverageIgnoreStart
23 23
 return [
24
-	'routes' => [
25
-		[
26
-			'name' => 'settings#state',
27
-			'url' => '/settings/state',
28
-			'verb' => 'GET'
29
-		],
30
-		[
31
-			'name' => 'settings#createCodes',
32
-			'url' => '/settings/create',
33
-			'verb' => 'POST'
34
-		],
35
-	]
24
+    'routes' => [
25
+        [
26
+            'name' => 'settings#state',
27
+            'url' => '/settings/state',
28
+            'verb' => 'GET'
29
+        ],
30
+        [
31
+            'name' => 'settings#createCodes',
32
+            'url' => '/settings/create',
33
+            'verb' => 'POST'
34
+        ],
35
+    ]
36 36
 ];
37 37
 // @codeCoverageIgnoreEnd
Please login to merge, or discard this patch.
apps/encryption/templates/altmail.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -4,8 +4,8 @@
 block discarded – undo
4 4
 
5 5
 print_unescaped($l->t("Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n", array($_['password'])));
6 6
 if ( isset($_['expiration']) ) {
7
-	print_unescaped($l->t("The share will expire on %s.", array($_['expiration'])));
8
-	print_unescaped("\n\n");
7
+    print_unescaped($l->t("The share will expire on %s.", array($_['expiration'])));
8
+    print_unescaped("\n\n");
9 9
 }
10 10
 // TRANSLATORS term at the end of a mail
11 11
 p($l->t("Cheers!"));
Please login to merge, or discard this patch.