Completed
Pull Request — master (#8259)
by Robin
17:26
created
apps/files_sharing/lib/DeleteOrphanedSharesJob.php 1 patch
Indentation   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -31,36 +31,36 @@
 block discarded – undo
31 31
  */
32 32
 class DeleteOrphanedSharesJob extends TimedJob {
33 33
 
34
-	/**
35
-	 * Default interval in minutes
36
-	 *
37
-	 * @var int $defaultIntervalMin
38
-	 **/
39
-	protected $defaultIntervalMin = 15;
34
+    /**
35
+     * Default interval in minutes
36
+     *
37
+     * @var int $defaultIntervalMin
38
+     **/
39
+    protected $defaultIntervalMin = 15;
40 40
 
41
-	/**
42
-	 * sets the correct interval for this timed job
43
-	 */
44
-	public function __construct(){
45
-		$this->interval = $this->defaultIntervalMin * 60;
46
-	}
41
+    /**
42
+     * sets the correct interval for this timed job
43
+     */
44
+    public function __construct(){
45
+        $this->interval = $this->defaultIntervalMin * 60;
46
+    }
47 47
 
48
-	/**
49
-	 * Makes the background job do its work
50
-	 *
51
-	 * @param array $argument unused argument
52
-	 */
53
-	public function run($argument) {
54
-		$connection = \OC::$server->getDatabaseConnection();
55
-		$logger = \OC::$server->getLogger();
48
+    /**
49
+     * Makes the background job do its work
50
+     *
51
+     * @param array $argument unused argument
52
+     */
53
+    public function run($argument) {
54
+        $connection = \OC::$server->getDatabaseConnection();
55
+        $logger = \OC::$server->getLogger();
56 56
 
57
-		$sql =
58
-			'DELETE FROM `*PREFIX*share` ' .
59
-			'WHERE `item_type` in (\'file\', \'folder\') ' .
60
-			'AND NOT EXISTS (SELECT `fileid` FROM `*PREFIX*filecache` WHERE `file_source` = `fileid`)';
57
+        $sql =
58
+            'DELETE FROM `*PREFIX*share` ' .
59
+            'WHERE `item_type` in (\'file\', \'folder\') ' .
60
+            'AND NOT EXISTS (SELECT `fileid` FROM `*PREFIX*filecache` WHERE `file_source` = `fileid`)';
61 61
 
62
-		$deletedEntries = $connection->executeUpdate($sql);
63
-		$logger->debug("$deletedEntries orphaned share(s) deleted", ['app' => 'DeleteOrphanedSharesJob']);
64
-	}
62
+        $deletedEntries = $connection->executeUpdate($sql);
63
+        $logger->debug("$deletedEntries orphaned share(s) deleted", ['app' => 'DeleteOrphanedSharesJob']);
64
+    }
65 65
 
66 66
 }
Please login to merge, or discard this patch.
apps/files_sharing/public.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -28,9 +28,9 @@
 block discarded – undo
28 28
 $route = isset($_GET['download']) ? 'files_sharing.sharecontroller.downloadShare' : 'files_sharing.sharecontroller.showShare';
29 29
 
30 30
 if($token !== '') {
31
-	OC_Response::redirect($urlGenerator->linkToRoute($route, array('token' => $token)));
31
+    OC_Response::redirect($urlGenerator->linkToRoute($route, array('token' => $token)));
32 32
 } else {
33
-	header('HTTP/1.0 404 Not Found');
34
-	$tmpl = new OCP\Template('', '404', 'guest');
35
-	print_unescaped($tmpl->fetchPage());
33
+    header('HTTP/1.0 404 Not Found');
34
+    $tmpl = new OCP\Template('', '404', 'guest');
35
+    print_unescaped($tmpl->fetchPage());
36 36
 }
Please login to merge, or discard this patch.
apps/provisioning_api/lib/Controller/AppConfigController.php 1 patch
Indentation   +123 added lines, -123 removed lines patch added patch discarded remove patch
@@ -31,127 +31,127 @@
 block discarded – undo
31 31
 
32 32
 class AppConfigController extends OCSController {
33 33
 
34
-	/** @var IConfig */
35
-	protected $config;
36
-
37
-	/** @var IAppConfig */
38
-	protected $appConfig;
39
-
40
-	/**
41
-	 * @param string $appName
42
-	 * @param IRequest $request
43
-	 * @param IConfig $config
44
-	 * @param IAppConfig $appConfig
45
-	 */
46
-	public function __construct($appName,
47
-								IRequest $request,
48
-								IConfig $config,
49
-								IAppConfig $appConfig) {
50
-		parent::__construct($appName, $request);
51
-		$this->config = $config;
52
-		$this->appConfig = $appConfig;
53
-	}
54
-
55
-	/**
56
-	 * @return DataResponse
57
-	 */
58
-	public function getApps() {
59
-		return new DataResponse([
60
-			'data' => $this->appConfig->getApps(),
61
-		]);
62
-	}
63
-
64
-	/**
65
-	 * @param string $app
66
-	 * @return DataResponse
67
-	 */
68
-	public function getKeys($app) {
69
-		try {
70
-			$this->verifyAppId($app);
71
-		} catch (\InvalidArgumentException $e) {
72
-			return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
73
-		}
74
-		return new DataResponse([
75
-			'data' => $this->config->getAppKeys($app),
76
-		]);
77
-	}
78
-
79
-	/**
80
-	 * @param string $app
81
-	 * @param string $key
82
-	 * @param string $defaultValue
83
-	 * @return DataResponse
84
-	 */
85
-	public function getValue($app, $key, $defaultValue = '') {
86
-		try {
87
-			$this->verifyAppId($app);
88
-		} catch (\InvalidArgumentException $e) {
89
-			return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
90
-		}
91
-		return new DataResponse([
92
-			'data' => $this->config->getAppValue($app, $key, $defaultValue),
93
-		]);
94
-	}
95
-
96
-	/**
97
-	 * @PasswordConfirmationRequired
98
-	 * @param string $app
99
-	 * @param string $key
100
-	 * @param string $value
101
-	 * @return DataResponse
102
-	 */
103
-	public function setValue($app, $key, $value) {
104
-		try {
105
-			$this->verifyAppId($app);
106
-			$this->verifyConfigKey($app, $key);
107
-		} catch (\InvalidArgumentException $e) {
108
-			return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
109
-		}
110
-
111
-		$this->config->setAppValue($app, $key, $value);
112
-		return new DataResponse();
113
-	}
114
-
115
-	/**
116
-	 * @PasswordConfirmationRequired
117
-	 * @param string $app
118
-	 * @param string $key
119
-	 * @return DataResponse
120
-	 */
121
-	public function deleteKey($app, $key) {
122
-		try {
123
-			$this->verifyAppId($app);
124
-			$this->verifyConfigKey($app, $key);
125
-		} catch (\InvalidArgumentException $e) {
126
-			return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
127
-		}
128
-
129
-		$this->config->deleteAppValue($app, $key);
130
-		return new DataResponse();
131
-	}
132
-
133
-	/**
134
-	 * @param string $app
135
-	 * @throws \InvalidArgumentException
136
-	 */
137
-	protected function verifyAppId($app) {
138
-		if (\OC_App::cleanAppId($app) !== $app) {
139
-			throw new \InvalidArgumentException('Invalid app id given');
140
-		}
141
-	}
142
-
143
-	/**
144
-	 * @param string $app
145
-	 * @param string $key
146
-	 * @throws \InvalidArgumentException
147
-	 */
148
-	protected function verifyConfigKey($app, $key) {
149
-		if (in_array($key, ['installed_version', 'enabled', 'types'])) {
150
-			throw new \InvalidArgumentException('The given key can not be set');
151
-		}
152
-
153
-		if ($app === 'core' && (strpos($key, 'public_') === 0 || strpos($key, 'remote_') === 0)) {
154
-			throw new \InvalidArgumentException('The given key can not be set');
155
-		}
156
-	}
34
+    /** @var IConfig */
35
+    protected $config;
36
+
37
+    /** @var IAppConfig */
38
+    protected $appConfig;
39
+
40
+    /**
41
+     * @param string $appName
42
+     * @param IRequest $request
43
+     * @param IConfig $config
44
+     * @param IAppConfig $appConfig
45
+     */
46
+    public function __construct($appName,
47
+                                IRequest $request,
48
+                                IConfig $config,
49
+                                IAppConfig $appConfig) {
50
+        parent::__construct($appName, $request);
51
+        $this->config = $config;
52
+        $this->appConfig = $appConfig;
53
+    }
54
+
55
+    /**
56
+     * @return DataResponse
57
+     */
58
+    public function getApps() {
59
+        return new DataResponse([
60
+            'data' => $this->appConfig->getApps(),
61
+        ]);
62
+    }
63
+
64
+    /**
65
+     * @param string $app
66
+     * @return DataResponse
67
+     */
68
+    public function getKeys($app) {
69
+        try {
70
+            $this->verifyAppId($app);
71
+        } catch (\InvalidArgumentException $e) {
72
+            return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
73
+        }
74
+        return new DataResponse([
75
+            'data' => $this->config->getAppKeys($app),
76
+        ]);
77
+    }
78
+
79
+    /**
80
+     * @param string $app
81
+     * @param string $key
82
+     * @param string $defaultValue
83
+     * @return DataResponse
84
+     */
85
+    public function getValue($app, $key, $defaultValue = '') {
86
+        try {
87
+            $this->verifyAppId($app);
88
+        } catch (\InvalidArgumentException $e) {
89
+            return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
90
+        }
91
+        return new DataResponse([
92
+            'data' => $this->config->getAppValue($app, $key, $defaultValue),
93
+        ]);
94
+    }
95
+
96
+    /**
97
+     * @PasswordConfirmationRequired
98
+     * @param string $app
99
+     * @param string $key
100
+     * @param string $value
101
+     * @return DataResponse
102
+     */
103
+    public function setValue($app, $key, $value) {
104
+        try {
105
+            $this->verifyAppId($app);
106
+            $this->verifyConfigKey($app, $key);
107
+        } catch (\InvalidArgumentException $e) {
108
+            return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
109
+        }
110
+
111
+        $this->config->setAppValue($app, $key, $value);
112
+        return new DataResponse();
113
+    }
114
+
115
+    /**
116
+     * @PasswordConfirmationRequired
117
+     * @param string $app
118
+     * @param string $key
119
+     * @return DataResponse
120
+     */
121
+    public function deleteKey($app, $key) {
122
+        try {
123
+            $this->verifyAppId($app);
124
+            $this->verifyConfigKey($app, $key);
125
+        } catch (\InvalidArgumentException $e) {
126
+            return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
127
+        }
128
+
129
+        $this->config->deleteAppValue($app, $key);
130
+        return new DataResponse();
131
+    }
132
+
133
+    /**
134
+     * @param string $app
135
+     * @throws \InvalidArgumentException
136
+     */
137
+    protected function verifyAppId($app) {
138
+        if (\OC_App::cleanAppId($app) !== $app) {
139
+            throw new \InvalidArgumentException('Invalid app id given');
140
+        }
141
+    }
142
+
143
+    /**
144
+     * @param string $app
145
+     * @param string $key
146
+     * @throws \InvalidArgumentException
147
+     */
148
+    protected function verifyConfigKey($app, $key) {
149
+        if (in_array($key, ['installed_version', 'enabled', 'types'])) {
150
+            throw new \InvalidArgumentException('The given key can not be set');
151
+        }
152
+
153
+        if ($app === 'core' && (strpos($key, 'public_') === 0 || strpos($key, 'remote_') === 0)) {
154
+            throw new \InvalidArgumentException('The given key can not be set');
155
+        }
156
+    }
157 157
 }
Please login to merge, or discard this patch.
apps/provisioning_api/lib/Middleware/Exceptions/NotSubAdminException.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 block discarded – undo
5 5
 use OCP\AppFramework\Http;
6 6
 
7 7
 class NotSubAdminException extends \Exception {
8
-	public function __construct() {
9
-		parent::__construct('Logged in user must be at least a sub admin', Http::STATUS_FORBIDDEN);
10
-	}
8
+    public function __construct() {
9
+        parent::__construct('Logged in user must be at least a sub admin', Http::STATUS_FORBIDDEN);
10
+    }
11 11
 }
12 12
\ No newline at end of file
Please login to merge, or discard this patch.
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/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/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.