Completed
Push — master ( d98dea...115e7e )
by Blizzz
37s
created
apps/files_versions/lib/Expiration.php 2 patches
Indentation   +169 added lines, -169 removed lines patch added patch discarded remove patch
@@ -27,173 +27,173 @@
 block discarded – undo
27 27
 
28 28
 class Expiration {
29 29
 
30
-	// how long do we keep files a version if no other value is defined in the config file (unit: days)
31
-	const NO_OBLIGATION = -1;
32
-
33
-	/** @var ITimeFactory */
34
-	private $timeFactory;
35
-
36
-	/** @var string */
37
-	private $retentionObligation;
38
-
39
-	/** @var int */
40
-	private $minAge;
41
-
42
-	/** @var int */
43
-	private $maxAge;
44
-
45
-	/** @var bool */
46
-	private $canPurgeToSaveSpace;
47
-
48
-	public function __construct(IConfig $config,ITimeFactory $timeFactory){
49
-		$this->timeFactory = $timeFactory;
50
-		$this->retentionObligation = $config->getSystemValue('versions_retention_obligation', 'auto');
51
-
52
-		if ($this->retentionObligation !== 'disabled') {
53
-			$this->parseRetentionObligation();
54
-		}
55
-	}
56
-
57
-	/**
58
-	 * Is versions expiration enabled
59
-	 * @return bool
60
-	 */
61
-	public function isEnabled(){
62
-		return $this->retentionObligation !== 'disabled';
63
-	}
64
-
65
-	/**
66
-	 * Is default expiration active
67
-	 */
68
-	public function shouldAutoExpire(){
69
-		return $this->minAge === self::NO_OBLIGATION
70
-				|| $this->maxAge === self::NO_OBLIGATION;
71
-	}
72
-
73
-	/**
74
-	 * Check if given timestamp in expiration range
75
-	 * @param int $timestamp
76
-	 * @param bool $quotaExceeded
77
-	 * @return bool
78
-	 */
79
-	public function isExpired($timestamp, $quotaExceeded = false){
80
-		// No expiration if disabled
81
-		if (!$this->isEnabled()) {
82
-			return false;
83
-		}
84
-
85
-		// Purge to save space (if allowed)
86
-		if ($quotaExceeded && $this->canPurgeToSaveSpace) {
87
-			return true;
88
-		}
89
-
90
-		$time = $this->timeFactory->getTime();
91
-		// Never expire dates in future e.g. misconfiguration or negative time
92
-		// adjustment
93
-		if ($time<$timestamp) {
94
-			return false;
95
-		}
96
-
97
-		// Purge as too old
98
-		if ($this->maxAge !== self::NO_OBLIGATION) {
99
-			$maxTimestamp = $time - ($this->maxAge * 86400);
100
-			$isOlderThanMax = $timestamp < $maxTimestamp;
101
-		} else {
102
-			$isOlderThanMax = false;
103
-		}
104
-
105
-		if ($this->minAge !== self::NO_OBLIGATION) {
106
-			// older than Min obligation and we are running out of quota?
107
-			$minTimestamp = $time - ($this->minAge * 86400);
108
-			$isMinReached = ($timestamp < $minTimestamp) && $quotaExceeded;
109
-		} else {
110
-			$isMinReached = false;
111
-		}
112
-
113
-		return $isOlderThanMax || $isMinReached;
114
-	}
115
-
116
-	/**
117
-	 * Get maximal retention obligation as a timestamp
118
-	 * @return int
119
-	 */
120
-	public function getMaxAgeAsTimestamp(){
121
-		$maxAge = false;
122
-		if ($this->isEnabled() && $this->maxAge !== self::NO_OBLIGATION) {
123
-			$time = $this->timeFactory->getTime();
124
-			$maxAge = $time - ($this->maxAge * 86400);
125
-		}
126
-		return $maxAge;
127
-	}
128
-
129
-	/**
130
-	* Read versions_retention_obligation, validate it 
131
-	* and set private members accordingly
132
-	*/
133
-	private function parseRetentionObligation(){
134
-		$splitValues = explode(',', $this->retentionObligation);
135
-		if (!isset($splitValues[0])) {
136
-			$minValue = 'auto';
137
-		} else {
138
-			$minValue = trim($splitValues[0]);
139
-		}
140
-
141
-		if (!isset($splitValues[1])) {
142
-			$maxValue = 'auto';
143
-		} else {
144
-			$maxValue = trim($splitValues[1]);
145
-		}
146
-
147
-		$isValid = true;
148
-		// Validate
149
-		if (!ctype_digit($minValue) && $minValue !== 'auto') {
150
-			$isValid = false;
151
-			\OC::$server->getLogger()->warning(
152
-					$minValue . ' is not a valid value for minimal versions retention obligation. Check versions_retention_obligation in your config.php. Falling back to auto.',
153
-					['app'=>'files_versions']
154
-			);
155
-		}
156
-
157
-		if (!ctype_digit($maxValue) && $maxValue !== 'auto') {
158
-			$isValid = false;
159
-			\OC::$server->getLogger()->warning(
160
-					$maxValue . ' is not a valid value for maximal versions retention obligation. Check versions_retention_obligation in your config.php. Falling back to auto.',
161
-					['app'=>'files_versions']
162
-			);
163
-		}
164
-
165
-		if (!$isValid){
166
-			$minValue = 'auto';
167
-			$maxValue = 'auto';
168
-		}
169
-
170
-
171
-		if ($minValue === 'auto' && $maxValue === 'auto') {
172
-			// Default: Delete anytime if space needed
173
-			$this->minAge = self::NO_OBLIGATION;
174
-			$this->maxAge = self::NO_OBLIGATION;
175
-			$this->canPurgeToSaveSpace = true;
176
-		} elseif ($minValue !== 'auto' && $maxValue === 'auto') {
177
-			// Keep for X days but delete anytime if space needed
178
-			$this->minAge = intval($minValue);
179
-			$this->maxAge = self::NO_OBLIGATION;
180
-			$this->canPurgeToSaveSpace = true;
181
-		} elseif ($minValue === 'auto' && $maxValue !== 'auto') {
182
-			// Delete anytime if space needed, Delete all older than max automatically
183
-			$this->minAge = self::NO_OBLIGATION;
184
-			$this->maxAge = intval($maxValue);
185
-			$this->canPurgeToSaveSpace = true;
186
-		} elseif ($minValue !== 'auto' && $maxValue !== 'auto') {
187
-			// Delete all older than max OR older than min if space needed
188
-
189
-			// Max < Min as per https://github.com/owncloud/core/issues/16301
190
-			if ($maxValue < $minValue) {
191
-				$maxValue = $minValue;
192
-			}
193
-
194
-			$this->minAge = intval($minValue);
195
-			$this->maxAge = intval($maxValue);
196
-			$this->canPurgeToSaveSpace = false;
197
-		}
198
-	}
30
+    // how long do we keep files a version if no other value is defined in the config file (unit: days)
31
+    const NO_OBLIGATION = -1;
32
+
33
+    /** @var ITimeFactory */
34
+    private $timeFactory;
35
+
36
+    /** @var string */
37
+    private $retentionObligation;
38
+
39
+    /** @var int */
40
+    private $minAge;
41
+
42
+    /** @var int */
43
+    private $maxAge;
44
+
45
+    /** @var bool */
46
+    private $canPurgeToSaveSpace;
47
+
48
+    public function __construct(IConfig $config,ITimeFactory $timeFactory){
49
+        $this->timeFactory = $timeFactory;
50
+        $this->retentionObligation = $config->getSystemValue('versions_retention_obligation', 'auto');
51
+
52
+        if ($this->retentionObligation !== 'disabled') {
53
+            $this->parseRetentionObligation();
54
+        }
55
+    }
56
+
57
+    /**
58
+     * Is versions expiration enabled
59
+     * @return bool
60
+     */
61
+    public function isEnabled(){
62
+        return $this->retentionObligation !== 'disabled';
63
+    }
64
+
65
+    /**
66
+     * Is default expiration active
67
+     */
68
+    public function shouldAutoExpire(){
69
+        return $this->minAge === self::NO_OBLIGATION
70
+                || $this->maxAge === self::NO_OBLIGATION;
71
+    }
72
+
73
+    /**
74
+     * Check if given timestamp in expiration range
75
+     * @param int $timestamp
76
+     * @param bool $quotaExceeded
77
+     * @return bool
78
+     */
79
+    public function isExpired($timestamp, $quotaExceeded = false){
80
+        // No expiration if disabled
81
+        if (!$this->isEnabled()) {
82
+            return false;
83
+        }
84
+
85
+        // Purge to save space (if allowed)
86
+        if ($quotaExceeded && $this->canPurgeToSaveSpace) {
87
+            return true;
88
+        }
89
+
90
+        $time = $this->timeFactory->getTime();
91
+        // Never expire dates in future e.g. misconfiguration or negative time
92
+        // adjustment
93
+        if ($time<$timestamp) {
94
+            return false;
95
+        }
96
+
97
+        // Purge as too old
98
+        if ($this->maxAge !== self::NO_OBLIGATION) {
99
+            $maxTimestamp = $time - ($this->maxAge * 86400);
100
+            $isOlderThanMax = $timestamp < $maxTimestamp;
101
+        } else {
102
+            $isOlderThanMax = false;
103
+        }
104
+
105
+        if ($this->minAge !== self::NO_OBLIGATION) {
106
+            // older than Min obligation and we are running out of quota?
107
+            $minTimestamp = $time - ($this->minAge * 86400);
108
+            $isMinReached = ($timestamp < $minTimestamp) && $quotaExceeded;
109
+        } else {
110
+            $isMinReached = false;
111
+        }
112
+
113
+        return $isOlderThanMax || $isMinReached;
114
+    }
115
+
116
+    /**
117
+     * Get maximal retention obligation as a timestamp
118
+     * @return int
119
+     */
120
+    public function getMaxAgeAsTimestamp(){
121
+        $maxAge = false;
122
+        if ($this->isEnabled() && $this->maxAge !== self::NO_OBLIGATION) {
123
+            $time = $this->timeFactory->getTime();
124
+            $maxAge = $time - ($this->maxAge * 86400);
125
+        }
126
+        return $maxAge;
127
+    }
128
+
129
+    /**
130
+     * Read versions_retention_obligation, validate it 
131
+     * and set private members accordingly
132
+     */
133
+    private function parseRetentionObligation(){
134
+        $splitValues = explode(',', $this->retentionObligation);
135
+        if (!isset($splitValues[0])) {
136
+            $minValue = 'auto';
137
+        } else {
138
+            $minValue = trim($splitValues[0]);
139
+        }
140
+
141
+        if (!isset($splitValues[1])) {
142
+            $maxValue = 'auto';
143
+        } else {
144
+            $maxValue = trim($splitValues[1]);
145
+        }
146
+
147
+        $isValid = true;
148
+        // Validate
149
+        if (!ctype_digit($minValue) && $minValue !== 'auto') {
150
+            $isValid = false;
151
+            \OC::$server->getLogger()->warning(
152
+                    $minValue . ' is not a valid value for minimal versions retention obligation. Check versions_retention_obligation in your config.php. Falling back to auto.',
153
+                    ['app'=>'files_versions']
154
+            );
155
+        }
156
+
157
+        if (!ctype_digit($maxValue) && $maxValue !== 'auto') {
158
+            $isValid = false;
159
+            \OC::$server->getLogger()->warning(
160
+                    $maxValue . ' is not a valid value for maximal versions retention obligation. Check versions_retention_obligation in your config.php. Falling back to auto.',
161
+                    ['app'=>'files_versions']
162
+            );
163
+        }
164
+
165
+        if (!$isValid){
166
+            $minValue = 'auto';
167
+            $maxValue = 'auto';
168
+        }
169
+
170
+
171
+        if ($minValue === 'auto' && $maxValue === 'auto') {
172
+            // Default: Delete anytime if space needed
173
+            $this->minAge = self::NO_OBLIGATION;
174
+            $this->maxAge = self::NO_OBLIGATION;
175
+            $this->canPurgeToSaveSpace = true;
176
+        } elseif ($minValue !== 'auto' && $maxValue === 'auto') {
177
+            // Keep for X days but delete anytime if space needed
178
+            $this->minAge = intval($minValue);
179
+            $this->maxAge = self::NO_OBLIGATION;
180
+            $this->canPurgeToSaveSpace = true;
181
+        } elseif ($minValue === 'auto' && $maxValue !== 'auto') {
182
+            // Delete anytime if space needed, Delete all older than max automatically
183
+            $this->minAge = self::NO_OBLIGATION;
184
+            $this->maxAge = intval($maxValue);
185
+            $this->canPurgeToSaveSpace = true;
186
+        } elseif ($minValue !== 'auto' && $maxValue !== 'auto') {
187
+            // Delete all older than max OR older than min if space needed
188
+
189
+            // Max < Min as per https://github.com/owncloud/core/issues/16301
190
+            if ($maxValue < $minValue) {
191
+                $maxValue = $minValue;
192
+            }
193
+
194
+            $this->minAge = intval($minValue);
195
+            $this->maxAge = intval($maxValue);
196
+            $this->canPurgeToSaveSpace = false;
197
+        }
198
+    }
199 199
 }
Please login to merge, or discard this patch.
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 	/** @var bool */
46 46
 	private $canPurgeToSaveSpace;
47 47
 
48
-	public function __construct(IConfig $config,ITimeFactory $timeFactory){
48
+	public function __construct(IConfig $config, ITimeFactory $timeFactory) {
49 49
 		$this->timeFactory = $timeFactory;
50 50
 		$this->retentionObligation = $config->getSystemValue('versions_retention_obligation', 'auto');
51 51
 
@@ -58,14 +58,14 @@  discard block
 block discarded – undo
58 58
 	 * Is versions expiration enabled
59 59
 	 * @return bool
60 60
 	 */
61
-	public function isEnabled(){
61
+	public function isEnabled() {
62 62
 		return $this->retentionObligation !== 'disabled';
63 63
 	}
64 64
 
65 65
 	/**
66 66
 	 * Is default expiration active
67 67
 	 */
68
-	public function shouldAutoExpire(){
68
+	public function shouldAutoExpire() {
69 69
 		return $this->minAge === self::NO_OBLIGATION
70 70
 				|| $this->maxAge === self::NO_OBLIGATION;
71 71
 	}
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 	 * @param bool $quotaExceeded
77 77
 	 * @return bool
78 78
 	 */
79
-	public function isExpired($timestamp, $quotaExceeded = false){
79
+	public function isExpired($timestamp, $quotaExceeded = false) {
80 80
 		// No expiration if disabled
81 81
 		if (!$this->isEnabled()) {
82 82
 			return false;
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
 		$time = $this->timeFactory->getTime();
91 91
 		// Never expire dates in future e.g. misconfiguration or negative time
92 92
 		// adjustment
93
-		if ($time<$timestamp) {
93
+		if ($time < $timestamp) {
94 94
 			return false;
95 95
 		}
96 96
 
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
 	 * Get maximal retention obligation as a timestamp
118 118
 	 * @return int
119 119
 	 */
120
-	public function getMaxAgeAsTimestamp(){
120
+	public function getMaxAgeAsTimestamp() {
121 121
 		$maxAge = false;
122 122
 		if ($this->isEnabled() && $this->maxAge !== self::NO_OBLIGATION) {
123 123
 			$time = $this->timeFactory->getTime();
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
 	* Read versions_retention_obligation, validate it 
131 131
 	* and set private members accordingly
132 132
 	*/
133
-	private function parseRetentionObligation(){
133
+	private function parseRetentionObligation() {
134 134
 		$splitValues = explode(',', $this->retentionObligation);
135 135
 		if (!isset($splitValues[0])) {
136 136
 			$minValue = 'auto';
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
 		if (!ctype_digit($minValue) && $minValue !== 'auto') {
150 150
 			$isValid = false;
151 151
 			\OC::$server->getLogger()->warning(
152
-					$minValue . ' is not a valid value for minimal versions retention obligation. Check versions_retention_obligation in your config.php. Falling back to auto.',
152
+					$minValue.' is not a valid value for minimal versions retention obligation. Check versions_retention_obligation in your config.php. Falling back to auto.',
153 153
 					['app'=>'files_versions']
154 154
 			);
155 155
 		}
@@ -157,12 +157,12 @@  discard block
 block discarded – undo
157 157
 		if (!ctype_digit($maxValue) && $maxValue !== 'auto') {
158 158
 			$isValid = false;
159 159
 			\OC::$server->getLogger()->warning(
160
-					$maxValue . ' is not a valid value for maximal versions retention obligation. Check versions_retention_obligation in your config.php. Falling back to auto.',
160
+					$maxValue.' is not a valid value for maximal versions retention obligation. Check versions_retention_obligation in your config.php. Falling back to auto.',
161 161
 					['app'=>'files_versions']
162 162
 			);
163 163
 		}
164 164
 
165
-		if (!$isValid){
165
+		if (!$isValid) {
166 166
 			$minValue = 'auto';
167 167
 			$maxValue = 'auto';
168 168
 		}
Please login to merge, or discard this patch.
apps/files_versions/download.php 2 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -32,13 +32,13 @@
 block discarded – undo
32 32
 $revision=(int)$_GET['revision'];
33 33
 
34 34
 try {
35
-	list($uid, $filename) = OCA\Files_Versions\Storage::getUidAndFilename($file);
35
+    list($uid, $filename) = OCA\Files_Versions\Storage::getUidAndFilename($file);
36 36
 } catch(\OCP\Files\NotFoundException $e) {
37
-	header("HTTP/1.1 404 Not Found");
38
-	$tmpl = new OCP\Template('', '404', 'guest');
39
-	$tmpl->assign('file', '');
40
-	$tmpl->printPage();
41
-	exit();
37
+    header("HTTP/1.1 404 Not Found");
38
+    $tmpl = new OCP\Template('', '404', 'guest');
39
+    $tmpl->assign('file', '');
40
+    $tmpl->printPage();
41
+    exit();
42 42
 }
43 43
 
44 44
 $versionName = '/'.$uid.'/files_versions/'.$filename.'.v'.$revision;
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -29,11 +29,11 @@
 block discarded – undo
29 29
 OCP\JSON::checkLoggedIn();
30 30
 
31 31
 $file = $_GET['file'];
32
-$revision=(int)$_GET['revision'];
32
+$revision = (int) $_GET['revision'];
33 33
 
34 34
 try {
35 35
 	list($uid, $filename) = OCA\Files_Versions\Storage::getUidAndFilename($file);
36
-} catch(\OCP\Files\NotFoundException $e) {
36
+} catch (\OCP\Files\NotFoundException $e) {
37 37
 	header("HTTP/1.1 404 Not Found");
38 38
 	$tmpl = new OCP\Template('', '404', 'guest');
39 39
 	$tmpl->assign('file', '');
Please login to merge, or discard this patch.
apps/files_versions/appinfo/routes.php 1 patch
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -31,20 +31,20 @@
 block discarded – undo
31 31
 
32 32
 $application = new Application();
33 33
 $application->registerRoutes($this, [
34
-	'routes' => [
35
-		[
36
-			'name' => 'Preview#getPreview',
37
-			'url' => '/preview',
38
-			'verb' => 'GET',
39
-		],
40
-	],
34
+    'routes' => [
35
+        [
36
+            'name' => 'Preview#getPreview',
37
+            'url' => '/preview',
38
+            'verb' => 'GET',
39
+        ],
40
+    ],
41 41
 ]);
42 42
 
43 43
 /** @var $this \OCP\Route\IRouter */
44 44
 $this->create('files_versions_download', 'download.php')
45
-	->actionInclude('files_versions/download.php');
45
+    ->actionInclude('files_versions/download.php');
46 46
 $this->create('files_versions_ajax_getVersions', 'ajax/getVersions.php')
47
-	->actionInclude('files_versions/ajax/getVersions.php');
47
+    ->actionInclude('files_versions/ajax/getVersions.php');
48 48
 $this->create('files_versions_ajax_rollbackVersion', 'ajax/rollbackVersion.php')
49
-	->actionInclude('files_versions/ajax/rollbackVersion.php');
49
+    ->actionInclude('files_versions/ajax/rollbackVersion.php');
50 50
 
Please login to merge, or discard this patch.
lib/public/Authentication/LoginCredentials/IStore.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -31,14 +31,14 @@
 block discarded – undo
31 31
  */
32 32
 interface IStore {
33 33
 	
34
-	/**
35
-	 * Get login credentials of the currently logged in user
36
-	 *
37
-	 * @since 12
38
-	 *
39
-	 * @throws CredentialsUnavailableException
40
-	 * @return ICredentials the login credentials of the current user
41
-	 */
42
-	public function getLoginCredentials();
34
+    /**
35
+     * Get login credentials of the currently logged in user
36
+     *
37
+     * @since 12
38
+     *
39
+     * @throws CredentialsUnavailableException
40
+     * @return ICredentials the login credentials of the current user
41
+     */
42
+    public function getLoginCredentials();
43 43
 	
44 44
 }
Please login to merge, or discard this patch.
lib/public/Authentication/TwoFactorAuth/IProvider.php 1 patch
Indentation   +55 added lines, -55 removed lines patch added patch discarded remove patch
@@ -30,64 +30,64 @@
 block discarded – undo
30 30
  */
31 31
 interface IProvider {
32 32
 
33
-	/**
34
-	 * Get unique identifier of this 2FA provider
35
-	 *
36
-	 * @since 9.1.0
37
-	 *
38
-	 * @return string
39
-	 */
40
-	public function getId();
33
+    /**
34
+     * Get unique identifier of this 2FA provider
35
+     *
36
+     * @since 9.1.0
37
+     *
38
+     * @return string
39
+     */
40
+    public function getId();
41 41
 
42
-	/**
43
-	 * Get the display name for selecting the 2FA provider
44
-	 *
45
-	 * Example: "Email"
46
-	 *
47
-	 * @since 9.1.0
48
-	 *
49
-	 * @return string
50
-	 */
51
-	public function getDisplayName();
42
+    /**
43
+     * Get the display name for selecting the 2FA provider
44
+     *
45
+     * Example: "Email"
46
+     *
47
+     * @since 9.1.0
48
+     *
49
+     * @return string
50
+     */
51
+    public function getDisplayName();
52 52
 
53
-	/**
54
-	 * Get the description for selecting the 2FA provider
55
-	 *
56
-	 * Example: "Get a token via e-mail"
57
-	 *
58
-	 * @since 9.1.0
59
-	 *
60
-	 * @return string
61
-	 */
62
-	public function getDescription();
53
+    /**
54
+     * Get the description for selecting the 2FA provider
55
+     *
56
+     * Example: "Get a token via e-mail"
57
+     *
58
+     * @since 9.1.0
59
+     *
60
+     * @return string
61
+     */
62
+    public function getDescription();
63 63
 
64
-	/**
65
-	 * Get the template for rending the 2FA provider view
66
-	 *
67
-	 * @since 9.1.0
68
-	 *
69
-	 * @param IUser $user
70
-	 * @return Template
71
-	 */
72
-	public function getTemplate(IUser $user);
64
+    /**
65
+     * Get the template for rending the 2FA provider view
66
+     *
67
+     * @since 9.1.0
68
+     *
69
+     * @param IUser $user
70
+     * @return Template
71
+     */
72
+    public function getTemplate(IUser $user);
73 73
 
74
-	/**
75
-	 * Verify the given challenge
76
-	 *
77
-	 * @since 9.1.0
78
-	 *
79
-	 * @param IUser $user
80
-	 * @param string $challenge
81
-	 */
82
-	public function verifyChallenge(IUser $user, $challenge);
74
+    /**
75
+     * Verify the given challenge
76
+     *
77
+     * @since 9.1.0
78
+     *
79
+     * @param IUser $user
80
+     * @param string $challenge
81
+     */
82
+    public function verifyChallenge(IUser $user, $challenge);
83 83
 
84
-	/**
85
-	 * Decides whether 2FA is enabled for the given user
86
-	 *
87
-	 * @since 9.1.0
88
-	 *
89
-	 * @param IUser $user
90
-	 * @return boolean
91
-	 */
92
-	public function isTwoFactorAuthEnabledForUser(IUser $user);
84
+    /**
85
+     * Decides whether 2FA is enabled for the given user
86
+     *
87
+     * @since 9.1.0
88
+     *
89
+     * @param IUser $user
90
+     * @return boolean
91
+     */
92
+    public function isTwoFactorAuthEnabledForUser(IUser $user);
93 93
 }
Please login to merge, or discard this patch.
lib/public/IHelper.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -38,13 +38,13 @@
 block discarded – undo
38 38
  * @deprecated 8.1.0
39 39
  */
40 40
 interface IHelper {
41
-	/**
42
-	 * Gets the content of an URL by using CURL or a fallback if it is not
43
-	 * installed
44
-	 * @param string $url the url that should be fetched
45
-	 * @return string the content of the webpage
46
-	 * @since 6.0.0
47
-	 * @deprecated 8.1.0 Use \OCP\IServerContainer::getHTTPClientService
48
-	 */
49
-	public function getUrlContent($url);
41
+    /**
42
+     * Gets the content of an URL by using CURL or a fallback if it is not
43
+     * installed
44
+     * @param string $url the url that should be fetched
45
+     * @return string the content of the webpage
46
+     * @since 6.0.0
47
+     * @deprecated 8.1.0 Use \OCP\IServerContainer::getHTTPClientService
48
+     */
49
+    public function getUrlContent($url);
50 50
 }
Please login to merge, or discard this patch.
lib/public/ITagManager.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -46,17 +46,17 @@
 block discarded – undo
46 46
  */
47 47
 interface ITagManager {
48 48
 
49
-	/**
50
-	 * Create a new \OCP\ITags instance and load tags from db for the current user.
51
-	 *
52
-	 * @see \OCP\ITags
53
-	 * @param string $type The type identifier e.g. 'contact' or 'event'.
54
-	 * @param array $defaultTags An array of default tags to be used if none are stored.
55
-	 * @param boolean $includeShared Whether to include tags for items shared with this user by others.
56
-	 * @param string $userId user for which to retrieve the tags, defaults to the currently
57
-	 * logged in user
58
-	 * @return \OCP\ITags
59
-	 * @since 6.0.0 - parameter $includeShared and $userId were added in 8.0.0
60
-	*/
61
-	public function load($type, $defaultTags = array(), $includeShared = false, $userId = null);
49
+    /**
50
+     * Create a new \OCP\ITags instance and load tags from db for the current user.
51
+     *
52
+     * @see \OCP\ITags
53
+     * @param string $type The type identifier e.g. 'contact' or 'event'.
54
+     * @param array $defaultTags An array of default tags to be used if none are stored.
55
+     * @param boolean $includeShared Whether to include tags for items shared with this user by others.
56
+     * @param string $userId user for which to retrieve the tags, defaults to the currently
57
+     * logged in user
58
+     * @return \OCP\ITags
59
+     * @since 6.0.0 - parameter $includeShared and $userId were added in 8.0.0
60
+     */
61
+    public function load($type, $defaultTags = array(), $includeShared = false, $userId = null);
62 62
 }
Please login to merge, or discard this patch.
lib/public/Console/ConsoleEvent.php 1 patch
Indentation   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -32,39 +32,39 @@
 block discarded – undo
32 32
  */
33 33
 class ConsoleEvent extends Event {
34 34
 
35
-	const EVENT_RUN = 'OC\Console\Application::run';
35
+    const EVENT_RUN = 'OC\Console\Application::run';
36 36
 
37
-	/** @var string */
38
-	protected $event;
37
+    /** @var string */
38
+    protected $event;
39 39
 
40
-	/** @var string[] */
41
-	protected $arguments;
40
+    /** @var string[] */
41
+    protected $arguments;
42 42
 
43
-	/**
44
-	 * DispatcherEvent constructor.
45
-	 *
46
-	 * @param string $event
47
-	 * @param string[] $arguments
48
-	 * @since 9.0.0
49
-	 */
50
-	public function __construct($event, array $arguments) {
51
-		$this->event = $event;
52
-		$this->arguments = $arguments;
53
-	}
43
+    /**
44
+     * DispatcherEvent constructor.
45
+     *
46
+     * @param string $event
47
+     * @param string[] $arguments
48
+     * @since 9.0.0
49
+     */
50
+    public function __construct($event, array $arguments) {
51
+        $this->event = $event;
52
+        $this->arguments = $arguments;
53
+    }
54 54
 
55
-	/**
56
-	 * @return string
57
-	 * @since 9.0.0
58
-	 */
59
-	public function getEvent() {
60
-		return $this->event;
61
-	}
55
+    /**
56
+     * @return string
57
+     * @since 9.0.0
58
+     */
59
+    public function getEvent() {
60
+        return $this->event;
61
+    }
62 62
 
63
-	/**
64
-	 * @return string[]
65
-	 * @since 9.0.0
66
-	 */
67
-	public function getArguments() {
68
-		return $this->arguments;
69
-	}
63
+    /**
64
+     * @return string[]
65
+     * @since 9.0.0
66
+     */
67
+    public function getArguments() {
68
+        return $this->arguments;
69
+    }
70 70
 }
Please login to merge, or discard this patch.
lib/public/IDBConnection.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@
 block discarded – undo
59 59
 	 * @return \Doctrine\DBAL\Driver\Statement The prepared statement.
60 60
 	 * @since 6.0.0
61 61
 	 */
62
-	public function prepare($sql, $limit=null, $offset=null);
62
+	public function prepare($sql, $limit = null, $offset = null);
63 63
 
64 64
 	/**
65 65
 	 * Executes an, optionally parameterized, SQL query.
Please login to merge, or discard this patch.
Indentation   +207 added lines, -207 removed lines patch added patch discarded remove patch
@@ -44,236 +44,236 @@
 block discarded – undo
44 44
  * @since 6.0.0
45 45
  */
46 46
 interface IDBConnection {
47
-	/**
48
-	 * Gets the QueryBuilder for the connection.
49
-	 *
50
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder
51
-	 * @since 8.2.0
52
-	 */
53
-	public function getQueryBuilder();
47
+    /**
48
+     * Gets the QueryBuilder for the connection.
49
+     *
50
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder
51
+     * @since 8.2.0
52
+     */
53
+    public function getQueryBuilder();
54 54
 
55
-	/**
56
-	 * Used to abstract the ownCloud database access away
57
-	 * @param string $sql the sql query with ? placeholder for params
58
-	 * @param int $limit the maximum number of rows
59
-	 * @param int $offset from which row we want to start
60
-	 * @return \Doctrine\DBAL\Driver\Statement The prepared statement.
61
-	 * @since 6.0.0
62
-	 */
63
-	public function prepare($sql, $limit=null, $offset=null);
55
+    /**
56
+     * Used to abstract the ownCloud database access away
57
+     * @param string $sql the sql query with ? placeholder for params
58
+     * @param int $limit the maximum number of rows
59
+     * @param int $offset from which row we want to start
60
+     * @return \Doctrine\DBAL\Driver\Statement The prepared statement.
61
+     * @since 6.0.0
62
+     */
63
+    public function prepare($sql, $limit=null, $offset=null);
64 64
 
65
-	/**
66
-	 * Executes an, optionally parameterized, SQL query.
67
-	 *
68
-	 * If the query is parameterized, a prepared statement is used.
69
-	 * If an SQLLogger is configured, the execution is logged.
70
-	 *
71
-	 * @param string $query The SQL query to execute.
72
-	 * @param string[] $params The parameters to bind to the query, if any.
73
-	 * @param array $types The types the previous parameters are in.
74
-	 * @return \Doctrine\DBAL\Driver\Statement The executed statement.
75
-	 * @since 8.0.0
76
-	 */
77
-	public function executeQuery($query, array $params = array(), $types = array());
65
+    /**
66
+     * Executes an, optionally parameterized, SQL query.
67
+     *
68
+     * If the query is parameterized, a prepared statement is used.
69
+     * If an SQLLogger is configured, the execution is logged.
70
+     *
71
+     * @param string $query The SQL query to execute.
72
+     * @param string[] $params The parameters to bind to the query, if any.
73
+     * @param array $types The types the previous parameters are in.
74
+     * @return \Doctrine\DBAL\Driver\Statement The executed statement.
75
+     * @since 8.0.0
76
+     */
77
+    public function executeQuery($query, array $params = array(), $types = array());
78 78
 
79
-	/**
80
-	 * Executes an SQL INSERT/UPDATE/DELETE query with the given parameters
81
-	 * and returns the number of affected rows.
82
-	 *
83
-	 * This method supports PDO binding types as well as DBAL mapping types.
84
-	 *
85
-	 * @param string $query The SQL query.
86
-	 * @param array $params The query parameters.
87
-	 * @param array $types The parameter types.
88
-	 * @return integer The number of affected rows.
89
-	 * @since 8.0.0
90
-	 */
91
-	public function executeUpdate($query, array $params = array(), array $types = array());
79
+    /**
80
+     * Executes an SQL INSERT/UPDATE/DELETE query with the given parameters
81
+     * and returns the number of affected rows.
82
+     *
83
+     * This method supports PDO binding types as well as DBAL mapping types.
84
+     *
85
+     * @param string $query The SQL query.
86
+     * @param array $params The query parameters.
87
+     * @param array $types The parameter types.
88
+     * @return integer The number of affected rows.
89
+     * @since 8.0.0
90
+     */
91
+    public function executeUpdate($query, array $params = array(), array $types = array());
92 92
 
93
-	/**
94
-	 * Used to get the id of the just inserted element
95
-	 * @param string $table the name of the table where we inserted the item
96
-	 * @return int the id of the inserted element
97
-	 * @since 6.0.0
98
-	 */
99
-	public function lastInsertId($table = null);
93
+    /**
94
+     * Used to get the id of the just inserted element
95
+     * @param string $table the name of the table where we inserted the item
96
+     * @return int the id of the inserted element
97
+     * @since 6.0.0
98
+     */
99
+    public function lastInsertId($table = null);
100 100
 
101
-	/**
102
-	 * Insert a row if the matching row does not exists.
103
-	 *
104
-	 * @param string $table The table name (will replace *PREFIX* with the actual prefix)
105
-	 * @param array $input data that should be inserted into the table  (column name => value)
106
-	 * @param array|null $compare List of values that should be checked for "if not exists"
107
-	 *				If this is null or an empty array, all keys of $input will be compared
108
-	 *				Please note: text fields (clob) must not be used in the compare array
109
-	 * @return int number of inserted rows
110
-	 * @throws \Doctrine\DBAL\DBALException
111
-	 * @since 6.0.0 - parameter $compare was added in 8.1.0, return type changed from boolean in 8.1.0
112
-	 */
113
-	public function insertIfNotExist($table, $input, array $compare = null);
101
+    /**
102
+     * Insert a row if the matching row does not exists.
103
+     *
104
+     * @param string $table The table name (will replace *PREFIX* with the actual prefix)
105
+     * @param array $input data that should be inserted into the table  (column name => value)
106
+     * @param array|null $compare List of values that should be checked for "if not exists"
107
+     *				If this is null or an empty array, all keys of $input will be compared
108
+     *				Please note: text fields (clob) must not be used in the compare array
109
+     * @return int number of inserted rows
110
+     * @throws \Doctrine\DBAL\DBALException
111
+     * @since 6.0.0 - parameter $compare was added in 8.1.0, return type changed from boolean in 8.1.0
112
+     */
113
+    public function insertIfNotExist($table, $input, array $compare = null);
114 114
 
115
-	/**
116
-	 * Insert or update a row value
117
-	 *
118
-	 * @param string $table
119
-	 * @param array $keys (column name => value)
120
-	 * @param array $values (column name => value)
121
-	 * @param array $updatePreconditionValues ensure values match preconditions (column name => value)
122
-	 * @return int number of new rows
123
-	 * @throws \Doctrine\DBAL\DBALException
124
-	 * @throws PreconditionNotMetException
125
-	 * @since 9.0.0
126
-	 */
127
-	public function setValues($table, array $keys, array $values, array $updatePreconditionValues = []);
115
+    /**
116
+     * Insert or update a row value
117
+     *
118
+     * @param string $table
119
+     * @param array $keys (column name => value)
120
+     * @param array $values (column name => value)
121
+     * @param array $updatePreconditionValues ensure values match preconditions (column name => value)
122
+     * @return int number of new rows
123
+     * @throws \Doctrine\DBAL\DBALException
124
+     * @throws PreconditionNotMetException
125
+     * @since 9.0.0
126
+     */
127
+    public function setValues($table, array $keys, array $values, array $updatePreconditionValues = []);
128 128
 
129
-	/**
130
-	 * Create an exclusive read+write lock on a table
131
-	 *
132
-	 * Important Note: Due to the nature how locks work on different DBs, it is
133
-	 * only possible to lock one table at a time. You should also NOT start a
134
-	 * transaction while holding a lock.
135
-	 *
136
-	 * @param string $tableName
137
-	 * @since 9.1.0
138
-	 */
139
-	public function lockTable($tableName);
129
+    /**
130
+     * Create an exclusive read+write lock on a table
131
+     *
132
+     * Important Note: Due to the nature how locks work on different DBs, it is
133
+     * only possible to lock one table at a time. You should also NOT start a
134
+     * transaction while holding a lock.
135
+     *
136
+     * @param string $tableName
137
+     * @since 9.1.0
138
+     */
139
+    public function lockTable($tableName);
140 140
 
141
-	/**
142
-	 * Release a previous acquired lock again
143
-	 *
144
-	 * @since 9.1.0
145
-	 */
146
-	public function unlockTable();
141
+    /**
142
+     * Release a previous acquired lock again
143
+     *
144
+     * @since 9.1.0
145
+     */
146
+    public function unlockTable();
147 147
 
148
-	/**
149
-	 * Start a transaction
150
-	 * @since 6.0.0
151
-	 */
152
-	public function beginTransaction();
148
+    /**
149
+     * Start a transaction
150
+     * @since 6.0.0
151
+     */
152
+    public function beginTransaction();
153 153
 
154
-	/**
155
-	 * Check if a transaction is active
156
-	 *
157
-	 * @return bool
158
-	 * @since 8.2.0
159
-	 */
160
-	public function inTransaction();
154
+    /**
155
+     * Check if a transaction is active
156
+     *
157
+     * @return bool
158
+     * @since 8.2.0
159
+     */
160
+    public function inTransaction();
161 161
 
162
-	/**
163
-	 * Commit the database changes done during a transaction that is in progress
164
-	 * @since 6.0.0
165
-	 */
166
-	public function commit();
162
+    /**
163
+     * Commit the database changes done during a transaction that is in progress
164
+     * @since 6.0.0
165
+     */
166
+    public function commit();
167 167
 
168
-	/**
169
-	 * Rollback the database changes done during a transaction that is in progress
170
-	 * @since 6.0.0
171
-	 */
172
-	public function rollBack();
168
+    /**
169
+     * Rollback the database changes done during a transaction that is in progress
170
+     * @since 6.0.0
171
+     */
172
+    public function rollBack();
173 173
 
174
-	/**
175
-	 * Gets the error code and message as a string for logging
176
-	 * @return string
177
-	 * @since 6.0.0
178
-	 */
179
-	public function getError();
174
+    /**
175
+     * Gets the error code and message as a string for logging
176
+     * @return string
177
+     * @since 6.0.0
178
+     */
179
+    public function getError();
180 180
 
181
-	/**
182
-	 * Fetch the SQLSTATE associated with the last database operation.
183
-	 *
184
-	 * @return integer The last error code.
185
-	 * @since 8.0.0
186
-	 */
187
-	public function errorCode();
181
+    /**
182
+     * Fetch the SQLSTATE associated with the last database operation.
183
+     *
184
+     * @return integer The last error code.
185
+     * @since 8.0.0
186
+     */
187
+    public function errorCode();
188 188
 
189
-	/**
190
-	 * Fetch extended error information associated with the last database operation.
191
-	 *
192
-	 * @return array The last error information.
193
-	 * @since 8.0.0
194
-	 */
195
-	public function errorInfo();
189
+    /**
190
+     * Fetch extended error information associated with the last database operation.
191
+     *
192
+     * @return array The last error information.
193
+     * @since 8.0.0
194
+     */
195
+    public function errorInfo();
196 196
 
197
-	/**
198
-	 * Establishes the connection with the database.
199
-	 *
200
-	 * @return bool
201
-	 * @since 8.0.0
202
-	 */
203
-	public function connect();
197
+    /**
198
+     * Establishes the connection with the database.
199
+     *
200
+     * @return bool
201
+     * @since 8.0.0
202
+     */
203
+    public function connect();
204 204
 
205
-	/**
206
-	 * Close the database connection
207
-	 * @since 8.0.0
208
-	 */
209
-	public function close();
205
+    /**
206
+     * Close the database connection
207
+     * @since 8.0.0
208
+     */
209
+    public function close();
210 210
 
211
-	/**
212
-	 * Quotes a given input parameter.
213
-	 *
214
-	 * @param mixed $input Parameter to be quoted.
215
-	 * @param int $type Type of the parameter.
216
-	 * @return string The quoted parameter.
217
-	 * @since 8.0.0
218
-	 */
219
-	public function quote($input, $type = IQueryBuilder::PARAM_STR);
211
+    /**
212
+     * Quotes a given input parameter.
213
+     *
214
+     * @param mixed $input Parameter to be quoted.
215
+     * @param int $type Type of the parameter.
216
+     * @return string The quoted parameter.
217
+     * @since 8.0.0
218
+     */
219
+    public function quote($input, $type = IQueryBuilder::PARAM_STR);
220 220
 
221
-	/**
222
-	 * Gets the DatabasePlatform instance that provides all the metadata about
223
-	 * the platform this driver connects to.
224
-	 *
225
-	 * @return \Doctrine\DBAL\Platforms\AbstractPlatform The database platform.
226
-	 * @since 8.0.0
227
-	 */
228
-	public function getDatabasePlatform();
221
+    /**
222
+     * Gets the DatabasePlatform instance that provides all the metadata about
223
+     * the platform this driver connects to.
224
+     *
225
+     * @return \Doctrine\DBAL\Platforms\AbstractPlatform The database platform.
226
+     * @since 8.0.0
227
+     */
228
+    public function getDatabasePlatform();
229 229
 
230
-	/**
231
-	 * Drop a table from the database if it exists
232
-	 *
233
-	 * @param string $table table name without the prefix
234
-	 * @since 8.0.0
235
-	 */
236
-	public function dropTable($table);
230
+    /**
231
+     * Drop a table from the database if it exists
232
+     *
233
+     * @param string $table table name without the prefix
234
+     * @since 8.0.0
235
+     */
236
+    public function dropTable($table);
237 237
 
238
-	/**
239
-	 * Check if a table exists
240
-	 *
241
-	 * @param string $table table name without the prefix
242
-	 * @return bool
243
-	 * @since 8.0.0
244
-	 */
245
-	public function tableExists($table);
238
+    /**
239
+     * Check if a table exists
240
+     *
241
+     * @param string $table table name without the prefix
242
+     * @return bool
243
+     * @since 8.0.0
244
+     */
245
+    public function tableExists($table);
246 246
 
247
-	/**
248
-	 * Escape a parameter to be used in a LIKE query
249
-	 *
250
-	 * @param string $param
251
-	 * @return string
252
-	 * @since 9.0.0
253
-	 */
254
-	public function escapeLikeParameter($param);
247
+    /**
248
+     * Escape a parameter to be used in a LIKE query
249
+     *
250
+     * @param string $param
251
+     * @return string
252
+     * @since 9.0.0
253
+     */
254
+    public function escapeLikeParameter($param);
255 255
 
256
-	/**
257
-	 * Check whether or not the current database support 4byte wide unicode
258
-	 *
259
-	 * @return bool
260
-	 * @since 11.0.0
261
-	 */
262
-	public function supports4ByteText();
256
+    /**
257
+     * Check whether or not the current database support 4byte wide unicode
258
+     *
259
+     * @return bool
260
+     * @since 11.0.0
261
+     */
262
+    public function supports4ByteText();
263 263
 
264
-	/**
265
-	 * Create the schema of the connected database
266
-	 *
267
-	 * @return Schema
268
-	 * @since 13.0.0
269
-	 */
270
-	public function createSchema();
264
+    /**
265
+     * Create the schema of the connected database
266
+     *
267
+     * @return Schema
268
+     * @since 13.0.0
269
+     */
270
+    public function createSchema();
271 271
 
272
-	/**
273
-	 * Migrate the database to the given schema
274
-	 *
275
-	 * @param Schema $toSchema
276
-	 * @since 13.0.0
277
-	 */
278
-	public function migrateToSchema(Schema $toSchema);
272
+    /**
273
+     * Migrate the database to the given schema
274
+     *
275
+     * @param Schema $toSchema
276
+     * @since 13.0.0
277
+     */
278
+    public function migrateToSchema(Schema $toSchema);
279 279
 }
Please login to merge, or discard this patch.