[Gdtc-commits] r1688 - /trunk/gdtc/cgi-bin/adhesion.cgi

[bdrieu]

Author: benj
Date: Mon May 30 14:02:36 2016
New Revision: 1688

URL: http://svn.gna.org/viewcvs/gdtc?rev=1688&view=rev
Log:
Modifications needed to work on a Debian stable environmenet


Modified:
    trunk/gdtc/cgi-bin/adhesion.cgi

Modified: trunk/gdtc/cgi-bin/adhesion.cgi
URL: 
http://svn.gna.org/viewcvs/gdtc/trunk/gdtc/cgi-bin/adhesion.cgi?rev=1688&r1=1687&r2=1688&view=diff
==============================================================================
--- trunk/gdtc/cgi-bin/adhesion.cgi     (original)
+++ trunk/gdtc/cgi-bin/adhesion.cgi     Mon May 30 14:02:36 2016
@@ -21,7 +21,7 @@
 use Text::Iconv;
 
 ### Pour la clé SHA1 permettant de payer la cotisation avant validation.
-use Digest::SHA1;
+use Digest::SHA;
 
 use File::Basename;
 use lib ( dirname($0) . "/../scripts" );
@@ -161,7 +161,6 @@
     my $mailing_list = join (",", @mailing_lists);
 
     # Creation de l'acteur
-    my $result;
     my $result = do_query ( "insert into actor 
(actor_type,nickname,password,actor_status,mailing_list) values ( 'person', 
'$alias', '', 'pending', '$mailing_list' );" );
     die ( "Erreur à l'insertion de $alias.  " . mysql_error() ) unless 
$result;
 
@@ -205,7 +204,7 @@
     $nom = uc($nom);
 
     my $prenom = &addslashes($q->param('prenom'));
-    my $prenom = &addslashes($q->param('prenom'));
+    $prenom = &addslashes($q->param('prenom'));
     $prenom =~ s/^([a-z])/\u$1/g; # That's Perl black magic.
     $prenom =~ s/([\s-])(.)/$1\u$2/g; # That's Perl black magic.
     $prenom =~ s/^á/Á/;
@@ -229,27 +228,27 @@
     $prenom =~ s/^ü/Ü/;
     $prenom =~ s/^û/Û/;
     $prenom =~ s/^ç/Ç/;
-    $prenom =~ s/([\s-])á/\1Á/;
-    $prenom =~ s/([\s-])à/\1À/;
-    $prenom =~ s/([\s-])â/\1Â/;
-    $prenom =~ s/([\s-])ä/\1Ä/;
-    $prenom =~ s/([\s-])é/\1É/;
-    $prenom =~ s/([\s-])è/\1È/;
-    $prenom =~ s/([\s-])ê/\1Ê/;
-    $prenom =~ s/([\s-])ë/\1Ë/;
-    $prenom =~ s/([\s-])í/\1Í/;
-    $prenom =~ s/([\s-])ì/\1Ì/;
-    $prenom =~ s/([\s-])î/\1Î/;
-    $prenom =~ s/([\s-])ï/\1Ï/;
-    $prenom =~ s/([\s-])ó/\1Ó/;
-    $prenom =~ s/([\s-])ò/\1Ò/;
-    $prenom =~ s/([\s-])ô/\1Ô/;
-    $prenom =~ s/([\s-])ö/\1Ö/;
-    $prenom =~ s/([\s-])ú/\1Ú/;
-    $prenom =~ s/([\s-])ù/\1Ù/;
-    $prenom =~ s/([\s-])ü/\1Ü/;
-    $prenom =~ s/([\s-])û/\1Û/;
-    $prenom =~ s/([\s-])ç/\1Ç/;
+    $prenom =~ s/([\s-])á/$1Á/;
+    $prenom =~ s/([\s-])à/$1À/;
+    $prenom =~ s/([\s-])â/$1Â/;
+    $prenom =~ s/([\s-])ä/$1Ä/;
+    $prenom =~ s/([\s-])é/$1É/;
+    $prenom =~ s/([\s-])è/$1È/;
+    $prenom =~ s/([\s-])ê/$1Ê/;
+    $prenom =~ s/([\s-])ë/$1Ë/;
+    $prenom =~ s/([\s-])í/$1Í/;
+    $prenom =~ s/([\s-])ì/$1Ì/;
+    $prenom =~ s/([\s-])î/$1Î/;
+    $prenom =~ s/([\s-])ï/$1Ï/;
+    $prenom =~ s/([\s-])ó/$1Ó/;
+    $prenom =~ s/([\s-])ò/$1Ò/;
+    $prenom =~ s/([\s-])ô/$1Ô/;
+    $prenom =~ s/([\s-])ö/$1Ö/;
+    $prenom =~ s/([\s-])ú/$1Ú/;
+    $prenom =~ s/([\s-])ù/$1Ù/;
+    $prenom =~ s/([\s-])ü/$1Ü/;
+    $prenom =~ s/([\s-])û/$1Û/;
+    $prenom =~ s/([\s-])ç/$1Ç/;
 
     # Creation de la personne associée.
     my $query = "insert into person (actor_id,civility,firstname,name,".
@@ -501,7 +500,7 @@
                                   $actor_id, $actor_id ) );
 
     my $sid = $r[0] -> {'sid'};
-    my $key = Digest::SHA1::sha1_hex ( $r[0] -> {'nickname'} . $r[0] -> 
{'sid'} );
+    my $key = Digest::SHA::sha1_hex ( $r[0] -> {'nickname'} . $r[0] -> {'sid'} 
);
 
     # Affichage du trailer HTML
     print 
$q->redirect("http://www.april.org/association/demande-adhesion-recue.html?sid=$sid&key=$key";);


_______________________________________________
Gdtc-commits mailing list
Gdtc-commits@gna.org
https://mail.gna.org/listinfo/gdtc-commits