From a36e46d44db24622eeed4438342dfdbd98a28727 Mon Sep 17 00:00:00 2001
From: Kevin Chabowski <kevin@kch42.de>
Date: Sat, 21 Jan 2012 22:00:33 +0100
Subject: Setup script and clean config file.

---
 ratatoeskr/sys/db.php          | 14 ++++++++------
 ratatoeskr/sys/translation.php | 18 ++++++++++++++----
 2 files changed, 22 insertions(+), 10 deletions(-)

(limited to 'ratatoeskr/sys')

diff --git a/ratatoeskr/sys/db.php b/ratatoeskr/sys/db.php
index 6add093..5ab2688 100644
--- a/ratatoeskr/sys/db.php
+++ b/ratatoeskr/sys/db.php
@@ -10,7 +10,9 @@
  * See "ratatoeskr/licenses/ratatoeskr" for more information.
  */
 
-require_once(dirname(__FILE__) . "/../config.php");
+if(!defined("SETUP"))
+	require_once(dirname(__FILE__) . "/../config.php");
+
 require_once(dirname(__FILE__) . "/utils.php");
 
 /*
@@ -21,16 +23,16 @@ require_once(dirname(__FILE__) . "/utils.php");
 function db_connect()
 {
 	global $config;
-	$db_connection = mysql_pconnect(
+	$db_connection = @mysql_pconnect(
 		$config["mysql"]["server"],
 		$config["mysql"]["user"],
 		$config["mysql"]["passwd"]);
 	if(!$db_connection)
-		die("Could not connect to database server. " . mysql_error());
+		throw new MySQLException("Could not connect to database server. " . mysql_error());
+	
+	if(!@mysql_select_db($config["mysql"]["db"], $db_connection))
+		throw new MySQLException("Could not open database. " . mysql_error());
 	
-	if(!mysql_select_db($config["mysql"]["db"], $db_connection))
-		die("Could not open database. " . mysql_error());
-
 	mysql_query("SET NAMES 'utf8'", $db_connection);
 }
 
diff --git a/ratatoeskr/sys/translation.php b/ratatoeskr/sys/translation.php
index ca43c13..6c494db 100644
--- a/ratatoeskr/sys/translation.php
+++ b/ratatoeskr/sys/translation.php
@@ -9,10 +9,12 @@
  * See "ratatoeskr/licenses/ratatoeskr" for more information.
  */
 
-require_once(dirname(__FILE__) . "/models.php");
 require_once(dirname(__FILE__) . "/utils.php");
 require_once(dirname(__FILE__) . "/init_ste.php");
 
+if(!defined("SETUP"))
+	require_once(dirname(__FILE__) . "/models.php");
+
 if(!defined(TRANSLATION_PLUGIN_LOADED))
 {
 	$ste->register_tag(
@@ -38,9 +40,17 @@ if(!defined(TRANSLATION_PLUGIN_LOADED))
  */
 function load_language($lang=NULL)
 {
-	global $ratatoeskr_settings;
-	if($lang === NULL)
-		$lang = $ratatoeskr_settings["default_language"];
+	if(!defined("SETUP"))
+	{
+		global $ratatoeskr_settings;
+		if($lang === NULL)
+			$lang = $ratatoeskr_settings["default_language"];
+	}
+	else
+	{
+		if($lang === NULL)
+			$lang = "en";
+	}
 	
 	/*
 	 * Because we will include an file defined by the $lang param, we will
-- 
cgit v1.2.3-70-g09d2