Index: trunk/admin/install.php
===================================================================
diff -u -r542 -r544
--- trunk/admin/install.php	(.../install.php)	(revision 542)
+++ trunk/admin/install.php	(.../install.php)	(revision 544)
@@ -326,7 +326,7 @@
       $LoggedIn = FALSE;
       if($_POST["UserName"]=="root") 
       {
-          $ado =& inst_&GetADODBConnection();
+          $ado =& inst_GetADODBConnection();
           $sql = "SELECT * FROM ".$g_TablePrefix."ConfigurationValues WHERE VariableName='RootPass'";
           
           $rs = $ado->Execute($sql);
@@ -383,7 +383,7 @@
 	          case 1:
 	              /* clean out all tables */
 	              $install_type = 4;
-	              $ado =& inst_&GetADODBConnection();
+	              $ado =& inst_GetADODBConnection();
 	              $filename = $pathtoroot.$admin."/install/inportal_remove.sql";  
 	              RunSchemaFile($ado,$filename);
 	              /* run install again */
@@ -400,7 +400,7 @@
 	          case 4:
 	          		$install_type = 6;
 	              /* clean out all tables */
-	              $ado =& inst_&GetADODBConnection();
+	              $ado =& inst_GetADODBConnection();
 	              //$filename = $pathtoroot.$admin."/install/inportal_remove.sql";              
 	              //RunSchemaFile($ado,$filename);
 	              /* run install again */
@@ -426,7 +426,7 @@
 }
 
 if ($state == "upgrade") {
-    $ado =& inst_&GetADODBConnection();
+    $ado =& inst_GetADODBConnection();
     
     $Modules = array();
     $Texts = array();    
@@ -486,7 +486,7 @@
 }
 
 if ($state == "upgrade_process") {
-    $ado =& inst_&GetADODBConnection();	
+    $ado =& inst_GetADODBConnection();	
 	$mod_arr = $_POST['modules'];
 	
 	$mod_str = '';
@@ -600,7 +600,7 @@
 		
 		if(file_exists($backupfile) && is_readable($backupfile))
 		{
-           $ado =& inst_&GetADODBConnection();
+           $ado =& inst_GetADODBConnection();
 
 	       $show_warning = false;              
 	       
@@ -658,7 +658,7 @@
 
 if($state=="restore_run")
 {
-  $ado =& inst_&GetADODBConnection();
+  $ado =& inst_GetADODBConnection();
   $FileOffset = (int)$_GET["Offset"];
   if(!strlen($backupfile))
     $backupfile = SuperStrip($_GET['File'], true);
@@ -904,7 +904,7 @@
 
 if($state=="reinstall")
 {
-    $ado =& inst_&GetADODBConnection();
+    $ado =& inst_GetADODBConnection();
     
     $show_upgrade = false;
 
@@ -1055,7 +1055,7 @@
 
 if($state=="runsql")
 {    
-  $ado =& inst_&GetADODBConnection();
+  $ado =& inst_GetADODBConnection();
   $installed = TableExists($ado,"ConfigurationAdmin,Category,Permissions");
   if(!$installed)
   {  
@@ -1129,7 +1129,7 @@
 }
 
 if ($state == "finish") {
-    $ado =& inst_&GetADODBConnection();
+    $ado =& inst_GetADODBConnection();
   	$PhraseTable = GetTablePrefix()."ImportPhrases";
   	$EventTable = GetTablePrefix()."ImportEvents";    
 	$ado->Execute("DROP TABLE IF EXISTS $PhraseTable");
@@ -1155,7 +1155,7 @@
   {
   	  $pass = md5($pass);
       $sql = "UPDATE ".$g_TablePrefix."ConfigurationValues SET VariableValue = '$pass' WHERE VariableName='RootPass' OR VariableName='RootPassVerify'";
-      $ado =& inst_&GetADODBConnection();
+      $ado =& inst_GetADODBConnection();
       $ado->Execute($sql);
       $state="modselect";
   }
@@ -1170,7 +1170,7 @@
 {
   include_once($pathtoroot."kernel/include/xml.php");
 
-  $ado =& inst_&GetADODBConnection();
+  $ado =& inst_GetADODBConnection();
   
   if (TableExists($ado, "Language,Phrase")) {
 	  $MaxInserts = 200;
@@ -1370,7 +1370,7 @@
 if($state=="lang_default_set")
 {
 //	phpinfo(INFO_VARIABLES);
-    /*$ado =& inst_&GetADODBConnection();
+    /*$ado =& inst_GetADODBConnection();
   	$PhraseTable = GetTablePrefix()."ImportPhrases";
   	$EventTable = GetTablePrefix()."ImportEvents";    
 	$ado->Execute("DROP TABLE IF EXISTS $PhraseTable");
@@ -1402,7 +1402,7 @@
     $doms = $_POST["domain"];
     if(is_array($doms))
     {
-        $ado =& inst_&GetADODBConnection();
+        $ado =& inst_GetADODBConnection();
         require_once $pathtoroot.'kernel/include/tag-class.php';
         if( !isset($objTagList) || !is_object($objTagList) ) $objTagList = new clsTagList();
         foreach($doms as $p)
@@ -1494,7 +1494,7 @@
     //$g_DomainName= $_SERVER["HTTP_HOST"];
     save_values();
 
-    $ado =& inst_&GetADODBConnection();
+    $ado =& inst_GetADODBConnection();
     if(substr($sitepath,0,1)!="/")
         $sitepath="/".$sitepath;
     if(substr($sitepath,-1)!="/")
@@ -1581,7 +1581,7 @@
     ## get & define Non-Blocking & Blocking versions ## 
 	$blocking_sockets = minimum_php_version("4.3.0")? 0 : 1;
 	
-	$ado =& inst_&GetADODBConnection();
+	$ado =& inst_GetADODBConnection();
     $sql = "UPDATE ".$g_TablePrefix."ConfigurationValues SET VariableValue = '$blocking_sockets' WHERE VariableName='SocketBlockingMode'";
     $ado->Execute($sql);
     ## get & define Non-Blocking & Blocking versions ##