[freeside-commits] freeside/torrus/perllib/Torrus/Renderer Freeside.pm, 1.4, 1.5

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/torrus/perllib/Torrus/Renderer
In directory wavetail.420.am:/tmp/cvs-serv5912/torrus/perllib/Torrus/Renderer

Modified Files:
	Freeside.pm 
Log Message:
torrus, RT#10574

Index: Freeside.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/torrus/perllib/Torrus/Renderer/Freeside.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -d -r1.4 -r1.5
--- Freeside.pm	29 Dec 2010 03:47:35 -0000	1.4
+++ Freeside.pm	30 Dec 2010 07:25:30 -0000	1.5
@@ -1,65 +1,6 @@
 package Torrus::Renderer::Freeside;
 
-use strict;
-
-#Freeside
-use FS::Mason qw( mason_interps );
-use FS::UID qw(cgisuidsetup);
-use FS::TicketSystem;
-
-my $outbuf;
-my( $fs_interp, $rt_interp ) = mason_interps('standalone', 'outbuf'=>\$outbuf);
-
-sub freesideHeader {
-  my($self, $title, $stylesheet) = @_;
-
-  #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>
-    ';
-
-  $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');
-}
-
-our $FSURL;
-
-sub freesideComponent {
-  my($self, $comp) = (shift, shift);
-
-#  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);
-  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;
-
-}
+use base 'Torrus::Freeside';
 
 1;