Und wieder ein Schwung strict.

[kivitendo-erp.git] / sql / Pg-upgrade2 / cp_greeting_migration.pl

diff --git a/sql/Pg-upgrade2/cp_greeting_migration.pl b/sql/Pg-upgrade2/cp_greeting_migration.pl
index 1ee6abd..40c1ebd 100644 (file)
--- a/sql/Pg-upgrade2/cp_greeting_migration.pl
+++ b/sql/Pg-upgrade2/cp_greeting_migration.pl
@@ -2,8 +2,12 @@
 # @description: Migration of cp_greeting to cp_gender
 # @depends: generic_translations
 
+use strict;
+
 die("This script cannot be run from the command line.") unless ($main::form);
 
+# import vars from caller
+our ($dbup_locale, $dbup_myconfig, $dbh, $iconv);
 
 sub mydberror {
   my ($msg) = @_;
@@ -26,40 +30,40 @@ sub query_result {
 
   # list of all entries where cp_greeting is empty, meaning can't determine gender from parsing Herr/Frau/...
   # this assumes cp_greeting still exists, i.e. gender.sql was not run yet
-  my $gender_table;
+  my ($gender_table, $mchecked, $fchecked);
 
   my $sql2 = "select cp_id,cp_givenname,cp_name,cp_title,cp_greeting from contacts where not (cp_greeting ILIKE '%frau%' OR cp_greeting ILIKE '%herr%' or cp_greeting ILIKE '%mrs.%' or cp_greeting ILIKE '%miss%') ";
   my $sth2 = $dbh->prepare($sql2) or die $dbh->errstr();
-  $sth2->execute() or die $dbh->errstr(); 
+  $sth2->execute() or die $dbh->errstr();
 
-  my $i = 1;   
+  my $i = 1;
   $gender_table .= '<table border="1"><tr><th>cp_givenname</th><th>cp_name</th><th>cp_title</th><th>cp_greeting</th><th><translate>male/female</th></tr>';
   $gender_table .= "\n";
 
   while (my $row = $sth2->fetchrow_hashref()) {
-    if ( main::form->{"gender_$i"} eq "f" ) {
+    if ($main::form->{"gender_$i"} eq "f" ) {
                        $mchecked = "";
                        $fchecked = "checked";
        } else {
                        $mchecked = "checked";
                        $fchecked = "";
        };
-    
+
    $gender_table .= "<tr><input type=hidden name=\"cp_id_$i\" value=\"$row->{cp_id}\"> <td>$row->{cp_givenname}</td> <td>$row->{cp_name}</td> <td>$row->{cp_title} </td> <td>$row->{cp_greeting} </td><td> <input type=\"radio\" name=\"gender_$i\" value=\"m\" $mchecked> <input type=\"radio\" name=\"gender_$i\" value=\"f\" $fchecked></td></tr>\n";
    $i++;
   };
 
-  $gender_table .= "<input type=hidden name=\"number_of_gender_entries\" value=\"$i\">"; 
+  $gender_table .= "<input type=hidden name=\"number_of_gender_entries\" value=\"$i\">";
   $gender_table .= "</table>";
 
   $main::form->{gender_table} = $gender_table;
 
   my $title_table;
-  
+
   my $sql3 = "select cp_id,cp_givenname,cp_name,cp_title,cp_greeting from contacts where not ( (cp_greeting ILIKE '%frau%' OR cp_greeting ILIKE '%herr%' or cp_greeting ILIKE '%mrs.%' or cp_greeting ILIKE '%miss%')) and not (cp_greeting like ''); ";
 
   my $sth3 = $dbh->prepare($sql3) or die $dbh->errstr();
-  $sth3->execute() or die $dbh->errstr(); 
+  $sth3->execute() or die $dbh->errstr();
 
   $title_table = '<table border="1"><tr><th>cp_givenname</th><th>cp_name</th><th>cp_title</th><th>cp_greeting</th><th>cp_title new</th></tr>';
 
@@ -74,7 +78,7 @@ sub query_result {
                  $j++;
   };
 
-  $title_table .= "<input type=hidden name=\"number_of_title_entries\" value=\"$j\">"; 
+  $title_table .= "<input type=hidden name=\"number_of_title_entries\" value=\"$j\">";
   $title_table .= "</table>";
   $main::form->{title_table} = $title_table;