Index: trunk/admin/install.php
===================================================================
diff -u -r478 -r534
--- trunk/admin/install.php	(.../install.php)	(revision 478)
+++ trunk/admin/install.php	(.../install.php)	(revision 534)
@@ -248,7 +248,7 @@
 
 if(strlen($state)==0)
 {
-    $ado =& inst_GetADODBConnection();
+    $ado =& inst_&GetADODBConnection();
     $installed = $ado ? TableExists($ado,"ConfigurationAdmin,Category,Permissions") : false;
     
     if(!minimum_php_version("4.1.2"))
@@ -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'];
 	
     foreach($mod_arr as $p)
@@ -584,7 +584,7 @@
 		
 		if(file_exists($backupfile) && is_readable($backupfile))
 		{
-           $ado =& inst_GetADODBConnection();
+           $ado =& inst_&GetADODBConnection();
 
 	       $show_warning = false;              
 	       
@@ -642,7 +642,7 @@
 
 if($state=="restore_run")
 {
-  $ado =& inst_GetADODBConnection();
+  $ado =& inst_&GetADODBConnection();
   $FileOffset = (int)$_GET["Offset"];
   if(!strlen($backupfile))
     $backupfile = SuperStrip($_GET['File'], true);
@@ -888,7 +888,7 @@
 
 if($state=="reinstall")
 {
-    $ado =& inst_GetADODBConnection();
+    $ado =& inst_&GetADODBConnection();
     
     $show_upgrade = false;
 
@@ -1039,7 +1039,7 @@
 
 if($state=="runsql")
 {    
-  $ado =& inst_GetADODBConnection();
+  $ado =& inst_&GetADODBConnection();
   $installed = TableExists($ado,"ConfigurationAdmin,Category,Permissions");
   if(!$installed)
   {  
@@ -1113,7 +1113,7 @@
 }
 
 if ($state == "finish") {
-    $ado =& inst_GetADODBConnection();
+    $ado =& inst_&GetADODBConnection();
   	$PhraseTable = GetTablePrefix()."ImportPhrases";
   	$EventTable = GetTablePrefix()."ImportEvents";    
 	$ado->Execute("DROP TABLE IF EXISTS $PhraseTable");
@@ -1139,7 +1139,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";
   }
@@ -1154,7 +1154,7 @@
 {
   include_once($pathtoroot."kernel/include/xml.php");
 
-  $ado =& inst_GetADODBConnection();
+  $ado =& inst_&GetADODBConnection();
   
   if (TableExists($ado, "Language,Phrase")) {
 	  $MaxInserts = 200;
@@ -1333,7 +1333,7 @@
   	  }
   	  else
   	  {
-  	    $db =& GetADODBConnection();
+  	    $db =&GetADODBConnection();
     	$prefix = GetTablePrefix();
     	$db->Execute('DROP TABLE IF EXISTS '.$prefix.'ImportPhrases');
     	$db->Execute('DROP TABLE IF EXISTS '.$prefix.'ImportEvents');
@@ -1354,7 +1354,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");
@@ -1386,7 +1386,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)
@@ -1478,7 +1478,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)!="/")
@@ -1565,7 +1565,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 ##