[Koha-cvs] koha C4/Auth.pm installer/install.pl

[paul poulain]

CVSROOT:        /sources/koha
Module name:    koha
Changes by:     paul poulain <tipaul>   07/06/26 14:30:23

Modified files:
        C4             : Auth.pm 
        installer      : install.pl 

Log message:
        updating web installer : going to step1 if needed and fixing sql

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Auth.pm?cvsroot=koha&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/koha/installer/install.pl?cvsroot=koha&r1=1.8&r2=1.9

Patches:
Index: C4/Auth.pm
===================================================================
RCS file: /sources/koha/koha/C4/Auth.pm,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- C4/Auth.pm  6 Jun 2007 13:08:35 -0000       1.63
+++ C4/Auth.pm  26 Jun 2007 14:30:22 -0000      1.64
@@ -36,7 +36,7 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.63 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.64 $' =~ /\d+/g;
     shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v );
 };
 
@@ -339,7 +339,7 @@
 
     my $dbh     = C4::Context->dbh;
     unless (C4::Context->preference('Version')){
-      print $query->redirect("/cgi-bin/koha/installer/install.pl?step=3");
+      print $query->redirect("/cgi-bin/koha/installer/install.pl");
       exit;
     }
     my $timeout = C4::Context->preference('timeout');

Index: installer/install.pl
===================================================================
RCS file: /sources/koha/koha/installer/install.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- installer/install.pl        15 Jun 2007 13:44:45 -0000      1.8
+++ installer/install.pl        26 Jun 2007 14:30:22 -0000      1.9
@@ -223,7 +223,7 @@
     foreach my $file (@fnames){
 #      warn $file;
       undef $/;
-      my $strcmd="mysql ".($info{hostname}?"-h $info{hostname} 
":"").($info{port}?"-P $info{port} ":"").($info{user}?"-u $info{user} 
":"").($info{password}?"-p$info{password}":"")." $info{dbname} ";
+      my $strcmd="mysql ".($info{hostname}?" -h $info{hostname} 
":"").($info{port}?" -P $info{port} ":"").($info{user}?" -u $info{user} 
":"").($info{password}?" -p$info{password}":"")." $info{dbname} ";
       my $error = qx($strcmd < $file 2>&1);
       my @file = split qr(\/|\\),$file;
       $lang=$file[scalar(@file)-3] unless ($lang);
@@ -336,7 +336,8 @@
     #Import data structure and show errors if any
     my $filename="kohastructure.sql";
     undef $/;
-       my $str = qx(mysql -h $info{hostname} -P $info{port} -u $info{user} 
-p$info{password} $info{dbname} <$filename 2>&1);
+    my $strcmd="mysql ".($info{hostname}?"-h $info{hostname} 
":"").($info{port}?"-P $info{port} ":"").($info{user}?"-u $info{user} 
":"").($info{password}?"-p$info{password}":"")." $info{dbname} ";
+    my $str = qx($strcmd < $filename 2>&1);
        $str=~s/\n|\r/<br \/>/g;
        $template->param("error"=>$str ,
                         "$op"=> 1, );