[rt-commit] [svn] r670 - in rt/trunk: etc html/Ticket/Elements lib/RT lib/RT/Interface

[jesse at fsck.com]

Author: jesse
Date: Mon Apr  5 10:14:32 2004
New Revision: 670

Modified:
   rt/trunk/etc/RT_Config.pm
   rt/trunk/html/Ticket/Elements/ShowRequestor
   rt/trunk/lib/RT/CurrentUser.pm
   rt/trunk/lib/RT/Interface/Email.pm
Log:
Only show _users_ in the "About this requestor" box

Modified: rt/trunk/etc/RT_Config.pm
==============================================================================
--- rt/trunk/etc/RT_Config.pm	(original)
+++ rt/trunk/etc/RT_Config.pm	Mon Apr  5 10:14:32 2004
@@ -177,7 +177,7 @@
 # Note that you should remove the '-t' from $SendmailArguments
 # if you use 'sendmail rather than 'sendmailpipe'
 
-Set($MailCommand , 'sendmailpipe');
+Set($MailCommand , 'sendmail');
 
 # $SendmailArguments defines what flags to pass to $Sendmail
 # assuming you picked 'sendmail' or 'sendmailpipe' as the $MailCommand above.

Modified: rt/trunk/html/Ticket/Elements/ShowRequestor
==============================================================================
--- rt/trunk/html/Ticket/Elements/ShowRequestor	(original)
+++ rt/trunk/html/Ticket/Elements/ShowRequestor	Mon Apr  5 10:14:32 2004
@@ -23,7 +23,7 @@
 %# END LICENSE BLOCK
 <%PERL>
 my $rows = 10;
-my $people = $Ticket->Requestors->MembersObj;
+my $people = $Ticket->Requestors->UserMembersObj;
 while (my $member=$people->Next) {
 my $requestor = $member->MemberObj->Object;
 my $name=$requestor->RealName || $requestor->EmailAddress;	

Modified: rt/trunk/lib/RT/CurrentUser.pm
==============================================================================
--- rt/trunk/lib/RT/CurrentUser.pm	(original)
+++ rt/trunk/lib/RT/CurrentUser.pm	Mon Apr  5 10:14:32 2004
@@ -330,19 +330,25 @@
 
 sub LanguageHandle {
     my $self = shift;
-    if  ((!defined $self->{'LangHandle'}) || 
-         (!UNIVERSAL::can($self->{'LangHandle'}, 'maketext')) || 
-         (@_))  {
-	if ( $self->Lang) {
-	    push @_, $self->Lang;
-	}
+    if (   ( !defined $self->{'LangHandle'} )
+        || ( !UNIVERSAL::can( $self->{'LangHandle'}, 'maketext' ) )
+        || (@_) ) {
+
+        if ( $self->id == $RT::SystemUser->id() ) {
+            @_ = qw(en-US);
+        }
+
+        elsif ( $self->Lang ) {
+            push @_, $self->Lang;
+        }
         $self->{'LangHandle'} = RT::I18N->get_handle(@_);
     }
+
     # Fall back to english.
-    unless ($self->{'LangHandle'}) {
+    unless ( $self->{'LangHandle'} ) {
         die "We couldn't get a dictionary. Nye mogu naidti slovar. No puedo encontrar dictionario.";
     }
-    return ($self->{'LangHandle'});
+    return ( $self->{'LangHandle'} );
 }
 
 sub loc {

Modified: rt/trunk/lib/RT/Interface/Email.pm
==============================================================================
--- rt/trunk/lib/RT/Interface/Email.pm	(original)
+++ rt/trunk/lib/RT/Interface/Email.pm	Mon Apr  5 10:14:32 2004
@@ -182,14 +182,14 @@
 
     }
 
- 
+    $RT::Logger->crit($entity->as_string); 
     if ($RT::MailCommand eq 'sendmailpipe') {
         open (MAIL, "|$RT::SendmailPath $RT::SendmailArguments") || return(0);
         print MAIL $entity->as_string;
         close(MAIL);
     }
     else {
-	$entity->send($RT::MailCommand, $RT::MailParams);
+    	$entity->send($RT::MailCommand, $RT::MailParams);
     }
 }