projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
THIS fixes ticketing main layout problems. whew! RT#6640
[freeside.git]
/
rt
/
bin
/
mason_handler.fcgi
diff --git
a/rt/bin/mason_handler.fcgi
b/rt/bin/mason_handler.fcgi
index
4ce6c00
..
881d638
100755
(executable)
--- a/
rt/bin/mason_handler.fcgi
+++ b/
rt/bin/mason_handler.fcgi
@@
-2,8
+2,8
@@
# BEGIN BPS TAGGED BLOCK {{{
#
# COPYRIGHT:
# BEGIN BPS TAGGED BLOCK {{{
#
# COPYRIGHT:
-#
-# This software is Copyright (c) 1996-200
5 Best Practical Solutions, LLC
+#
+# This software is Copyright (c) 1996-200
9 Best Practical Solutions, LLC
# <jesse@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
# <jesse@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
@@
-23,7
+23,9
@@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 or visit their web page on the internet at
+# http://www.gnu.org/copyleft/gpl.html.
#
#
# CONTRIBUTION SUBMISSION POLICY:
#
#
# CONTRIBUTION SUBMISSION POLICY:
@@
-44,18
+46,16
@@
# those contributions and any derivatives thereof.
#
# END BPS TAGGED BLOCK }}}
# those contributions and any derivatives thereof.
#
# END BPS TAGGED BLOCK }}}
-package RT::Mason;
-
use strict;
use strict;
-use vars '$Handler';
+use warnings;
+no warnings qw(once);
+
use File::Basename;
use File::Basename;
-require (
'/opt/rt3/bin
/webmux.pl');
+require (
dirname(__FILE__) .'
/webmux.pl');
# Enter CGI::Fast mode, which should also work as a vanilla CGI script.
require CGI::Fast;
# Enter CGI::Fast mode, which should also work as a vanilla CGI script.
require CGI::Fast;
-RT::Init();
-
while ( my $cgi = CGI::Fast->new ) {
# the whole point of fastcgi requires the env to get reset here..
# So we must squash it again
while ( my $cgi = CGI::Fast->new ) {
# the whole point of fastcgi requires the env to get reset here..
# So we must squash it again
@@
-65,15
+65,19
@@
while ( my $cgi = CGI::Fast->new ) {
$ENV{'ENV'} = '' if defined $ENV{'ENV'};
$ENV{'IFS'} = '' if defined $ENV{'IFS'};
$ENV{'ENV'} = '' if defined $ENV{'ENV'};
$ENV{'IFS'} = '' if defined $ENV{'IFS'};
- Module::Refresh->refresh if
$RT::DevelMode
;
+ Module::Refresh->refresh if
RT->Config->Get('DevelMode')
;
RT::ConnectToDatabase();
RT::ConnectToDatabase();
- if ( ( !$Handler->interp->comp_exists( $cgi->path_info ) )
- && ( $Handler->interp->comp_exists( $cgi->path_info . "/index.html" ) ) ) {
+ my $interp = $RT::Mason::Handler->interp;
+ if (
+ !$interp->comp_exists( $cgi->path_info )
+ && $interp->comp_exists( $cgi->path_info . "/index.html" )
+ ) {
$cgi->path_info( $cgi->path_info . "/index.html" );
}
$cgi->path_info( $cgi->path_info . "/index.html" );
}
- eval { $Handler->handle_cgi_object($cgi); };
+ local $@;
+ eval { $RT::Mason::Handler->handle_cgi_object($cgi); };
if ($@) {
$RT::Logger->crit($@);
}
if ($@) {
$RT::Logger->crit($@);
}