Skip to content

Commit

Permalink
fix: double-including confing results in redefining constants
Browse files Browse the repository at this point in the history
  • Loading branch information
martinambrus committed Nov 6, 2017
1 parent 5a92945 commit e92d075
Show file tree
Hide file tree
Showing 10 changed files with 26 additions and 26 deletions.
6 changes: 3 additions & 3 deletions Templates/Ajax/mapscroll.tpl
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php
session_start();
include('GameEngine/config.php');
include_once('GameEngine/config.php');
include_once ("GameEngine/Lang/" . LANG . ".php");
include("GameEngine/Generator.php");
include("GameEngine/Database.php");
include_once("GameEngine/Generator.php");
include_once("GameEngine/Database.php");

//include("GameEngine/Session.php");

Expand Down
6 changes: 3 additions & 3 deletions Templates/Ajax/mapscroll2.tpl
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php
session_start();
include('GameEngine/config.php');
include_once('GameEngine/config.php');
include_once ("GameEngine/Lang/" . LANG . ".php");
include("GameEngine/Generator.php");
include("GameEngine/Database.php");
include_once("GameEngine/Generator.php");
include_once("GameEngine/Database.php");
header("Content-Type: application/json;");

//include("GameEngine/Session.php");
Expand Down
2 changes: 1 addition & 1 deletion Templates/Manual/52.tpl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
$count="0";
include("GameEngine/Config.php");
include_once("GameEngine/Config.php");

$connection = mysqli_connect(SQL_SERVER, SQL_USER, SQL_PASS) or die(mysqli_error($database->dblink));
mysqli_select_db(SQL_DB, $connection) or die(mysqli_error($database->dblink));
Expand Down
6 changes: 3 additions & 3 deletions anleitung.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

use App\Utils\AccessLogger;

include("GameEngine/config.php");
include("GameEngine/Database.php");
include("GameEngine/Lang/".LANG.".php");
include_once("GameEngine/config.php");
include_once("GameEngine/Database.php");
include_once("GameEngine/Lang/".LANG.".php");
AccessLogger::logRequest();
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
Expand Down
6 changes: 3 additions & 3 deletions impressum.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

use App\Utils\AccessLogger;

include("GameEngine/config.php");
include("GameEngine/Database.php");
include("GameEngine/Lang/".LANG.".php");
include_once("GameEngine/config.php");
include_once("GameEngine/Database.php");
include_once("GameEngine/Lang/".LANG.".php");
AccessLogger::logRequest();
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
Expand Down
2 changes: 1 addition & 1 deletion index.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
exit;
}

include ("GameEngine/config.php");
include_once("GameEngine/config.php");
/*
if($_SERVER['HTTP_HOST'] != '.SERVER.')
{
Expand Down
2 changes: 1 addition & 1 deletion manual.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
## ##
#################################################################################

include("GameEngine/config.php");
include_once("GameEngine/config.php");
?>

<html>
Expand Down
10 changes: 5 additions & 5 deletions password.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
header("Location: install/");
exit;
}
include("GameEngine/config.php");
include("GameEngine/Lang/" . LANG . ".php");
include("GameEngine/Database.php");
include("GameEngine/Mailer.php");
include("GameEngine/Generator.php");
include_once("GameEngine/config.php");
include_once("GameEngine/Lang/" . LANG . ".php");
include_once("GameEngine/Database.php");
include_once("GameEngine/Mailer.php");
include_once("GameEngine/Generator.php");
AccessLogger::logRequest();

if(!isset($_REQUEST['npw'])){
Expand Down
6 changes: 3 additions & 3 deletions spielregeln.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

use App\Utils\AccessLogger;

include("GameEngine/config.php");
include("GameEngine/Database.php");
include("GameEngine/Lang/".LANG.".php");
include_once("GameEngine/config.php");
include_once("GameEngine/Database.php");
include_once("GameEngine/Lang/".LANG.".php");
AccessLogger::logRequest();
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
Expand Down
6 changes: 3 additions & 3 deletions tutorial.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@

use App\Utils\AccessLogger;

include("GameEngine/config.php");
include("GameEngine/Database.php");
include("GameEngine/Lang/".LANG.".php");
include_once("GameEngine/config.php");
include_once("GameEngine/Database.php");
include_once("GameEngine/Lang/".LANG.".php");
AccessLogger::logRequest();
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
Expand Down

0 comments on commit e92d075

Please sign in to comment.