From 4a893caca8b2fa455ec4da12d54b890c10edec9d Mon Sep 17 00:00:00 2001 From: ivan Date: Sat, 4 Aug 2007 00:14:05 +0000 Subject: [PATCH] clean up corners & colors --- rt/html/NoAuth/css/3.5-default/misc.css | 2 +- rt/html/NoAuth/css/3.5-default/transactions.css | 4 + rt/html/NoAuth/images/css/cb.gif | Bin 163 -> 110 bytes rt/html/NoAuth/images/css/cbr.gif | Bin 188 -> 110 bytes rt/html/NoAuth/images/css/ct.gif | Bin 162 -> 110 bytes rt/html/NoAuth/images/css/ctr.gif | Bin 188 -> 111 bytes rt/lib/RT.pm | 274 ++++++++++++++++-------- 7 files changed, 190 insertions(+), 90 deletions(-) diff --git a/rt/html/NoAuth/css/3.5-default/misc.css b/rt/html/NoAuth/css/3.5-default/misc.css index cf3b54ca4..ddb2e687b 100755 --- a/rt/html/NoAuth/css/3.5-default/misc.css +++ b/rt/html/NoAuth/css/3.5-default/misc.css @@ -71,7 +71,7 @@ body { font-size: 1.5em; } -.evenline { background-color: #fe00f8; } +.evenline { background-color: white; } .oddline { background-color: #ddd; } td { diff --git a/rt/html/NoAuth/css/3.5-default/transactions.css b/rt/html/NoAuth/css/3.5-default/transactions.css index dfc4cb9d3..e9decf8ee 100755 --- a/rt/html/NoAuth/css/3.5-default/transactions.css +++ b/rt/html/NoAuth/css/3.5-default/transactions.css @@ -57,6 +57,10 @@ .ticket-transaction.even { background: #eee; } +.ticket-transaction.odd { + background: #fff; +} + .ticket-transaction .date { font-size: 0.9em; diff --git a/rt/html/NoAuth/images/css/cb.gif b/rt/html/NoAuth/images/css/cb.gif index 53bb2aec208dfeff65ff76f6e425e17a83cf3244..49a4a97b63ab512c18f877e983a784c68a8952f9 100644 GIT binary patch delta 79 zcmZ3?n8)kx>1JV>$i=|P@R*NbqJX;9ix)2#z(DaQ3nLc;KZ6d42U5VmB5kn8GjpZI c!(C>%9p6pPKA70EVd9g4AHV+mClM(AWMSlDkY~_g00NMm46F(ZKJ=<&PFc}3?TnXG=Wj>; XhfV>;Yb>59tdKjm(L#htk--`O=saMS diff --git a/rt/html/NoAuth/images/css/cbr.gif b/rt/html/NoAuth/images/css/cbr.gif index 754cee19b909f905ae96e63085717e52cb2f6413..eeb7ff44414cc27b51fccf43198058151cc9157d 100644 GIT binary patch delta 79 zcmdnPn8)kx>1JV>$i=|P@R*NbqJX;9ix)2#z(DaQ3nLc;KZ6d42U5VmBK_f{CG*~= cmzF$##eb>9**K0VIj%jEsb%4gJQfCP03s04AHV+mClM(A6Ll_1O)N=GQ7F$W$xsN%NL6sp%q?J0{K>+|#URh1 x!vF*z$1t!eJW%gj>@e?`r`D?zTjH6v9x$Z^R8(ZJ1^^fZYViO7 diff --git a/rt/html/NoAuth/images/css/ct.gif b/rt/html/NoAuth/images/css/ct.gif index d16a5c57ff8b3bb8c6823727956a48774fdfd65d..d2ae8d8ae52f42843c40a7e016fe2d78684588ce 100644 GIT binary patch delta 79 zcmZ3)n8)kx>1JV>$i=|P@R*NbqJX;9ix)2#z(DaQ3nLc;KZ6d42U5VmBE8|{N*>0| cbC2&#ak}o=Y@w94eM#)0qNBfAidYz|0Sq@5ga7~l literal 162 zcmZ?wbhEHb4AHV+mClM(AWMSlDkY~_g00NMm46O1BDqZJ_L=L`Ch`-%+_Q9?T W&Sy%RcAt5twQri@4?zKE25SJ92x5c) diff --git a/rt/html/NoAuth/images/css/ctr.gif b/rt/html/NoAuth/images/css/ctr.gif index 9754e1567bcb9eed374e4e19266741e76361b21e..d17e647c019b1677141bd2db279ebb3a9e9a7b0d 100644 GIT binary patch delta 80 zcmdnPn9u9(>1JV>$i=|P@R*NbqJX;fix)2#z(DaQ3nLc;KZ6d42U5VmA|oKMc-CJ1 e=f$(HF(udDGMFU!XyMI6X(xY+6bUdgSOWkfmlpj1 literal 188 zcmZ?wbhEHb4AHV+mClM(A6Ll_1O)N=GQ7F$W$xsN%NL6sp%q?J0{K>+|#URh1 w!vF*z$1t!eBm~HGGtYg#d{xKHb+0b$`QUC7uvcy8IwQNON # # (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ # # 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: @@ -66,7 +68,7 @@ use vars qw($VERSION $System $SystemUser $Nobody $Handle $Logger $MasonSessionDir ); -$VERSION = '3.4.5'; +$VERSION = '3.6.4'; $CORE_CONFIG_FILE = "/opt/rt3/etc/RT_Config.pm"; $SITE_CONFIG_FILE = "/opt/rt3/etc/RT_SiteConfig.pm"; @@ -127,12 +129,52 @@ have not been set already. sub LoadConfig { local *Set = sub { $_[0] = $_[1] unless defined $_[0] }; + + my $username = getpwuid($>); + my $group = getgrgid($(); + my $message = <Init; } @@ -144,6 +186,8 @@ Conenct to the database, set up logging. sub Init { + CheckPerlRequirements(); + #Get a database connection ConnectToDatabase(); @@ -161,7 +205,7 @@ sub Init { InitLogging(); } - + =head2 ConnectToDatabase Get a database connection @@ -175,7 +219,7 @@ sub ConnectToDatabase { } $Handle->Connect(); } - + =head2 InitLogging Create the RT::Logger object. @@ -193,80 +237,100 @@ sub InitLogging { unless ($RT::Logger) { - $RT::Logger=Log::Dispatch->new(); + $RT::Logger = Log::Dispatch->new(); + + my $simple_cb = sub { + # if this code throw any warning we can get segfault + no warnings; + + my %p = @_; + + my $frame = 0; # stack frame index + # skip Log::* stack frames + $frame++ while( caller($frame) && caller($frame) =~ /^Log::/ ); + + my ($package, $filename, $line) = caller($frame); + $p{message} =~ s/(?:\r*\n)+$//; + my $str = "[".gmtime(time)."] [".$p{level}."]: $p{message} ($filename:$line)\n"; + + if( $RT::LogStackTraces ) { + $str .= "\nStack trace:\n"; + # skip calling of the Log::* subroutins + $frame++ while( caller($frame) && (caller($frame))[3] =~ /^Log::/ ); + while( my ($package, $filename, $line, $sub) = caller($frame++) ) { + $str .= "\t". $sub ."() called at $filename:$line\n"; + } + } + return $str; + }; + + my $syslog_cb = sub { + my %p = @_; + + my $frame = 0; # stack frame index + # skip Log::* stack frames + $frame++ while( caller($frame) && caller($frame) =~ /^Log::/ ); + my ($package, $filename, $line) = caller($frame); + + # syswrite() cannot take utf8; turn it off here. + Encode::_utf8_off($p{message}); + + $p{message} =~ s/(?:\r*\n)+$//; + if ($p{level} eq 'debug') { + return "$p{message}\n" + } else { + return "$p{message} ($filename:$line)\n" + } + }; if ($RT::LogToFile) { - my ($filename, $logdir); - if ($RT::LogToFileNamed =~ m![/\\]!) { - # looks like an absolute path. - $filename = $RT::LogToFileNamed; - ($logdir) = $RT::LogToFileNamed =~ m!^(.*[/\\])!; - } - else { - $filename = "$RT::LogDir/$RT::LogToFileNamed"; - $logdir = $RT::LogDir; - } - - unless ( -d $logdir && ( ( -f $filename && -w $filename ) || -w $logdir ) ) { - # localizing here would be hard when we don't have a current user yet - # die $self->loc("Log directory [_1] not found or couldn't be written.\n RT can't run.", $RT::LogDir); - die ("Log file $filename couldn't be written or created.\n RT can't run."); - } - - package Log::Dispatch::File; - require Log::Dispatch::File; - - - $RT::Logger->add(Log::Dispatch::File->new - ( name=>'rtlog', - min_level=> $RT::LogToFile, - filename=> $filename, - mode=>'append', - callbacks => sub { my %p = @_; - my ($package, $filename, $line) = caller(5); - return "[".gmtime(time)."] [".$p{level}."]: $p{message} ($filename:$line)\n"} - - - - )); + my ($filename, $logdir); + if ($RT::LogToFileNamed =~ m![/\\]!) { + # looks like an absolute path. + $filename = $RT::LogToFileNamed; + ($logdir) = $RT::LogToFileNamed =~ m!^(.*[/\\])!; + } + else { + $filename = "$RT::LogDir/$RT::LogToFileNamed"; + $logdir = $RT::LogDir; + } + + unless ( -d $logdir && ( ( -f $filename && -w $filename ) || -w $logdir ) ) { + # localizing here would be hard when we don't have a current user yet + die "Log file $filename couldn't be written or created.\n RT can't run."; + } + + package Log::Dispatch::File; + require Log::Dispatch::File; + $RT::Logger->add(Log::Dispatch::File->new + ( name=>'rtlog', + min_level=> $RT::LogToFile, + filename=> $filename, + mode=>'append', + callbacks => $simple_cb, + )); } if ($RT::LogToScreen) { - package Log::Dispatch::Screen; - require Log::Dispatch::Screen; - $RT::Logger->add(Log::Dispatch::Screen->new - ( name => 'screen', - min_level => $RT::LogToScreen, - callbacks => sub { my %p = @_; - my ($package, $filename, $line) = caller(5); - return "[".gmtime(time)."] [".$p{level}."]: $p{message} ($filename:$line)\n" - }, - - stderr => 1 - )); + package Log::Dispatch::Screen; + require Log::Dispatch::Screen; + $RT::Logger->add(Log::Dispatch::Screen->new + ( name => 'screen', + min_level => $RT::LogToScreen, + callbacks => $simple_cb, + stderr => 1, + )); } if ($RT::LogToSyslog) { - package Log::Dispatch::Syslog; - require Log::Dispatch::Syslog; - $RT::Logger->add(Log::Dispatch::Syslog->new - ( name => 'syslog', + package Log::Dispatch::Syslog; + require Log::Dispatch::Syslog; + $RT::Logger->add(Log::Dispatch::Syslog->new + ( name => 'syslog', ident => 'RT', - min_level => $RT::LogToSyslog, - callbacks => sub { my %p = @_; - my ($package, $filename, $line) = caller(5); - - # syswrite() cannot take utf8; turn it off here. - Encode::_utf8_off($p{message}); - - if ($p{level} eq 'debug') { - - return "$p{message}\n" } - else { - return "$p{message} ($filename:$line)\n"} - }, - - stderr => 1, - @RT::LogToSyslogConf - )); + min_level => $RT::LogToSyslog, + callbacks => $syslog_cb, + stderr => 1, + @RT::LogToSyslogConf + )); } } @@ -278,14 +342,16 @@ sub InitLogging { ## Mason). It will log all problems through the standard logging ## mechanism (see above). -$SIG{__WARN__} = sub { - my $w = shift; - $w =~ s/(?:\r*\n)+$//; - # The 'wide character' warnings has to be silenced for now, at least - # until HTML::Mason offers a sane way to process both raw output and - # unicode strings. - $RT::Logger->warning($w) if index($w, 'Wide character in ') != 0; -}; + $SIG{__WARN__} = sub { + # The 'wide character' warnings has to be silenced for now, at least + # until HTML::Mason offers a sane way to process both raw output and + # unicode strings. + # use 'goto &foo' syntax to hide ANON sub from stack + if( index($_[0], 'Wide character in ') != 0 ) { + unshift @_, $RT::Logger, qw(level warning message); + goto &Log::Dispatch::log; + } + }; #When we call die, trap it and log->crit with the value of the die. @@ -293,18 +359,48 @@ $SIG{__DIE__} = sub { unless ($^S || !defined $^S ) { $RT::Handle->Rollback(); $RT::Logger->crit("$_[0]"); - exit(-1); - } - else { - #Get out of here if we're in an eval - die $_[0]; } + die $_[0]; }; # }}} } + +sub CheckPerlRequirements { + if ($^V < 5.008003) { + die sprintf "RT requires Perl v5.8.3 or newer. Your current Perl is v%vd\n", $^V; + } + + local ($@); + eval { + my $x = ''; + my $y = \$x; + require Scalar::Util; Scalar::Util::weaken($y); + }; + if ($@) { + die <<"EOF"; + +RT requires the Scalar::Util module be built with support for the 'weaken' +function. + +It is sometimes the case that operating system upgrades will replace +a working Scalar::Util with a non-working one. If your system was working +correctly up until now, this is likely the cause of the problem. + +Please reinstall Scalar::Util, being careful to let it build with your C +compiler. Ususally this is as simple as running the following command as +root. + + perl -MCPAN -e'install Scalar::Util' + +EOF + + } +} + + =head2 InitClasses Load all modules that define base classes -- 2.11.0