[Koha-cvs] CVS: koha/C4 Output.pm,1.24,1.25

[Andrew Arensburger]

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv4145

Modified Files:
        Output.pm 
Log Message:
Added some FIXMEs.
Made code more Perlish.
(bug fix): Allow whitespace in $HTTP_ACCEPT_LANGUAGE (Konqueror uses
", " as language separator).


Index: Output.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Output.pm,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** Output.pm   10 Oct 2002 04:41:05 -0000      1.24
--- Output.pm   10 Oct 2002 05:32:20 -0000      1.25
***************
*** 29,32 ****
--- 29,33 ----
  use C4::Database;
  use C4::Search; #for getting the systempreferences
+       # FIXME - Get rid of this, and use C4::Context->preference
  
  use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
***************
*** 229,232 ****
--- 230,235 ----
  =cut
  #'
+ # FIXME - Fix POD: it doesn't look in the directory given by the
+ # 'includes' option in /etc/koha.conf.
  sub pathtotemplate {
    my %params = @_;
***************
*** 256,268 ****
    unshift (@tmpldirs, $params{'path'}) if $params{'path'};
  
!   my ($edir, $etheme, $elanguage, $epath);
  
!   # FIXME - Use 'foreach my $var (...)'
!   CHECK: foreach (@tmpldirs) {
!     $edir= $_;
!     foreach ($theme, 'all', 'default') {
!       $etheme=$_;
!       foreach ($language, @languageorder, 'all','en') {  # 'en' is the 
fallback-language
!         $elanguage = $_;
                if (-e "$edir/$type$etheme/$elanguage/$template") {
                  $epath = "$edir/$type$etheme/$elanguage/$template";
--- 259,268 ----
    unshift (@tmpldirs, $params{'path'}) if $params{'path'};
  
!   my ($etheme, $elanguage, $epath);
  
!   CHECK: foreach my $edir (@tmpldirs) {
!     foreach $etheme ($theme, 'all', 'default') {
!       foreach $elanguage ($language, @languageorder, 'all','en') {
!                               # 'en' is the fallback-language
                if (-e "$edir/$type$etheme/$elanguage/$template") {
                  $epath = "$edir/$type$etheme/$elanguage/$template";
***************
*** 313,319 ****
  
    if ($ENV{'HTTP_ACCEPT_LANGUAGE'}) {
!     @languageorder = split (/,/ ,lc($ENV{'HTTP_ACCEPT_LANGUAGE'}));
    } elsif ($prefs{'languageorder'}) {
!     @languageorder = split (/,/ ,lc($prefs{'languageorder'}));
    } else { # here should be another elsif checking for apache's languageorder
      @languageorder = ('en');
--- 313,319 ----
  
    if ($ENV{'HTTP_ACCEPT_LANGUAGE'}) {
!     @languageorder = split (/\s*,\s*/ ,lc($ENV{'HTTP_ACCEPT_LANGUAGE'}));
    } elsif ($prefs{'languageorder'}) {
!     @languageorder = split (/\s*,\s*/ ,lc($prefs{'languageorder'}));
    } else { # here should be another elsif checking for apache's languageorder
      @languageorder = ('en');