[popfile-commit] engine/UI HTML.pm,1.357,1.358

[Manni H. <man...@us...>]

Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22610/UI

Modified Files:
	HTML.pm 
Log Message:
Adapt handling of the shutdown page to Joe's skin changes and the fact that we got rid of the session key.

Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.357
retrieving revision 1.358
diff -C2 -d -r1.357 -r1.358
*** HTML.pm	10 Sep 2005 08:49:41 -0000	1.357
--- HTML.pm	15 Sep 2005 07:49:24 -0000	1.358
***************
*** 3908,3921 ****
      # Replace the reference to the favicon, we won't be able to handle
      # that request
- 
      $text =~ s/<link rel="icon" href="favicon\.ico">//;
  
!     # Replace the link to the style sheet with the style sheet itself
! 
!     $text =~ s/\Q<link rel="stylesheet" type="text\/css" href="${root}style.css" title="POPFile-Style">\E/$css/;
! 
!     # Remove the session key from the menu links:
  
-     $text =~ s/href="(.+?)\?session=.+?"/href="$1"/g;
  
      return $text;
--- 3908,3916 ----
      # Replace the reference to the favicon, we won't be able to handle
      # that request
      $text =~ s/<link rel="icon" href="favicon\.ico">//;
  
!     # Replace the link to the style sheets with the style sheet itself
!     $text =~ s/<link rel="stylesheet" .* media="handheld">/$css/s;
  
  
      return $text;