SF.net SVN: ledger-smb:[3164] trunk/LedgerSMB/Initiate.pm

[..hidden..]

Revision: 3164
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=3164&view=rev
Author:   einhverfr
Date:     2011-05-22 22:39:43 +0000 (Sun, 22 May 2011)

Log Message:
-----------
Ian's patch 2945482

Modified Paths:
--------------
    trunk/LedgerSMB/Initiate.pm

Modified: trunk/LedgerSMB/Initiate.pm
===================================================================
--- trunk/LedgerSMB/Initiate.pm	2011-05-22 22:26:40 UTC (rev 3163)
+++ trunk/LedgerSMB/Initiate.pm	2011-05-22 22:39:43 UTC (rev 3164)
@@ -69,45 +69,8 @@
 
 
 
-sub getdbh
-{
 
- my($self,$form)..hidden..;
 
- my($database,$host,$port,$username,$password);
-
- if($form->{initiateon}==1)
- {
-   $ENV{PGDATABASE} = $form->{company};
-   $ENV{PGHOST}=$form->{host};
-   $ENV{PGPORT}=$form->{port};
-   $username=$form->{username};
-   $password=$form->{password};
-   $ENV{PGUSER} = $form->{username};
-   $ENV{PGPASSWORD} = $form->{password};
- }
- else
- {
-
-    $ENV{PGDATABASE}=$form->{database};
-    $ENV{PGHOST}=$form->{dbhost};
-    $ENV{PGPORT}=$form->{dbport};
-    $username=$form->{username};
-    $password=$form->{password};
-
- }
-  
-
-   my $dbconnect = "dbi:Pg:user=$username password=$password";    # for easier debugging
-
-   my $dbh = DBI->connect($dbconnect) or return "no999";
-
-   return($dbh);
-
-}
-
-
-
 sub checksuperuser
 {
 
@@ -299,7 +262,7 @@
 		
 		#stage 3 -  Execute series of files which are located in array @totalexecutable_files
 
-	LedgerSMB::Initiate->run_all_sql_scripts($form,..hidden..);
+	LedgerSMB::Initiate->run_scripts_as_admin_user($form,..hidden..);
 
 		#Stage -  Wind up completed the task
 	process_roles($form);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.