Completed
Pull Request — master (#155)
by Sander
02:27
created
lib/Db/CredentialMapper.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 		$sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' .
58 58
 			'WHERE `user_id` = ? and vault_id = ? AND shared_key is NULL LIMIT 20';
59 59
 		$entities = $this->findEntities($sql, [$user_id, $vault_id]);
60
-		$count = count($entities)-1;
60
+		$count = count($entities) - 1;
61 61
 		$entities = array_splice($entities, rand(0, $count), 1);
62 62
 		return $entities;
63 63
 	}
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 	 * @param $timestamp
68 68
 	 * @return Credential[]
69 69
 	 */
70
-	public function getExpiredCredentials($timestamp){
70
+	public function getExpiredCredentials($timestamp) {
71 71
 		$sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' .
72 72
 			'WHERE `expire_time` > 0 AND `expire_time` < ?';
73 73
 		return $this->findEntities($sql, [$timestamp]);
@@ -80,16 +80,16 @@  discard block
 block discarded – undo
80 80
      * @param null $user_id
81 81
      * @return Credential
82 82
      */
83
-	public function getCredentialById($credential_id, $user_id = null){
83
+	public function getCredentialById($credential_id, $user_id = null) {
84 84
 		$sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' .
85 85
 			'WHERE `id` = ?';
86 86
         // If we want to check the owner, add it to the query
87 87
 		$params = [$credential_id];
88
-        if ($user_id !== null){
88
+        if ($user_id !== null) {
89 89
         	$sql .= ' and `user_id` = ? ';
90 90
 			array_push($params, $user_id);
91 91
 		}
92
-		return $this->findEntity($sql,$params);
92
+		return $this->findEntity($sql, $params);
93 93
 	}
94 94
 
95 95
 	/**
@@ -97,10 +97,10 @@  discard block
 block discarded – undo
97 97
 	 * @param $credential_id
98 98
 	 * @return Credential
99 99
 	 */
100
-	public function getCredentialLabelById($credential_id){
100
+	public function getCredentialLabelById($credential_id) {
101 101
 		$sql = 'SELECT id, label FROM `*PREFIX*passman_credentials` ' .
102 102
 			'WHERE `id` = ? ';
103
-		return $this->findEntity($sql,[$credential_id]);
103
+		return $this->findEntity($sql, [$credential_id]);
104 104
 	}
105 105
 
106 106
 	/**
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
 	 * @param $raw_credential
109 109
 	 * @return Credential
110 110
 	 */
111
-	public function create($raw_credential){
111
+	public function create($raw_credential) {
112 112
 		$credential = new Credential();
113 113
 
114 114
 		$credential->setGuid($this->utils->GUID());
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 		$credential->setCustomFields($raw_credential['custom_fields']);
132 132
 		$credential->setOtp($raw_credential['otp']);
133 133
 		$credential->setHidden($raw_credential['hidden']);
134
-		if(isset($raw_credential['shared_key'])) {
134
+		if (isset($raw_credential['shared_key'])) {
135 135
 			$credential->setSharedKey($raw_credential['shared_key']);
136 136
 		}
137 137
 		return parent::insert($credential);
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 	 * @param $raw_credential array An array containing all the credential fields
143 143
 	 * @return Credential The updated credential
144 144
 	 */
145
-	public function updateCredential($raw_credential){
145
+	public function updateCredential($raw_credential) {
146 146
 		$original = $this->getCredentialByGUID($raw_credential['guid']);
147 147
 		$credential = new Credential();
148 148
 		$credential->setId($original->getId());
@@ -170,11 +170,11 @@  discard block
 block discarded – undo
170 170
 		return parent::update($credential);
171 171
 	}
172 172
 
173
-	public function deleteCredential(Credential $credential){
173
+	public function deleteCredential(Credential $credential) {
174 174
 		return $this->delete($credential);
175 175
 	}
176 176
 
177
-	public function upd(Credential $credential){
177
+	public function upd(Credential $credential) {
178 178
 		$this->update($credential);
179 179
 	}
180 180
 
@@ -183,10 +183,10 @@  discard block
 block discarded – undo
183 183
      * @param $credential_guid
184 184
      * @return Credential
185 185
      */
186
-	public function getCredentialByGUID($credential_guid, $user_id = null){
186
+	public function getCredentialByGUID($credential_guid, $user_id = null) {
187 187
 	    $q = 'SELECT * FROM `*PREFIX*passman_credentials` WHERE guid = ? ';
188 188
 		$params = [$credential_guid];
189
-		if ($user_id !== null){
189
+		if ($user_id !== null) {
190 190
 			$q .= ' and `user_id` = ? ';
191 191
 			array_push($params, $user_id);
192 192
 		}
Please login to merge, or discard this patch.
controller/filecontroller.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
 	public function __construct($AppName,
24 24
 								IRequest $request,
25 25
 								$UserId,
26
-								FileService $fileService){
26
+								FileService $fileService) {
27 27
 		parent::__construct($AppName, $request);
28 28
 		$this->userId = $UserId;
29 29
 		$this->fileService = $fileService;
@@ -59,20 +59,20 @@  discard block
 block discarded – undo
59 59
 		return new JSONResponse($this->fileService->deleteFile($file_id, $this->userId));
60 60
 	}
61 61
 
62
-	public function updateFile($file_id, $file_data, $filename, $mimetype, $size){
63
-		try{
62
+	public function updateFile($file_id, $file_data, $filename, $mimetype, $size) {
63
+		try {
64 64
 			$file = $this->fileService->getFile($file_id, $this->userId);
65
-		} catch (\Exception $doesNotExistException){
65
+		} catch (\Exception $doesNotExistException) {
66 66
 
67 67
 		}
68
-		if($file){
69
-			if($file_data) {
68
+		if ($file) {
69
+			if ($file_data) {
70 70
 				$file->setFileData($file_data);
71 71
 			}
72
-			if($filename) {
72
+			if ($filename) {
73 73
 				$file->setFilename($filename);
74 74
 			}
75
-			if($filename || $file_data){
75
+			if ($filename || $file_data) {
76 76
 				new JSONResponse($this->fileService->updateFile($file));
77 77
 			}
78 78
 		}
Please login to merge, or discard this patch.
templates/part.admin.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@
 block discarded – undo
30 30
 		<h2><?php p($l->t('Passman Settings')); ?></h2>
31 31
 		<?php
32 32
 		if ($checkVersion) {
33
-			p($l->t('Github version:'). ' '. $githubVersion);
33
+			p($l->t('Github version:') . ' ' . $githubVersion);
34 34
 			print '<br />';
35 35
 		} ?>
36 36
 		Local version: <?php p($localVersion); ?><br/>
Please login to merge, or discard this patch.
lib/Service/SettingsService.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 	 * @param $value mixed Value of the setting
98 98
 	 */
99 99
 
100
-	public function setUserSetting($key, $value){
100
+	public function setUserSetting($key, $value) {
101 101
 		return $this->config->setUserValue($this->userId, $this->appName, $key, $value);
102 102
 	}
103 103
 
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 	 * @param $setting
108 108
 	 * @return bool
109 109
 	 */
110
-	public function isEnabled($setting){
110
+	public function isEnabled($setting) {
111 111
 		$value = intval($this->config->getAppValue('passman', $setting, false));
112 112
 		return ($value === 1);
113 113
 	}
Please login to merge, or discard this patch.
lib/AppInfo/Application.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 use OCP\IL10N;
46 46
 use OCP\Util;
47 47
 class Application extends App {
48
-	public function __construct () {
48
+	public function __construct() {
49 49
 		parent::__construct('passman');
50 50
 		$container = $this->getContainer();
51 51
 		// Allow automatic DI for the View, until we migrated to Nodes API
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 		/**
60 60
 		 * Middleware
61 61
 		 */
62
-		$container->registerService('ShareMiddleware', function($c){
62
+		$container->registerService('ShareMiddleware', function($c) {
63 63
 			return new ShareMiddleware($c->query('SettingsService'));
64 64
 		});
65 65
 		$container->registerMiddleware('ShareMiddleware');
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 
90 90
 
91 91
 		/** Cron **/
92
-		$container->registerService('CronService', function ($c) {
92
+		$container->registerService('CronService', function($c) {
93 93
 			return new CronService(
94 94
 				$c->query('CredentialService'),
95 95
 				$c->query('Logger'),
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 			);
101 101
 		});
102 102
 
103
-		$container->registerService('Db', function () {
103
+		$container->registerService('Db', function() {
104 104
 			return new Db();
105 105
 		});
106 106
 
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 		$c = $this->getContainer();
133 133
 		/** @var \OCP\IServerContainer $server */
134 134
 		$server = $c->getServer();
135
-		$navigationEntry = function () use ($c, $server) {
135
+		$navigationEntry = function() use ($c, $server) {
136 136
 			return [
137 137
 				'id' => $c->getAppName(),
138 138
 				'order' => 10,
Please login to merge, or discard this patch.
middleware/sharemiddleware.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -12,23 +12,23 @@  discard block
 block discarded – undo
12 12
 
13 13
 	private $settings;
14 14
 
15
-	public function __construct(SettingsService $config){
15
+	public function __construct(SettingsService $config) {
16 16
 		$this->settings = $config;
17 17
 	}
18 18
 
19 19
 
20 20
 	public function beforeController($controller, $methodName) {
21
-		if ($controller instanceof ShareController){
21
+		if ($controller instanceof ShareController) {
22 22
 			$http_response_code = \OCP\AppFramework\Http::STATUS_FORBIDDEN;
23 23
 			$result = 'FORBIDDEN';
24 24
 
25
-			if(in_array($methodName, array('updateSharedCredentialACL', 'getFile', 'getItemAcl'))){
25
+			if (in_array($methodName, array('updateSharedCredentialACL', 'getFile', 'getItemAcl'))) {
26 26
 				$sharing_enabled = ($this->settings->isEnabled('link_sharing_enabled') || $this->settings->isEnabled('user_sharing_enabled'));
27 27
 			} else {
28 28
 				$publicMethods = array('createPublicShare', 'getPublicCredentialData');
29 29
 				$setting = (in_array($methodName, $publicMethods)) ? 'link_sharing_enabled' : 'user_sharing_enabled';
30 30
 				$sharing_enabled = ($this->settings->isEnabled($setting));
31
-				if($methodName === 'getVaultItems' || $methodName === 'getPendingRequests'){
31
+				if ($methodName === 'getVaultItems' || $methodName === 'getPendingRequests') {
32 32
 					$http_response_code = Http::STATUS_OK;
33 33
 					$result = array();
34 34
 				}
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 				$response = new JSONResponse($result);
40 40
 				http_response_code($http_response_code);
41 41
 				header('Passman-sharing: disabled');
42
-				header('Passman-method: ShareController.'. $methodName);
42
+				header('Passman-method: ShareController.' . $methodName);
43 43
 				die($response->render());
44 44
 			}
45 45
 		}
Please login to merge, or discard this patch.