Completed
Push — master ( 9476ec...a8d129 )
by Sander
10s
created
middleware/sharemiddleware.php 2 patches
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.
Braces   +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 3 patches
Indentation   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -30,66 +30,66 @@
 block discarded – undo
30 30
 use OCA\Passman\Utility\Utils;
31 31
 
32 32
 class SharingACLMapper extends Mapper {
33
-    const TABLE_NAME = '*PREFIX*passman_sharing_acl';
33
+	const TABLE_NAME = '*PREFIX*passman_sharing_acl';
34 34
 
35
-    public function __construct(IDBConnection $db) {
36
-        parent::__construct($db, 'passman_sharing_acl');
37
-    }
35
+	public function __construct(IDBConnection $db) {
36
+		parent::__construct($db, 'passman_sharing_acl');
37
+	}
38 38
 
39
-    public function createACLEntry(SharingACL $acl){
40
-        return $this->insert($acl);
41
-    }
39
+	public function createACLEntry(SharingACL $acl){
40
+		return $this->insert($acl);
41
+	}
42 42
 
43
-    /**
44
-     * Gets the currently accepted share requests from the given user for the given vault guid
45
-     * @param $user_id
46
-     * @param $vault_guid
47
-     * @return SharingACL[]
48
-     */
49
-    public function getVaultEntries($user_id, $vault_guid) {
50
-        $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND vault_guid = ?";
51
-        return $this->findEntities($q, [$user_id, $vault_guid]);
52
-    }
43
+	/**
44
+	 * Gets the currently accepted share requests from the given user for the given vault guid
45
+	 * @param $user_id
46
+	 * @param $vault_guid
47
+	 * @return SharingACL[]
48
+	 */
49
+	public function getVaultEntries($user_id, $vault_guid) {
50
+		$q = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND vault_guid = ?";
51
+		return $this->findEntities($q, [$user_id, $vault_guid]);
52
+	}
53 53
 
54
-    /**
55
-     * Gets the acl for a given item guid
56
-     * @param $user_id
57
-     * @param $item_guid
58
-     * @return SharingACL
59
-     */
60
-    public function getItemACL($user_id, $item_guid) {
61
-        $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ? AND ";
62
-        $filter = [$item_guid];
63
-        $q .= ($user_id === null) ? 'user_id is null' : 'user_id = ? ';
64
-        if ($user_id !== null){
54
+	/**
55
+	 * Gets the acl for a given item guid
56
+	 * @param $user_id
57
+	 * @param $item_guid
58
+	 * @return SharingACL
59
+	 */
60
+	public function getItemACL($user_id, $item_guid) {
61
+		$q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ? AND ";
62
+		$filter = [$item_guid];
63
+		$q .= ($user_id === null) ? 'user_id is null' : 'user_id = ? ';
64
+		if ($user_id !== null){
65 65
 			$filter[] = $user_id;
66
-        }
66
+		}
67 67
 
68
-        return $this->findEntity($q, $filter);
69
-    }
68
+		return $this->findEntity($q, $filter);
69
+	}
70 70
 
71
-    /**
72
-     * Update the acl for a given item guid
73
-     * @param $user_id
74
-     * @param $item_guid
75
-     * @return SharingACL
76
-     */
77
-    public function updateCredentialACL(SharingACL $sharingACL) {
78
-        return $this->update($sharingACL);
79
-    }
71
+	/**
72
+	 * Update the acl for a given item guid
73
+	 * @param $user_id
74
+	 * @param $item_guid
75
+	 * @return SharingACL
76
+	 */
77
+	public function updateCredentialACL(SharingACL $sharingACL) {
78
+		return $this->update($sharingACL);
79
+	}
80 80
 
81
-    /**
82
-     * Gets the currently accepted share requests from the given user for the given vault guid
83
-     * @param $user_id
84
-     * @param $vault_id
85
-     * @return SharingACL[]
86
-     */
87
-    public function getCredentialAclList($item_guid) {
88
-        $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE item_guid = ?";
89
-        return $this->findEntities($q, [$item_guid]);
90
-    }
81
+	/**
82
+	 * Gets the currently accepted share requests from the given user for the given vault guid
83
+	 * @param $user_id
84
+	 * @param $vault_id
85
+	 * @return SharingACL[]
86
+	 */
87
+	public function getCredentialAclList($item_guid) {
88
+		$q = "SELECT * FROM ". self::TABLE_NAME ." WHERE item_guid = ?";
89
+		return $this->findEntities($q, [$item_guid]);
90
+	}
91 91
 
92
-    public function deleteShareACL(SharingACL $ACL){
93
-    	return $this->delete($ACL);
92
+	public function deleteShareACL(SharingACL $ACL){
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.
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.
Braces   +3 added lines, -3 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
 
@@ -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
 
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
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 2 patches
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.
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;
@@ -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){
62
+	public function updateFile($file_id, $file_data, $filename) {
63 63
 		try{
64 64
 			$file = $this->fileService->getFile($file_id, $this->userId);
65 65
 		} catch (\Exception $doesNotExistException){
66 66
 
67 67
 		}
68
-		if($file){
68
+		if($file) {
69 69
 			if($file_data) {
70 70
 				$file->setFileData($file_data);
71 71
 			}
72 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.