projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
5779a29
)
torrus, RT#10574
author
ivan
<ivan>
Thu, 30 Dec 2010 17:33:10 +0000
(17:33 +0000)
committer
ivan
<ivan>
Thu, 30 Dec 2010 17:33:10 +0000
(17:33 +0000)
torrus/configs/torrus-siteconfig.pl
patch
|
blob
|
history
torrus/perllib/Torrus/Freeside.pm
patch
|
blob
|
history
torrus/perllib/Torrus/Renderer/Freeside.pm
patch
|
blob
|
history
torrus/perllib/Torrus/ReportOutput/Freeside.pm
patch
|
blob
|
history
diff --git
a/torrus/configs/torrus-siteconfig.pl
b/torrus/configs/torrus-siteconfig.pl
index
623f7a9
..
504c0f3
100644
(file)
--- a/
torrus/configs/torrus-siteconfig.pl
+++ b/
torrus/configs/torrus-siteconfig.pl
@@
-21,7
+21,7
@@
$Torrus::CGI::authorizeUsers = 0;
$Torrus::Renderer::rendererURL = '/freeside/torrus';
$Torrus::Renderer::plainURL = '/freeside/torrus/plain/';
$Torrus::CGI::authorizeUsers = 0;
$Torrus::Renderer::rendererURL = '/freeside/torrus';
$Torrus::Renderer::plainURL = '/freeside/torrus/plain/';
-$Torrus::
Renderer::
Freeside::FSURL = '%%%FREESIDE_URL%%%';
+$Torrus::Freeside::FSURL = '%%%FREESIDE_URL%%%';
$Torrus::Renderer::displayReports = 1;
push (@Torrus::Collector::loadModules, 'Torrus::Collector::ExternalStorage');
$Torrus::SQL::connections{'Default'}{'dsn'} =
$Torrus::Renderer::displayReports = 1;
push (@Torrus::Collector::loadModules, 'Torrus::Collector::ExternalStorage');
$Torrus::SQL::connections{'Default'}{'dsn'} =
diff --git
a/torrus/perllib/Torrus/Freeside.pm
b/torrus/perllib/Torrus/Freeside.pm
index
1b0a281
..
359d544
100644
(file)
--- a/
torrus/perllib/Torrus/Freeside.pm
+++ b/
torrus/perllib/Torrus/Freeside.pm
@@
-5,8
+5,6
@@
use warnings;
#Freeside
use FS::Mason qw( mason_interps );
#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);
my $outbuf;
my( $fs_interp, $rt_interp ) = mason_interps('standalone', 'outbuf'=>\$outbuf);
@@
-49,8
+47,7
@@
sub freesideComponent {
$FS::Mason::Request::FSURL .= '/' unless $FS::Mason::Request::FSURL =~ /\/$/;
# $FS::Mason::Request::QUERY_STRING = $packet->{'query_string'} || '';
$FS::Mason::Request::FSURL .= '/' unless $FS::Mason::Request::FSURL =~ /\/$/;
# $FS::Mason::Request::QUERY_STRING = $packet->{'query_string'} || '';
- cgisuidsetup($Torrus::CGI::q);
- FS::TicketSystem->init();
+ $self->freesideSetup;
$outbuf = '';
#$fs_interp->exec($comp, @args); #only FS for now alas...
$outbuf = '';
#$fs_interp->exec($comp, @args); #only FS for now alas...
diff --git
a/torrus/perllib/Torrus/Renderer/Freeside.pm
b/torrus/perllib/Torrus/Renderer/Freeside.pm
index
837147f
..
8d93415
100644
(file)
--- a/
torrus/perllib/Torrus/Renderer/Freeside.pm
+++ b/
torrus/perllib/Torrus/Renderer/Freeside.pm
@@
-1,6
+1,18
@@
package Torrus::Renderer::Freeside;
package Torrus::Renderer::Freeside;
+use strict;
+use warnings;
use base 'Torrus::Freeside';
use base 'Torrus::Freeside';
+use FS::UID qw(cgisuidsetup);
+use FS::TicketSystem;
+
+sub freesideSetup {
+ #my $self = shift;
+
+ cgisuidsetup($Torrus::CGI::q);
+ FS::TicketSystem->init();
+
+}
1;
1;
diff --git
a/torrus/perllib/Torrus/ReportOutput/Freeside.pm
b/torrus/perllib/Torrus/ReportOutput/Freeside.pm
index
95daa06
..
47db28d
100644
(file)
--- a/
torrus/perllib/Torrus/ReportOutput/Freeside.pm
+++ b/
torrus/perllib/Torrus/ReportOutput/Freeside.pm
@@
-1,6
+1,18
@@
package Torrus::ReportOutput::Freeside;
package Torrus::ReportOutput::Freeside;
+use strict;
+use warnings;
use base 'Torrus::Freeside';
use base 'Torrus::Freeside';
+use FS::UID qw(adminsuidsetup);
+use FS::TicketSystem;
+
+sub freesideSetup {
+ #my $self = shift;
+
+ adminsuidsetup('fs_queue'); #XXX for now
+ FS::TicketSystem->init();
+
+}
1;
1;