Passed
Push — dartcafe-patch-1 ( 6b4dc4...6a565e )
by René
19:55
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/main.tmpl.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -27,9 +27,9 @@  discard block
 block discarded – undo
27 27
 	\OCP\Util::addStyle('polls', 'list');
28 28
 	\OCP\Util::addScript('polls', 'start');
29 29
 
30
-	$userId = $_['userId'];
31
-	$userMgr = $_['userMgr'];
32
-	$urlGenerator = $_['urlGenerator'];
30
+	$userId = $_[ 'userId' ];
31
+	$userMgr = $_[ 'userMgr' ];
32
+	$urlGenerator = $_[ 'urlGenerator' ];
33 33
 ?>
34 34
 	<div id="app-content">
35 35
 		<div id="app-content-wrapper">
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 						<input class="stop icon-close" style="display:none" value="" type="button">
49 49
 					</div>
50 50
 				</div>
51
-	<?php if (count($_['polls']) === 0) : ?>
51
+	<?php if (count($_[ 'polls' ]) === 0) : ?>
52 52
 		<div id="emptycontent" class="">
53 53
 			<div class="icon-polls"></div>
54 54
 			<h2><?php p($l->t('No existing polls.')); ?></h2>
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 					 </div>
82 82
 				</div>
83 83
 
84
-				<?php foreach ($_['polls'] as $poll) : ?>
84
+				<?php foreach ($_[ 'polls' ] as $poll) : ?>
85 85
 					<?php
86 86
 						if (!userHasAccess($poll, $userId)) continue;
87 87
 						// direct url to poll
@@ -90,15 +90,15 @@  discard block
 block discarded – undo
90 90
 
91 91
 						$expiry_style = '';
92 92
 						if ($poll->getType() === '0') {
93
-							$participated = $_['participations'];
93
+							$participated = $_[ 'participations' ];
94 94
 						} else {
95
-							$participated = $_['participations_text'];
95
+							$participated = $_[ 'participations_text' ];
96 96
 						}
97 97
 						$participated_class = 'partic_no';
98 98
 						$participated_title = 'You did not vote';
99 99
 						$participated_count = count($participated);
100 100
 
101
-						$comments = $_['comments'];
101
+						$comments = $_[ 'comments' ];
102 102
 						$commented_class = 'commented_no';
103 103
 						$commented_title = 'You did not comment';
104 104
 						$commented_count = count($comments);
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
 						}
122 122
 
123 123
 						for ($i = 0; $i < count($participated); $i++) {
124
-							if ($poll->getId() === intval($participated[$i]->getPollId())) {
124
+							if ($poll->getId() === intval($participated[ $i ]->getPollId())) {
125 125
 								$participated_class = 'partic_yes';
126 126
 								$participated_title = 'You voted';
127 127
 								array_splice($participated, $i, 1);
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
 						}
131 131
 
132 132
 						for ($i = 0; $i < count($comments); $i++) {
133
-							if ($poll->getId() === intval($comments[$i]->getPollId())) {
133
+							if ($poll->getId() === intval($comments[ $i ]->getPollId())) {
134 134
 								$commented_class = 'commented_yes';
135 135
 								$commented_title = 'You commented';
136 136
 								array_splice($comments, $i, 1);
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 					<div class="row table-body">
144 144
 						<div class="wrapper group-master">
145 145
 							<div class="wrapper group-1">
146
-								<div class="thumbnail <?php p($expiry_style . " " . $commented_class. " " . $participated_class); ?>"></div>  <!-- Image to display status or type of poll */ -->
146
+								<div class="thumbnail <?php p($expiry_style . " " . $commented_class . " " . $participated_class); ?>"></div>  <!-- Image to display status or type of poll */ -->
147 147
 								<a href="<?php p($pollUrl); ?>" class="wrapper group-1-1">
148 148
 									<div class="column name">						  <?php p($poll->getTitle()); ?></div>
149 149
 									<div class="column description">				   <?php p($poll->getDescription()); ?></div>
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
 												</button>
167 167
 											</li>
168 168
 											<li>
169
-												<a href="<?php p($urlGenerator->linkToRoute('polls.page.edit_poll', ['hash' => $poll->getHash()])); ?>" class="menuitem action permanent" id="id_edit_<?php p($poll->getId()); ?>">
169
+												<a href="<?php p($urlGenerator->linkToRoute('polls.page.edit_poll', [ 'hash' => $poll->getHash() ])); ?>" class="menuitem action permanent" id="id_edit_<?php p($poll->getId()); ?>">
170 170
 													<span class="icon-rename"></span>
171 171
 													<span>Edit Poll</span>
172 172
 												</a>
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
 	}
221 221
 	// Nextcloud >= 12
222 222
 	$groups = \OC::$server->getGroupManager()->getUserGroups(\OC::$server->getUserSession()->getUser());
223
-	return array_map(function ($group) {
223
+	return array_map(function($group) {
224 224
 		return $group->getGID();
225 225
 	}, $groups);
226 226
 }
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', '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.