Completed
Push — master ( e0a6ce...4ce9f9 )
by Sander
11s
created
lib/Db/ShareRequestMapper.php 1 patch
Spacing   +13 added lines, -13 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,8 +67,8 @@  discard block
 block discarded – undo
67 67
      * @param $user_id
68 68
      * @return ShareRequest[]
69 69
      */
70
-    public function getUserPendingRequests($user_id){
71
-        $q = "SELECT * FROM *PREFIX*". self::TABLE_NAME ." WHERE target_user_id = ?";
70
+    public function getUserPendingRequests($user_id) {
71
+        $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE target_user_id = ?";
72 72
         return $this->findEntities($q, [$user_id]);
73 73
     }
74 74
 
@@ -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/ActivityService.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -48,10 +48,10 @@
 block discarded – undo
48 48
 	 * @param $type string
49 49
 	 * @return array
50 50
 	 */
51
-	public function add($subject,$subjectParams=array(),
52
-						$message='',$messageParams=array(),
53
-						$link='',$user=null,$type='') {
54
-		if($user) {
51
+	public function add($subject, $subjectParams = array(),
52
+						$message = '', $messageParams = array(),
53
+						$link = '', $user = null, $type = '') {
54
+		if ($user) {
55 55
 			$activity = $this->manager->generateEvent();
56 56
 			$activity->setType($type);
57 57
 			$activity->setApp('passman');
Please login to merge, or discard this patch.
controller/credentialcontroller.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -163,13 +163,13 @@
 block discarded – undo
163 163
 				$activity . '_self', array($label, $this->userId, $revision_created),
164 164
 				'', array(),
165 165
 				$link, $this->userId, Activity::TYPE_ITEM_ACTION);
166
-		} else if (($storedCredential->getDeleteTime() === 0) && (int)$delete_time > 0) {
166
+		} else if (($storedCredential->getDeleteTime() === 0) && (int) $delete_time > 0) {
167 167
 			$activity = 'item_deleted';
168 168
 			$this->activityService->add(
169 169
 				$activity . '_self', array($label, $this->userId),
170 170
 				'', array(),
171 171
 				$link, $this->userId, Activity::TYPE_ITEM_ACTION);
172
-		} else if (($storedCredential->getDeleteTime() > 0) && (int)$delete_time === 0) {
172
+		} else if (($storedCredential->getDeleteTime() > 0) && (int) $delete_time === 0) {
173 173
 			$activity = 'item_recovered';
174 174
 			$this->activityService->add(
175 175
 				$activity . '_self', array($label, $this->userId),
Please login to merge, or discard this patch.
lib/AppInfo/Application.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -51,17 +51,17 @@  discard block
 block discarded – undo
51 51
 		parent::__construct('passman');
52 52
 		$container = $this->getContainer();
53 53
 		// Allow automatic DI for the View, until we migrated to Nodes API
54
-		$container->registerService(View::class, function () {
54
+		$container->registerService(View::class, function() {
55 55
 			return new View('');
56 56
 		}, false);
57
-		$container->registerService('isCLI', function () {
57
+		$container->registerService('isCLI', function() {
58 58
 			return \OC::$CLI;
59 59
 		});
60 60
 
61 61
 		/**
62 62
 		 * Middleware
63 63
 		 */
64
-		$container->registerService('ShareMiddleware', function ($c) {
64
+		$container->registerService('ShareMiddleware', function($c) {
65 65
 			return new ShareMiddleware($c->query('SettingsService'));
66 66
 		});
67 67
 		$container->registerMiddleware('ShareMiddleware');
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 		/**
70 70
 		 * Controllers
71 71
 		 */
72
-		$container->registerService('ShareController', function ($c) {
72
+		$container->registerService('ShareController', function($c) {
73 73
 			$container = $this->getContainer();
74 74
 			$server = $container->getServer();
75 75
 			return new ShareController(
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
 
91 91
 
92 92
 		/** Cron **/
93
-		$container->registerService('CronService', function ($c) {
93
+		$container->registerService('CronService', function($c) {
94 94
 			return new CronService(
95 95
 				$c->query('CredentialService'),
96 96
 				$c->query('Logger'),
@@ -101,11 +101,11 @@  discard block
 block discarded – undo
101 101
 			);
102 102
 		});
103 103
 
104
-		$container->registerService('Db', function () {
104
+		$container->registerService('Db', function() {
105 105
 			return new Db();
106 106
 		});
107 107
 
108
-		$container->registerService('Logger', function ($c) {
108
+		$container->registerService('Logger', function($c) {
109 109
 			return $c->query('ServerContainer')->getLogger();
110 110
 		});
111 111
 
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 		$c = $this->getContainer();
134 134
 		/** @var \OCP\IServerContainer $server */
135 135
 		$server = $c->getServer();
136
-		$navigationEntry = function () use ($c, $server) {
136
+		$navigationEntry = function() use ($c, $server) {
137 137
 			return [
138 138
 				'id' => $c->getAppName(),
139 139
 				'order' => 10,
Please login to merge, or discard this patch.
migration/serversideencryption.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -83,7 +83,7 @@
 block discarded – undo
83 83
 		}
84 84
 	}
85 85
 
86
-	private function fetchAll($sql){
86
+	private function fetchAll($sql) {
87 87
 		return $this->db->executeQuery($sql)->fetchAll();
88 88
 	}
89 89
 
Please login to merge, or discard this patch.
middleware/sharemiddleware.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
 			$setting = (in_array($methodName, $publicMethods)) ? 'link_sharing_enabled' : 'user_sharing_enabled';
27 27
 			$sharing_enabled = ($this->settings->isEnabled($setting));
28 28
 
29
-			if(in_array($methodName, $user_pub_methods)){
29
+			if (in_array($methodName, $user_pub_methods)) {
30 30
 				$sharing_enabled = ($this->settings->isEnabled('link_sharing_enabled') || $this->settings->isEnabled('user_sharing_enabled'));
31 31
 			}
32 32
 
Please login to merge, or discard this patch.
lib/Db/SharingACLMapper.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
         parent::__construct($db, 'passman_sharing_acl');
37 37
     }
38 38
 
39
-    public function createACLEntry(SharingACL $acl){
39
+    public function createACLEntry(SharingACL $acl) {
40 40
         return $this->insert($acl);
41 41
     }
42 42
 
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
      * @return SharingACL[]
48 48
      */
49 49
     public function getVaultEntries($user_id, $vault_guid) {
50
-        $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND vault_guid = ?";
50
+        $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE user_id = ? AND vault_guid = ?";
51 51
         return $this->findEntities($q, [$user_id, $vault_guid]);
52 52
     }
53 53
 
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
         $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ? AND ";
62 62
         $filter = [$item_guid];
63 63
         $q .= ($user_id === null) ? 'user_id is null' : 'user_id = ? ';
64
-        if ($user_id !== null){
64
+        if ($user_id !== null) {
65 65
 			$filter[] = $user_id;
66 66
         }
67 67
 
@@ -85,11 +85,11 @@  discard block
 block discarded – undo
85 85
      * @return SharingACL[]
86 86
      */
87 87
     public function getCredentialAclList($item_guid) {
88
-        $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE item_guid = ?";
88
+        $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ?";
89 89
         return $this->findEntities($q, [$item_guid]);
90 90
     }
91 91
 
92
-    public function deleteShareACL(SharingACL $ACL){
92
+    public function deleteShareACL(SharingACL $ACL) {
93 93
     	return $this->delete($ACL);
94 94
 	}
95 95
 }
96 96
\ No newline at end of file
Please login to merge, or discard this patch.
lib/Service/CronService.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -50,16 +50,16 @@
 block discarded – undo
50 50
 	public function expireCredentials() {
51 51
 		$this->logger->info('Passman cron test', array('app' => 'passman'));
52 52
 		$expired_credentials = $this->credentialService->getExpiredCredentials($this->utils->getTime());
53
-		foreach($expired_credentials as $credential){
53
+		foreach ($expired_credentials as $credential) {
54 54
 			$link = ''; // @TODO create direct link to credential
55 55
 
56 56
 			$sql = 'SELECT count(*) as rows from `*PREFIX*notifications` WHERE `subject`= \'credential_expired\' AND object_id=?';
57 57
 			$id = $credential->getId();
58 58
 			$result = $this->db->executeQuery($sql, array($id));
59
-			$this->logger->debug($credential->getLabel() .' is expired, checking notifications!', array('app' => 'passman'));
59
+			$this->logger->debug($credential->getLabel() . ' is expired, checking notifications!', array('app' => 'passman'));
60 60
 			$notifications = intval($result->fetch()['rows']);
61
-			if($notifications === 0) {
62
-				$this->logger->debug($credential->getLabel() .' is expired, adding notification!', array('app' => 'passman'));
61
+			if ($notifications === 0) {
62
+				$this->logger->debug($credential->getLabel() . ' is expired, adding notification!', array('app' => 'passman'));
63 63
 				$this->activityService->add(
64 64
 					Activity::SUBJECT_ITEM_EXPIRED, array($credential->getLabel(), $credential->getUserId()),
65 65
 					'', array(),
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){
63
-		try{
62
+	public function updateFile($file_id, $file_data, $filename) {
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.