Completed
Pull Request — master (#813)
by rakekniven
03:57
created
lib/Controller/SystemController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -164,7 +164,7 @@
 block discarded – undo
164 164
 							'id' => $contact['UID'],
165 165
 							'user' => $contact['FN'],
166 166
 							'displayName' => $contact['FN'],
167
-							'organisation' => isset($contact['ORG']) ? $contact['ORG'] : '' ,
167
+							'organisation' => isset($contact['ORG']) ? $contact['ORG'] : '',
168 168
 							'emailAddress' => $emailAddress,
169 169
 							'desc' => 'Contact',
170 170
 							'type' => 'contact',
Please login to merge, or discard this patch.
lib/Controller/PollController.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -279,7 +279,7 @@
 block discarded – undo
279 279
 		$clonePoll->setAccess($this->poll->getAccess());
280 280
 		$clonePoll->setExpire($this->poll->getExpire());
281 281
 		$clonePoll->setAnonymous(intval($this->poll->getAnonymous()));
282
-		$clonePoll->setFullAnonymous(intval($this->poll->getFullAnonymous())  * $clonePoll->getAnonymous());
282
+		$clonePoll->setFullAnonymous(intval($this->poll->getFullAnonymous()) * $clonePoll->getAnonymous());
283 283
 		$clonePoll->setAllowMaybe(intval($this->poll->getAllowMaybe()));
284 284
 		$clonePoll->setVoteLimit(intval($this->poll->getVoteLimit()));
285 285
 		$clonePoll->setSettings('');
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -123,7 +123,7 @@
 block discarded – undo
123 123
 
124 124
 				foreach ($polls as $poll) {
125 125
 					$combinedPoll = (object) array_merge(
126
-        				(array) json_decode(json_encode($poll)), (array) json_decode(json_encode($this->acl->setPollId($poll->getId()))));
126
+						(array) json_decode(json_encode($poll)), (array) json_decode(json_encode($this->acl->setPollId($poll->getId()))));
127 127
 					if ($combinedPoll->allowView) {
128 128
 						$pollList[] = $combinedPoll;
129 129
 					}
Please login to merge, or discard this patch.
lib/Controller/ShareController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -209,7 +209,7 @@
 block discarded – undo
209 209
 				$userShare->setPollId($publicShare->getPollId());
210 210
 				$userShare->setUserId($userName);
211 211
 				$userShare->setUserEmail('');
212
-				$this->logger->debug('Create share: '. json_encode($userShare));
212
+				$this->logger->debug('Create share: ' . json_encode($userShare));
213 213
 				$userShare = $this->mapper->insert($userShare);
214 214
 				return new DataResponse($userShare, Http::STATUS_OK);
215 215
 
Please login to merge, or discard this patch.
lib/Model/Acl.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -119,9 +119,9 @@
 block discarded – undo
119 119
 	}
120 120
 
121 121
 	/**
122
-	* @NoAdminRequired
123
-	* @return string
124
-	*/
122
+	 * @NoAdminRequired
123
+	 * @return string
124
+	 */
125 125
 	public function getLoggedIn() {
126 126
 		return \OC::$server->getUserSession()->isLoggedIn();
127 127
 	}
Please login to merge, or discard this patch.
lib/Controller/CommentController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
 		}
178 178
 
179 179
 
180
-		$this->logger->alert('ok '. json_encode($comment));
180
+		$this->logger->alert('ok ' . json_encode($comment));
181 181
 		return new DataResponse($comment, Http::STATUS_OK);
182 182
 
183 183
 	}
@@ -224,7 +224,7 @@  discard block
 block discarded – undo
224 224
 		}
225 225
 
226 226
 		try {
227
-			if ( $comment['userId'] === $this->acl->getUserId() ) {
227
+			if ($comment['userId'] === $this->acl->getUserId()) {
228 228
 					$comment = $this->mapper->find($comment['id']);
229 229
 					$comment = $this->mapper->delete($comment);
230 230
 			}
Please login to merge, or discard this patch.
lib/Db/OptionMapper.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@
 block discarded – undo
70 70
 		   ->where(
71 71
 			   $qb->expr()->eq('poll_id', $qb->createNamedParameter($pollId, IQueryBuilder::PARAM_INT))
72 72
 		   )
73
-		   ->orderBy('order', 'ASC');;
73
+		   ->orderBy('order', 'ASC'); ;
74 74
 
75 75
 		return $this->findEntities($qb);
76 76
 	}
Please login to merge, or discard this patch.