Completed
Push — dartcafe-patch-1 ( 8dca15...e6a7a2 )
by René
04:27 queued 02:14
created
templates/goto.tmpl.php 1 patch
Spacing   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -27,18 +27,18 @@  discard block
 block discarded – undo
27 27
 	\OCP\Util::addStyle('polls', 'vote');
28 28
 	\OCP\Util::addScript('polls', 'vote');
29 29
 	
30
-	$userId = $_['userId'];
31
-	$userMgr = $_['userMgr'];
32
-	$urlGenerator = $_['urlGenerator'];
33
-	$avaMgr = $_['avatarManager'];
30
+	$userId = $_[ 'userId' ];
31
+	$userMgr = $_[ 'userMgr' ];
32
+	$urlGenerator = $_[ 'urlGenerator' ];
33
+	$avaMgr = $_[ 'avatarManager' ];
34 34
 
35
-	$poll = $_['poll'];
36
-	$dates = $_['dates'];
37
-	$votes = $_['votes'];
38
-	$comments = $_['comments'];
35
+	$poll = $_[ 'poll' ];
36
+	$dates = $_[ 'dates' ];
37
+	$votes = $_[ 'votes' ];
38
+	$comments = $_[ 'comments' ];
39 39
 	$isAnonymous = $poll->getIsAnonymous() && $userId != $poll->getOwner();
40 40
 	$hideNames = $poll->getIsAnonymous() && $poll->getFullAnonymous();
41
-	$notification = $_['notification'];
41
+	$notification = $_[ 'notification' ];
42 42
 
43 43
 	if ($poll->getExpire() == null) {
44 44
 		$expired = false;
@@ -47,14 +47,14 @@  discard block
 block discarded – undo
47 47
 	}
48 48
 ?>
49 49
 
50
-<?php if($poll->getType() == '0') : ?>
51
-	<?php foreach($dates as $d) : ?>
50
+<?php if ($poll->getType() == '0') : ?>
51
+	<?php foreach ($dates as $d) : ?>
52 52
 		<input class="hidden-dates" type="hidden" value="<?php print_unescaped($d->getDt()); ?>" />
53 53
 	<?php endforeach ?>
54 54
 <?php endif ?>
55 55
 
56 56
 <?php
57
-if (   $poll->getDescription() != null 
57
+if ($poll->getDescription() != null 
58 58
 	&& $poll->getDescription() != ''
59 59
 ) {
60 60
 	$description = nl2br($poll->getDescription());
@@ -65,13 +65,13 @@  discard block
 block discarded – undo
65 65
 // init array for counting 'yes'-votes for each date
66 66
 $total_y = array();
67 67
 $total_n = array();
68
-for ($i = 0 ; $i < count($dates) ; $i++) {
69
-	$total_y[$i] = 0;
70
-	$total_n[$i] = 0;
68
+for ($i = 0; $i < count($dates); $i++) {
69
+	$total_y[ $i ] = 0;
70
+	$total_n[ $i ] = 0;
71 71
 }
72 72
 $user_voted = array();
73 73
 
74
-$pollUrl = $urlGenerator->linkToRouteAbsolute('polls.page.goto_poll', ['hash' => $poll->getHash()]);
74
+$pollUrl = $urlGenerator->linkToRouteAbsolute('polls.page.goto_poll', [ 'hash' => $poll->getHash() ]);
75 75
 ?>
76 76
 
77 77
 <div id="app">
@@ -123,10 +123,10 @@  discard block
 block discarded – undo
123 123
 									//group by user
124 124
 									$others = array();
125 125
 									foreach ($votes as $vote) {
126
-										if (!isset($others[$vote->getUserId()])) {
127
-											$others[$vote->getUserId()] = array();
126
+										if (!isset($others[ $vote->getUserId() ])) {
127
+											$others[ $vote->getUserId() ] = array();
128 128
 										}
129
-										array_push($others[$vote->getUserId()], $vote);
129
+										array_push($others[ $vote->getUserId() ], $vote);
130 130
 									}
131 131
 									$userCnt = 0;
132 132
 									foreach (array_keys($others) as $usr) {
@@ -135,26 +135,26 @@  discard block
 block discarded – undo
135 135
 											// if poll expired, just put current user among the others;
136 136
 											// otherwise skip here to add current user as last row (to vote)
137 137
 											if (!$expired) {
138
-												$user_voted = $others[$usr];
138
+												$user_voted = $others[ $usr ];
139 139
 												continue;
140 140
 											}
141 141
 										}
142 142
 										print_unescaped('<tr>');
143 143
 										print_unescaped('<td class="avatar-cell">');
144
-										if (	$userMgr->get($usr) != null 
144
+										if ($userMgr->get($usr) != null 
145 145
 											&& !$isAnonymous && !$hideNames
146 146
 										) {
147
-											print_unescaped('<div class="poll avatardiv" title="'.($usr).'"></div>');
147
+											print_unescaped('<div class="poll avatardiv" title="' . ($usr) . '"></div>');
148 148
 											print_unescaped('</td>');
149 149
 											print_unescaped('<td colspan="2" class="name">');
150 150
 											p($userMgr->get($usr)->getDisplayName());
151 151
 										} else {
152 152
 											if ($isAnonymous || $hideNames) {
153
-											print_unescaped('<div class="poll avatardiv" title="'.($userCnt).'"></div>');
153
+											print_unescaped('<div class="poll avatardiv" title="' . ($userCnt) . '"></div>');
154 154
 											print_unescaped('</td>');
155 155
 											print_unescaped('<td colspan="2" class="name">');
156 156
 											} else {
157
-												print_unescaped('<div class="poll avatardiv" title="'.($usr).'"></div>');
157
+												print_unescaped('<div class="poll avatardiv" title="' . ($usr) . '"></div>');
158 158
 												print_unescaped('</td>');
159 159
 												print_unescaped('<td colspan="2" class="name">');
160 160
 												p($usr);
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
 											}
175 175
 											// look what user voted for this dts
176 176
 											$found = false;
177
-											foreach ($others[$usr] as $vote) {
177
+											foreach ($others[ $usr ] as $vote) {
178 178
 												$voteVal = null;
179 179
 												if ($poll->getType() == '0') {
180 180
 													$voteVal = strtotime($vote->getDt());
@@ -184,10 +184,10 @@  discard block
 block discarded – undo
184 184
 												if ($date_id == $voteVal) {
185 185
 													if ($vote->getType() == '1') {
186 186
 														$cl = 'poll-cell yes';
187
-														$total_y[$i_tot]++;
187
+														$total_y[ $i_tot ]++;
188 188
 													} else if ($vote->getType() == '0') {
189 189
 														$cl = 'poll-cell no';
190
-														$total_n[$i_tot]++;
190
+														$total_n[ $i_tot ]++;
191 191
 													} else if ($vote->getType() == '2') {
192 192
 														$cl = 'poll-cell maybe';
193 193
 													} else {
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
 									print_unescaped('<tr class="current-user">');
216 216
 									print_unescaped('<td class="avatar-cell">');
217 217
 									if (User::isLoggedIn()) {
218
-										print_unescaped('<div class="poll avatardiv" title="'.($userId).'"></div>');
218
+										print_unescaped('<div class="poll avatardiv" title="' . ($userId) . '"></div>');
219 219
 										print_unescaped('</td>');
220 220
 										print_unescaped('<td class="name">');
221 221
 										p($userMgr->get($userId)->getDisplayName());
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
 										if (isset($user_voted)) {
241 241
 											foreach ($user_voted as $obj) {
242 242
 												$voteVal = null;
243
-												if($poll->getType() == '0') {
243
+												if ($poll->getType() == '0') {
244 244
 													$voteVal = strtotime($obj->getDt());
245 245
 												} else {
246 246
 													$voteVal = $obj->getText();
@@ -248,11 +248,11 @@  discard block
 block discarded – undo
248 248
 												if ($voteVal == $date_id) {
249 249
 													if ($obj->getType() == '1') {
250 250
 														$cl = 'poll-cell active yes';
251
-														$total_y[$i_tot]++;
251
+														$total_y[ $i_tot ]++;
252 252
 													} else if ($obj->getType() == '0') {
253 253
 														$cl = 'poll-cell active no';
254
-														$total_n[$i_tot]++;
255
-													} else if($obj->getType() == '2') {
254
+														$total_n[ $i_tot ]++;
255
+													} else if ($obj->getType() == '2') {
256 256
 														$cl = 'poll-cell active maybe';
257 257
 													}
258 258
 													break;
@@ -272,28 +272,28 @@  discard block
 block discarded – undo
272 272
 							<tbody class="summary">
273 273
 								<?php
274 274
 									$diff_array = $total_y;
275
-									for($i = 0 ; $i < count($diff_array) ; $i++) {
276
-										$diff_array[$i] = ($total_y[$i] - $total_n[$i]);
275
+									for ($i = 0; $i < count($diff_array); $i++) {
276
+										$diff_array[ $i ] = ($total_y[ $i ] - $total_n[ $i ]);
277 277
 									}
278 278
 									$max_votes = max($diff_array);
279 279
 								?>
280 280
 								<tr class="total">
281 281
 									<th colspan="3"><?php p($l->t('Total')); ?></th>
282
-									<?php for ($i = 0 ; $i < count($dates) ; $i++) : ?>
282
+									<?php for ($i = 0; $i < count($dates); $i++) : ?>
283 283
 										<td class="total">
284 284
 											<?php
285
-											$classSuffix = "pollid_" . $dates[$i]->getId();
286
-											if (isset($total_y[$i])) {
287
-												$val = $total_y[$i];
285
+											$classSuffix = "pollid_" . $dates[ $i ]->getId();
286
+											if (isset($total_y[ $i ])) {
287
+												$val = $total_y[ $i ];
288 288
 											} else {
289 289
 												$val = 0;
290 290
 											}
291 291
 											?>
292
-											<div id="id_y_<?php p($classSuffix); ?>" class="result-cell yes" data-value=<?php p(isset($total_y_others[$i]) ? $total_y_others[$i] : '0'); ?>>
292
+											<div id="id_y_<?php p($classSuffix); ?>" class="result-cell yes" data-value=<?php p(isset($total_y_others[ $i ]) ? $total_y_others[ $i ] : '0'); ?>>
293 293
 												<?php p($val); ?>
294 294
 											</div>
295
-											<div id="id_n_<?php p($classSuffix); ?>" class="result-cell no" data-value=<?php p(isset($total_n_others[$i]) ? $total_n_others[$i] : '0'); ?>>
296
-												<?php p(isset($total_n[$i]) ? $total_n[$i] : '0'); ?>
295
+											<div id="id_n_<?php p($classSuffix); ?>" class="result-cell no" data-value=<?php p(isset($total_n_others[ $i ]) ? $total_n_others[ $i ] : '0'); ?>>
296
+												<?php p(isset($total_n[ $i ]) ? $total_n[ $i ] : '0'); ?>
297 297
 											</div>
298 298
 										</td>
299 299
 									<?php endfor; ?>
@@ -303,7 +303,7 @@  discard block
 block discarded – undo
303 303
 									<?php
304 304
 									for ($i = 0; $i < count($dates); $i++) {
305 305
 										$check = '';
306
-										if ($total_y[$i] - $total_n[$i] == $max_votes) {
306
+										if ($total_y[ $i ] - $total_n[ $i ] == $max_votes) {
307 307
 											$check = 'icon-checkmark';
308 308
 										}
309 309
 										print_unescaped('<td class="win_row ' . $check . '" id="id_total_' . $i . '"></td>');
@@ -334,7 +334,7 @@  discard block
 block discarded – undo
334 334
 						<div class="input-group-addon">
335 335
 							<span class="icon-share"></span><?php p($l->t('Link')); ?>
336 336
 						</div>
337
-						<input type="text" value="<?php p($pollUrl);?>" readonly="readonly">
337
+						<input type="text" value="<?php p($pollUrl); ?>" readonly="readonly">
338 338
 					</div>
339 339
 					<?php if ($expired) : ?>
340 340
 						<div id="expired_info">
Please login to merge, or discard this patch.
templates/create.tmpl.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -27,18 +27,18 @@  discard block
 block discarded – undo
27 27
 	\OCP\Util::addScript('polls', 'create_edit');
28 28
 	\OCP\Util::addScript('polls', 'vendor/jquery.datetimepicker.full.min');
29 29
 
30
-	$userId = $_['userId'];
31
-	$userMgr = $_['userMgr'];
32
-	$urlGenerator = $_['urlGenerator'];
33
-	$isUpdate = isset($_['poll']) && $_['poll'] != null;
30
+	$userId = $_[ 'userId' ];
31
+	$userMgr = $_[ 'userMgr' ];
32
+	$urlGenerator = $_[ 'urlGenerator' ];
33
+	$isUpdate = isset($_[ 'poll' ]) && $_[ 'poll' ] != null;
34 34
 	$isAnonymous = false;
35 35
 	$hideNames = false;
36 36
 
37 37
 	if ($isUpdate) {
38
-		$poll = $_['poll'];
38
+		$poll = $_[ 'poll' ];
39 39
 		$isAnonymous = $poll->getIsAnonymous();
40 40
 		$hideNames = $isAnonymous && $poll->getFullAnonymous();
41
-		$dates = $_['dates'];
41
+		$dates = $_[ 'dates' ];
42 42
 		$chosen = '[';
43 43
 		foreach ($dates as $d) {
44 44
 			if ($poll->getType() == '0') {
@@ -53,12 +53,12 @@  discard block
 block discarded – undo
53 53
 		$title = $poll->getTitle();
54 54
 		$desc = $poll->getDescription();
55 55
 		if ($poll->getExpire() != null) {
56
-			$expireTs = strtotime($poll->getExpire()) - 60*60*24; //remove one day, which has been added to expire at the end of a day
56
+			$expireTs = strtotime($poll->getExpire()) - 60 * 60 * 24; //remove one day, which has been added to expire at the end of a day
57 57
 			$expireStr = date('d.m.Y', $expireTs);
58 58
 		}
59 59
 		$access = $poll->getAccess();
60 60
 		$accessTypes = $access;
61
-		if (   $access != 'registered' 
61
+		if ($access != 'registered' 
62 62
 			&& $access != 'hidden' && $access != 'public'
63 63
 		) {
64 64
 			$access = 'select';
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
 							<table id="selected-dates-table" class="choices">
167 167
 							</table>
168 168
 						</div>
169
-						<div id="text-select-container" <?php if(!$isUpdate || $poll->getType() == '0') print_unescaped('style="display:none;"'); ?> >
169
+						<div id="text-select-container" <?php if (!$isUpdate || $poll->getType() == '0') print_unescaped('style="display:none;"'); ?> >
170 170
 							<label for="text-title" class="input_title"><?php p($l->t('Text item')); ?></label>
171 171
 							<div class="input-group">
172 172
 								<input type="text" id="text-title" placeholder="<?php print_unescaped('Insert text...'); ?>" />
Please login to merge, or discard this patch.
lib/Controller/PageController.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -246,7 +246,7 @@  discard block
 block discarded – undo
246 246
             ]);
247 247
         } else {
248 248
             User::checkLoggedIn();
249
-            return new TemplateResponse('polls', 'no.acc.tmpl', []);
249
+            return new TemplateResponse('polls', 'no.acc.tmpl', [ ]);
250 250
         }
251 251
     }
252 252
 
@@ -387,7 +387,7 @@  discard block
 block discarded – undo
387 387
      */
388 388
     public function createPoll() {
389 389
         return new TemplateResponse('polls', 'create.tmpl',
390
-            ['userId' => $this->userId, 'userMgr' => $this->manager, 'urlGenerator' => $this->urlGenerator]);
390
+            [ 'userId' => $this->userId, 'userMgr' => $this->manager, 'urlGenerator' => $this->urlGenerator ]);
391 391
     }
392 392
 
393 393
     /**
@@ -539,15 +539,15 @@  discard block
 block discarded – undo
539 539
                     $part = new Participation();
540 540
                     $part->setPollId($pollId);
541 541
                     $part->setUserId($userId);
542
-                    $part->setDt(date('Y-m-d H:i:s', $dates[$i]));
543
-                    $part->setType($types[$i]);
542
+                    $part->setDt(date('Y-m-d H:i:s', $dates[ $i ]));
543
+                    $part->setType($types[ $i ]);
544 544
                     $this->participationMapper->insert($part);
545 545
                 } else {
546 546
                     $part = new ParticipationText();
547 547
                     $part->setPollId($pollId);
548 548
                     $part->setUserId($userId);
549
-                    $part->setText($dates[$i]);
550
-                    $part->setType($types[$i]);
549
+                    $part->setText($dates[ $i ]);
550
+                    $part->setType($types[ $i ]);
551 551
                     $this->participationTextMapper->insert($part);
552 552
                 }
553 553
 
@@ -555,7 +555,7 @@  discard block
 block discarded – undo
555 555
             $this->sendNotifications($pollId, $userId);
556 556
         }
557 557
         $hash = $poll->getHash();
558
-        $url = $this->urlGenerator->linkToRoute('polls.page.goto_poll', ['hash' => $hash]);
558
+        $url = $this->urlGenerator->linkToRoute('polls.page.goto_poll', [ 'hash' => $hash ]);
559 559
         return new RedirectResponse($url);
560 560
     }
561 561
 
Please login to merge, or discard this patch.