Completed
Pull Request — master (#102)
by Litera
10:11 queued 01:46
created
app/services/SkautisAuthenticator.php 1 patch
Braces   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -9,11 +9,11 @@
 block discarded – undo
9 9
  * Never let user to set his ID himself.
10 10
  * @author Hána František <[email protected]>
11 11
  */
12
-class SkautisAuthenticator extends Nette\Object implements Nette\Security\IAuthenticator
13
-{
12
+class SkautisAuthenticator extends Nette\Object implements Nette\Security\IAuthenticator
13
+{
14 14
 
15
-	public function authenticate(array $credentials)
16
-	{
15
+	public function authenticate(array $credentials)
16
+	{
17 17
 		$data = $credentials[0];
18 18
 		return new Nette\Security\Identity($data->ID_User);
19 19
 	}
Please login to merge, or discard this patch.
app/models/BlockModel.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -88,8 +88,11 @@
 block discarded – undo
88 88
 		$html_select = "<select style='width: 300px; font-size: 10px' name='block'>\n";
89 89
 
90 90
 		foreach($result as $data){
91
-			if($data['id'] == $blockId) $selected = "selected";
92
-			else $selected = "";
91
+			if($data['id'] == $blockId) {
92
+				$selected = "selected";
93
+			} else {
94
+				$selected = "";
95
+			}
93 96
 			$html_select .= "<option ".$selected." value='".$data['id']."'>".$data['day'].", ".$data->from->format('%H:%I:%S')." - ".$data->to->format('%H:%I:%S')." : ".$data['name']."</option>\n";
94 97
 		}
95 98
 		$html_select .= "</select>\n";
Please login to merge, or discard this patch.
app/helpers.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -7,7 +7,8 @@  discard block
 block discarded – undo
7 7
 	 * @param  mixed
8 8
 	 * @return void
9 9
 	 */
10
-	function dd() {
10
+	function dd()
11
+	{
11 12
 		array_map(function ($x){
12 13
 			(\Tracy\Debugger::dump($x));
13 14
 		}, func_get_args());
@@ -22,7 +23,8 @@  discard block
 block discarded – undo
22 23
 	 *
23 24
 	 * @return string
24 25
 	 */
25
-	function appVersion() {
26
+	function appVersion()
27
+	{
26 28
 		$packagePath = realpath(__DIR__ . '/../package.json');
27 29
 		$package = json_decode(file_get_contents($packagePath));
28 30
 
Please login to merge, or discard this patch.
app/models/MeetingModel.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -193,8 +193,9 @@
 block discarded – undo
193 193
 		foreach($result as $data) {
194 194
 			if($data['id'] == $selectedProvince) {
195 195
 				$sel = "selected";
196
+			} else {
197
+				$sel = "";
196 198
 			}
197
-			else $sel = "";
198 199
 			$html_select .= "<option value='" . $data['id'] . "' " . $sel . ">" . $data['province_name'] . "</option>";
199 200
 		}
200 201
 
Please login to merge, or discard this patch.
app/models/MealModel.php 1 patch
Braces   +11 added lines, -4 removed lines patch added patch discarded remove patch
@@ -131,9 +131,15 @@  discard block
 block discarded – undo
131 131
 
132 132
 		$htmlSelect = '';
133 133
 		foreach(static::$dayMeal as $title => $varName){
134
-			if(preg_match('/breakfast/', $varName))	$mealIcon = 'breakfast';
135
-			if(preg_match('/lunch/', $varName))		$mealIcon = 'lunch';
136
-			if(preg_match('/dinner/', $varName))	$mealIcon = 'dinner';
134
+			if(preg_match('/breakfast/', $varName)) {
135
+				$mealIcon = 'breakfast';
136
+			}
137
+			if(preg_match('/lunch/', $varName)) {
138
+				$mealIcon = 'lunch';
139
+			}
140
+			if(preg_match('/dinner/', $varName)) {
141
+				$mealIcon = 'dinner';
142
+			}
137 143
 
138 144
 			$htmlSelect .= "<span style='display:block;font-size:11px;'>".$title.":</span>\n";
139 145
 			$htmlSelect .= "<img style='width:18px;' src='".IMG_DIR."icons/".$mealIcon.".png' />\n";
@@ -142,8 +148,9 @@  discard block
 block discarded – undo
142 148
 			foreach ($yesNoArray as $key){
143 149
 				if($key == $mealsValue[$varName]){
144 150
 					$selected = "selected";
151
+				} else {
152
+					$selected = "";
145 153
 				}
146
-				else $selected = "";
147 154
 				$htmlSelect .= "<option value='".$key."' ".$selected.">".$key."</option>";
148 155
 			}
149 156
 			$htmlSelect .= "</select><br />\n";
Please login to merge, or discard this patch.
app/models/ProgramModel.php 1 patch
Braces   +39 added lines, -22 removed lines patch added patch discarded remove patch
@@ -114,8 +114,11 @@  discard block
 block discarded – undo
114 114
 			}
115 115
 
116 116
 			// pokud uz jednou bylo zaskrtnuto, nezaskrtavam znovu
117
-			if(!$checked_flag) $checked = "checked='checked'";
118
-			else $checked = "";
117
+			if(!$checked_flag) {
118
+				$checked = "checked='checked'";
119
+			} else {
120
+				$checked = "";
121
+			}
119 122
 
120 123
 			$html .= "<input ".$checked." type='radio' name='blck_".$blockId."' value='0' /> Nebudu přítomen <br />\n";
121 124
 			$html .= $html_input;
@@ -152,8 +155,7 @@  discard block
 block discarded – undo
152 155
 				if($fullProgramData['visitors'] >= $data['capacity']){
153 156
 					//$html .= "<input disabled type='radio' name='".$id."' value='".$data['id']."' />\n";
154 157
 					$fullProgramInfo = "<span style='font-size:12px; font-weight:bold;'>".$fullProgramData['visitors']."/".$data['capacity']."</span> (kapacita programu je naplněna!)";
155
-				}
156
-				else {
158
+				} else {
157 159
 					//$html .= "<input type='radio' name='".$id."' value='".$data['id']."' /> \n";
158 160
 					$fullProgramInfo = "<span style='font-size:12px; font-weight:bold;'>".$fullProgramData['visitors']."/".$data['capacity']."</span>";
159 161
 				}
@@ -196,7 +198,9 @@  discard block
 block discarded – undo
196 198
 
197 199
 			foreach($progSql as $progData){
198 200
 				//nemoznost volit predsnemovni dikusi
199
-				if($progData['id'] == 63) $notDisplayed = "style='display:none;'";
201
+				if($progData['id'] == 63) {
202
+					$notDisplayed = "style='display:none;'";
203
+				}
200 204
 				//obsazenost raftu
201 205
 				/*
202 206
 				elseif($raftCountData['raft'] >= 18){
@@ -204,9 +208,13 @@  discard block
 block discarded – undo
204 208
 					else $notDisplayed = "";
205 209
 				}
206 210
 				*/
207
-				else $notDisplayed = "";
211
+				else {
212
+					$notDisplayed = "";
213
+				}
208 214
 				$programs .= "<div ".$notDisplayed.">".$progData['day'].", ".$progData['from']." - ".$progData['to']." : ".$progData['name']."</div>\n";
209
-				if($progData['program'] == 1) $programs .= "<div ".$notDisplayed.">".$this->getExportPrograms($progData['id'])."</div>";
215
+				if($progData['program'] == 1) {
216
+					$programs .= "<div ".$notDisplayed.">".$this->getExportPrograms($progData['id'])."</div>";
217
+				}
210 218
 				$programs .= "<br />";
211 219
 			}
212 220
 		}
@@ -302,8 +310,7 @@  discard block
 block discarded – undo
302 310
 
303 311
 		if(!$result){
304 312
 			$html = "";
305
-		}
306
-		else{
313
+		} else{
307 314
 			$html = "<div>\n";
308 315
 			$html .= "<input ".$disabled." checked type='radio' name='".$id."' value='0' /> Nebudu přítomen <br />\n";
309 316
 			foreach($result as $data){
@@ -315,14 +322,16 @@  discard block
 block discarded – undo
315 322
 							$data['id'], '0')->fetch();
316 323
 
317 324
 				// nezobrazeni programu v registraci, v adminu zaskrtavatko u programu
318
-				if($data['display_in_reg'] == 0) $notDisplayedProg = "style='display:none;'";
319
-				else $notDisplayedProg = "";
325
+				if($data['display_in_reg'] == 0) {
326
+					$notDisplayedProg = "style='display:none;'";
327
+				} else {
328
+					$notDisplayedProg = "";
329
+				}
320 330
 
321 331
 				if($fullProgramData['visitors'] >= $data['capacity']){
322 332
 					$html .= "<div ".$notDisplayedProg."><input disabled type='radio' name='".$id."' value='".$data['id']."' />\n";
323 333
 					$fullProgramInfo = " (NELZE ZAPSAT - kapacita programu je již naplněna!)";
324
-				}
325
-				else {
334
+				} else {
326 335
 					$html .= "<div ".$notDisplayedProg."><input ".$disabled." type='radio' name='".$id."' value='".$data['id']."' /> \n";
327 336
 					$fullProgramInfo = "";
328 337
 				}
@@ -369,7 +378,8 @@  discard block
 block discarded – undo
369 378
 		}
370 379
 	}
371 380
 
372
-	public function getSelectedPrograms($visitorId) {
381
+	public function getSelectedPrograms($visitorId)
382
+	{
373 383
 		$programs = "  <div style='border-bottom:1px solid black;text-align:right;'>vybrané programy</div>";
374 384
 
375 385
 		$result = $this->database
@@ -414,7 +424,8 @@  discard block
 block discarded – undo
414 424
 			->fetchAll();
415 425
 	}
416 426
 
417
-	public static function getPdfPrograms($id, $vid, $database){
427
+	public static function getPdfPrograms($id, $vid, $database)
428
+	{
418 429
 		$result = $database
419 430
 			->table('kk_programs')
420 431
 			->where('block ? AND deleted ?', $id, '0')
@@ -432,7 +443,9 @@  discard block
 block discarded – undo
432 443
 					->table('kk_visitor-program')
433 444
 					->where('program ? AND visitor ?', $data->id, $vid)
434 445
 					->fetchAll();
435
-				if($rows) $html .= $data['name'];
446
+				if($rows) {
447
+					$html .= $data['name'];
448
+				}
436 449
 			}
437 450
 			$html .= "</div>\n";
438 451
 		}
@@ -440,7 +453,8 @@  discard block
 block discarded – undo
440 453
 		return $html;
441 454
 	}
442 455
 
443
-	public function getProgramsLarge($id){
456
+	public function getProgramsLarge($id)
457
+	{
444 458
 		$result = $this->database
445 459
 			->query('SELECT progs.name AS name,
446 460
 						cat.style AS style
@@ -450,8 +464,9 @@  discard block
 block discarded – undo
450 464
 				LIMIT 10',
451 465
 				$id, '0')->fetchAll();
452 466
 
453
-		if(!$result) $html = "";
454
-		else {
467
+		if(!$result) {
468
+			$html = "";
469
+		} else {
455 470
 			$html = "<table>";
456 471
 			$html .= " <tr>";
457 472
 			foreach($result as $data){
@@ -474,8 +489,9 @@  discard block
 block discarded – undo
474 489
 
475 490
 		$html = '';
476 491
 
477
-		if(!$result) $html = "";
478
-		else {
492
+		if(!$result) {
493
+			$html = "";
494
+		} else {
479 495
 			foreach($result as $data){
480 496
 				$html .= $data['name'].",\n";
481 497
 			}
@@ -510,8 +526,9 @@  discard block
 block discarded – undo
510 526
 			$inner_html .= " <td class=\"label\">Obsazenost programu:</td>\n";
511 527
 			$inner_html .= " <td class=\"text\">".$countData['visitors']."/".$capacity."</td>\n";
512 528
 		    $inner_html .= "</tr>\n";
529
+		} else {
530
+			$inner_html = "";
513 531
 		}
514
-		else $inner_html = "";
515 532
 
516 533
 		$html = '<html><head><meta http-equiv="Content-Type" content="text/html; charset='.$httpEncoding.'" /></head><body><style>td.text {text-align:left;}</style><table class="form"><tr><td class="label">Program:</td><td class="text">'.$name.'</td></tr><tr><td class="label">Popis:</td><td class="text">'.$description.'</td></tr><tr><td class="label">Lektor:</td><td class="text">'.$tutor.'</td></tr><tr><td class="label">E-mail:</td><td class="text"><a href="mailto:'.$email.'" title="e-mail">'.$email.'</a></td></tr>'.$inner_html.'</table></body></html>';
517 534
 
Please login to merge, or discard this patch.
app/models/ExportModel.php 1 patch
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -211,11 +211,14 @@
 block discarded – undo
211 211
 		} else {
212 212
 			foreach($data as $progData) {
213 213
 				// zbaveni se predsnemovni diskuse
214
-				if($progData['id'] == 63) $programs .= "";
215
-				else {
214
+				if($progData['id'] == 63) {
215
+					$programs .= "";
216
+				} else {
216 217
 					$programs .= "<div class='block'>".$progData['day'].", ".$progData['from']." - ".$progData['to']." : ".$progData['name']."</div>\n";
217 218
 
218
-					if($progData['program'] == 1) $programs .= "<div>".ProgramModel::getPdfPrograms($progData['id'], $vid, self::$connection)."</div>";
219
+					if($progData['program'] == 1) {
220
+						$programs .= "<div>".ProgramModel::getPdfPrograms($progData['id'], $vid, self::$connection)."</div>";
221
+					}
219 222
 				}
220 223
 			}
221 224
 		}
Please login to merge, or discard this patch.
app/services/Filters/Number2WordFilter.php 1 patch
Braces   +44 added lines, -21 removed lines patch added patch discarded remove patch
@@ -44,49 +44,72 @@
 block discarded – undo
44 44
 		$length = strlen($number);
45 45
 
46 46
 		// treatment of 0
47
-		if($number == 0) return $zero ? 'nula' : false;
47
+		if($number == 0) {
48
+			return $zero ? 'nula' : false;
49
+		}
48 50
 		// 1 regulation - units
49
-		elseif($length == 1) return $units[$number];
51
+		elseif($length == 1) {
52
+			return $units[$number];
53
+		}
50 54
 		// 2 regulations - desítky
51 55
 		elseif($length == 2) {
52 56
 			$dozensAndUnits = $number{0} . $number{1};
53
-			if($dozensAndUnits == 10) echo 'deset';
54
-			elseif($dozensAndUnits < 20) {
57
+			if($dozensAndUnits == 10) {
58
+				echo 'deset';
59
+			} elseif($dozensAndUnits < 20) {
55 60
 				return $between[$dozensAndUnits];
56
-			}
57
-			else {
61
+			} else {
58 62
 				return $dozens[$number{0}] . $units[$number{1}];
59 63
 			}
60 64
 		}
61 65
 		// 3 regulations - hundreds
62 66
 		elseif($length == 3) {
63
-			if($number{0} == 1) return 'sto' . self::__invoke(substr($number, 1));
64
-			elseif($number{0} == 2) return 'dvěstě' . self::__invoke(substr($number, 1));
65
-			elseif($number{0} == 3 || $number{0} == 4) return $units[$number{0}] . 'sta' . self::__invoke(substr($number, 1));
66
-			else return $units[$number{0}] . 'set' . self::__invoke(substr($number, 1));
67
+			if($number{0} == 1) {
68
+				return 'sto' . self::__invoke(substr($number, 1));
69
+			} elseif($number{0} == 2) {
70
+				return 'dvěstě' . self::__invoke(substr($number, 1));
71
+			} elseif($number{0} == 3 || $number{0} == 4) {
72
+				return $units[$number{0}] . 'sta' . self::__invoke(substr($number, 1));
73
+			} else {
74
+				return $units[$number{0}] . 'set' . self::__invoke(substr($number, 1));
75
+			}
67 76
 		}
68 77
 		// 4 regulations - thousands
69 78
 		elseif($length == 4) {
70
-			if($number{0} == 1) return 'tisíc' . self::__invoke(substr($number, 1));
71
-			elseif($number{0} < 5) return $units[$number{0}] . 'tisíce' . self::__invoke(substr($number, 1));
72
-			else return $units[$number{0}] . 'tisíc' . self::__invoke(substr($number, 1));
79
+			if($number{0} == 1) {
80
+				return 'tisíc' . self::__invoke(substr($number, 1));
81
+			} elseif($number{0} < 5) {
82
+				return $units[$number{0}] . 'tisíce' . self::__invoke(substr($number, 1));
83
+			} else {
84
+				return $units[$number{0}] . 'tisíc' . self::__invoke(substr($number, 1));
85
+			}
73 86
 		}
74 87
 		// 5 regulations - tens of thousands
75 88
 		elseif($length == 5) {
76 89
 			$tensOfThousands = $number{0} . $number{1};
77
-			if($tensOfThousands == 10) return 'desettisíc' . self::__invoke(substr($number, 2));
78
-			elseif($tensOfThousands < 20) return $between[$tensOfThousands] . 'tisíc' . self::__invoke(substr($number, 2));
79
-			elseif($tensOfThousands < 100) return $dozens[$number{0}] . $units[$number{1}] . 'tisíc' . self::__invoke(substr($number, 2));
90
+			if($tensOfThousands == 10) {
91
+				return 'desettisíc' . self::__invoke(substr($number, 2));
92
+			} elseif($tensOfThousands < 20) {
93
+				return $between[$tensOfThousands] . 'tisíc' . self::__invoke(substr($number, 2));
94
+			} elseif($tensOfThousands < 100) {
95
+				return $dozens[$number{0}] . $units[$number{1}] . 'tisíc' . self::__invoke(substr($number, 2));
96
+			}
80 97
 		}
81 98
 		// 6 regulations - hundreds of thousands
82 99
 		elseif($length == 6) {
83 100
 			if($number{0} == 1) {
84
-				if($number{1} . $number{2} == 00) return 'stotisíc' . self::__invoke(substr($number, 3));
85
-				else return 'sto' . self::__invoke(substr($number, 1));
101
+				if($number{1} . $number{2} == 00) {
102
+					return 'stotisíc' . self::__invoke(substr($number, 3));
103
+				} else {
104
+					return 'sto' . self::__invoke(substr($number, 1));
105
+				}
106
+			} elseif($number{0} == 2) {
107
+				return 'dvěstě' . self::__invoke(substr($number, 1));
108
+			} elseif($number{0} == 3 || $number{0} == 4) {
109
+				return $units[$number{0}] . 'sta' . self::__invoke(substr($number, 1));
110
+			} else {
111
+				return $units[$number{0}] . 'set' . self::__invoke(substr($number, 1));
86 112
 			}
87
-			elseif($number{0} == 2) return 'dvěstě' . self::__invoke(substr($number, 1));
88
-			elseif($number{0} == 3 || $number{0} == 4) return $units[$number{0}] . 'sta' . self::__invoke(substr($number, 1));
89
-			else return $units[$number{0}] . 'set' . self::__invoke(substr($number, 1));
90 113
 		}
91 114
 
92 115
 		return false;
Please login to merge, or discard this patch.