Completed
Pull Request — master (#552)
by
unknown
14:12 queued 04:03
created
controller/translationcontroller.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@
 block discarded – undo
41 41
 	public function getLanguageStrings() {
42 42
 		$translations = array(
43 43
 			// js/app/controllers/bookmarklet.js
44
-			'generating.sharing.keys' =>  $this->trans->t('Generating sharing keys ( %s / 2)','%step'),
44
+			'generating.sharing.keys' =>  $this->trans->t('Generating sharing keys ( %s / 2)', '%step'),
45 45
 			'invalid.vault.key' => $this->trans->t('Incorrect vault password!'),
46 46
 			'password.do.not.match' => $this->trans->t('Passwords do not match'),
47 47
 			'general' => $this->trans->t('General'),
Please login to merge, or discard this patch.
controller/iconcontroller.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -57,13 +57,13 @@  discard block
 block discarded – undo
57 57
 	 * @NoCSRFRequired
58 58
 	 */
59 59
 	public function getIcon($base64Url, $credentialId) {
60
-		$url = base64_decode(str_replace('_','/', $base64Url));
60
+		$url = base64_decode(str_replace('_', '/', $base64Url));
61 61
 
62
-		if($credentialId) {
62
+		if ($credentialId) {
63 63
 			try {
64 64
 				$credential = $this->credentialService->getCredentialById($credentialId, $this->userId);
65 65
 				$credential = $credential->jsonSerialize();
66
-			} catch (DoesNotExistException $e){
66
+			} catch (DoesNotExistException $e) {
67 67
 				// Credential is not found, continue
68 68
 				$credential = false;
69 69
 			}
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 			];
90 90
 			$credential['icon'] = json_encode($iconData);
91 91
 			try {
92
-				if($credential) {
92
+				if ($credential) {
93 93
 					$this->credentialService->updateCredential($credential);
94 94
 				}
95 95
 			} catch (DriverException $exception) {
@@ -130,12 +130,12 @@  discard block
 block discarded – undo
130 130
 			$pack = explode('/', $path[1])[2];
131 131
 			$mime = mime_content_type($iconPath);
132 132
 			//print_r($path);
133
-			if($mime !== 'directory') {
133
+			if ($mime !== 'directory') {
134 134
 				$icon = [];
135 135
 				$icon['mimetype'] = mime_content_type($iconPath);
136 136
 				$icon['url'] = $this->urlGenerator->linkTo('passman', $path[1]);
137 137
 				$icon['pack'] = $pack;
138
-				if(!isset($icons[$pack])){
138
+				if (!isset($icons[$pack])) {
139 139
 					$icons[$pack] = [];
140 140
 				}
141 141
 				$icons[$pack][] = $icon;
Please login to merge, or discard this patch.
controller/pagecontroller.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
 
23 23
 	private $userId;
24 24
 
25
-	public function __construct($AppName, IRequest $request, $UserId){
25
+	public function __construct($AppName, IRequest $request, $UserId) {
26 26
 		parent::__construct($AppName, $request);
27 27
 		$this->userId = $UserId;
28 28
 	}
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 	 */
40 40
 	public function index() {
41 41
 		$params = ['user' => $this->userId];
42
-		$response = new TemplateResponse('passman', 'main', $params);  // templates/main.php
42
+		$response = new TemplateResponse('passman', 'main', $params); // templates/main.php
43 43
 
44 44
 		$csp = new StrictContentSecurityPolicy();
45 45
 		$csp->allowEvalScript();
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 	 * @NoAdminRequired
56 56
 	 * @NoCSRFRequired
57 57
 	 */
58
-	public function bookmarklet($url='',$title='') {
58
+	public function bookmarklet($url = '', $title = '') {
59 59
 		$params = array('url' => $url, 'title' => $title);
60 60
 		return new TemplateResponse('passman', 'bookmarklet', $params);
61 61
 	}
Please login to merge, or discard this patch.