Skip to content
GitLab
Commit 9dae7fa8 authored by Jesse Vincent's avatar Jesse Vincent
Browse files

(empty commit message) 

git-svn-id: svn+ssh://svn.bestpractical.com/svn/bps-public/rt/branches/3.8-TESTING@12773 e417ac7c-1bcc-0310-8ffa-8f5827389a85
parent d7ac58eb
Expand all Hide whitespace changes
Inline Side-by-side
Makefile.in
View file @ 9dae7fa8
......@@ -125,6 +125,8 @@ RT_READABLE_DIR_MODE = 0755
RT_MODPERL_HANDLER = $(RT_BIN_PATH)/webmux.pl
# RT_STANDALONE_SERVER is a stand-alone HTTP server
RT_STANDALONE_SERVER = $(RT_BIN_PATH)/standalone_httpd
# RT_NET_SERVER is an HTTP server using Net::Server
RT_NET_SERVER = $(RT_BIN_PATH)/rt-server
# RT_SPEEDYCGI_HANDLER is the mason handler script for SpeedyCGI
RT_SPEEDYCGI_HANDLER = $(RT_BIN_PATH)/mason_handler.scgi
# RT_FASTCGI_HANDLER is the mason handler script for FastCGI
......@@ -154,7 +156,6 @@ SYSTEM_BINARIES = $(DESTDIR)/$(RT_SBIN_PATH)/rt-dump-database \
$(DESTDIR)/$(RT_SBIN_PATH)/rt-setup-database \
$(DESTDIR)/$(RT_SBIN_PATH)/rt-send-digest \
$(DESTDIR)/$(RT_SBIN_PATH)/rt-email-dashboards \
$(DESTDIR)/$(RT_SBIN_PATH)/rt-server \
$(DESTDIR)/$(RT_SBIN_PATH)/rt-test-dependencies \
$(DESTDIR)/$(RT_SBIN_PATH)/rt-clean-sessions \
$(DESTDIR)/$(RT_SBIN_PATH)/rt-shredder \
......@@ -433,8 +434,7 @@ sbin-install:
sbin/rt-shredder \
sbin/rt-notify-group-admin \
sbin/rt-send-digest \
sbin/rt-email-dashboards \
sbin/rt-server
sbin/rt-email-dashboards
-cp -rp \
sbin/rt-dump-database \
sbin/rt-setup-database \
......@@ -444,7 +444,6 @@ sbin-install:
sbin/rt-notify-group-admin \
sbin/rt-send-digest \
sbin/rt-email-dashboards \
sbin/rt-server \
$(DESTDIR)/$(RT_SBIN_PATH)
# }}}
......@@ -460,6 +459,7 @@ bin-install:
bin/mason_handler.fcgi \
bin/mason_handler.scgi \
bin/standalone_httpd \
bin/rt-server \
bin/mason_handler.svc \
bin/rt \
bin/webmux.pl \
......@@ -495,7 +495,7 @@ start-httpd:
$(PERL) bin/standalone_httpd &
start-server:
$(PERL) sbin/rt-server &
$(PERL) bin/rt-server &
apachectl:
$(APACHECTL) stop
......
bin/rt-crontool.in
View file @ 9dae7fa8
......@@ -53,21 +53,12 @@ use Carp;
BEGIN {
require File::Spec;
my @libs = ("@RT_LIB_PATH@", "@LOCAL_LIB_PATH@");
my $bin_path;
for my $lib (@libs) {
unless ( File::Spec->file_name_is_absolute($lib) ) {
unless ($bin_path) {
if ( File::Spec->file_name_is_absolute(__FILE__) ) {
$bin_path = ( File::Spec->splitpath(__FILE__) )[1];
}
else {
require FindBin;
no warnings "once";
$bin_path = $FindBin::Bin;
}
}
$lib = File::Spec->catfile( $bin_path, File::Spec->updir, $lib );
require FindBin;
no warnings "once";
$lib =
File::Spec->catfile( $FindBin::Bin, File::Spec->updir, $lib );
}
unshift @INC, $lib;
}
......
bin/standalone_httpd.in
View file @ 9dae7fa8
......@@ -53,21 +53,12 @@ use strict;
BEGIN {
require File::Spec;
my @libs = ("@RT_LIB_PATH@", "@LOCAL_LIB_PATH@");
my $bin_path;
for my $lib (@libs) {
unless ( File::Spec->file_name_is_absolute($lib) ) {
unless ($bin_path) {
if ( File::Spec->file_name_is_absolute(__FILE__) ) {
$bin_path = ( File::Spec->splitpath(__FILE__) )[1];
}
else {
require FindBin;
no warnings "once";
$bin_path = $FindBin::Bin;
}
}
$lib = File::Spec->catfile( $bin_path, File::Spec->updir, $lib );
require FindBin;
no warnings "once";
$lib =
File::Spec->catfile( $FindBin::Bin, File::Spec->updir, $lib );
}
unshift @INC, $lib;
}
......
bin/webmux.pl.in
View file @ 9dae7fa8
......@@ -68,21 +68,12 @@ BEGIN {
BEGIN {
require File::Spec;
my @libs = ("@RT_LIB_PATH@", "@LOCAL_LIB_PATH@");
my $bin_path;
for my $lib (@libs) {
unless ( File::Spec->file_name_is_absolute($lib) ) {
unless ($bin_path) {
if ( File::Spec->file_name_is_absolute(__FILE__) ) {
$bin_path = ( File::Spec->splitpath(__FILE__) )[1];
}
else {
require FindBin;
no warnings "once";
$bin_path = $FindBin::Bin;
}
}
$lib = File::Spec->catfile( $bin_path, File::Spec->updir, $lib );
require FindBin;
no warnings "once";
$lib =
File::Spec->catfile( $FindBin::Bin, File::Spec->updir, $lib );
}
unshift @INC, $lib;
}
......
etc/RT_Config.pm.in
View file @ 9dae7fa8
......@@ -601,7 +601,7 @@ Set($StandaloneMinServers, 1);
Set($StandaloneMaxServers, 1);
# These next two options can be used to scale up and down the number of servers
# to adjust to load. These two options will respect the $StandaloneMinServers
# to adjust to load. These two otions will respect the $StandaloneMinServers
# and $StandaloneMaxServers options.
Set($StandaloneMinSpareServers, 0);
Set($StandaloneMaxSpareServers, 0);
......@@ -756,7 +756,7 @@ Set($StrictLinkACL, 1);
# If you use RT behind a reverse proxy, you almost certainly want to
# enable this option.
Set($CanonicalizeRedirectURLs, 0);
Set($CanonicalizeRedirectURLs, 1);
# }}}
......
lib/RT/Action/SendEmail.pm
View file @ 9dae7fa8
......@@ -362,12 +362,14 @@ sub AddAttachments {
$attachments->OrderBy( FIELD => 'id' );
# We want to make sure that we don't include the attachment that's
# being used as the "Content" of this message" unless that attachment's
# content type is not like text/...
# being sued as the "Content" of this message"
my $transaction_content_obj = $self->TransactionObj->ContentObj;
# XXX: this is legacy check of content type looks quite incorrect
# to me //ruz
if ( $transaction_content_obj
&& $transaction_content_obj->ContentType =~ m{text/}i )
&& $transaction_content_obj->id
&& $transaction_content_obj->ContentType =~ m{text/plain}i )
{
$attachments->Limit(
ENTRYAGGREGATOR => 'AND',
......
lib/RT/I18N/hr.po
View file @ 9dae7fa8
This diff is collapsed.
lib/RT/Interface/Email.pm
View file @ 9dae7fa8
......@@ -914,7 +914,7 @@ sub ParseAddressFromHeader {
return ( undef, undef );
}
my $Name = ( $AddrObj->name || $AddrObj->phrase || $AddrObj->comment || $AddrObj->address );
my $Name = ( $AddrObj->phrase || $AddrObj->comment || $AddrObj->address );
#Lets take the from and load a user object.
my $Address = $AddrObj->address;
......
lib/RT/Interface/Web.pm
View file @ 9dae7fa8
......@@ -548,7 +548,6 @@ sub ProcessUpdateMessage {
@_
);
if ( $args{ARGSRef}->{'UpdateAttachments'}
&& !keys %{$args{ARGSRef}->{'UpdateAttachments'}} )
{
......
lib/RT/Template_Overlay.pm
View file @ 9dae7fa8
......@@ -298,7 +298,6 @@ sub Parse {
my $self = shift;
my ($rv, $msg);
if ($self->Content =~ m{^Content-Type:\s+text/html\b}im) {
local $RT::Transaction::PreferredContentType = 'text/html';
($rv, $msg) = $self->_Parse(@_);
......@@ -309,7 +308,6 @@ sub Parse {
# We only HTMLify things if the template includes at least one Transaction->Content call.
return ($rv, $msg) unless $rv and $self->Content =~ /->\s*Content\b/;
my $orig_entity = $self->MIMEObj;
my $mime_type = $self->MIMEObj->mime_type;
......@@ -443,7 +441,6 @@ sub _ParseContent {
sub _DowngradeFromHTML {
my $self = shift;
my $orig_entity = $self->MIMEObj;
die 'hehe';
local $RT::Transaction::PreferredContentType = 'text/plain';
......
lib/RT/Ticket_Overlay.pm
View file @ 9dae7fa8
......@@ -1706,8 +1706,7 @@ sub SetQueue {
# On queue change, change queue for reminders too
my $reminder_collection = $self->Reminders->Collection;
while ( my $reminder = $reminder_collection->Next ) {
my ($status, $msg) = $reminder->SetQueue($NewQueue);
$RT::Logger->error('Queue change failed for reminder #' . $reminder->Id . ': ' . $msg) unless $status;
return ( 0, $self->loc("Queue change failed for reminder [_1]: [_2]", $reminder->Id ,$msg) ) unless $val;
}
return ( $self->_Set( Field => 'Queue', Value => $NewQueueObj->Id() ) );
......
lib/RT/Tickets_Overlay.pm
View file @ 9dae7fa8
......@@ -1292,6 +1292,8 @@ sub _CustomFieldLimit {
$self->_OpenParen;
$self->_OpenParen;
$self->_SQLLimit(
ALIAS => $TicketCFs,
FIELD => $column || 'Content',
......@@ -1300,6 +1302,30 @@ sub _CustomFieldLimit {
%rest
);
$self->_OpenParen;
$self->_SQLLimit(
ALIAS => $TicketCFs,
FIELD => $column || 'Content',
OPERATOR => '=',
VALUE => '',
QUOTEVALUE => 0,
ENTRYAGGREGATOR => 'OR'
);
$self->_SQLLimit(
ALIAS => $TicketCFs,
FIELD => 'LargeContent',
OPERATOR => $op,
VALUE => $value,
QUOTEVALUE => 1,
ENTRYAGGREGATOR => 'AND',
);
$self->_CloseParen;
$self->_CloseParen;
# XXX: if we join via CustomFields table then
# because of order of left joins we get NULLs in
# CF table and then get nulls for those records
......
lib/RT/Transactions_Overlay.pm
View file @ 9dae7fa8
......@@ -134,7 +134,6 @@ sub Next {
if ((defined($Transaction)) and (ref($Transaction))) {
# If the user can see the transaction's type, then they can
# see the transaction and we should hand it back.
$RT::Logger->crit( $Transaction->Type, $Transaction->id );
if ($Transaction->Type) {
return($Transaction);
}
......
sbin/rt-clean-sessions.in
View file @ 9dae7fa8
......@@ -53,24 +53,16 @@ use warnings;
BEGIN {
require File::Spec;
my @libs = ("@RT_LIB_PATH@", "@LOCAL_LIB_PATH@");
my $bin_path;
for my $lib (@libs) {
unless ( File::Spec->file_name_is_absolute($lib) ) {
unless ($bin_path) {
if ( File::Spec->file_name_is_absolute(__FILE__) ) {
$bin_path = ( File::Spec->splitpath(__FILE__) )[1];
}
else {
require FindBin;
no warnings "once";
$bin_path = $FindBin::Bin;
}
}
$lib = File::Spec->catfile( $bin_path, File::Spec->updir, $lib );
require FindBin;
no warnings "once";
$lib =
File::Spec->catfile( $FindBin::Bin, File::Spec->updir, $lib );
}
unshift @INC, $lib;
}
}
use Getopt::Long;
......
sbin/rt-dump-database.in
View file @ 9dae7fa8
......@@ -52,21 +52,12 @@ use strict;
BEGIN {
require File::Spec;
my @libs = ("@RT_LIB_PATH@", "@LOCAL_LIB_PATH@");
my $bin_path;
for my $lib (@libs) {
unless ( File::Spec->file_name_is_absolute($lib) ) {
unless ($bin_path) {
if ( File::Spec->file_name_is_absolute(__FILE__) ) {
$bin_path = ( File::Spec->splitpath(__FILE__) )[1];
}
else {
require FindBin;
no warnings "once";
$bin_path = $FindBin::Bin;
}
}
$lib = File::Spec->catfile( $bin_path, File::Spec->updir, $lib );
require FindBin;
no warnings "once";
$lib =
File::Spec->catfile( $FindBin::Bin, File::Spec->updir, $lib );
}
unshift @INC, $lib;
}
......
sbin/rt-email-dashboards.in
View file @ 9dae7fa8
......@@ -53,21 +53,12 @@ use warnings;
BEGIN {
require File::Spec;
my @libs = ("@RT_LIB_PATH@", "@LOCAL_LIB_PATH@");
my $bin_path;
for my $lib (@libs) {
unless ( File::Spec->file_name_is_absolute($lib) ) {
unless ($bin_path) {
if ( File::Spec->file_name_is_absolute(__FILE__) ) {
$bin_path = ( File::Spec->splitpath(__FILE__) )[1];
}
else {
require FindBin;
no warnings "once";
$bin_path = $FindBin::Bin;
}
}
$lib = File::Spec->catfile( $bin_path, File::Spec->updir, $lib );
require FindBin;
no warnings "once";
$lib =
File::Spec->catfile( $FindBin::Bin, File::Spec->updir, $lib );
}
unshift @INC, $lib;
}
......
sbin/rt-notify-group-admin.in
View file @ 9dae7fa8
......@@ -90,21 +90,12 @@ use strict;
BEGIN {
require File::Spec;
my @libs = ("@RT_LIB_PATH@", "@LOCAL_LIB_PATH@");
my $bin_path;
for my $lib (@libs) {
unless ( File::Spec->file_name_is_absolute($lib) ) {
unless ($bin_path) {
if ( File::Spec->file_name_is_absolute(__FILE__) ) {
$bin_path = ( File::Spec->splitpath(__FILE__) )[1];
}
else {
require FindBin;
no warnings "once";
$bin_path = $FindBin::Bin;
}
}
$lib = File::Spec->catfile( $bin_path, File::Spec->updir, $lib );
require FindBin;
no warnings "once";
$lib =
File::Spec->catfile( $FindBin::Bin, File::Spec->updir, $lib );
}
unshift @INC, $lib;
}
......
sbin/rt-server.in
View file @ 9dae7fa8
......@@ -53,21 +53,12 @@ use strict;
BEGIN {
require File::Spec;
my @libs = ("@RT_LIB_PATH@", "@LOCAL_LIB_PATH@");
my $bin_path;
for my $lib (@libs) {
unless ( File::Spec->file_name_is_absolute($lib) ) {
unless ($bin_path) {
if ( File::Spec->file_name_is_absolute(__FILE__) ) {
$bin_path = ( File::Spec->splitpath(__FILE__) )[1];
}
else {
require FindBin;
no warnings "once";
$bin_path = $FindBin::Bin;
}
}
$lib = File::Spec->catfile( $bin_path, File::Spec->updir, $lib );
require FindBin;
no warnings "once";
$lib =
File::Spec->catfile( $FindBin::Bin, File::Spec->updir, $lib );
}
unshift @INC, $lib;
}
......
sbin/rt-setup-database.in
View file @ 9dae7fa8
......@@ -55,21 +55,12 @@ use vars qw($Nobody $SystemUser $item);
BEGIN {
require File::Spec;
my @libs = ("@RT_LIB_PATH@", "@LOCAL_LIB_PATH@");
my $bin_path;
for my $lib (@libs) {
unless ( File::Spec->file_name_is_absolute($lib) ) {
unless ($bin_path) {
if ( File::Spec->file_name_is_absolute(__FILE__) ) {
$bin_path = ( File::Spec->splitpath(__FILE__) )[1];
}
else {
require FindBin;
no warnings "once";
$bin_path = $FindBin::Bin;
}
}
$lib = File::Spec->catfile( $bin_path, File::Spec->updir, $lib );
require FindBin;
no warnings "once";
$lib =
File::Spec->catfile( $FindBin::Bin, File::Spec->updir, $lib );
}
unshift @INC, $lib;
}
......
sbin/rt-shredder.in
View file @ 9dae7fa8
......@@ -114,21 +114,12 @@ use warnings FATAL => 'all';
BEGIN {
require File::Spec;
my @libs = ("@RT_LIB_PATH@", "@LOCAL_LIB_PATH@");
my $bin_path;
for my $lib (@libs) {
unless ( File::Spec->file_name_is_absolute($lib) ) {
unless ($bin_path) {
if ( File::Spec->file_name_is_absolute(__FILE__) ) {
$bin_path = ( File::Spec->splitpath(__FILE__) )[1];
}
else {
require FindBin;
no warnings "once";
$bin_path = $FindBin::Bin;
}
}
$lib = File::Spec->catfile( $bin_path, File::Spec->updir, $lib );
require FindBin;
no warnings "once";
$lib =
File::Spec->catfile( $FindBin::Bin, File::Spec->updir, $lib );
}
unshift @INC, $lib;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment