Completed
Branch master (8d2de8)
by Litera
06:30
created
phpinfo.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -2,21 +2,21 @@
 block discarded – undo
2 2
 
3 3
 //pokud jsem na vyvojovem stroji
4 4
 $ISDEV = ($_SERVER["SERVER_NAME"] == 'localhost'
5
-		 )?true:false;
5
+		 ) ? true : false;
6 6
 
7
-if($ISDEV)
7
+if ($ISDEV)
8 8
 	{
9 9
 	//vyvojova masina
10 10
 	if ($_SERVER["SERVER_NAME"] == 'vodni.poutnicikolin.cz')
11 11
 		{
12 12
 		//define('ROOT_DIR',"../");
13 13
   	  	//define('ROOT_DIR', "/home/www/poutnicikolin.cz/subdomains/dev/admin/");
14
-		define('HTTP_DIR','http://'.$_SERVER['HTTP_HOST']."/vodni/srazvs/");
14
+		define('HTTP_DIR', 'http://'.$_SERVER['HTTP_HOST']."/vodni/srazvs/");
15 15
 		//echo ROOT_DIR;
16 16
   		}
17 17
 	else {
18
-		 define('ROOT_DIR',$_SERVER['DOCUMENT_ROOT'].'/vodni/srazvs/');
19
-		 define('HTTP_DIR','http://'.$_SERVER['HTTP_HOST'].'/vodni/');
18
+		 define('ROOT_DIR', $_SERVER['DOCUMENT_ROOT'].'/vodni/srazvs/');
19
+		 define('HTTP_DIR', 'http://'.$_SERVER['HTTP_HOST'].'/vodni/');
20 20
 		 }
21 21
 	}
22 22
 //ostra masina
Please login to merge, or discard this 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.
index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,6 +3,6 @@
 block discarded – undo
3 3
 // Uncomment this line if you must temporarily take down your site for maintenance.
4 4
 // require '.maintenance.php';
5 5
 
6
-$container = require_once __DIR__ . '/app/bootstrap.php';
6
+$container = require_once __DIR__.'/app/bootstrap.php';
7 7
 
8 8
 $container->getService('application')->run();
Please login to merge, or discard this patch.
inc/access.inc.php 2 patches
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -1,15 +1,15 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if(isset($_POST['login'])) $login = $_POST['login'];
3
+if (isset($_POST['login'])) $login = $_POST['login'];
4 4
 else $login = "";
5
-if(isset($_POST['passwd'])) $passwd = $_POST['passwd'];
5
+if (isset($_POST['passwd'])) $passwd = $_POST['passwd'];
6 6
 else $passwd = "";
7
-if(isset($_POST['cms'])) $cms = $_POST['cms'];
8
-elseif(isset($_GET['cms'])) $cms = $_GET['cms'];
7
+if (isset($_POST['cms'])) $cms = $_POST['cms'];
8
+elseif (isset($_GET['cms'])) $cms = $_GET['cms'];
9 9
 else $cms = "";
10 10
 
11 11
 //odhlaseni uzivatele
12
-if($cms == "logout") {
12
+if ($cms == "logout") {
13 13
 	//zrusim promenne v session
14 14
 	session_unset();
15 15
 	session_destroy();
@@ -25,10 +25,10 @@  discard block
 block discarded – undo
25 25
 $nologin = true;
26 26
 //dd(isset($_SESSION) && (!isset($_SESSION[SESSION_PREFIX.'user'])) || !isset($_SESSION[SESSION_PREFIX.'password']));
27 27
 //kontrola casove existence session a delky jeji necinnosti
28
-if(isset($_SESSION) && (!isset($_SESSION[SESSION_PREFIX.'user']) || !isset($_SESSION[SESSION_PREFIX.'password']))) {
28
+if (isset($_SESSION) && (!isset($_SESSION[SESSION_PREFIX.'user']) || !isset($_SESSION[SESSION_PREFIX.'password']))) {
29 29
 	$_SESSION['user']["logged"] = false;
30 30
 	session_unset();
31
-	if(session_id()) {
31
+	if (session_id()) {
32 32
 		session_destroy();
33 33
 	}
34 34
 	header("Location: ".HTTP_DIR."admin/");
@@ -36,15 +36,15 @@  discard block
 block discarded – undo
36 36
 }
37 37
 else $_SESSION['user']["logged"] = true;
38 38
 
39
-if(isset($_SESSION['user']['logged']) && ($_SESSION['user']['logged'] == true)) {
39
+if (isset($_SESSION['user']['logged']) && ($_SESSION['user']['logged'] == true)) {
40 40
 	// neverim session z jineho systemu, takze overuju, jestli jsou udaje pravdive
41
-	if(!isset($database)) {
41
+	if (!isset($database)) {
42 42
 		$database = $this->database;
43 43
 	}
44 44
 	$user = $database->table('sunlight-users')->where('id', $_SESSION[SESSION_PREFIX.'user'])->fetch();
45 45
 
46
-	if($user) {
47
-		if($_SESSION[SESSION_PREFIX.'password'] != $user['password']) {
46
+	if ($user) {
47
+		if ($_SESSION[SESSION_PREFIX.'password'] != $user['password']) {
48 48
 			Tracy\Debugger::log('Access: bad password!', Tracy\Debugger::ERROR);
49 49
 		}
50 50
 		else {
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 
56 56
 		$uid = $_SESSION[SESSION_PREFIX.'user'];
57 57
 		// 20 slunda || 19 dytta || 7 pavlik || 105 liska || 21 Pumpa || 155 jantikjanouch || 165 OVAMysak || 46 Luca || 2 hvezdar || 178 cednik || 182 tester || 179 koblizek
58
-		if(($uid != 19) && ($uid != 7) && ($uid != 105) && ($uid != 21) && ($uid != 20) && ($uid != 155) && ($uid != 165) && ($uid != 46) && ($uid != 2) && ($uid != 13) && ($uid != 178) && ($uid != 182) && ($uid != 179)){
58
+		if (($uid != 19) && ($uid != 7) && ($uid != 105) && ($uid != 21) && ($uid != 20) && ($uid != 155) && ($uid != 165) && ($uid != 46) && ($uid != 2) && ($uid != 13) && ($uid != 178) && ($uid != 182) && ($uid != 179)) {
59 59
 			header("Location: ".HTTP_DIR."admin/");
60 60
 		}
61 61
 	} else {
Please login to merge, or discard this 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.