Completed
Pull Request — master (#140)
by Litera
09:52
created
phpinfo.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -13,8 +13,7 @@
 block discarded – undo
13 13
   	  	//define('ROOT_DIR', "/home/www/poutnicikolin.cz/subdomains/dev/admin/");
14 14
 		define('HTTP_DIR','http://'.$_SERVER['HTTP_HOST']."/vodni/srazvs/");
15 15
 		//echo ROOT_DIR;
16
-  		}
17
-	else {
16
+  		} else {
18 17
 		 define('ROOT_DIR',$_SERVER['DOCUMENT_ROOT'].'/vodni/srazvs/');
19 18
 		 define('HTTP_DIR','http://'.$_SERVER['HTTP_HOST'].'/vodni/');
20 19
 		 }
Please login to merge, or discard this patch.
inc/access.inc.php 1 patch
Braces   +21 added lines, -12 removed lines patch added patch discarded remove patch
@@ -1,12 +1,22 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if(isset($_POST['login'])) $login = $_POST['login'];
4
-else $login = "";
5
-if(isset($_POST['passwd'])) $passwd = $_POST['passwd'];
6
-else $passwd = "";
7
-if(isset($_POST['cms'])) $cms = $_POST['cms'];
8
-elseif(isset($_GET['cms'])) $cms = $_GET['cms'];
9
-else $cms = "";
3
+if(isset($_POST['login'])) {
4
+	$login = $_POST['login'];
5
+} else {
6
+	$login = "";
7
+}
8
+if(isset($_POST['passwd'])) {
9
+	$passwd = $_POST['passwd'];
10
+} else {
11
+	$passwd = "";
12
+}
13
+if(isset($_POST['cms'])) {
14
+	$cms = $_POST['cms'];
15
+} elseif(isset($_GET['cms'])) {
16
+	$cms = $_GET['cms'];
17
+} else {
18
+	$cms = "";
19
+}
10 20
 
11 21
 //odhlaseni uzivatele
12 22
 if($cms == "logout") {
@@ -33,8 +43,9 @@  discard block
 block discarded – undo
33 43
 	}
34 44
 	header("Location: ".HTTP_DIR."admin/");
35 45
 	exit('Session Not Exists');
46
+} else {
47
+	$_SESSION['user']["logged"] = true;
36 48
 }
37
-else $_SESSION['user']["logged"] = true;
38 49
 
39 50
 if(isset($_SESSION['user']['logged']) && ($_SESSION['user']['logged'] == true)) {
40 51
 	// neverim session z jineho systemu, takze overuju, jestli jsou udaje pravdive
@@ -46,8 +57,7 @@  discard block
 block discarded – undo
46 57
 	if($user) {
47 58
 		if($_SESSION[SESSION_PREFIX.'password'] != $user['password']) {
48 59
 			Tracy\Debugger::log('Access: bad password!', Tracy\Debugger::ERROR);
49
-		}
50
-		else {
60
+		} else {
51 61
 			$nologin = false;
52 62
 			// znovuobnovim pocitani casu
53 63
 			$_SESSION['user']['access_time'] = time();
@@ -61,8 +71,7 @@  discard block
 block discarded – undo
61 71
 	} else {
62 72
 		Tracy\Debugger::log('Access: user data does not exist!', Tracy\Debugger::ERROR);
63 73
 	}
64
-}
65
-else {
74
+} else {
66 75
 	session_unset();
67 76
 	session_destroy();
68 77
 	header("Location: ".HTTP_DIR."admin/");
Please login to merge, or discard this patch.
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/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/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.
app/components/PublicBlocksByDayControl.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -23,8 +23,7 @@
 block discarded – undo
23 23
 		BlockModel $model,
24 24
 		PublicProgramsControl $programsControl,
25 25
 		PublicBlockDetailControl $blockDetailControl
26
-	)
27
-	{
26
+	) {
28 27
 		$this->setBlockModel($model);
29 28
 		$this->setProgramsControl($programsControl);
30 29
 		$this->setPublicBlockDetailControl($blockDetailControl);
Please login to merge, or discard this patch.