0
@@ -40,8 +40,7 @@ function load_adodb() {
0
     else
0
     {
0
       # ADOdb cannot be found, show a message and stop the script execution
0
-			echo "The ADOdb Lite database abstraction library cannot be found, CMS Made Simple cannot load.";
0
-			die();
0
+			die('The ADOdb Lite database abstraction library cannot be found, CMS Made Simple cannot load.');
0
     }
0
   }
0
   
0
@@ -53,33 +52,29 @@ function & adodb_connect()
0
 {
0
   global $db, $config;
0
   
0
-	$dbinstance = &ADONewConnection($config['dbms'], 'pear:date:extend:transaction');
0
-	if (isset($config['persistent_db_conn']) && $config['persistent_db_conn'] == true)
0
-	{
0
-		$connect_result = $dbinstance->PConnect($config["db_hostname"],$config["db_username"],$config["db_password"],$config["db_name"]);
0
-	}
0
-	else
0
-	{
0
-		$connect_result = $dbinstance->Connect($config["db_hostname"],$config["db_username"],$config["db_password"],$config["db_name"]);
0
-	}
0
+	$dbinstance =& ADONewConnection($config['dbms'], 'pear:date:extend:transaction');
0
+	$conn_func = (isset($config['persistent_db_conn']) && $config['persistent_db_conn'] == true) ? 'PConnect' : 'Connect';
0
+	$connect_result = $dbinstance->$conn_func($config['db_hostname'], $config['db_username'], $config['db_password'], $config['db_name']);
0
+	
0
   if (FALSE == $connect_result)
0
   {
0
     die('Database Connection failed');
0
   }
0
-	$dbinstance->SetFetchMode(ADODB_FETCH_ASSOC);
0
   
0
-	if ($config['dbms'] == 'sqlite')
0
-	{
0
-		$dbinstance->Execute("PRAGMA short_column_names = 1;");
0
-		sqlite_create_function($cmsdb->_connectionID,'now','time',0);
0
-	}
0
+	$dbinstance->SetFetchMode(ADODB_FETCH_ASSOC);
0
   
0
-	//$dbinstance->debug = true;
0
   if ($config['debug'] == true)
0
   {
0
     $dbinstance->debug = true;
0
     #$dbinstance->LogSQL();
0
   }
0
+	
0
+	if ($config['dbms'] == 'sqlite')
0
+	{
0
+		$dbinstance->Execute('PRAGMA short_column_names = 1;');
0
+		sqlite_create_function($cmsdb->_connectionID, 'now', 'time', 0);
0
+	}
0
+	
0
   $db =& $dbinstance;
0
   return $db;
0
 }