Failed Conditions
Pull Request — master (#682)
by
unknown
09:41
created
controller/admincontroller.php 1 patch
Braces   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -113,10 +113,10 @@  discard block
 block discarded – undo
113 113
 		return new JSONResponse(array('success' => true));
114 114
 	}
115 115
 
116
-	public function listRequests(){
116
+	public function listRequests() {
117 117
 		$requests = $this->deleteVaultRequestService->getDeleteRequests();
118 118
 		$results = array();
119
-		foreach($requests as $request){
119
+		foreach($requests as $request) {
120 120
 			$r = $request->jsonSerialize();
121 121
 			$r['displayName'] = Utils::getNameByUid($request->getRequestedBy(), $this->userManager);
122 122
 			array_push($results, $r);
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
 		return new JSONResponse($results);
125 125
 	}
126 126
 
127
-	public function acceptRequestDeletion($vault_guid, $requested_by){
127
+	public function acceptRequestDeletion($vault_guid, $requested_by) {
128 128
 		$req = $this->deleteVaultRequestService->getDeleteRequestForVault($vault_guid);
129 129
 		try{
130 130
 			$vault = $this->vaultService->getByGuid($vault_guid, $requested_by);
@@ -132,14 +132,14 @@  discard block
 block discarded – undo
132 132
 			//Ignore
133 133
 		}
134 134
 
135
-		if(isset($vault)){
135
+		if(isset($vault)) {
136 136
 			$credentials = $this->credentialService->getCredentialsByVaultId($vault->getId(), $requested_by);
137
-			foreach($credentials as $credential){
137
+			foreach($credentials as $credential) {
138 138
 				$revisions = $this->revisionService->getRevisions($credential->getId());
139
-				foreach($revisions as $revision){
139
+				foreach($revisions as $revision) {
140 140
 					$this->revisionService->deleteRevision($revision['revision_id'], $requested_by);
141 141
 				}
142
-				if($credential instanceof Credential){
142
+				if($credential instanceof Credential) {
143 143
 					$this->credentialService->deleteCredential($credential);
144 144
 				}
145 145
 			}
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
 	 */
158 158
 	public function requestDeletion($vault_guid, $reason) {
159 159
 		$req = $this->deleteVaultRequestService->getDeleteRequestForVault($vault_guid);
160
-		if($req){
160
+		if($req) {
161 161
 			return new JSONResponse('Already exists');
162 162
 		}
163 163
 		$vault = $this->vaultService->getByGuid($vault_guid, $this->userId);
Please login to merge, or discard this patch.
lib/Service/VaultService.php 1 patch
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
 	 * @param $user_id
96 96
 	 * @return Vault|Entity
97 97
 	 */
98
-	public function setLastAccess($vault_id, $user_id){
98
+	public function setLastAccess($vault_id, $user_id) {
99 99
 		return $this->vaultMapper->setLastAccess($vault_id, $user_id);
100 100
 	}
101 101
 
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
 	 * @param $publicKey
107 107
 	 * @return Vault|Entity
108 108
 	 */
109
-	public function updateSharingKeys($vault_id, $privateKey, $publicKey){
109
+	public function updateSharingKeys($vault_id, $privateKey, $publicKey) {
110 110
 		return $this->vaultMapper->updateSharingKeys($vault_id, $privateKey, $publicKey);
111 111
 	}
112 112
 
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 	 * @param string $vault_guid
116 116
 	 * @param string $user_id
117 117
 	 */
118
-	public function deleteVault($vault_guid, $user_id){
118
+	public function deleteVault($vault_guid, $user_id) {
119 119
 		$vault = $this->getByGuid($vault_guid, $user_id);
120 120
 		if($vault instanceof Vault) {
121 121
 			$this->vaultMapper->deleteVault($vault);
Please login to merge, or discard this patch.
lib/Service/ShareService.php 1 patch
Braces   +18 added lines, -6 removed lines patch added patch discarded remove patch
@@ -101,7 +101,9 @@  discard block
 block discarded – undo
101 101
 	 * @return Entity
102 102
 	 */
103 103
 	public function createACLEntry(SharingACL $acl) {
104
-		if ($acl->getCreated() === null) $acl->setCreated((new \DateTime())->getTimestamp());
104
+		if ($acl->getCreated() === null) {
105
+			$acl->setCreated((new \DateTime())->getTimestamp());
106
+		}
105 107
 		return $this->sharingACL->createACLEntry($acl);
106 108
 	}
107 109
 
@@ -159,13 +161,17 @@  discard block
 block discarded – undo
159 161
 		$return = [];
160 162
 		foreach ($entries as $entry) {
161 163
 			// Check if the user can read the credential, probably unnecesary, but just to be sure
162
-			if (!$entry->hasPermission(SharingACL::READ)) continue;
164
+			if (!$entry->hasPermission(SharingACL::READ)) {
165
+				continue;
166
+			}
163 167
 			$tmp = $entry->jsonSerialize();
164 168
 			$credential = $this->credential->getCredentialById($entry->getItemId());
165 169
 			$credential = $this->encryptService->decryptCredential($credential);
166 170
 			$tmp['credential_data'] = $credential->jsonSerialize();
167 171
 
168
-			if (!$entry->hasPermission(SharingACL::FILES)) unset($tmp['credential_data']['files']);
172
+			if (!$entry->hasPermission(SharingACL::FILES)) {
173
+				unset($tmp['credential_data']['files']);
174
+			}
169 175
 			unset($tmp['credential_data']['shared_key']);
170 176
 			$return[] = $tmp;
171 177
 		}
@@ -194,7 +200,9 @@  discard block
 block discarded – undo
194 200
 		$acl = $this->sharingACL->getItemACL($user_id, $item_guid);
195 201
 
196 202
 		// Check if the user can read the credential, probably unnecesary, but just to be sure
197
-		if (!$acl->hasPermission(SharingACL::READ)) throw new DoesNotExistException("Item not found or wrong access level");
203
+		if (!$acl->hasPermission(SharingACL::READ)) {
204
+			throw new DoesNotExistException("Item not found or wrong access level");
205
+		}
198 206
 
199 207
 		$tmp = $acl->jsonSerialize();
200 208
 		$credential = $this->credential->getCredentialById($acl->getItemId());
@@ -202,7 +210,9 @@  discard block
 block discarded – undo
202 210
 
203 211
 		$tmp['credential_data'] = $credential->jsonSerialize();
204 212
 
205
-		if (!$acl->hasPermission(SharingACL::FILES)) unset($tmp['credential_data']['files']);
213
+		if (!$acl->hasPermission(SharingACL::FILES)) {
214
+			unset($tmp['credential_data']['files']);
215
+		}
206 216
 		unset($tmp['credential_data']['shared_key']);
207 217
 
208 218
 		return $tmp;
@@ -217,7 +227,9 @@  discard block
 block discarded – undo
217 227
 	 */
218 228
 	public function getItemHistory(string $user_id, string $item_guid) {
219 229
 		$acl = $this->sharingACL->getItemACL($user_id, $item_guid);
220
-		if (!$acl->hasPermission(SharingACL::READ | SharingACL::HISTORY)) return [];
230
+		if (!$acl->hasPermission(SharingACL::READ | SharingACL::HISTORY)) {
231
+			return [];
232
+		}
221 233
 
222 234
 		return $this->revisions->getRevisions($acl->getItemId());
223 235
 	}
Please login to merge, or discard this patch.
lib/Utility/Utils.php 1 patch
Braces   +4 added lines, -5 removed lines patch added patch discarded remove patch
@@ -45,8 +45,7 @@  discard block
 block discarded – undo
45 45
      * @return string
46 46
      */
47 47
 	public static function GUID() {
48
-		if (function_exists('com_create_guid') === true)
49
-		{
48
+		if (function_exists('com_create_guid') === true) {
50 49
 			return trim(com_create_guid(), '{}');
51 50
 		}
52 51
 
@@ -58,7 +57,7 @@  discard block
 block discarded – undo
58 57
 	 * @param IUserManager $userManager
59 58
 	 * @return string
60 59
 	 */
61
-	public static function getNameByUid(string $uid, IUserManager $userManager){
60
+	public static function getNameByUid(string $uid, IUserManager $userManager) {
62 61
 		$u = $userManager->get($uid);
63 62
 		return $u->getDisplayName();
64 63
 	}
@@ -68,10 +67,10 @@  discard block
 block discarded – undo
68 67
 	 * @param array $results
69 68
 	 * @return array|mixed
70 69
 	 */
71
-	public static function getDirContents(string $dir, &$results = array()){
70
+	public static function getDirContents(string $dir, &$results = array()) {
72 71
 		$files = scandir($dir);
73 72
 
74
-		foreach($files as $value){
73
+		foreach($files as $value) {
75 74
 			$path = realpath($dir.DIRECTORY_SEPARATOR.$value);
76 75
 			if(!is_dir($path)) {
77 76
 				$results[] = $path;
Please login to merge, or discard this patch.