Passed
Push — dartcafe-patch-1 ( 6b4dc4...6a565e )
by René
19:55
created
templates/goto.tmpl.php 1 patch
Indentation   +237 added lines, -237 removed lines patch added patch discarded remove patch
@@ -1,50 +1,50 @@  discard block
 block discarded – undo
1 1
 <?php
2
-	/**
3
-	 * @copyright Copyright (c) 2017 Vinzenz Rosenkranz <[email protected]>
4
-	 *
5
-	 * @author Vinzenz Rosenkranz <[email protected]>
6
-	 *
7
-	 * @license GNU AGPL version 3 or any later version
8
-	 *
9
-	 *  This program is free software: you can redistribute it and/or modify
10
-	 *  it under the terms of the GNU Affero General Public License as
11
-	 *  published by the Free Software Foundation, either version 3 of the
12
-	 *  License, or (at your option) any later version.
13
-	 *
14
-	 *  This program is distributed in the hope that it will be useful,
15
-	 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
16
-	 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
17
-	 *  GNU Affero General Public License for more details.
18
-	 *
19
-	 *  You should have received a copy of the GNU Affero General Public License
20
-	 *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
21
-	 *
22
-	 */
2
+    /**
3
+     * @copyright Copyright (c) 2017 Vinzenz Rosenkranz <[email protected]>
4
+     *
5
+     * @author Vinzenz Rosenkranz <[email protected]>
6
+     *
7
+     * @license GNU AGPL version 3 or any later version
8
+     *
9
+     *  This program is free software: you can redistribute it and/or modify
10
+     *  it under the terms of the GNU Affero General Public License as
11
+     *  published by the Free Software Foundation, either version 3 of the
12
+     *  License, or (at your option) any later version.
13
+     *
14
+     *  This program is distributed in the hope that it will be useful,
15
+     *  but WITHOUT ANY WARRANTY; without even the implied warranty of
16
+     *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
17
+     *  GNU Affero General Public License for more details.
18
+     *
19
+     *  You should have received a copy of the GNU Affero General Public License
20
+     *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
21
+     *
22
+     */
23 23
 
24
-	use OCP\User;
24
+    use OCP\User;
25 25
 
26
-	\OCP\Util::addStyle('polls', 'main');
27
-	\OCP\Util::addStyle('polls', 'vote');
28
-	\OCP\Util::addScript('polls', 'vote');
26
+    \OCP\Util::addStyle('polls', 'main');
27
+    \OCP\Util::addStyle('polls', 'vote');
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'];
39
-	$isAnonymous = $poll->getIsAnonymous() && $userId !== $poll->getOwner();
40
-	$hideNames = $poll->getIsAnonymous() && $poll->getFullAnonymous();
41
-	$notification = $_['notification'];
35
+    $poll = $_['poll'];
36
+    $dates = $_['dates'];
37
+    $votes = $_['votes'];
38
+    $comments = $_['comments'];
39
+    $isAnonymous = $poll->getIsAnonymous() && $userId !== $poll->getOwner();
40
+    $hideNames = $poll->getIsAnonymous() && $poll->getFullAnonymous();
41
+    $notification = $_['notification'];
42 42
 
43
-	if ($poll->getExpire() === null) {
44
-		$expired = false;
45
-	} else {
46
-		$expired = time() > strtotime($poll->getExpire());
47
-	}
43
+    if ($poll->getExpire() === null) {
44
+        $expired = false;
45
+    } else {
46
+        $expired = time() > strtotime($poll->getExpire());
47
+    }
48 48
 ?>
49 49
 
50 50
 <?php if($poll->getType() === '0') : ?>
@@ -55,19 +55,19 @@  discard block
 block discarded – undo
55 55
 
56 56
 <?php
57 57
 if (   $poll->getDescription() !== null 
58
-	&& $poll->getDescription() !== ''
58
+    && $poll->getDescription() !== ''
59 59
 ) {
60
-	$description = nl2br($poll->getDescription());
60
+    $description = nl2br($poll->getDescription());
61 61
 } else {
62
-	$description = $l->t('No description provided.');
62
+    $description = $l->t('No description provided.');
63 63
 }
64 64
 
65 65
 // init array for counting 'yes'-votes for each date
66 66
 $total_y = array();
67 67
 $total_n = array();
68 68
 for ($i = 0 ; $i < count($dates) ; $i++) {
69
-	$total_y[$i] = 0;
70
-	$total_n[$i] = 0;
69
+    $total_y[$i] = 0;
70
+    $total_n[$i] = 0;
71 71
 }
72 72
 $user_voted = array();
73 73
 
@@ -106,189 +106,189 @@  discard block
 block discarded – undo
106 106
 						<table class="vote_table">
107 107
 							<thead>
108 108
 									<?php
109
-									if ($poll->getType() === '0') {
110
-										print_unescaped('<tr id="time-slots-header"><th class="first_header_cell" colspan="3"></th>');
111
-									} else {
112
-										print_unescaped('<tr id="vote-options-header"><th class="first_header_cell" colspan="3"></th>');
113
-										foreach ($dates as $el) {
114
-											print_unescaped('<th title="' . preg_replace('/_\d+$/', '', $el->getText()) . '" class="vote-option">' . preg_replace('/_\d+$/', '', $el->getText()) . '</th>');
115
-										}
116
-									}
117
-									print_unescaped('</tr>');
118
-									?>
109
+                                    if ($poll->getType() === '0') {
110
+                                        print_unescaped('<tr id="time-slots-header"><th class="first_header_cell" colspan="3"></th>');
111
+                                    } else {
112
+                                        print_unescaped('<tr id="vote-options-header"><th class="first_header_cell" colspan="3"></th>');
113
+                                        foreach ($dates as $el) {
114
+                                            print_unescaped('<th title="' . preg_replace('/_\d+$/', '', $el->getText()) . '" class="vote-option">' . preg_replace('/_\d+$/', '', $el->getText()) . '</th>');
115
+                                        }
116
+                                    }
117
+                                    print_unescaped('</tr>');
118
+                                    ?>
119 119
 							</thead>
120 120
 							<tbody class="votes">
121 121
 								<?php
122
-								if ($votes !== null) {
123
-									//group by user
124
-									$others = array();
125
-									foreach ($votes as $vote) {
126
-										if (!isset($others[$vote->getUserId()])) {
127
-											$others[$vote->getUserId()] = array();
128
-										}
129
-										array_push($others[$vote->getUserId()], $vote);
130
-									}
131
-									$userCnt = 0;
132
-									foreach (array_keys($others) as $usr) {
133
-										$userCnt++;
134
-										if ($usr === $userId) {
135
-											// if poll expired, just put current user among the others;
136
-											// otherwise skip here to add current user as last row (to vote)
137
-											if (!$expired) {
138
-												$user_voted = $others[$usr];
139
-												continue;
140
-											}
141
-										}
142
-										print_unescaped('<tr>');
143
-										print_unescaped('<td class="avatar-cell">');
144
-										if (	$userMgr->get($usr) !== null 
145
-											&& !$isAnonymous && !$hideNames
146
-										) {
147
-											print_unescaped('<div class="poll avatardiv" title="'.($usr).'"></div>');
148
-											print_unescaped('</td>');
149
-											print_unescaped('<td colspan="2" class="name">');
150
-											p($userMgr->get($usr)->getDisplayName());
151
-										} else {
152
-											if ($isAnonymous || $hideNames) {
153
-											print_unescaped('<div class="poll avatardiv" title="'.($userCnt).'"></div>');
154
-											print_unescaped('</td>');
155
-											print_unescaped('<td colspan="2" class="name">');
156
-											} else {
157
-												print_unescaped('<div class="poll avatardiv" title="'.($usr).'"></div>');
158
-												print_unescaped('</td>');
159
-												print_unescaped('<td colspan="2" class="name">');
160
-												p($usr);
161
-											}
162
-										}
163
-										print_unescaped('</td>');
122
+                                if ($votes !== null) {
123
+                                    //group by user
124
+                                    $others = array();
125
+                                    foreach ($votes as $vote) {
126
+                                        if (!isset($others[$vote->getUserId()])) {
127
+                                            $others[$vote->getUserId()] = array();
128
+                                        }
129
+                                        array_push($others[$vote->getUserId()], $vote);
130
+                                    }
131
+                                    $userCnt = 0;
132
+                                    foreach (array_keys($others) as $usr) {
133
+                                        $userCnt++;
134
+                                        if ($usr === $userId) {
135
+                                            // if poll expired, just put current user among the others;
136
+                                            // otherwise skip here to add current user as last row (to vote)
137
+                                            if (!$expired) {
138
+                                                $user_voted = $others[$usr];
139
+                                                continue;
140
+                                            }
141
+                                        }
142
+                                        print_unescaped('<tr>');
143
+                                        print_unescaped('<td class="avatar-cell">');
144
+                                        if (	$userMgr->get($usr) !== null 
145
+                                            && !$isAnonymous && !$hideNames
146
+                                        ) {
147
+                                            print_unescaped('<div class="poll avatardiv" title="'.($usr).'"></div>');
148
+                                            print_unescaped('</td>');
149
+                                            print_unescaped('<td colspan="2" class="name">');
150
+                                            p($userMgr->get($usr)->getDisplayName());
151
+                                        } else {
152
+                                            if ($isAnonymous || $hideNames) {
153
+                                            print_unescaped('<div class="poll avatardiv" title="'.($userCnt).'"></div>');
154
+                                            print_unescaped('</td>');
155
+                                            print_unescaped('<td colspan="2" class="name">');
156
+                                            } else {
157
+                                                print_unescaped('<div class="poll avatardiv" title="'.($usr).'"></div>');
158
+                                                print_unescaped('</td>');
159
+                                                print_unescaped('<td colspan="2" class="name">');
160
+                                                p($usr);
161
+                                            }
162
+                                        }
163
+                                        print_unescaped('</td>');
164 164
 
165
-										// loop over dts
166
-										$i_tot = 0;
167
-										foreach ($dates as $dt) {
168
-											if ($poll->getType() === '0') {
169
-												$date_id = strtotime($dt->getDt());
170
-												$poll_id = "pollid_" . $dt->getId();
171
-											} else {
172
-												$date_id = $dt->getText();
173
-												$poll_id = "pollid_" . $dt->getId();
174
-											}
175
-											// look what user voted for this dts
176
-											$found = false;
177
-											foreach ($others[$usr] as $vote) {
178
-												$voteVal = null;
179
-												if ($poll->getType() === '0') {
180
-													$voteVal = strtotime($vote->getDt());
181
-												} else {
182
-													$voteVal = $vote->getText();
183
-												}
184
-												if ($date_id === $voteVal) {
185
-													if ($vote->getType() === '1') {
186
-														$cl = 'poll-cell yes';
187
-														$total_y[$i_tot]++;
188
-													} else if ($vote->getType() === '0') {
189
-														$cl = 'poll-cell no';
190
-														$total_n[$i_tot]++;
191
-													} else if ($vote->getType() === '2') {
192
-														$cl = 'poll-cell maybe';
193
-													} else {
194
-														$cl = 'poll-cell unvoted';
195
-													}
196
-													$found = true;
197
-													break;
198
-												}
199
-											}
200
-											if (!$found) {
201
-												$cl = 'poll-cell unvoted';
202
-											}
203
-											// Make the td clickable
204
-											print_unescaped('<td class="' . $cl . '"><div></div></td>');
205
-											// Make the div clickable
206
-											// print_unescaped('<td><div class="' . $cl . '"></div></td>');
207
-											$i_tot++;
208
-										}
209
-										print_unescaped('</tr>');
210
-									}
211
-								}
212
-								$total_y_others = array_merge(array(), $total_y);
213
-								$total_n_others = array_merge(array(), $total_n);
214
-								if (!$expired) {
215
-									print_unescaped('<tr class="current-user">');
216
-									print_unescaped('<td class="avatar-cell">');
217
-									if (User::isLoggedIn()) {
218
-										print_unescaped('<div class="poll avatardiv" title="'.($userId).'"></div>');
219
-										print_unescaped('</td>');
220
-										print_unescaped('<td class="name">');
221
-										p($userMgr->get($userId)->getDisplayName());
222
-									} else {
223
-										print_unescaped('<div class="poll avatardiv" title="?"></div>');
224
-										print_unescaped('</td>');
225
-										print_unescaped('<td id="id_ac_detected" class="external current-user"><input type="text" name="user_name" id="user_name" placeholder="' . $l->t('Your name here') . '" />');
226
-									}
227
-									print_unescaped('</td><td class="toggle-all toggle maybe"><div id="toggle" class=""></div><img class="svg" src="../../../../core/img/actions/play-next.svg" "="" alt=""></td>');
228
-									// print_unescaped('</td><td class="toggle-cell"><div id="toggle" class="toggle-all toggle maybe"></div><img class="svg" src="../../../../core/img/actions/play-next.svg" "="" alt=""></td>');
229
-									$i_tot = 0;
230
-									foreach ($dates as $dt) {
231
-										if ($poll->getType() === '0') {
232
-											$date_id = strtotime($dt->getDt());
233
-											$poll_id = "pollid_" . $dt->getId();
234
-										} else {
235
-											$date_id = $dt->getText();
236
-											$poll_id = "pollid_" . $dt->getId();
237
-										}
238
-										// see if user already has data for this event
239
-										$cl = 'poll-cell active unvoted ';
240
-										if (isset($user_voted)) {
241
-											foreach ($user_voted as $obj) {
242
-												$voteVal = null;
243
-												if($poll->getType() === '0') {
244
-													$voteVal = strtotime($obj->getDt());
245
-												} else {
246
-													$voteVal = $obj->getText();
247
-												}
248
-												if ($voteVal === $date_id) {
249
-													if ($obj->getType() === '1') {
250
-														$cl = 'poll-cell active yes';
251
-														$total_y[$i_tot]++;
252
-													} else if ($obj->getType() === '0') {
253
-														$cl = 'poll-cell active no';
254
-														$total_n[$i_tot]++;
255
-													} else if($obj->getType() === '2') {
256
-														$cl = 'poll-cell active maybe';
257
-													}
258
-													break;
259
-												}
260
-											}
261
-										}
262
-										// Make the td clickable
263
-										print_unescaped('<td id="' . $poll_id . '" class="cl_click ' . $cl . '" data-value="' . $date_id . '"><div></div></td>');
264
-										// Make the div clickable
265
-										// print_unescaped('<td><div id="' . $date_id . '" class="cl_click ' . $cl . '"></div></td>');
165
+                                        // loop over dts
166
+                                        $i_tot = 0;
167
+                                        foreach ($dates as $dt) {
168
+                                            if ($poll->getType() === '0') {
169
+                                                $date_id = strtotime($dt->getDt());
170
+                                                $poll_id = "pollid_" . $dt->getId();
171
+                                            } else {
172
+                                                $date_id = $dt->getText();
173
+                                                $poll_id = "pollid_" . $dt->getId();
174
+                                            }
175
+                                            // look what user voted for this dts
176
+                                            $found = false;
177
+                                            foreach ($others[$usr] as $vote) {
178
+                                                $voteVal = null;
179
+                                                if ($poll->getType() === '0') {
180
+                                                    $voteVal = strtotime($vote->getDt());
181
+                                                } else {
182
+                                                    $voteVal = $vote->getText();
183
+                                                }
184
+                                                if ($date_id === $voteVal) {
185
+                                                    if ($vote->getType() === '1') {
186
+                                                        $cl = 'poll-cell yes';
187
+                                                        $total_y[$i_tot]++;
188
+                                                    } else if ($vote->getType() === '0') {
189
+                                                        $cl = 'poll-cell no';
190
+                                                        $total_n[$i_tot]++;
191
+                                                    } else if ($vote->getType() === '2') {
192
+                                                        $cl = 'poll-cell maybe';
193
+                                                    } else {
194
+                                                        $cl = 'poll-cell unvoted';
195
+                                                    }
196
+                                                    $found = true;
197
+                                                    break;
198
+                                                }
199
+                                            }
200
+                                            if (!$found) {
201
+                                                $cl = 'poll-cell unvoted';
202
+                                            }
203
+                                            // Make the td clickable
204
+                                            print_unescaped('<td class="' . $cl . '"><div></div></td>');
205
+                                            // Make the div clickable
206
+                                            // print_unescaped('<td><div class="' . $cl . '"></div></td>');
207
+                                            $i_tot++;
208
+                                        }
209
+                                        print_unescaped('</tr>');
210
+                                    }
211
+                                }
212
+                                $total_y_others = array_merge(array(), $total_y);
213
+                                $total_n_others = array_merge(array(), $total_n);
214
+                                if (!$expired) {
215
+                                    print_unescaped('<tr class="current-user">');
216
+                                    print_unescaped('<td class="avatar-cell">');
217
+                                    if (User::isLoggedIn()) {
218
+                                        print_unescaped('<div class="poll avatardiv" title="'.($userId).'"></div>');
219
+                                        print_unescaped('</td>');
220
+                                        print_unescaped('<td class="name">');
221
+                                        p($userMgr->get($userId)->getDisplayName());
222
+                                    } else {
223
+                                        print_unescaped('<div class="poll avatardiv" title="?"></div>');
224
+                                        print_unescaped('</td>');
225
+                                        print_unescaped('<td id="id_ac_detected" class="external current-user"><input type="text" name="user_name" id="user_name" placeholder="' . $l->t('Your name here') . '" />');
226
+                                    }
227
+                                    print_unescaped('</td><td class="toggle-all toggle maybe"><div id="toggle" class=""></div><img class="svg" src="../../../../core/img/actions/play-next.svg" "="" alt=""></td>');
228
+                                    // print_unescaped('</td><td class="toggle-cell"><div id="toggle" class="toggle-all toggle maybe"></div><img class="svg" src="../../../../core/img/actions/play-next.svg" "="" alt=""></td>');
229
+                                    $i_tot = 0;
230
+                                    foreach ($dates as $dt) {
231
+                                        if ($poll->getType() === '0') {
232
+                                            $date_id = strtotime($dt->getDt());
233
+                                            $poll_id = "pollid_" . $dt->getId();
234
+                                        } else {
235
+                                            $date_id = $dt->getText();
236
+                                            $poll_id = "pollid_" . $dt->getId();
237
+                                        }
238
+                                        // see if user already has data for this event
239
+                                        $cl = 'poll-cell active unvoted ';
240
+                                        if (isset($user_voted)) {
241
+                                            foreach ($user_voted as $obj) {
242
+                                                $voteVal = null;
243
+                                                if($poll->getType() === '0') {
244
+                                                    $voteVal = strtotime($obj->getDt());
245
+                                                } else {
246
+                                                    $voteVal = $obj->getText();
247
+                                                }
248
+                                                if ($voteVal === $date_id) {
249
+                                                    if ($obj->getType() === '1') {
250
+                                                        $cl = 'poll-cell active yes';
251
+                                                        $total_y[$i_tot]++;
252
+                                                    } else if ($obj->getType() === '0') {
253
+                                                        $cl = 'poll-cell active no';
254
+                                                        $total_n[$i_tot]++;
255
+                                                    } else if($obj->getType() === '2') {
256
+                                                        $cl = 'poll-cell active maybe';
257
+                                                    }
258
+                                                    break;
259
+                                                }
260
+                                            }
261
+                                        }
262
+                                        // Make the td clickable
263
+                                        print_unescaped('<td id="' . $poll_id . '" class="cl_click ' . $cl . '" data-value="' . $date_id . '"><div></div></td>');
264
+                                        // Make the div clickable
265
+                                        // print_unescaped('<td><div id="' . $date_id . '" class="cl_click ' . $cl . '"></div></td>');
266 266
 
267
-										$i_tot++;
268
-									}
269
-								}
270
-								?>
267
+                                        $i_tot++;
268
+                                    }
269
+                                }
270
+                                ?>
271 271
 							</tbody>
272 272
 							<tbody class="summary">
273 273
 								<?php
274
-									$diff_array = $total_y;
275
-									for($i = 0 ; $i < count($diff_array) ; $i++) {
276
-										$diff_array[$i] = ($total_y[$i] - $total_n[$i]);
277
-									}
278
-									$max_votes = max($diff_array);
279
-								?>
274
+                                    $diff_array = $total_y;
275
+                                    for($i = 0 ; $i < count($diff_array) ; $i++) {
276
+                                        $diff_array[$i] = ($total_y[$i] - $total_n[$i]);
277
+                                    }
278
+                                    $max_votes = max($diff_array);
279
+                                ?>
280 280
 								<tr class="total">
281 281
 									<th colspan="3"><?php p($l->t('Total')); ?></th>
282 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];
288
-											} else {
289
-												$val = 0;
290
-											}
291
-											?>
285
+                                            $classSuffix = "pollid_" . $dates[$i]->getId();
286
+                                            if (isset($total_y[$i])) {
287
+                                                $val = $total_y[$i];
288
+                                            } else {
289
+                                                $val = 0;
290
+                                            }
291
+                                            ?>
292 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>
@@ -301,14 +301,14 @@  discard block
 block discarded – undo
301 301
 								<tr class="best">
302 302
 									<th colspan="3"><?php p($l->t('Best option')); ?></th>
303 303
 									<?php
304
-									for ($i = 0; $i < count($dates); $i++) {
305
-										$check = '';
306
-										if ($total_y[$i] - $total_n[$i] === $max_votes) {
307
-											$check = 'icon-checkmark';
308
-										}
309
-										print_unescaped('<td class="win_row ' . $check . '" id="id_total_' . $i . '"></td>');
310
-									}
311
-									?>
304
+                                    for ($i = 0; $i < count($dates); $i++) {
305
+                                        $check = '';
306
+                                        if ($total_y[$i] - $total_n[$i] === $max_votes) {
307
+                                            $check = 'icon-checkmark';
308
+                                        }
309
+                                        print_unescaped('<td class="win_row ' . $check . '" id="id_total_' . $i . '"></td>');
310
+                                    }
311
+                                    ?>
312 312
 								</tr>
313 313
 							</tbody>
314 314
 						</table>
@@ -371,19 +371,19 @@  discard block
 block discarded – undo
371 371
 								<div class="comment">
372 372
 									<div class="comment-header">
373 373
 										<?php
374
-										print_unescaped('<span class="comment-date">' . date('d.m.Y H:i:s', strtotime($comment->getDt())) . '</span>');
375
-										if ($isAnonymous || $hideNames) {
376
-											p('Anonymous');
377
-										} else {
378
-											if ($userMgr->get($comment->getUserId()) !== null) {
379
-												p($userMgr->get($comment->getUserId())->getDisplayName());
380
-											} else {
381
-												print_unescaped('<i>');
382
-												p($comment->getUserId());
383
-												print_unescaped('</i>');
384
-											}
385
-										}
386
-										?>
374
+                                        print_unescaped('<span class="comment-date">' . date('d.m.Y H:i:s', strtotime($comment->getDt())) . '</span>');
375
+                                        if ($isAnonymous || $hideNames) {
376
+                                            p('Anonymous');
377
+                                        } else {
378
+                                            if ($userMgr->get($comment->getUserId()) !== null) {
379
+                                                p($userMgr->get($comment->getUserId())->getDisplayName());
380
+                                            } else {
381
+                                                print_unescaped('<i>');
382
+                                                p($comment->getUserId());
383
+                                                print_unescaped('</i>');
384
+                                            }
385
+                                        }
386
+                                        ?>
387 387
 									</div>
388 388
 									<div class="wordwrap comment-content">
389 389
 										<?php p($comment->getComment()); ?>
Please login to merge, or discard this patch.
templates/main.tmpl.php 1 patch
Indentation   +122 added lines, -122 removed lines patch added patch discarded remove patch
@@ -1,35 +1,35 @@  discard block
 block discarded – undo
1 1
 <?php
2
-	/**
3
-	 * @copyright Copyright (c) 2017 Vinzenz Rosenkranz <[email protected]>
4
-	 *
5
-	 * @author Vinzenz Rosenkranz <[email protected]>
6
-	 *
7
-	 * @license GNU AGPL version 3 or any later version
8
-	 *
9
-	 *  This program is free software: you can redistribute it and/or modify
10
-	 *  it under the terms of the GNU Affero General Public License as
11
-	 *  published by the Free Software Foundation, either version 3 of the
12
-	 *  License, or (at your option) any later version.
13
-	 *
14
-	 *  This program is distributed in the hope that it will be useful,
15
-	 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
16
-	 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
17
-	 *  GNU Affero General Public License for more details.
18
-	 *
19
-	 *  You should have received a copy of the GNU Affero General Public License
20
-	 *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
21
-	 *
22
-	 */
2
+    /**
3
+     * @copyright Copyright (c) 2017 Vinzenz Rosenkranz <[email protected]>
4
+     *
5
+     * @author Vinzenz Rosenkranz <[email protected]>
6
+     *
7
+     * @license GNU AGPL version 3 or any later version
8
+     *
9
+     *  This program is free software: you can redistribute it and/or modify
10
+     *  it under the terms of the GNU Affero General Public License as
11
+     *  published by the Free Software Foundation, either version 3 of the
12
+     *  License, or (at your option) any later version.
13
+     *
14
+     *  This program is distributed in the hope that it will be useful,
15
+     *  but WITHOUT ANY WARRANTY; without even the implied warranty of
16
+     *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
17
+     *  GNU Affero General Public License for more details.
18
+     *
19
+     *  You should have received a copy of the GNU Affero General Public License
20
+     *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
21
+     *
22
+     */
23 23
 
24
-	use OCP\User;
24
+    use OCP\User;
25 25
 
26
-	\OCP\Util::addStyle('polls', 'main');
27
-	\OCP\Util::addStyle('polls', 'list');
28
-	\OCP\Util::addScript('polls', 'start');
26
+    \OCP\Util::addStyle('polls', 'main');
27
+    \OCP\Util::addStyle('polls', 'list');
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">
@@ -83,61 +83,61 @@  discard block
 block discarded – undo
83 83
 
84 84
 				<?php foreach ($_['polls'] as $poll) : ?>
85 85
 					<?php
86
-						if (!userHasAccess($poll, $userId)) continue;
87
-						// direct url to poll
88
-						$pollUrl = $urlGenerator->linkToRouteAbsolute('polls.page.goto_poll', array('hash' => $poll->getHash()));
89
-						$owner = $poll->getOwner();
86
+                        if (!userHasAccess($poll, $userId)) continue;
87
+                        // direct url to poll
88
+                        $pollUrl = $urlGenerator->linkToRouteAbsolute('polls.page.goto_poll', array('hash' => $poll->getHash()));
89
+                        $owner = $poll->getOwner();
90 90
 
91
-						$expiry_style = '';
92
-						if ($poll->getType() === '0') {
93
-							$participated = $_['participations'];
94
-						} else {
95
-							$participated = $_['participations_text'];
96
-						}
97
-						$participated_class = 'partic_no';
98
-						$participated_title = 'You did not vote';
99
-						$participated_count = count($participated);
91
+                        $expiry_style = '';
92
+                        if ($poll->getType() === '0') {
93
+                            $participated = $_['participations'];
94
+                        } else {
95
+                            $participated = $_['participations_text'];
96
+                        }
97
+                        $participated_class = 'partic_no';
98
+                        $participated_title = 'You did not vote';
99
+                        $participated_count = count($participated);
100 100
 
101
-						$comments = $_['comments'];
102
-						$commented_class = 'commented_no';
103
-						$commented_title = 'You did not comment';
104
-						$commented_count = count($comments);
101
+                        $comments = $_['comments'];
102
+                        $commented_class = 'commented_no';
103
+                        $commented_title = 'You did not comment';
104
+                        $commented_count = count($comments);
105 105
 
106
-						if ($owner === $userId) {
107
-							$owner = $l->t('Yourself');
108
-						}
106
+                        if ($owner === $userId) {
107
+                            $owner = $l->t('Yourself');
108
+                        }
109 109
 
110
-						if ($poll->getExpire() !== null) {
111
-							// $expiry_date = date('d.m.Y', strtotime($poll->getExpire()));
112
-							$expiry_date = OCP\relative_modified_date(strtotime($poll->getExpire())); // does not work, because relative_modified_date seems not to recognise future time diffs
113
-							$expiry_style = ' progress';
114
-							if (date('U') > strtotime($poll->getExpire())) {
115
-								$expiry_date = OCP\relative_modified_date(strtotime($poll->getExpire()));
116
-								$expiry_style = ' expired';
117
-							}
118
-						} else {
119
-							$expiry_style = ' endless';
120
-							$expiry_date = $l->t('Never');
121
-						}
110
+                        if ($poll->getExpire() !== null) {
111
+                            // $expiry_date = date('d.m.Y', strtotime($poll->getExpire()));
112
+                            $expiry_date = OCP\relative_modified_date(strtotime($poll->getExpire())); // does not work, because relative_modified_date seems not to recognise future time diffs
113
+                            $expiry_style = ' progress';
114
+                            if (date('U') > strtotime($poll->getExpire())) {
115
+                                $expiry_date = OCP\relative_modified_date(strtotime($poll->getExpire()));
116
+                                $expiry_style = ' expired';
117
+                            }
118
+                        } else {
119
+                            $expiry_style = ' endless';
120
+                            $expiry_date = $l->t('Never');
121
+                        }
122 122
 
123
-						for ($i = 0; $i < count($participated); $i++) {
124
-							if ($poll->getId() === intval($participated[$i]->getPollId())) {
125
-								$participated_class = 'partic_yes';
126
-								$participated_title = 'You voted';
127
-								array_splice($participated, $i, 1);
128
-								break;
129
-							}
130
-						}
123
+                        for ($i = 0; $i < count($participated); $i++) {
124
+                            if ($poll->getId() === intval($participated[$i]->getPollId())) {
125
+                                $participated_class = 'partic_yes';
126
+                                $participated_title = 'You voted';
127
+                                array_splice($participated, $i, 1);
128
+                                break;
129
+                            }
130
+                        }
131 131
 
132
-						for ($i = 0; $i < count($comments); $i++) {
133
-							if ($poll->getId() === intval($comments[$i]->getPollId())) {
134
-								$commented_class = 'commented_yes';
135
-								$commented_title = 'You commented';
136
-								array_splice($comments, $i, 1);
137
-								break;
138
-							}
139
-						}
140
-					?>
132
+                        for ($i = 0; $i < count($comments); $i++) {
133
+                            if ($poll->getId() === intval($comments[$i]->getPollId())) {
134
+                                $commented_class = 'commented_yes';
135
+                                $commented_title = 'You commented';
136
+                                array_splice($comments, $i, 1);
137
+                                break;
138
+                            }
139
+                        }
140
+                    ?>
141 141
 
142 142
 
143 143
 					<div class="row table-body">
@@ -213,16 +213,16 @@  discard block
 block discarded – undo
213 213
  * @return array with groups
214 214
  */
215 215
 function getGroups($userId) {
216
-	// $this->requireLogin();
217
-	if (class_exists('\OC_Group', true)) {
218
-		// Nextcloud <= 11, ownCloud
219
-		return \OC_Group::getUserGroups($userId);
220
-	}
221
-	// Nextcloud >= 12
222
-	$groups = \OC::$server->getGroupManager()->getUserGroups(\OC::$server->getUserSession()->getUser());
223
-	return array_map(function ($group) {
224
-		return $group->getGID();
225
-	}, $groups);
216
+    // $this->requireLogin();
217
+    if (class_exists('\OC_Group', true)) {
218
+        // Nextcloud <= 11, ownCloud
219
+        return \OC_Group::getUserGroups($userId);
220
+    }
221
+    // Nextcloud >= 12
222
+    $groups = \OC::$server->getGroupManager()->getUserGroups(\OC::$server->getUserSession()->getUser());
223
+    return array_map(function ($group) {
224
+        return $group->getGID();
225
+    }, $groups);
226 226
 }
227 227
 
228 228
 /**
@@ -231,42 +231,42 @@  discard block
 block discarded – undo
231 231
  * @return boolean 
232 232
  */
233 233
 function userHasAccess($poll, $userId) {
234
-	if ($poll === null) {
235
-		return false;
236
-	}
237
-	$access = $poll->getAccess();
238
-	$owner = $poll->getOwner();
239
-	if (!User::isLoggedIn()) {
240
-		return false;
241
-	}
242
-	if ($access === 'public') {
243
-		return true;
244
-	}
245
-	if ($access === 'hidden') {
246
-		return true;
247
-	}
248
-	if ($access === 'registered') {
249
-		return true;
250
-	}
251
-	if ($owner === $userId) {
252
-		return true;
253
-	}
254
-	$user_groups = getGroups($userId);
234
+    if ($poll === null) {
235
+        return false;
236
+    }
237
+    $access = $poll->getAccess();
238
+    $owner = $poll->getOwner();
239
+    if (!User::isLoggedIn()) {
240
+        return false;
241
+    }
242
+    if ($access === 'public') {
243
+        return true;
244
+    }
245
+    if ($access === 'hidden') {
246
+        return true;
247
+    }
248
+    if ($access === 'registered') {
249
+        return true;
250
+    }
251
+    if ($owner === $userId) {
252
+        return true;
253
+    }
254
+    $user_groups = getGroups($userId);
255 255
 
256
-	$arr = explode(';', $access);
256
+    $arr = explode(';', $access);
257 257
 
258
-	foreach ($arr as $item) {
259
-		if (strpos($item, 'group_') === 0) {
260
-			$grp = substr($item, 6);
261
-			foreach ($user_groups as $user_group) {
262
-				if ($user_group === $grp) return true;
263
-			}
264
-		}
265
-		else if (strpos($item, 'user_') === 0) {
266
-			$usr = substr($item, 5);
267
-			if ($usr === $userId) return true;
268
-		}
269
-	}
270
-	return false;
258
+    foreach ($arr as $item) {
259
+        if (strpos($item, 'group_') === 0) {
260
+            $grp = substr($item, 6);
261
+            foreach ($user_groups as $user_group) {
262
+                if ($user_group === $grp) return true;
263
+            }
264
+        }
265
+        else if (strpos($item, 'user_') === 0) {
266
+            $usr = substr($item, 5);
267
+            if ($usr === $userId) return true;
268
+        }
269
+    }
270
+    return false;
271 271
 }
272 272
 ?>
Please login to merge, or discard this patch.
templates/create.tmpl.php 1 patch
Indentation   +65 added lines, -65 removed lines patch added patch discarded remove patch
@@ -1,69 +1,69 @@
 block discarded – undo
1 1
 <?php
2
-	/**
3
-	 * @copyright Copyright (c) 2017 Vinzenz Rosenkranz <[email protected]>
4
-	 *
5
-	 * @author Vinzenz Rosenkranz <[email protected]>
6
-	 *
7
-	 * @license GNU AGPL version 3 or any later version
8
-	 *
9
-	 *  This program is free software: you can redistribute it and/or modify
10
-	 *  it under the terms of the GNU Affero General Public License as
11
-	 *  published by the Free Software Foundation, either version 3 of the
12
-	 *  License, or (at your option) any later version.
13
-	 *
14
-	 *  This program is distributed in the hope that it will be useful,
15
-	 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
16
-	 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
17
-	 *  GNU Affero General Public License for more details.
18
-	 *
19
-	 *  You should have received a copy of the GNU Affero General Public License
20
-	 *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
21
-	 *
22
-	 */
23
-
24
-	\OCP\Util::addStyle('polls', 'main');
25
-	\OCP\Util::addStyle('polls', 'createpoll');
26
-	\OCP\Util::addStyle('polls', 'jquery.datetimepicker');
27
-	\OCP\Util::addScript('polls', 'create_edit');
28
-	\OCP\Util::addScript('polls', 'jquery.datetimepicker.full.min');
29
-
30
-	$userId = $_['userId'];
31
-	$userMgr = $_['userMgr'];
32
-	$urlGenerator = $_['urlGenerator'];
33
-	$isUpdate = isset($_['poll']) && $_['poll'] !== null;
34
-	$isAnonymous = false;
35
-	$hideNames = false;
36
-
37
-	if ($isUpdate) {
38
-		$poll = $_['poll'];
39
-		$isAnonymous = $poll->getIsAnonymous();
40
-		$hideNames = $isAnonymous && $poll->getFullAnonymous();
41
-		$dates = $_['dates'];
42
-		$chosen = '[';
43
-		foreach ($dates as $d) {
44
-			if ($poll->getType() === '0') {
45
-				$chosen .= strtotime($d->getDt());
46
-			} else {
47
-				$chosen .= '"' . $d->getText() . '"';
48
-			}
49
-			$chosen .= ',';
50
-		}
51
-		$chosen = trim($chosen, ',');
52
-		$chosen .= ']';
53
-		$title = $poll->getTitle();
54
-		$desc = $poll->getDescription();
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
57
-			$expireStr = date('d.m.Y', $expireTs);
58
-		}
59
-		$access = $poll->getAccess();
60
-		$accessTypes = $access;
61
-		if (   $access !== 'registered' 
62
-			&& $access !== 'hidden' && $access !== 'public'
63
-		) {
64
-			$access = 'select';
65
-		}
66
-	}
2
+    /**
3
+     * @copyright Copyright (c) 2017 Vinzenz Rosenkranz <[email protected]>
4
+     *
5
+     * @author Vinzenz Rosenkranz <[email protected]>
6
+     *
7
+     * @license GNU AGPL version 3 or any later version
8
+     *
9
+     *  This program is free software: you can redistribute it and/or modify
10
+     *  it under the terms of the GNU Affero General Public License as
11
+     *  published by the Free Software Foundation, either version 3 of the
12
+     *  License, or (at your option) any later version.
13
+     *
14
+     *  This program is distributed in the hope that it will be useful,
15
+     *  but WITHOUT ANY WARRANTY; without even the implied warranty of
16
+     *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
17
+     *  GNU Affero General Public License for more details.
18
+     *
19
+     *  You should have received a copy of the GNU Affero General Public License
20
+     *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
21
+     *
22
+     */
23
+
24
+    \OCP\Util::addStyle('polls', 'main');
25
+    \OCP\Util::addStyle('polls', 'createpoll');
26
+    \OCP\Util::addStyle('polls', 'jquery.datetimepicker');
27
+    \OCP\Util::addScript('polls', 'create_edit');
28
+    \OCP\Util::addScript('polls', 'jquery.datetimepicker.full.min');
29
+
30
+    $userId = $_['userId'];
31
+    $userMgr = $_['userMgr'];
32
+    $urlGenerator = $_['urlGenerator'];
33
+    $isUpdate = isset($_['poll']) && $_['poll'] !== null;
34
+    $isAnonymous = false;
35
+    $hideNames = false;
36
+
37
+    if ($isUpdate) {
38
+        $poll = $_['poll'];
39
+        $isAnonymous = $poll->getIsAnonymous();
40
+        $hideNames = $isAnonymous && $poll->getFullAnonymous();
41
+        $dates = $_['dates'];
42
+        $chosen = '[';
43
+        foreach ($dates as $d) {
44
+            if ($poll->getType() === '0') {
45
+                $chosen .= strtotime($d->getDt());
46
+            } else {
47
+                $chosen .= '"' . $d->getText() . '"';
48
+            }
49
+            $chosen .= ',';
50
+        }
51
+        $chosen = trim($chosen, ',');
52
+        $chosen .= ']';
53
+        $title = $poll->getTitle();
54
+        $desc = $poll->getDescription();
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
57
+            $expireStr = date('d.m.Y', $expireTs);
58
+        }
59
+        $access = $poll->getAccess();
60
+        $accessTypes = $access;
61
+        if (   $access !== 'registered' 
62
+            && $access !== 'hidden' && $access !== 'public'
63
+        ) {
64
+            $access = 'select';
65
+        }
66
+    }
67 67
 ?>
68 68
 
69 69
 <div id="app">
Please login to merge, or discard this patch.