Completed
Push — stable13 ( f62775...bea70d )
by Roeland
12:09
created
apps/files_versions/ajax/rollbackVersion.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -30,12 +30,12 @@
 block discarded – undo
30 30
 OCP\JSON::checkAppEnabled('files_versions');
31 31
 OCP\JSON::callCheck();
32 32
 
33
-$file = (string)$_GET['file'];
34
-$revision=(int)$_GET['revision'];
33
+$file = (string) $_GET['file'];
34
+$revision = (int) $_GET['revision'];
35 35
 
36
-if(OCA\Files_Versions\Storage::rollback( $file, $revision )) {
37
-	OCP\JSON::success(array("data" => array( "revision" => $revision, "file" => $file )));
38
-}else{
36
+if (OCA\Files_Versions\Storage::rollback($file, $revision)) {
37
+	OCP\JSON::success(array("data" => array("revision" => $revision, "file" => $file)));
38
+} else {
39 39
 	$l = \OC::$server->getL10N('files_versions');
40
-	OCP\JSON::error(array("data" => array( "message" => $l->t("Could not revert: %s", array($file) ))));
40
+	OCP\JSON::error(array("data" => array("message" => $l->t("Could not revert: %s", array($file)))));
41 41
 }
Please login to merge, or discard this patch.
apps/files_versions/lib/Controller/PreviewController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@
 block discarded – undo
78 78
 		$y = 44,
79 79
 		$version = ''
80 80
 	) {
81
-		if($file === '' || $version === '' || $x === 0 || $y === 0) {
81
+		if ($file === '' || $version === '' || $x === 0 || $y === 0) {
82 82
 			return new DataResponse([], Http::STATUS_BAD_REQUEST);
83 83
 		}
84 84
 
Please login to merge, or discard this patch.
apps/files_versions/lib/Command/ExpireVersions.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -115,7 +115,7 @@
 block discarded – undo
115 115
 		\OC_Util::setupFS($user);
116 116
 
117 117
 		// Check if this user has a version directory
118
-		$view = new \OC\Files\View('/' . $user);
118
+		$view = new \OC\Files\View('/'.$user);
119 119
 		if (!$view->is_dir('/files_versions')) {
120 120
 			return false;
121 121
 		}
Please login to merge, or discard this patch.
apps/files_versions/lib/Command/CleanUp.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -107,8 +107,8 @@
 block discarded – undo
107 107
 	protected function deleteVersions($user) {
108 108
 		\OC_Util::tearDownFS();
109 109
 		\OC_Util::setupFS($user);
110
-		if ($this->rootFolder->nodeExists('/' . $user . '/files_versions')) {
111
-			$this->rootFolder->get('/' . $user . '/files_versions')->delete();
110
+		if ($this->rootFolder->nodeExists('/'.$user.'/files_versions')) {
111
+			$this->rootFolder->get('/'.$user.'/files_versions')->delete();
112 112
 		}
113 113
 	}
114 114
 
Please login to merge, or discard this patch.
apps/files_versions/lib/BackgroundJob/ExpireVersions.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@
 block discarded – undo
86 86
 		\OC_Util::setupFS($user);
87 87
 
88 88
 		// Check if this user has a versions directory
89
-		$view = new \OC\Files\View('/' . $user);
89
+		$view = new \OC\Files\View('/'.$user);
90 90
 		if (!$view->is_dir('/files_versions')) {
91 91
 			return false;
92 92
 		}
Please login to merge, or discard this patch.
apps/files_versions/lib/Expiration.php 1 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 1 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.
lib/public/Activity/IExtension.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -42,11 +42,11 @@
 block discarded – undo
42 42
 	const METHOD_STREAM = 'stream';
43 43
 	const METHOD_MAIL = 'email';
44 44
 
45
-	const PRIORITY_VERYLOW 	= 10;
46
-	const PRIORITY_LOW	= 20;
47
-	const PRIORITY_MEDIUM	= 30;
48
-	const PRIORITY_HIGH	= 40;
49
-	const PRIORITY_VERYHIGH	= 50;
45
+	const PRIORITY_VERYLOW = 10;
46
+	const PRIORITY_LOW = 20;
47
+	const PRIORITY_MEDIUM = 30;
48
+	const PRIORITY_HIGH = 40;
49
+	const PRIORITY_VERYHIGH = 50;
50 50
 
51 51
 	/**
52 52
 	 * The extension can return an array of additional notification types.
Please login to merge, or discard this patch.
lib/public/IUserManager.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@
 block discarded – undo
68 68
 	 * remove all user backends
69 69
 	 * @since 8.0.0
70 70
 	 */
71
-	public function clearBackends() ;
71
+	public function clearBackends();
72 72
 
73 73
 	/**
74 74
 	 * get a user by user id
Please login to merge, or discard this patch.