Completed
Pull Request — master (#160)
by Sander
11:47
created
controller/filecontroller.php 1 patch
Braces   +4 added lines, -4 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;
@@ -56,20 +56,20 @@  discard block
 block discarded – undo
56 56
 		return new JSONResponse($this->fileService->deleteFile($file_id, $this->userId));
57 57
 	}
58 58
 
59
-	public function updateFile($file_id, $file_data, $filename, $mimetype, $size){
59
+	public function updateFile($file_id, $file_data, $filename, $mimetype, $size) {
60 60
 		try{
61 61
 			$file = $this->fileService->getFile($file_id, $this->userId);
62 62
 		} catch (DoesNotExistException $doesNotExistException){
63 63
 
64 64
 		}
65
-		if($file){
65
+		if($file) {
66 66
 			if($file_data) {
67 67
 				$file->setFileData($file_data);
68 68
 			}
69 69
 			if($filename) {
70 70
 				$file->setFilename($filename);
71 71
 			}
72
-			if($filename || $file_data){
72
+			if($filename || $file_data) {
73 73
 				new JSONResponse($this->fileService->updateFile($file));
74 74
 			}
75 75
 		}
Please login to merge, or discard this patch.
controller/pagecontroller.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
 
22 22
 	private $userId;
23 23
 
24
-	public function __construct($AppName, IRequest $request, $UserId){
24
+	public function __construct($AppName, IRequest $request, $UserId) {
25 25
 		parent::__construct($AppName, $request);
26 26
 		$this->userId = $UserId;
27 27
 	}
Please login to merge, or discard this patch.
lib/Service/CronService.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
 	public function expireCredentials() {
38 38
 		$this->logger->info('Passman cron test', array('app' => 'passman'));
39 39
 		$expired_credentials = $this->credentialService->getExpiredCredentials($this->utils->getTime());
40
-		foreach($expired_credentials as $credential){
40
+		foreach($expired_credentials as $credential) {
41 41
 			$link = ''; // @TODO create direct link to credential
42 42
 
43 43
 			$sql = 'SELECT count(*) as rows from `*PREFIX*notifications` WHERE `subject`= \'credential_expired\' AND object_id=?';
Please login to merge, or discard this patch.
lib/Db/SharingACLMapper.php 1 patch
Braces   +4 added lines, -5 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
         parent::__construct($db, 'passman_sharing_acl');
23 23
     }
24 24
 
25
-    public function createACLEntry(SharingACL $acl){
25
+    public function createACLEntry(SharingACL $acl) {
26 26
         return $this->insert($acl);
27 27
     }
28 28
 
@@ -46,10 +46,9 @@  discard block
 block discarded – undo
46 46
     public function getItemACL($user_id, $item_guid) {
47 47
         $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ? AND ";
48 48
         $filter = [$item_guid];
49
-        if ($user_id === null){
49
+        if ($user_id === null) {
50 50
             $q .= 'user_id is null';
51
-        }
52
-        else {
51
+        } else {
53 52
             $q .= 'user_id = ? ';
54 53
             $filter[] = $user_id;
55 54
         }
@@ -77,7 +76,7 @@  discard block
 block discarded – undo
77 76
         return $this->findEntities($q, [$item_guid]);
78 77
     }
79 78
 
80
-    public function deleteShareACL(SharingACL $ACL){
79
+    public function deleteShareACL(SharingACL $ACL) {
81 80
     	return $this->delete($ACL);
82 81
 	}
83 82
 }
84 83
\ No newline at end of file
Please login to merge, or discard this patch.
lib/Db/ShareRequestMapper.php 1 patch
Braces   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
         parent::__construct($db, self::TABLE_NAME);
23 23
     }
24 24
 
25
-    public function createRequest(ShareRequest $request){
25
+    public function createRequest(ShareRequest $request) {
26 26
         return $this->insert($request);
27 27
     }
28 28
 
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
      * @param $target_vault_guid
33 33
      * @return ShareRequest
34 34
      */
35
-    public function getRequestByItemAndVaultGuid($item_guid, $target_vault_guid){
35
+    public function getRequestByItemAndVaultGuid($item_guid, $target_vault_guid) {
36 36
         $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? AND target_vault_guid = ?";
37 37
         return $this->findEntity($q, [$item_guid, $target_vault_guid]);
38 38
     }
@@ -42,8 +42,8 @@  discard block
 block discarded – undo
42 42
      * @param $item_guid
43 43
      * @return ShareRequest[]
44 44
      */
45
-    public function getRequestsByItemGuidGroupedByUser($item_guid){
46
-    	if (strtolower($this->db->getDatabasePlatform()->getName()) === 'mysql'){
45
+    public function getRequestsByItemGuidGroupedByUser($item_guid) {
46
+    	if (strtolower($this->db->getDatabasePlatform()->getName()) === 'mysql') {
47 47
     		$this->db->executeQuery("SET sql_mode = '';");
48 48
 		}
49 49
         $q = "SELECT *, target_user_id FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? GROUP BY target_user_id;";
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
      * @param $target_user_id   The target user
57 57
      * @return \PDOStatement    The result of running the db query
58 58
      */
59
-    public function cleanItemRequestsForUser($item_id, $target_user_id){
59
+    public function cleanItemRequestsForUser($item_id, $target_user_id) {
60 60
 		$q = "DELETE FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_id = ? AND target_user_id = ?";
61 61
 		$this->execute($q, [$item_id, $target_user_id]);
62 62
         return $this->execute($q, [$item_id, $target_user_id]);
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
      * @param $user_id
68 68
      * @return ShareRequest[]
69 69
      */
70
-    public function getUserPendingRequests($user_id){
70
+    public function getUserPendingRequests($user_id) {
71 71
         $q = "SELECT * FROM *PREFIX*". self::TABLE_NAME ." WHERE target_user_id = ?";
72 72
         return $this->findEntities($q, [$user_id]);
73 73
     }
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
      * @param ShareRequest $shareRequest    Request to delete
78 78
      * @return ShareRequest                 The deleted request
79 79
      */
80
-    public function deleteShareRequest(ShareRequest $shareRequest){
80
+    public function deleteShareRequest(ShareRequest $shareRequest) {
81 81
     	return $this->delete($shareRequest);
82 82
 	}
83 83
 
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
      * @return ShareRequest
88 88
 	 * @throws DoesNotExistException
89 89
      */
90
-	public function getShareRequestById($id){
90
+	public function getShareRequestById($id) {
91 91
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE id = ?";
92 92
 		return $this->findEntity($q, [$id]);
93 93
 	}
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
      * @param $item_guid
98 98
      * @return ShareRequest[]
99 99
      */
100
-	public function getShareRequestsByItemGuid($item_guid){
100
+	public function getShareRequestsByItemGuid($item_guid) {
101 101
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE 	item_guid = ?";
102 102
 		return $this->findEntities($q, [$item_guid]);
103 103
 	}
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
      * @param ShareRequest $shareRequest
108 108
      * @return ShareRequest
109 109
      */
110
-	public function updateShareRequest(ShareRequest $shareRequest){
110
+	public function updateShareRequest(ShareRequest $shareRequest) {
111 111
 		return $this->update($shareRequest);
112 112
 	}
113 113
 
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
      * @param $user_id
118 118
      * @return ShareRequest[]
119 119
      */
120
-	public function getPendingShareRequests($item_guid, $user_id){
120
+	public function getPendingShareRequests($item_guid, $user_id) {
121 121
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE 	item_guid = ? and target_user_id= ?";
122 122
 		return $this->findEntities($q, [$item_guid, $user_id]);
123 123
 	}
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
      * @param $permissions      The new permissions to apply
130 130
      * @return \PDOStatement    The result of the operation
131 131
      */
132
-	public function updatePendingRequestPermissions($item_guid, $user_id, $permissions){
132
+	public function updatePendingRequestPermissions($item_guid, $user_id, $permissions) {
133 133
 	    $q = "UPDATE *PREFIX*" . self::TABLE_NAME . " SET permissions = ? WHERE item_guid = ? AND target_user_id = ?";
134 134
         return $this->execute($q, [$permissions, $item_guid, $user_id]);
135 135
     }
Please login to merge, or discard this patch.
lib/Service/EncryptService.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -272,7 +272,9 @@
 block discarded – undo
272 272
 	protected function unpad($data) {
273 273
 		$length = $this->getKeySize();
274 274
 		$last = ord($data[strlen($data) - 1]);
275
-		if ($last > $length) return false;
275
+		if ($last > $length) {
276
+			return false;
277
+		}
276 278
 		if (substr($data, -1 * $last) !== str_repeat(chr($last), $last)) {
277 279
 			return false;
278 280
 		}
Please login to merge, or discard this patch.