X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=torrus%2Fperllib%2FTorrus%2FRenderer%2FFreeside.pm;h=d97920e156f205659f05d859fa1849783bf980f1;hb=HEAD;hp=dcdf72be50d8f8f796e31debb7a20c29a974539a;hpb=5395d671e88efe39c51849ef9c26f74f3019a394;p=freeside.git

diff --git a/torrus/perllib/Torrus/Renderer/Freeside.pm b/torrus/perllib/Torrus/Renderer/Freeside.pm
index dcdf72be5..d97920e15 100644
--- a/torrus/perllib/Torrus/Renderer/Freeside.pm
+++ b/torrus/perllib/Torrus/Renderer/Freeside.pm
@@ -1,64 +1,25 @@
 package Torrus::Renderer::Freeside;
 
 use strict;
-
-#Freeside
-use FS::Mason qw( mason_interps );
-use FS::UID qw(cgisuidsetup);
+use warnings;
+use base 'Torrus::Freeside';
+use FS::UID qw(setcgi adminsuidsetup);
 use FS::TicketSystem;
 
-my $outbuf;
-my( $fs_interp, $rt_interp ) = mason_interps('standalone', 'outbuf'=>\$outbuf);
-
-sub freesideHeader {
-  my($self, $title, $stylesheet) = @_;
+our $cgi = '';
 
-  #from html-incblocks.txt
-  my $head =
-  #  <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-  #  [% IF expires %]<META HTTP-EQUIV="Refresh" CONTENT="[% expires %]"/>[% END %]
-    '<STYLE type="text/css" media="all">
-     @import url( '. $Torrus::Renderer::plainURL. $stylesheet. ' );
-     </STYLE>
-    ';
+sub freesideSetup {
+  #my $self = shift;
 
-  $self->freesideComponent('/elements/header.html',
-                             {
-                               'title' => $title,
-                               'head'  => $head,
-                               #'etc'   => $etc,
-                               'nobr'  => 1,
-                               #'nocss' => 1,
-                             }
-                          );
-}
-
-sub freesideFooter {
-  my $self = shift;
-  $self->freesideComponent('/elements/footer.html');
-}
+  return if $cgi eq $Torrus::CGI::q;
 
-our $FSURL;
+  $cgi = $Torrus::CGI::q;
 
-sub freesideComponent {
-  my($self, $comp) = (shift, shift);
+  setcgi($cgi);
 
-#  my $conf = new FS::Conf;
-  $FS::Mason::Request::FSURL = $FSURL;
-  $FS::Mason::Request::FSURL .= '/' unless $FS::Mason::Request::FSURL =~ /\/$/;
-#  $FS::Mason::Request::QUERY_STRING = $packet->{'query_string'} || '';
-
-  cgisuidsetup($Torrus::CGI::q);
+  adminsuidsetup;
   FS::TicketSystem->init();
 
-  $outbuf = '';
-  #$fs_interp->exec($comp, @args); #only FS for now alas...
-  $fs_interp->exec($comp, @_); #only FS for now alas...
-
-  #errors? (turn off in-line error reporting?)
-
-  return $outbuf;
-
 }
 
 1;