[Koha-cvs] CVS: koha newmember.pl,1.4,1.5

[Ambrose Li]

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1:/tmp/cvs-serv24894

Modified Files:
        newmember.pl 
Log Message:
Corrected the missing brace syntax error (Bug 162)
Added meta tag handling for non-latin1 charsets
Removed some dead code

I have reindented the file; hopefully this will make it easier to read.
The file had inconsistent indentation that probably was the cause of the
missing brace. Please use cvs diff -bBtw to see the real diffs.


Index: newmember.pl
===================================================================
RCS file: /cvsroot/koha/koha/newmember.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** newmember.pl        18 Dec 2002 16:58:28 -0000      1.4
--- newmember.pl        20 Jan 2003 07:03:19 -0000      1.5
***************
*** 7,10 ****
--- 7,22 ----
  # 2002/12/18 address@hidden templating
  
+ # 2003/01/20 address@hidden XXX it seems to do the following:
+ # * "insert" seems to do nothing; in 1.2.2 the script just returns a blank
+ #   page (with the headers etc.) if "insert" has anything in it
+ # * $ok has the opposite meaning of what one expects; $ok == 1 means "not ok"
+ # * if ($ok == 0) considers the "ok" case; it displays a confirmation page
+ #   for the user to "click to confirm that everything is entered correctly"
+ # * The "else" case for ($ok == 0) handles the "not ok" case; $string is the
+ #   error message to display
+ 
+ # FIXME - What is the correct value of "flagsrequired"?
+ # FIXME - untranslatable strings here
+ 
  # Copyright 2000-2002 Katipo Communications
  #
***************
*** 25,30 ****
  
  use strict;
! use C4::Output;
  use C4::Input;
  use CGI;
  use Date::Manip;
--- 37,43 ----
  
  use strict;
! use C4::Auth;
  use C4::Input;
+ use C4::Charset;
  use CGI;
  use Date::Manip;
***************
*** 44,162 ****
  }
  
! my $template = gettemplate("newmember.tmpl");
! #print $input->header;
! #print startpage();
! #print startmenu('member');
! my $main="#99cc33";
! my $image="/images/background-mem.gif";
! if ($insert eq ''){
!   my $ok=0;
!   #check that all compulsary fields are entered
!   my $string="The following compulsary fields have been left blank. Please 
push the back button
!   and try again<p>";
!   if ($data{'cardnumber'} eq ''){
! 
!      $string.=" Cardnumber<br>";
!     $ok=1;
!   } else {
!      #check cardnumber is valid
!      my $valid=checkdigit(\%env,$data{'cardnumber'});
!      if ($valid != 1){
!        $ok=1;
!        $string.=" Invalid Cardnumber<br>";
!      }
!   }
!   if ($data{'sex'} eq ''){
      $string.=" Gender <br>";
      $ok=1;
!   }
!   if ($data{'firstname'} eq ''){
      $string.=" Given Names<br>";
      $ok=1;
!   }
!   if ($data{'surname'} eq ''){
      $string.=" Surname<br>";
      $ok=1;
!   }
!   if ($data{'address'} eq ''){
      $string.=" Postal Street Address<br>";
      $ok=1;
!   }
!   if ($data{'city'} eq ''){
      $string.=" Postal City<br>";
      $ok=1;
!   }
!   if ($data{'contactname'} eq ''){
      $string.=" Alternate Contact<br>";
      $ok=1;
!   }
!   #we are printing confirmation page
  $template->param(     OK=> ($ok==0),
!                                                               string=> 
$string);
!   if ($ok ==0){
!    my $name=$data{'title'}." ";
!    if ($data{'othernames'} ne ''){
!      $name.=$data{'othernames'}." ";
!    } else {
!      $name.=$data{'firstname'}." ";
!    }
!    $name.="$data{'surname'} ( $data{'firstname'}, $data{'initials'})";
!    my $sex;
!    if ($data{'sex'} eq 'M'){
!      $sex="Male";
!    } else {
!      $sex="Female";
!    }
!    if ($data{'joining'} eq ''){
!      $data{'joining'}=ParseDate('today');
!      $data{'joining'}=&UnixDate($data{'joining'},'%Y-%m-%d');
!    }
!    if ($data{'expiry'} eq ''){
!      $data{'expiry'}=ParseDate('in 1 year');
!      $data{'expiry'}=&UnixDate($data{'expiry'},'%Y-%m-%d');
!    }
!    my $ethnic=$data{'ethnicity'}." ".$data{'ethnicnotes'};
!    my $postal=$data{'address'}."<br>".$data{'city'};
!    my $home;
!    if ($data{'streetaddress'} ne ''){
!      $home=$data{'streetaddress'}."<br>".$data{'streetcity'};
!    } else {
!      $home=$postal;
!    }
!    my @inputsloop;
!    while (my ($key, $value) = each %data) {
!      $value=~ s/\"/%22/g;
!                       my %line;
!                       $line{'key'}=$key;
!                       $line{'value'}=$value;
!                       push(@inputsloop, \%line);
!   }
! 
!    $template->param(name => $name,
!                                                                       bornum 
=> $data{'borrowernumber'},
!                                                                       cardnum 
=> $data{'cardnumber'},
!                                                                       memcat 
=> $data{'categorycode'},
!                                                                       area => 
$data{'area'},
!                                                                       fee => 
$data{'fee'},
!                                                                       
joindate => $data{'joining'},
!                                                                       expdate 
=> $data{'expiry'},
!                                                                       
joinbranch => $data{'joinbranch'},
!                                                                       ethnic 
=> $ethnic,
!                                                                       dob => 
$data{'dateofbirth'},
!                                                                       sex => 
$sex,
!                                                                       postal 
=> $postal,
!                                                                       home => 
$home,
!                                                                       phone 
=> $data{'phone'},
!                                                                       
phoneday => $data{'phoneday'},
!                                                                       
faxnumber => $data{'faxnumber'},
!                                                                       
emailaddress => $data{'emailaddress'},
!                                                                       
contactname => $data{'contactname'},
!                                                                       
altphone => $data{'altphone'},
!                                                                       
altrelationship => $data{'altrelationship'},
!                                                                       
altnotes => $data{'altnotes'},
!                                                                       
bornotes => $data{'borrowernotes'},
!                                                                       
inputsloop => address@hidden);
!   }
! print "Content-Type: text/html\n\n", $template->output;
  
  
--- 57,191 ----
  }
  
! my ($template, $borrowernumber, $cookie)
!     = get_template_and_user({template_name => "newmember.tmpl",
!                            query => $input,
!                              type => "intranet",
!                              authnotrequired => 0,
!                              flagsrequired => {parameters => 1},
!                          });
! 
! # Check that all compulsary fields are entered
! # If everything is ok, set $ok = 0
! # Otherwise set $ok = 1 and $string to the error message to display.
! 
! my $ok=0;
! my $string = "The following compulsary fields have been left blank. "
!       . "Please push the back button and try again<p>";
! 
! if ($data{'cardnumber'} eq ''){
!     $string.=" Cardnumber<br>";
!     $ok=1;
! } else {
!     #check cardnumber is valid
!     my $valid=checkdigit(\%env,$data{'cardnumber'});
!     if ($valid != 1){
!         $ok=1;
!         $string.=" Invalid Cardnumber<br>";
!     }
! }
! if ($data{'sex'} eq ''){
      $string.=" Gender <br>";
      $ok=1;
! }
! if ($data{'firstname'} eq ''){
      $string.=" Given Names<br>";
      $ok=1;
! }
! if ($data{'surname'} eq ''){
      $string.=" Surname<br>";
      $ok=1;
! }
! if ($data{'address'} eq ''){
      $string.=" Postal Street Address<br>";
      $ok=1;
! }
! if ($data{'city'} eq ''){
      $string.=" Postal City<br>";
      $ok=1;
! }
! if ($data{'contactname'} eq ''){
      $string.=" Alternate Contact<br>";
      $ok=1;
! }
! 
! # Pass the ok/not ok status and the error message to the template
  $template->param(     OK=> ($ok==0),
!                       string=> $string);
! 
! # If things are ok, display the confirmation page
! if ($ok == 0) {
!     my $name=$data{'title'}." ";
!     if ($data{'othernames'} ne ''){
!       $name.=$data{'othernames'}." ";
!     } else {
!       $name.=$data{'firstname'}." ";
!     }
!     $name.="$data{'surname'} ( $data{'firstname'}, $data{'initials'})";
!     my $sex;
!     if ($data{'sex'} eq 'M'){
!       $sex="Male";
!     } else {
!       $sex="Female";
!     }
!     if ($data{'joining'} eq ''){
!       $data{'joining'}=ParseDate('today');
!       $data{'joining'}=&UnixDate($data{'joining'},'%Y-%m-%d');
!     }
!     if ($data{'expiry'} eq ''){
!       $data{'expiry'}=ParseDate('in 1 year');
!       $data{'expiry'}=&UnixDate($data{'expiry'},'%Y-%m-%d');
!     }
!     my $ethnic=$data{'ethnicity'}." ".$data{'ethnicnotes'};
!     my $postal=$data{'address'}."<br>".$data{'city'};
!     my $home;
!     if ($data{'streetaddress'} ne ''){
!       $home=$data{'streetaddress'}."<br>".$data{'streetcity'};
!     } else {
!       $home=$postal;
!     }
!     my @inputsloop;
!     while (my ($key, $value) = each %data) {
!       $value=~ s/\"/%22/g;
!       my %line;
!       $line{'key'}=$key;
!       $line{'value'}=$value;
!       push(@inputsloop, \%line);
!     }
! 
!     $template->param(name => $name,
!                    bornum => $data{'borrowernumber'},
!                    cardnum => $data{'cardnumber'},
!                    memcat => $data{'categorycode'},
!                    area => $data{'area'},
!                    fee => $data{'fee'},
!                    joindate => $data{'joining'},
!                    expdate => $data{'expiry'},
!                    joinbranch => $data{'joinbranch'},
!                    ethnic => $ethnic,
!                    dob => $data{'dateofbirth'},
!                    sex => $sex,
!                    postal => $postal,
!                    home => $home,
!                    phone => $data{'phone'},
!                    phoneday => $data{'phoneday'},
!                    faxnumber => $data{'faxnumber'},
!                    emailaddress => $data{'emailaddress'},
!                    contactname => $data{'contactname'},
!                    altphone => $data{'altphone'},
!                    altrelationship => $data{'altrelationship'},
!                    altnotes => $data{'altnotes'},
!                    bornotes => $data{'borrowernotes'},
!                    inputsloop => address@hidden);
! 
! # If things are not ok, display the error message
! } else {
!     # Nothing to do; the "OK" and "string" variables have already been set
!     ;
! }
! 
! print $input->header(
!     -type => guesstype($template->output),
!     -cookie => $cookie
! ), $template->output;