diff options
| -rw-r--r-- | default-conf/var_www_includes/config_db.php | 4 | ||||
| -rw-r--r-- | includes/funktion_lang.php | 43 | ||||
| -rw-r--r-- | includes/funktion_menu.php | 2 |
3 files changed, 24 insertions, 25 deletions
diff --git a/default-conf/var_www_includes/config_db.php b/default-conf/var_www_includes/config_db.php index 428a9339..a90e012e 100644 --- a/default-conf/var_www_includes/config_db.php +++ b/default-conf/var_www_includes/config_db.php @@ -3,6 +3,6 @@ include ("../include/funktion_db.php"); $con = mysql_connect("localhost", "root", "changeme") or die("connection failed"); $sel = mysql_select_db("tabel") or die(mysql_error()); -mysql_query("SET CHARACTER SET utf8;", $sql_connection); -mysql_query("SET NAMES 'utf8'", $sql_connection); +mysql_query("SET CHARACTER SET utf8;", $con); +mysql_query("SET NAMES 'utf8'", $con); ?> diff --git a/includes/funktion_lang.php b/includes/funktion_lang.php index e04dd8eb..3e26ea33 100644 --- a/includes/funktion_lang.php +++ b/includes/funktion_lang.php @@ -1,28 +1,27 @@ <?php - function Get_Text ($TextID, $NoError = false) { - global $con, $error_messages, $debug; +function Get_Text($TextID, $NoError = false) { + global $con, $error_messages, $debug; - if( !isset($_SESSION['Sprache'])) - $_SESSION['Sprache'] = "EN"; - if( $_SESSION['Sprache']=="") - $_SESSION['Sprache']="EN"; - if( isset($_GET["SetLanguage"])) - $_SESSION['Sprache']= $_GET["SetLanguage"]; + if (!isset ($_SESSION['Sprache'])) + $_SESSION['Sprache'] = "EN"; + if ($_SESSION['Sprache'] == "") + $_SESSION['Sprache'] = "EN"; + if (isset ($_GET["SetLanguage"])) + $_SESSION['Sprache'] = $_GET["SetLanguage"]; - $SQL = "SELECT * FROM `Sprache` WHERE TextID=\"$TextID\" AND Sprache ='".$_SESSION['Sprache']."'"; - @$Erg = mysql_query($SQL, $con); + $SQL = "SELECT * FROM `Sprache` WHERE TextID=\"$TextID\" AND Sprache ='" . $_SESSION['Sprache'] . "'"; + @ $Erg = mysql_query($SQL, $con); - if( mysql_num_rows( $Erg) == 1) - return (@mysql_result($Erg, 0, "Text")); - elseif( $NoError && !$debug) - return ""; - else { - array_push($error_messages, "Get_Text, '$TextID' found ". mysql_num_rows( $Erg). "x in Sprache Database Table for Language (".$_SESSION['Sprache'].")\n"); - return "Error Data, '$TextID' found ". mysql_num_rows( $Erg). "x"; - } - } + if (mysql_num_rows($Erg) == 1) + return (@ mysql_result($Erg, 0, "Text")); + elseif ($NoError && !$debug) return ""; + else { + array_push($error_messages, "Get_Text, '$TextID' found " . mysql_num_rows($Erg) . "x in Sprache Database Table for Language (" . $_SESSION['Sprache'] . ")\n"); + return "Error Data, '$TextID' found " . mysql_num_rows($Erg) . "x"; + } +} - function Print_Text($TextID, $NoError = false) { - echo Get_Text($TextID, $NoError); - } +function Print_Text($TextID, $NoError = false) { + echo Get_Text($TextID, $NoError); +} ?> diff --git a/includes/funktion_menu.php b/includes/funktion_menu.php index 8246dcc5..e62ff37c 100644 --- a/includes/funktion_menu.php +++ b/includes/funktion_menu.php @@ -15,7 +15,7 @@ function ShowMenu($MenuName) { if ((strpos("00$Key", "0$MenuName") > 0) || ((strlen($MenuName) == 0) && (strpos("0$Key", "/") == 0))) { $TempName = Get_Text($Key, true); - if ((true || $debug) && (strlen($TempName) == 0)) + if ((true || $debug) && ($TempName == "")) $TempName = "not found: \"$Key\""; if ($Entry == "Y") { |