[Rt-commit] [svn] r1159 - in rt/branches/rt-3.3: . bin etc html html/Admin/Elements html/Admin/Global html/Admin/Groups html/Admin/Queues html/Admin/Users html/Approvals html/Search html/Search/Elements html/SelfService html/Ticket html/Ticket/Elements html/User html/User/Groups lib/RT lib/RT/I18N lib/RT/Interface

jesse at pallas.eruditorum.org jesse at pallas.eruditorum.org
Sun Jun 27 23:08:02 EDT 2004


Author: jesse
Date: Sun Jun 27 23:08:01 2004
New Revision: 1159

Modified:
   rt/branches/rt-3.3/   (props changed)
   rt/branches/rt-3.3/Makefile.in
   rt/branches/rt-3.3/UPGRADING
   rt/branches/rt-3.3/bin/mason_handler.fcgi.in
   rt/branches/rt-3.3/bin/mason_handler.scgi.in
   rt/branches/rt-3.3/bin/rt.in
   rt/branches/rt-3.3/bin/webmux.pl.in
   rt/branches/rt-3.3/configure.ac
   rt/branches/rt-3.3/etc/RT_Config.pm.in
   rt/branches/rt-3.3/html/Admin/Elements/EditCustomField
   rt/branches/rt-3.3/html/Admin/Elements/EditScrip
   rt/branches/rt-3.3/html/Admin/Elements/EditTemplates
   rt/branches/rt-3.3/html/Admin/Elements/UserTabs
   rt/branches/rt-3.3/html/Admin/Global/GroupRights.html
   rt/branches/rt-3.3/html/Admin/Global/Template.html
   rt/branches/rt-3.3/html/Admin/Global/UserRights.html
   rt/branches/rt-3.3/html/Admin/Groups/GroupRights.html
   rt/branches/rt-3.3/html/Admin/Groups/Members.html
   rt/branches/rt-3.3/html/Admin/Groups/Modify.html
   rt/branches/rt-3.3/html/Admin/Groups/UserRights.html
   rt/branches/rt-3.3/html/Admin/Queues/GroupRights.html
   rt/branches/rt-3.3/html/Admin/Queues/Modify.html
   rt/branches/rt-3.3/html/Admin/Queues/Template.html
   rt/branches/rt-3.3/html/Admin/Queues/UserRights.html
   rt/branches/rt-3.3/html/Admin/Users/Modify.html
   rt/branches/rt-3.3/html/Approvals/index.html
   rt/branches/rt-3.3/html/Search/Bulk.html
   rt/branches/rt-3.3/html/Search/Elements/PickCFs
   rt/branches/rt-3.3/html/SelfService/Prefs.html
   rt/branches/rt-3.3/html/Ticket/Display.html
   rt/branches/rt-3.3/html/Ticket/Elements/ShowAttachments
   rt/branches/rt-3.3/html/Ticket/ModifyAll.html
   rt/branches/rt-3.3/html/Ticket/ModifyDates.html
   rt/branches/rt-3.3/html/Ticket/ModifyLinks.html
   rt/branches/rt-3.3/html/Ticket/Update.html
   rt/branches/rt-3.3/html/User/Delegation.html
   rt/branches/rt-3.3/html/User/Groups/Members.html
   rt/branches/rt-3.3/html/User/Groups/Modify.html
   rt/branches/rt-3.3/html/User/Prefs.html
   rt/branches/rt-3.3/html/autohandler
   rt/branches/rt-3.3/lib/RT/I18N/da.po
   rt/branches/rt-3.3/lib/RT/I18N/de.po
   rt/branches/rt-3.3/lib/RT/I18N/en_malkovich.po
   rt/branches/rt-3.3/lib/RT/I18N/es.po
   rt/branches/rt-3.3/lib/RT/I18N/fi.po
   rt/branches/rt-3.3/lib/RT/I18N/fr.po
   rt/branches/rt-3.3/lib/RT/I18N/he.po
   rt/branches/rt-3.3/lib/RT/I18N/it.po
   rt/branches/rt-3.3/lib/RT/I18N/ja.po
   rt/branches/rt-3.3/lib/RT/I18N/nl.po
   rt/branches/rt-3.3/lib/RT/I18N/no.po
   rt/branches/rt-3.3/lib/RT/I18N/pt_br.po
   rt/branches/rt-3.3/lib/RT/I18N/ru.po
   rt/branches/rt-3.3/lib/RT/Interface/Web.pm
   rt/branches/rt-3.3/lib/RT/SearchBuilder.pm
   rt/branches/rt-3.3/lib/RT/Templates_Overlay.pm
   rt/branches/rt-3.3/lib/RT/Ticket_Overlay.pm
   rt/branches/rt-3.3/lib/RT/Tickets_Overlay.pm
Log:
 ----------------------------------------------------------------------
 r1769 at tinbook:  jesse | 2004-06-01T20:22:38.640731Z
 
 
 ----------------------------------------------------------------------
 r1902 at tinbook:  jesse | 2004-06-17T01:08:53.996154Z
 
 
 ----------------------------------------------------------------------
 r1991 at tinbook:  jesse | 2004-06-28T02:03:57.669851Z
 
 
 ----------------------------------------------------------------------
 r1992 at tinbook:  jesse | 2004-06-28T02:19:36.386707Z
 
 Pulling forward from RT 3.1
 
 
 ----------------------------------------------------------------------
 r1993 at tinbook:  jesse | 2004-06-28T03:06:56.930396Z
 
 Merging forward from 3.1
 ----------------------------------------------------------------------


Modified: rt/branches/rt-3.3/Makefile.in
==============================================================================
--- rt/branches/rt-3.3/Makefile.in	(original)
+++ rt/branches/rt-3.3/Makefile.in	Sun Jun 27 23:08:01 2004
@@ -443,9 +443,6 @@
 start-httpd:
 	$(PERL) bin/standalone_httpd 80 &
 
-start-httpd:
-	$(PERL) bin/standalone_httpd 80 &
-
 apachectl:
 	$(APACHECTL) stop
 	sleep 10

Modified: rt/branches/rt-3.3/UPGRADING
==============================================================================
--- rt/branches/rt-3.3/UPGRADING	(original)
+++ rt/branches/rt-3.3/UPGRADING	Sun Jun 27 23:08:01 2004
@@ -10,7 +10,6 @@
 WARNING
 *******
 
-
 Before making any changes to your database, always ensure that you have a 
 complete current backup. If you don't have a current backup, you could 
 accidentally damage your database and lose data or worse.

Modified: rt/branches/rt-3.3/bin/mason_handler.fcgi.in
==============================================================================
--- rt/branches/rt-3.3/bin/mason_handler.fcgi.in	(original)
+++ rt/branches/rt-3.3/bin/mason_handler.fcgi.in	Sun Jun 27 23:08:01 2004
@@ -34,7 +34,6 @@
 
 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

Modified: rt/branches/rt-3.3/bin/mason_handler.scgi.in
==============================================================================
--- rt/branches/rt-3.3/bin/mason_handler.scgi.in	(original)
+++ rt/branches/rt-3.3/bin/mason_handler.scgi.in	Sun Jun 27 23:08:01 2004
@@ -31,7 +31,6 @@
 require CGI;
 
 RT::Init();
-RT::DropSetGIDPermissions();
 
 my $cgi = CGI->new;
 if ( ( !$h->interp->comp_exists( $cgi->path_info ) )

Modified: rt/branches/rt-3.3/bin/rt.in
==============================================================================
--- rt/branches/rt-3.3/bin/rt.in	(original)
+++ rt/branches/rt-3.3/bin/rt.in	Sun Jun 27 23:08:01 2004
@@ -777,10 +777,10 @@
 
         my ($head, $text) = split /\n\n/, $res->content, 2;
         my ($status, @headers) = split /\n/, $head;
-        $text =~ s/\n*$/\n/;
+        $text =~ s/\n*$/\n/ if ($text);
 
         # "RT/3.0.1 401 Credentials required"
-        if ($status !~ m#^RT/\d+(?:\.\d+)+(?:-?\w+)? (\d+) ([\w\s]+)$#) {
+	if ($status !~ m#^RT/\d+(?:\S+) (\d+) ([\w\s]+)$#) {
             warn "rt: Malformed RT response from $config{server}.\n";
             warn "(Rerun with RTDEBUG=3 for details.)\n" if $config{debug} < 3;
             exit -1;

Modified: rt/branches/rt-3.3/bin/webmux.pl.in
==============================================================================
--- rt/branches/rt-3.3/bin/webmux.pl.in	(original)
+++ rt/branches/rt-3.3/bin/webmux.pl.in	Sun Jun 27 23:08:01 2004
@@ -26,7 +26,7 @@
 use strict;
 
 BEGIN {
-    $ENV{'PATH'}   = '/bin:/usr/bin';                      # or whatever you need
+    $ENV{'PATH'}   = '/bin:/usr/bin';                     # or whatever you need
     $ENV{'CDPATH'} = '' if defined $ENV{'CDPATH'};
     $ENV{'SHELL'}  = '/bin/sh' if defined $ENV{'SHELL'};
     $ENV{'ENV'}    = '' if defined $ENV{'ENV'};
@@ -37,7 +37,7 @@
         if $ENV{'MOD_PERL'} and $ENV{'MOD_PERL'} =~ m{mod_perl/(?:2|1\.9)};
 }
 
-use lib ("@LOCAL_LIB_PATH@", "@RT_LIB_PATH@");
+use lib ( "@LOCAL_LIB_PATH@", "@RT_LIB_PATH@" );
 use RT;
 
 package RT::Mason;
@@ -72,7 +72,7 @@
     }
 }
 
-use HTML::Mason;                   # brings in subpackages: Parser, Interp, etc.
+use HTML::Mason;    # brings in subpackages: Parser, Interp, etc.
 
 use vars qw($Nobody $SystemUser $r);
 
@@ -82,6 +82,7 @@
 use Carp;
 
 {
+
     package HTML::Mason::Commands;
     use vars qw(%session);
 
@@ -95,25 +96,28 @@
     use Text::Quoted;
 }
 
-
 # Activate the following if running httpd as root (the normal case).
 # Resets ownership of all files created by Mason at startup.
 # Note that mysql uses DB for sessions, so there's no need to do this.
-unless ($RT::DatabaseType =~ /(mysql|Pg)/) {
+unless ( $RT::DatabaseType =~ /(mysql|Pg)/ ) {
+
     # Clean up our umask to protect session files
     umask(0077);
 
-if ( $CGI::MOD_PERL)  {
-    chown( Apache->server->uid, Apache->server->gid, [$RT::MasonSessionDir] )
-	if Apache->server->can('uid');
-        }
+    if ($CGI::MOD_PERL) {
+        chown( Apache->server->uid, Apache->server->gid,
+            [$RT::MasonSessionDir] )
+          if Apache->server->can('uid');
+    }
+
     # Die if WebSessionDir doesn't exist or we can't write to it
     stat($RT::MasonSessionDir);
     die "Can't read and write $RT::MasonSessionDir"
-	unless ( ( -d _ ) and ( -r _ ) and ( -w _ ) );
+      unless ( ( -d _ ) and ( -r _ ) and ( -w _ ) );
 }
 
-my $ah = &RT::Interface::Web::NewApacheHandler(@RT::MasonParameters) if $CGI::MOD_PERL;
+my $ah = &RT::Interface::Web::NewApacheHandler(@RT::MasonParameters)
+  if $CGI::MOD_PERL;
 
 sub handler {
     ($r) = @_;
@@ -130,14 +134,16 @@
     my $status;
     eval { $status = $ah->handle_request($r) };
     if ($@) {
-	$RT::Logger->crit($@);
+        $RT::Logger->crit($@);
     }
 
-    undef (%session);
+    undef(%session);
 
-    if ($RT::Handle->TransactionDepth) {
-	$RT::Handle->ForceRollback;
-    	$RT::Logger->crit("Transaction not committed. Usually indicates a software fault. Data loss may have occurred") ;
+    if ( $RT::Handle->TransactionDepth ) {
+        $RT::Handle->ForceRollback;
+        $RT::Logger->crit(
+"Transaction not committed. Usually indicates a software fault. Data loss may have occurred"
+        );
     }
     return $status;
 }

Modified: rt/branches/rt-3.3/configure.ac
==============================================================================
--- rt/branches/rt-3.3/configure.ac	(original)
+++ rt/branches/rt-3.3/configure.ac	Sun Jun 27 23:08:01 2004
@@ -28,6 +28,8 @@
 if test "$PERL" = 'not found'; then
 	AC_MSG_ERROR([cannot use $PACKAGE_NAME without perl])
 fi
+
+
 dnl SPEED_BIN
 AC_ARG_WITH(speedycgi,
 	    AC_HELP_STRING([--with-speedycgi=/path/to/speedy],
@@ -52,7 +54,7 @@
 dnl BIN_OWNER
 AC_ARG_WITH(bin-owner,
 	    AC_HELP_STRING([--with-bin-owner=OWNER],
-	    		   [user that will own rt binaries (default root)]),
+	    		   [user that will own RT binaries (default root)]),
             BIN_OWNER=$withval,
             BIN_OWNER=root)
 AC_SUBST(BIN_OWNER)
@@ -68,7 +70,7 @@
 dnl LIBS_GROUP
 AC_ARG_WITH(libs-group,
 	    AC_HELP_STRING([--with-libs-group=GROUP],
-	    		   [group that will own rt binaries (default bin)]),
+	    		   [group that will own RT binaries (default bin)]),
             LIBS_GROUP=$withval,
             LIBS_GROUP=bin)
 AC_SUBST(LIBS_GROUP)
@@ -76,11 +78,11 @@
 dnl DB_TYPE
 AC_ARG_WITH(db-type,
 	    AC_HELP_STRING([--with-db-type=TYPE],
-	    		   [sort of database RT will use (default: mysql) (mysql, Pg, Oracle and Informix are valid)]), 
+	    		   [sort of database RT will use (default: mysql) (mysql, Pg, Oracle, Informix and SQLite are valid)]), 
             DB_TYPE=$withval,
             DB_TYPE=mysql)
 if test "$DB_TYPE" != 'mysql' -a "$DB_TYPE" != 'Pg' -a "$DB_TYPE" != 'SQLite' -a "$DB_TYPE" != 'Oracle' -a "$DB_TYPE" != 'Informix' -a "$DB_TYPE" != 'Sybase' ; then
-	AC_MSG_ERROR([Only Oracle, Informix, Pg and mysql are valid db types])
+	AC_MSG_ERROR([Only Oracle, Informix, Pg, mysql and SQLite are valid db types])
 fi
 AC_SUBST(DB_TYPE)
 

Modified: rt/branches/rt-3.3/etc/RT_Config.pm.in
==============================================================================
--- rt/branches/rt-3.3/etc/RT_Config.pm.in	(original)
+++ rt/branches/rt-3.3/etc/RT_Config.pm.in	Sun Jun 27 23:08:01 2004
@@ -249,11 +249,11 @@
 Set($LogDir, '@RT_LOG_PATH@');
 Set($LogToFileNamed , "rt.log");    #log to rt.log
 
-# On Solaris, set to ( socket => 'inet' ).  Options here override any
-# other options RT passes to Log::Dispatch::Syslog.  Other interesting
-# flags include facility and logopt.  (See the Log::Dispatch::Syslog
-# documentation for more information.)  (Maybe ident too, if you have
-# multiple RT installations.)
+# On Solaris or UnixWare, set to ( socket => 'inet' ).  Options here
+# override any other options RT passes to Log::Dispatch::Syslog.
+# Other interesting flags include facility and logopt.  (See the
+# Log::Dispatch::Syslog documentation for more information.)  (Maybe
+# ident too, if you have multiple RT installations.)
 
 @LogToSyslogConf = () unless (@LogToSyslogConf);
 

Modified: rt/branches/rt-3.3/html/Admin/Elements/EditCustomField
==============================================================================
--- rt/branches/rt-3.3/html/Admin/Elements/EditCustomField	(original)
+++ rt/branches/rt-3.3/html/Admin/Elements/EditCustomField	Sun Jun 27 23:08:01 2004
@@ -59,7 +59,7 @@
 <& /Admin/Elements/AddCustomFieldValue, CustomField => $CustomFieldObj &>
 </font>
 % }
-<&/Elements/Submit&>
+<&/Elements/Submit, Label => loc('Create') &>
 </FORM>
 
 

Modified: rt/branches/rt-3.3/html/Admin/Elements/EditScrip
==============================================================================
--- rt/branches/rt-3.3/html/Admin/Elements/EditScrip	(original)
+++ rt/branches/rt-3.3/html/Admin/Elements/EditScrip	Sun Jun 27 23:08:01 2004
@@ -107,7 +107,8 @@
 </table>
 <& /Elements/TitleBoxEnd &>
 
-<& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+<& /Elements/Submit, Label => loc('Create'), Reset => 1 &>
+
 
 </FORM>
 <%init>
@@ -130,6 +131,7 @@
     );
     if ( defined $retval ) {
         push @actions, $msg;
+        $id = $scrip->id;
     }
     else {
         Abort( $msg);

Modified: rt/branches/rt-3.3/html/Admin/Elements/EditTemplates
==============================================================================
--- rt/branches/rt-3.3/html/Admin/Elements/EditTemplates	(original)
+++ rt/branches/rt-3.3/html/Admin/Elements/EditTemplates	Sun Jun 27 23:08:01 2004
@@ -54,7 +54,7 @@
 </TABLE>
 % }
 
-<& /Elements/Submit &>
+<& /Elements/Submit, Label => loc('Delete Template') &>
 </FORM>
 
 <%INIT>

Modified: rt/branches/rt-3.3/html/Admin/Elements/UserTabs
==============================================================================
--- rt/branches/rt-3.3/html/Admin/Elements/UserTabs	(original)
+++ rt/branches/rt-3.3/html/Admin/Elements/UserTabs	Sun Jun 27 23:08:01 2004
@@ -28,15 +28,14 @@
     Title => $Title &>
 <%INIT>
 my $tabs;
-my $subtabs;
 if ($id) {
 $tabs->{'this'} = { title => eval { $UserObj->Name },
 
-			   path => "Admin/Users/Modify.html?id=".$id,
+		path => "Admin/Users/Modify.html?id=".$id,
 subtabs => {
 	       Basics => { title => loc('Basics'),
-			   path => "Admin/Users/Modify.html?id=".$id
-			 },
+				path => "Admin/Users/Modify.html?id=".$id
+			},
 	       Memberships => { title => loc('Memberships'),
 			   path => "Admin/Users/Memberships.html?id=".$id
 			 },
@@ -47,7 +46,7 @@
 #			   path => "Admin/Users/Rights.html?id=".$id
 #			 }
 	       
-	      }
+	}
 }
 }
 if ($session{'CurrentUser'}->HasRight( Object => $RT::System, Right => 'AdminUsers')) {
@@ -56,11 +55,11 @@
 			   };
   $tabs->{"B"} = { title => loc('New user'),
   		     	path => "Admin/Users/Modify.html?Create=1",
-			   };
+	};
   $tabs->{"C"} = { title => loc('Custom Fields'),
   		     	path => "Admin/Users/CustomFields.html",
-			separator => 1,
-			   };
+		separator => 1,
+	};
 }
 
   # Now let callbacks add their extra tabs
@@ -80,12 +79,11 @@
 $tabs->{'this'}->{"current_subtab"} = $current_tab; 
 $current_tab = "Admin/Users/Modify.html?id=".$id if $id;
 </%INIT>
-  
-  
 <%ARGS>
 $UserObj => undef
 $id => undef
 $current_tab => undef
+$subtabs => undef
 $current_subtab => undef
 $Title => undef
 </%ARGS>

Modified: rt/branches/rt-3.3/html/Admin/Global/GroupRights.html
==============================================================================
--- rt/branches/rt-3.3/html/Admin/Global/GroupRights.html	(original)
+++ rt/branches/rt-3.3/html/Admin/Global/GroupRights.html	Sun Jun 27 23:08:01 2004
@@ -81,7 +81,7 @@
 </TABLE>
             
       <& /Elements/TitleBoxEnd &>
-      <& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+      <& /Elements/Submit, Label => loc('Modify Group Rights'), Reset => 1 &>
       
   </FORM>
   

Modified: rt/branches/rt-3.3/html/Admin/Global/Template.html
==============================================================================
--- rt/branches/rt-3.3/html/Admin/Global/Template.html	(original)
+++ rt/branches/rt-3.3/html/Admin/Global/Template.html	Sun Jun 27 23:08:01 2004
@@ -42,7 +42,7 @@
 
 <& /Admin/Elements/ModifyTemplate, Name => $TemplateObj->Name, Description => $TemplateObj->Description, Content => $TemplateObj->Content &>
 
-<& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+<& /Elements/Submit, Label => loc('Save Changes'), Reset => 1 &>
 </FORM>
 
 

Modified: rt/branches/rt-3.3/html/Admin/Global/UserRights.html
==============================================================================
--- rt/branches/rt-3.3/html/Admin/Global/UserRights.html	(original)
+++ rt/branches/rt-3.3/html/Admin/Global/UserRights.html	Sun Jun 27 23:08:01 2004
@@ -50,7 +50,7 @@
 </TABLE>
             
       <& /Elements/TitleBoxEnd &>
-      <& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+      <& /Elements/Submit, Label => loc('Modify User Rights'), Reset => 1 &>
       
   </FORM>
   

Modified: rt/branches/rt-3.3/html/Admin/Groups/GroupRights.html
==============================================================================
--- rt/branches/rt-3.3/html/Admin/Groups/GroupRights.html	(original)
+++ rt/branches/rt-3.3/html/Admin/Groups/GroupRights.html	Sun Jun 27 23:08:01 2004
@@ -69,7 +69,7 @@
 </TABLE>
             
       <& /Elements/TitleBoxEnd &>
-      <& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+      <& /Elements/Submit, Label => loc('Modify Group Rights'), Reset => 1 &>
       
   </FORM>
   

Modified: rt/branches/rt-3.3/html/Admin/Groups/Members.html
==============================================================================
--- rt/branches/rt-3.3/html/Admin/Groups/Members.html	(original)
+++ rt/branches/rt-3.3/html/Admin/Groups/Members.html	Sun Jun 27 23:08:01 2004
@@ -77,7 +77,7 @@
 </TR>
 </TABLE>
 <& /Elements/TitleBoxEnd &>
-<& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+<& /Elements/Submit, Label => loc('Modify Members'), Reset => 1 &>
 </form>
 
 

Modified: rt/branches/rt-3.3/html/Admin/Groups/Modify.html
==============================================================================
--- rt/branches/rt-3.3/html/Admin/Groups/Modify.html	(original)
+++ rt/branches/rt-3.3/html/Admin/Groups/Modify.html	Sun Jun 27 23:08:01 2004
@@ -62,7 +62,7 @@
 <INPUT TYPE=CHECKBOX NAME="Enabled" VALUE="1" <%$EnabledChecked%>> <&|/l&>Enabled (Unchecking this box disables this group)</&><BR>
 </TR>
 </TABLE>
-<& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+<& /Elements/Submit, Label => loc('Create'), Reset => 1 &>
 </form>
 <%INIT>
 

Modified: rt/branches/rt-3.3/html/Admin/Groups/UserRights.html
==============================================================================
--- rt/branches/rt-3.3/html/Admin/Groups/UserRights.html	(original)
+++ rt/branches/rt-3.3/html/Admin/Groups/UserRights.html	Sun Jun 27 23:08:01 2004
@@ -51,7 +51,7 @@
       </TABLE>
             
       <& /Elements/TitleBoxEnd &>
-      <& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+      <& /Elements/Submit, Label => loc('Modify User Rights'), Reset => 1 &>
       
   </FORM>
   

Modified: rt/branches/rt-3.3/html/Admin/Queues/GroupRights.html
==============================================================================
--- rt/branches/rt-3.3/html/Admin/Queues/GroupRights.html	(original)
+++ rt/branches/rt-3.3/html/Admin/Queues/GroupRights.html	Sun Jun 27 23:08:01 2004
@@ -82,7 +82,7 @@
 % }
 </TABLE>
             
-      <& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+      <& /Elements/Submit, Label => loc('Modify Group Rights'), Reset => 1 &>
       
   </FORM>
   

Modified: rt/branches/rt-3.3/html/Admin/Queues/Modify.html
==============================================================================
--- rt/branches/rt-3.3/html/Admin/Queues/Modify.html	(original)
+++ rt/branches/rt-3.3/html/Admin/Queues/Modify.html	Sun Jun 27 23:08:01 2004
@@ -86,7 +86,7 @@
 </TR>
 
 </TABLE>
-<& /Elements/Submit &>
+<& /Elements/Submit, Label => loc('Save Changes') &>
 </form>
 
 

Modified: rt/branches/rt-3.3/html/Admin/Queues/Template.html
==============================================================================
--- rt/branches/rt-3.3/html/Admin/Queues/Template.html	(original)
+++ rt/branches/rt-3.3/html/Admin/Queues/Template.html	Sun Jun 27 23:08:01 2004
@@ -41,7 +41,7 @@
 <INPUT TYPE=HIDDEN name="Queue" value="<%$Queue%>">
 <& /Admin/Elements/ModifyTemplate, Name => $TemplateObj->Name, Description =>
 $TemplateObj->Description, Content => $TemplateObj->Content &> 
-<& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+<& /Elements/Submit, Label => loc('Create'), Reset => 1 &>
 </FORM>
 
 

Modified: rt/branches/rt-3.3/html/Admin/Queues/UserRights.html
==============================================================================
--- rt/branches/rt-3.3/html/Admin/Queues/UserRights.html	(original)
+++ rt/branches/rt-3.3/html/Admin/Queues/UserRights.html	Sun Jun 27 23:08:01 2004
@@ -50,7 +50,7 @@
 % }
       </TABLE>
             
-      <& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+      <& /Elements/Submit, Label => loc('Modify User Rights'), Reset => 1 &>
       
   </FORM>
   

Modified: rt/branches/rt-3.3/html/Admin/Users/Modify.html
==============================================================================
--- rt/branches/rt-3.3/html/Admin/Users/Modify.html	(original)
+++ rt/branches/rt-3.3/html/Admin/Users/Modify.html	Sun Jun 27 23:08:01 2004
@@ -215,7 +215,7 @@
 </TR>
 </TABLE>
 
-<& /Elements/Submit &>
+<& /Elements/Submit, Label => loc('Save Changes') &>
 </form>
 
 <%INIT>

Modified: rt/branches/rt-3.3/html/Approvals/index.html
==============================================================================
--- rt/branches/rt-3.3/html/Approvals/index.html	(original)
+++ rt/branches/rt-3.3/html/Approvals/index.html	Sun Jun 27 23:08:01 2004
@@ -27,7 +27,7 @@
 <& /Elements/ListActions, actions => \@actions &>
 <form method="post">
 <& Elements/PendingMyApproval, %ARGS &>
-<& /Elements/Submit &>
+<& /Elements/Submit, Label => loc('Show Approvals') &>
 </form>
 <%init>
 

Modified: rt/branches/rt-3.3/html/Search/Bulk.html
==============================================================================
--- rt/branches/rt-3.3/html/Search/Bulk.html	(original)
+++ rt/branches/rt-3.3/html/Search/Bulk.html	Sun Jun 27 23:08:01 2004
@@ -149,7 +149,7 @@
 <& /Ticket/Elements/BulkLinks &>
 <& /Elements/TitleBoxEnd &>
 
-<& /Elements/Submit &>
+<& /Elements/Submit, Label => loc('Update All') &>
 
 
 </FORM>

Modified: rt/branches/rt-3.3/html/Search/Elements/PickCFs
==============================================================================
--- rt/branches/rt-3.3/html/Search/Elements/PickCFs	(original)
+++ rt/branches/rt-3.3/html/Search/Elements/PickCFs	Sun Jun 27 23:08:01 2004
@@ -24,14 +24,7 @@
 <table cellspacing=0 border=0>
 % while ( my $CustomField = $CustomFields->Next ) {
 <tr><td>
-
-% my $name;
-% if ($CustomField->QueueObj->id) {
-%   $name = "'CF." . $CustomField->QueueObj->Name . 
-%	".{" . $CustomField->Name . "}'";
-% } else {
-%   $name = "'CF." . $CustomField->Name . "'";
-% }
+% my $name = "'CF." . $CustomField->Name . "'";
 <% $CustomField->Name %> 
         <& /Elements/SelectCustomFieldOperator, Name => $name . "Op", 
                                     True => loc("is"), 

Modified: rt/branches/rt-3.3/html/SelfService/Prefs.html
==============================================================================
--- rt/branches/rt-3.3/html/SelfService/Prefs.html	(original)
+++ rt/branches/rt-3.3/html/SelfService/Prefs.html	Sun Jun 27 23:08:01 2004
@@ -33,7 +33,7 @@
 <& /Elements/TitleBoxEnd &>
 <BR>
 % }
-<& /Elements/Submit &>
+<& /Elements/Submit, Label => loc('Save Changes') &>
 	  </form>
 
 

Modified: rt/branches/rt-3.3/html/Ticket/Display.html
==============================================================================
--- rt/branches/rt-3.3/html/Ticket/Display.html	(original)
+++ rt/branches/rt-3.3/html/Ticket/Display.html	Sun Jun 27 23:08:01 2004
@@ -99,18 +99,17 @@
 	}
     }
 
-    if ( $ARGS{'UpdateContent'} || $session{'Attachments'}) {
-        $ARGS{'UpdateContent'} =~ s/\r\n/\n/g;
-        if ( $session{'Attachments'} || 
-	     (   $ARGS{'UpdateContent'} ne ''
-		 && $ARGS{'UpdateContent'} ne "-- \n"
-		 . $session{'CurrentUser'}->UserObj->Signature )) {
-            $ARGS{UpdateAttachments} = $session{'Attachments'};
-            ProcessUpdateMessage( ARGSRef   => \%ARGS,
-                                  Actions   => \@Actions,
-                                  TicketObj => $TicketObj );
-            delete $session{'Attachments'};
-        }
+    $ARGS{'UpdateContent'} =~ s/\r\n/\n/g;
+    if ( $ARGS{'UpdateTimeWorked'} ||
+	 $session{'Attachments'} || 
+	 (   $ARGS{'UpdateContent'} ne ''
+	     && $ARGS{'UpdateContent'} ne "-- \n"
+	     . $session{'CurrentUser'}->UserObj->Signature )) {
+	$ARGS{UpdateAttachments} = $session{'Attachments'};
+	ProcessUpdateMessage( ARGSRef   => \%ARGS,
+			      Actions   => \@Actions,
+			      TicketObj => $TicketObj );
+	delete $session{'Attachments'};
     }
     #Process status updates
     my @BasicActions = ProcessTicketBasics(ARGSRef => \%ARGS, TicketObj=>$TicketObj);

Modified: rt/branches/rt-3.3/html/Ticket/Elements/ShowAttachments
==============================================================================
--- rt/branches/rt-3.3/html/Ticket/Elements/ShowAttachments	(original)
+++ rt/branches/rt-3.3/html/Ticket/Elements/ShowAttachments	Sun Jun 27 23:08:01 2004
@@ -47,7 +47,10 @@
 </%PERL>
 
 <li><font <%$fontsize%>>
-        <A HREF="<%$RT::WebPath%>/Ticket/Attachment/<%$rev->TransactionId%>/<%$rev->Id%>/<%$rev->Filename | u%>"><%$rev->CreatedAsString%> (<% $size %>)</a></font></li>
+<A HREF="<%$RT::WebPath%>/Ticket/Attachment/<%$rev->TransactionId%>/<%$rev->Id%>/<%$rev->Filename | u%>">
+<&|/l, $rev->CreatedAsString, $size, $rev->CreatorObj->Name &>[_1] ([_2]) by [_3]</&>
+</a>
+</font></li>
 % }
 % $fontsize='size="-2"';
 % }

Modified: rt/branches/rt-3.3/html/Ticket/ModifyAll.html
==============================================================================
--- rt/branches/rt-3.3/html/Ticket/ModifyAll.html	(original)
+++ rt/branches/rt-3.3/html/Ticket/ModifyAll.html	Sun Jun 27 23:08:01 2004
@@ -76,7 +76,7 @@
   </tr>
   <tr>
     <td class="label"><&|/l&>Subject</&>:</td>
-    <td class="entry"><input name="UpdateSubject" size=60 value=""></td>
+    <td class="entry"><input name="UpdateSubject" size=60 value="<%$Ticket->Subject%>"></td>
   </tr>
 % if (my $TxnCFs = $Ticket->TransactionCustomFields) {
 %    while (my $CF = $TxnCFs->Next()) {

Modified: rt/branches/rt-3.3/html/Ticket/ModifyDates.html
==============================================================================
--- rt/branches/rt-3.3/html/Ticket/ModifyDates.html	(original)
+++ rt/branches/rt-3.3/html/Ticket/ModifyDates.html	Sun Jun 27 23:08:01 2004
@@ -35,7 +35,7 @@
 
 <& Elements/EditDates, TicketObj => $TicketObj &>
 <& /Elements/TitleBoxEnd &>
-<& /Elements/Submit, color => "#663366" &>
+<& /Elements/Submit, Label => loc('Save Changes'), color => "#663366" &>
 </form>
 
 

Modified: rt/branches/rt-3.3/html/Ticket/ModifyLinks.html
==============================================================================
--- rt/branches/rt-3.3/html/Ticket/ModifyLinks.html	(original)
+++ rt/branches/rt-3.3/html/Ticket/ModifyLinks.html	Sun Jun 27 23:08:01 2004
@@ -35,7 +35,7 @@
 <& /Elements/TitleBoxStart, title => loc('Edit Links'), color => "#336633"&>
 <& /Elements/EditLinks, Object => $Ticket, Merge => 1 &>
 <& /Elements/TitleBoxEnd &>
-<& /Elements/Submit, color => "#336633", Caption=> loc('Save Changes') &>
+<& /Elements/Submit, color => "#336633", Label => loc('Save Changes') &>
 </form>
 
 

Modified: rt/branches/rt-3.3/html/Ticket/Update.html
==============================================================================
--- rt/branches/rt-3.3/html/Ticket/Update.html	(original)
+++ rt/branches/rt-3.3/html/Ticket/Update.html	Sun Jun 27 23:08:01 2004
@@ -104,7 +104,7 @@
 
 
 
-<& /Elements/Submit, Name => 'SubmitTicket' &>
+<& /Elements/Submit, Label => loc('Update Ticket'), Name => 'SubmitTicket' &>
 % if ($TicketObj->CurrentUserHasRight('ShowOutgoingEmail')) {
 <& /Ticket/Elements/PreviewScrips, TicketObj => $TicketObj, %ARGS &>
 % }

Modified: rt/branches/rt-3.3/html/User/Delegation.html
==============================================================================
--- rt/branches/rt-3.3/html/User/Delegation.html	(original)
+++ rt/branches/rt-3.3/html/User/Delegation.html	Sun Jun 27 23:08:01 2004
@@ -33,7 +33,7 @@
 <& Elements/DelegateRights, personalgroups => $personalgroups, objects => $objects, ObjectType => 'RT::Queue' &>
 <& Elements/DelegateRights, personalgroups => $personalgroups, objects => $objects, ObjectType => 'RT::Group' &>
 
-<& /Elements/Submit &>
+<& /Elements/Submit, Label => loc('Modify Rights') &>
 </form>
 <%INIT>
 

Modified: rt/branches/rt-3.3/html/User/Groups/Members.html
==============================================================================
--- rt/branches/rt-3.3/html/User/Groups/Members.html	(original)
+++ rt/branches/rt-3.3/html/User/Groups/Members.html	Sun Jun 27 23:08:01 2004
@@ -76,7 +76,7 @@
 </TD>
 </TR>
 </TABLE>
-<& /Elements/Submit &>
+<& /Elements/Submit, Label => loc('Modify Members') &>
 </form>
 
 

Modified: rt/branches/rt-3.3/html/User/Groups/Modify.html
==============================================================================
--- rt/branches/rt-3.3/html/User/Groups/Modify.html	(original)
+++ rt/branches/rt-3.3/html/User/Groups/Modify.html	Sun Jun 27 23:08:01 2004
@@ -52,7 +52,7 @@
 <INPUT TYPE=CHECKBOX NAME="Enabled" VALUE="1" <%$EnabledChecked%>> <&|/l&>Enabled (Unchecking this box disables this group)</&><BR>
 </TR>
 </TABLE>
-<& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+<& /Elements/Submit, Label => loc('Create'), Reset => 1 &>
 </form>
 <%INIT>
 

Modified: rt/branches/rt-3.3/html/User/Prefs.html
==============================================================================
--- rt/branches/rt-3.3/html/User/Prefs.html	(original)
+++ rt/branches/rt-3.3/html/User/Prefs.html	Sun Jun 27 23:08:01 2004
@@ -154,7 +154,7 @@
 </TABLE>
 
 
-<& /Elements/Submit &>
+<& /Elements/Submit, Label => loc('Save Preferences') &>
 </form>
 
 

Modified: rt/branches/rt-3.3/html/autohandler
==============================================================================
--- rt/branches/rt-3.3/html/autohandler	(original)
+++ rt/branches/rt-3.3/html/autohandler	Sun Jun 27 23:08:01 2004
@@ -171,11 +171,15 @@
     if (!$session{'CurrentUser'}->id() ||
         !$session{'CurrentUser'}->IsPassword($pass))
     {
+	$RT::Logger->error("FAILED LOGIN for $user from $ENV{'REMOTE_ADDR'}");
         delete $session{'CurrentUser'};
         $m->comp('/Elements/Login', %ARGS,
                  Error => loc('Your username or password is incorrect'));
         $m->abort();
     }
+    else {
+	$RT::Logger->info("Successful login for $user from $ENV{'REMOTE_ADDR'}");
+    }
 }
   
 # If we've got credentials, let's serve the file up.

Modified: rt/branches/rt-3.3/lib/RT/I18N/da.po
==============================================================================
--- rt/branches/rt-3.3/lib/RT/I18N/da.po	(original)
+++ rt/branches/rt-3.3/lib/RT/I18N/da.po	Sun Jun 27 23:08:01 2004
@@ -1199,7 +1199,7 @@
 msgstr "Oprettede template %1"
 
 #: html/Ticket/Elements/EditLinks:27
-msgid "Current Relationships"
+msgid "Current Links"
 msgstr "Nuværende relationer"
 
 #: html/Admin/Elements/EditScrips:29
@@ -1488,7 +1488,7 @@
 msgstr "Editér customer felter for %1"
 
 #: html/Search/Bulk.html:143 html/Ticket/ModifyLinks.html:35
-msgid "Edit Relationships"
+msgid "Edit Links"
 msgstr "Editér forhold"
 
 #: html/Admin/Queues/Templates.html:41
@@ -2478,7 +2478,7 @@
 msgstr "Ny afventende godkendelse"
 
 #: html/Ticket/Elements/EditLinks:110
-msgid "New Relationships"
+msgid "New Links"
 msgstr "Nye relationer"
 
 #: html/Ticket/Elements/Tabs:35
@@ -3246,10 +3246,6 @@
 msgid "Refresh this page every %1 minutes."
 msgstr "Genindlæs denne side hver %1 minutter"
 
-#: html/Ticket/Create.html:173 html/Ticket/Elements/ShowSummary:61 html/Ticket/ModifyAll.html:56
-msgid "Relationships"
-msgstr "Relationer"
-
 #: html/Search/Bulk.html:97
 msgid "Remove AdminCc"
 msgstr "Fjern AdminCc"

Modified: rt/branches/rt-3.3/lib/RT/I18N/de.po
==============================================================================
--- rt/branches/rt-3.3/lib/RT/I18N/de.po	(original)
+++ rt/branches/rt-3.3/lib/RT/I18N/de.po	Sun Jun 27 23:08:01 2004
@@ -198,7 +198,6 @@
 msgid "%1 matches"
 msgstr "%1 enthält"
 
-
 #: html/Ticket/Elements/ShowBasics:36
 #. ($TimeWorked)
 msgid "%1 min"
@@ -1301,7 +1300,7 @@
 msgstr ""
 
 #: html/Ticket/Elements/EditLinks:28
-msgid "Current Relationships"
+msgid "Current Links"
 msgstr "Momentane Beziehungen"
 
 #: html/Admin/Elements/EditScrips:30
@@ -1579,7 +1578,7 @@
 msgstr "Bearbeite benutzerdefinierte Felder für Klasse %1"
 
 #: html/Ticket/ModifyLinks.html:36
-msgid "Edit Relationships"
+msgid "Edit Links"
 msgstr "Bearbeite Beziehungen"
 
 #: html/Admin/Queues/Templates.html:41
@@ -2338,7 +2337,6 @@
 msgid "Modify article #%1"
 msgstr "Ändere Artikel #%1"
 
-
 #: lib/RT/Queue_Overlay.pm:70
 msgid "Modify Access Control List"
 msgstr "Ändere Zugriffskontrollliste"
@@ -2606,7 +2604,6 @@
 msgid "New class"
 msgstr "Neue Klasse"
 
-
 #: html/Admin/Elements/ModifyUser:32 html/Admin/Users/Modify.html:93 html/User/Prefs.html:65
 msgid "New Password"
 msgstr "Neues Passwort"
@@ -2616,7 +2613,7 @@
 msgstr "Neue wartende Freigaben"
 
 #: html/Ticket/Elements/EditLinks:111
-msgid "New Relationships"
+msgid "New Links"
 msgstr "Neue Beziehungen"
 
 #: html/Ticket/Elements/Tabs:36
@@ -3357,10 +3354,6 @@
 msgid "Refresh this page every %1 minutes."
 msgstr "Seite alle %1 Minuten aktualisieren."
 
-#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:60 html/Ticket/ModifyAll.html:57
-msgid "Relationships"
-msgstr "Beziehungen"
-
 #: html/Search/Bulk.html:93
 msgid "Remove AdminCc"
 msgstr "Entferne AdminCC"
@@ -3778,7 +3771,6 @@
 msgid "Summary matches"
 msgstr "Zusammenfassung enthält"
 
-
 #: NOT FOUND IN SOURCE
 msgid "Stalled"
 msgstr ""

Modified: rt/branches/rt-3.3/lib/RT/I18N/en_malkovich.po
==============================================================================
--- rt/branches/rt-3.3/lib/RT/I18N/en_malkovich.po	(original)
+++ rt/branches/rt-3.3/lib/RT/I18N/en_malkovich.po	Sun Jun 27 23:08:01 2004
@@ -4,8 +4,6 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-
-
 msgid "#%1: %2"
 msgstr "#%1: %2"
 
@@ -72,7 +70,6 @@
 msgid "%1 highest priority tickets I own..."
 msgstr "%1 Malkovich Malkovich I Malkovich..."
 
-
 msgid "%1 highest priority tickets I requested..."
 msgstr "%1 Malkovich Malkovich I Malkovich..."
 
@@ -652,7 +649,7 @@
 msgid "Created CustomField %1"
 msgstr "Malkovich Malkovich %1"
 
-msgid "Current Relationships"
+msgid "Current Links"
 msgstr "Malkovich Malkovich"
 
 msgid "Current Scrips"
@@ -844,7 +841,7 @@
 msgid "Edit Custom Fields for %1"
 msgstr "Malkovich Malkovich %1"
 
-msgid "Edit Relationships"
+msgid "Edit Links"
 msgstr "Malkovich Malkovich"
 
 msgid "Edit Templates for queue %1"
@@ -1495,7 +1492,7 @@
 msgid "New Pending Approval"
 msgstr "Malkovich Malkovich"
 
-msgid "New Relationships"
+msgid "New Links"
 msgstr "Malkovich Malkovich"
 
 msgid "New Search"
@@ -1957,9 +1954,6 @@
 msgid "Refresh this page every %1 minutes."
 msgstr "Malkovich Malkovich %1 Malkovich."
 
-msgid "Relationships"
-msgstr "Malkovich"
-
 msgid "Remove AdminCc"
 msgstr "Malkovich"
 

Modified: rt/branches/rt-3.3/lib/RT/I18N/es.po
==============================================================================
--- rt/branches/rt-3.3/lib/RT/I18N/es.po	(original)
+++ rt/branches/rt-3.3/lib/RT/I18N/es.po	Sun Jun 27 23:08:01 2004
@@ -1247,7 +1247,7 @@
 msgstr "Plantilla %1 creada"
 
 #: html/Ticket/Elements/EditLinks:28
-msgid "Current Relationships"
+msgid "Current Links"
 msgstr "Relaciones actuales"
 
 #: html/Admin/Elements/EditScrips:30
@@ -1537,7 +1537,7 @@
 msgstr "Editar campos personalizados para %1"
 
 #: html/Ticket/ModifyLinks.html:36
-msgid "Edit Relationships"
+msgid "Edit Links"
 msgstr "Editar relaciones"
 
 #: html/Admin/Queues/Templates.html:41
@@ -2578,7 +2578,7 @@
 msgstr "Nueva pendiente de aprobación"
 
 #: html/Ticket/Elements/EditLinks:111
-msgid "New Relationships"
+msgid "New Links"
 msgstr "Nuevas relaciones"
 
 #: html/Ticket/Elements/Tabs:36
@@ -3319,10 +3319,6 @@
 msgid "Refresh this page every %1 minutes."
 msgstr "Refrescar esta página cada %1 minutos"
 
-#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:60 html/Ticket/ModifyAll.html:57
-msgid "Relationships"
-msgstr "Relaciones"
-
 #: html/Search/Bulk.html:93
 msgid "Remove AdminCc"
 msgstr "Quitar AdminCc"

Modified: rt/branches/rt-3.3/lib/RT/I18N/fi.po
==============================================================================
--- rt/branches/rt-3.3/lib/RT/I18N/fi.po	(original)
+++ rt/branches/rt-3.3/lib/RT/I18N/fi.po	Sun Jun 27 23:08:01 2004
@@ -1248,7 +1248,7 @@
 msgstr "Luotu pohja %1"
 
 #: html/Ticket/Elements/EditLinks:28
-msgid "Current Relationships"
+msgid "Current Links"
 msgstr "Tämänhetkiset suhteet"
 
 #: html/Admin/Elements/EditScrips:30
@@ -1538,7 +1538,7 @@
 msgstr "Muokkaa työjonon %1 kenttiä"
 
 #: html/Ticket/ModifyLinks.html:36
-msgid "Edit Relationships"
+msgid "Edit Links"
 msgstr "Muokkaa suhteita"
 
 #: html/Admin/Queues/Templates.html:41
@@ -2579,7 +2579,7 @@
 msgstr ""
 
 #: html/Ticket/Elements/EditLinks:111
-msgid "New Relationships"
+msgid "New Links"
 msgstr "Uusi linkki"
 
 #: html/Ticket/Elements/Tabs:36
@@ -3320,10 +3320,6 @@
 msgid "Refresh this page every %1 minutes."
 msgstr "Päivitä tämä sivu %1 minuutin välein"
 
-#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:60 html/Ticket/ModifyAll.html:57
-msgid "Relationships"
-msgstr "Linkit"
-
 #: html/Search/Bulk.html:93
 msgid "Remove AdminCc"
 msgstr "Poista kopio ylläpidolle"

Modified: rt/branches/rt-3.3/lib/RT/I18N/fr.po
==============================================================================
--- rt/branches/rt-3.3/lib/RT/I18N/fr.po	(original)
+++ rt/branches/rt-3.3/lib/RT/I18N/fr.po	Sun Jun 27 23:08:01 2004
@@ -1303,7 +1303,7 @@
 msgstr "Modèle %1 créé"
 
 #: html/Ticket/Elements/EditLinks:27
-msgid "Current Relationships"
+msgid "Current Links"
 msgstr "Relations actuelles"
 
 #: html/Admin/Elements/EditScrips:29
@@ -1616,7 +1616,7 @@
 msgstr "Editer les champs personnalisés pour %1"
 
 #: html/Search/Bulk.html:143 html/Ticket/ModifyLinks.html:35
-msgid "Edit Relationships"
+msgid "Edit Links"
 msgstr "Modifier les relations"
 
 #: html/Admin/Queues/Templates.html:41
@@ -2686,7 +2686,7 @@
 msgstr "Nouvelles approbations en attente"
 
 #: html/Ticket/Elements/EditLinks:110
-msgid "New Relationships"
+msgid "New Links"
 msgstr "Nouvelles relations"
 
 #: html/Ticket/Elements/Tabs:35
@@ -3490,10 +3490,6 @@
 msgid "Refresh this page every %1 minutes."
 msgstr "Rafraîchir cette page toutes les %1 minutes."
 
-#: html/Ticket/Create.html:173 html/Ticket/Elements/ShowSummary:61 html/Ticket/ModifyAll.html:56
-msgid "Relationships"
-msgstr "Relations"
-
 #: html/Search/Bulk.html:97
 msgid "Remove AdminCc"
 msgstr "Enlever AdminCc "

Modified: rt/branches/rt-3.3/lib/RT/I18N/he.po
==============================================================================
--- rt/branches/rt-3.3/lib/RT/I18N/he.po	(original)
+++ rt/branches/rt-3.3/lib/RT/I18N/he.po	Sun Jun 27 23:08:01 2004
@@ -1305,7 +1305,7 @@
 msgstr ""
 
 #: html/Ticket/Elements/EditLinks:28
-msgid "Current Relationships"
+msgid "Current Links"
 msgstr "יחסים נוכחיים"
 
 #: html/Admin/Elements/EditScrips:30
@@ -1598,7 +1598,7 @@
 msgstr ""
 
 #: html/Ticket/ModifyLinks.html:36
-msgid "Edit Relationships"
+msgid "Edit Links"
 msgstr ""
 
 #: html/Admin/Queues/Templates.html:42
@@ -2648,7 +2648,7 @@
 msgstr ""
 
 #: html/Ticket/Elements/EditLinks:111
-msgid "New Relationships"
+msgid "New Links"
 msgstr "יחסים חדשים"
 
 #: html/Ticket/Elements/Tabs:36
@@ -3425,10 +3425,6 @@
 msgid "Refresh this page every %1 minutes."
 msgstr "רענן דף זה כל %1 דקות."
 
-#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:62 html/Ticket/ModifyAll.html:57
-msgid "Relationships"
-msgstr "יחסים עם פניות אחרות"
-
 #: html/Search/Bulk.html:93
 msgid "Remove AdminCc"
 msgstr "הסר העתק ניהולי"

Modified: rt/branches/rt-3.3/lib/RT/I18N/it.po
==============================================================================
--- rt/branches/rt-3.3/lib/RT/I18N/it.po	(original)
+++ rt/branches/rt-3.3/lib/RT/I18N/it.po	Sun Jun 27 23:08:01 2004
@@ -1690,7 +1690,7 @@
 msgstr "Modello %1 creato"
 
 #: html/Ticket/Elements/EditLinks:27
-msgid "Current Relationships"
+msgid "Current Links"
 msgstr "Relazioni attuali"
 
 #: html/Admin/Elements/EditScrips:29
@@ -2058,7 +2058,7 @@
 msgstr "Modifica i Campi Personalizzati per %1"
 
 #: html/Ticket/ModifyLinks.html:35
-msgid "Edit Relationships"
+msgid "Edit Links"
 msgstr "Modifica Relazioni"
 
 #. ($QueueObj->Name)
@@ -3339,7 +3339,7 @@
 msgstr "New Pending Approval"
 
 #: html/Ticket/Elements/EditLinks:110
-msgid "New Relationships"
+msgid "New Links"
 msgstr "New Relationships"
 
 #: html/Ticket/Elements/Tabs:35
@@ -4401,12 +4401,6 @@
 msgid "Refresh this page every %1 minutes."
 msgstr "Aggiorna questa pagina ogni %1 minuti."
 
-#: html/Ticket/Create.html:173
-#: html/Ticket/Elements/ShowSummary:61
-#: html/Ticket/ModifyAll.html:56
-msgid "Relationships"
-msgstr "Relazioni"
-
 #: html/Search/Bulk.html:92
 msgid "Remove AdminCc"
 msgstr "Remove AdminCc"

Modified: rt/branches/rt-3.3/lib/RT/I18N/ja.po
==============================================================================
--- rt/branches/rt-3.3/lib/RT/I18N/ja.po	(original)
+++ rt/branches/rt-3.3/lib/RT/I18N/ja.po	Sun Jun 27 23:08:01 2004
@@ -1288,7 +1288,7 @@
 msgstr "テンプレート%1を作成しました"
 
 #: html/Ticket/Elements/EditLinks:28
-msgid "Current Relationships"
+msgid "Current Links"
 msgstr "現在の関係"
 
 #: html/Admin/Elements/EditScrips:30
@@ -1582,7 +1582,7 @@
 msgstr "%1のカスタムフィールドを編集する"
 
 #: html/Ticket/ModifyLinks.html:36
-msgid "Edit Relationships"
+msgid "Edit Links"
 msgstr "関係を編集する"
 
 #: html/Admin/Queues/Templates.html:41
@@ -2627,7 +2627,7 @@
 msgstr ""
 
 #: html/Ticket/Elements/EditLinks:111
-msgid "New Relationships"
+msgid "New Links"
 msgstr "新しい関係"
 
 #: html/Ticket/Elements/Tabs:36
@@ -3384,10 +3384,6 @@
 msgid "Refresh this page every %1 minutes."
 msgstr "このページを%1分おきに更新してください"
 
-#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:60 html/Ticket/ModifyAll.html:57
-msgid "Relationships"
-msgstr "関係"
-
 #: html/Search/Bulk.html:93
 msgid "Remove AdminCc"
 msgstr "管理Ccを削除する"

Modified: rt/branches/rt-3.3/lib/RT/I18N/nl.po
==============================================================================
--- rt/branches/rt-3.3/lib/RT/I18N/nl.po	(original)
+++ rt/branches/rt-3.3/lib/RT/I18N/nl.po	Sun Jun 27 23:08:01 2004
@@ -1285,7 +1285,7 @@
 msgstr "Sjabloon %1 Gecreëerd"
 
 #: html/Ticket/Elements/EditLinks:28
-msgid "Current Relationships"
+msgid "Current Links"
 msgstr "Huidige Relaties"
 
 #: html/Admin/Elements/EditScrips:30
@@ -1579,7 +1579,7 @@
 msgstr "Wijzig Specifieke Velden voor %1"
 
 #: html/Ticket/ModifyLinks.html:36
-msgid "Edit Relationships"
+msgid "Edit Links"
 msgstr "Wijzig Relaties"
 
 #: html/Admin/Queues/Templates.html:41
@@ -2624,7 +2624,7 @@
 msgstr "Nieuwe Hangende Goedkeuring"
 
 #: html/Ticket/Elements/EditLinks:111
-msgid "New Relationships"
+msgid "New Links"
 msgstr "Nieuwe Relaties"
 
 #: html/Ticket/Elements/Tabs:36
@@ -3381,10 +3381,6 @@
 msgid "Refresh this page every %1 minutes."
 msgstr "Ververs deze pagina elke %1 minuten."
 
-#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:60 html/Ticket/ModifyAll.html:57
-msgid "Relationships"
-msgstr "Relaties"
-
 #: html/Search/Bulk.html:93
 msgid "Remove AdminCc"
 msgstr "Verwijder AdminCc"

Modified: rt/branches/rt-3.3/lib/RT/I18N/no.po
==============================================================================
--- rt/branches/rt-3.3/lib/RT/I18N/no.po	(original)
+++ rt/branches/rt-3.3/lib/RT/I18N/no.po	Sun Jun 27 23:08:01 2004
@@ -1,16 +1,14 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: RT 3.0.1\n"
+"Project-Id-Version: RT 3.0.11\n"
 "POT-Creation-Date: 2003-04-01 06:06+0200\n"
 "PO-Revision-Date: 2003-05-01 04:47+0200\n"
-"Last-Translator: Marcus Ramberg <marcus at thefeed.no>\n"
+"Last-Translator: Ronny Pettersen <ronny.pettersen at edb.com>\n"
 "Language-Team: RT Norwegian <rt at thefeed.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-
-
 #: html/Elements/MyRequests:28 html/Elements/MyTickets:28
 msgid "#"
 msgstr "#"
@@ -79,7 +77,7 @@
 
 #: NOT FOUND IN SOURCE
 msgid "%1 (%2) %3 this ticket\\n"
-msgstr "%1 (%2) %3 denne biletten\\n""
+msgstr "%1 (%2) %3 denne saken\\n"
 
 #: html/Search/Listing.html:57
 #. (($session{'tickets'}->FirstRow+1), ($session{'tickets'}->FirstRow() + $session{'tickets'}->RowsPerPage()  ))
@@ -101,17 +99,17 @@
 #: bin/rt-crontool:179
 #. ("--action")
 msgid "%1 - Specify the action module you want to use"
-msgstr "%1 - Oppgi kommandomodulen du ønsker  bruke"
+msgstr "%1 - Oppgi kommandomodulen du ønsker å bruke"
 
 #: bin/rt-crontool:173
 #. ("--condition")
 msgid "%1 - Specify the condition module you want to use"
-msgstr "%1 - Oppgiv betingelsesmodulen du ønsker  bruke"
+msgstr "%1 - Oppgi betingelsesmodulen du ønsker å bruke"
 
 #: bin/rt-crontool:166
 #. ("--search")
 msgid "%1 - Specify the search module you want to use"
-msgstr "%1 - Oppgi søkemodulen du ønsker  bruke"
+msgstr "%1 - Oppgi søkemodulen du ønsker å bruke"
 
 #: lib/RT/ScripAction_Overlay.pm:122
 #. ($self->Id)
@@ -289,7 +287,7 @@
 #. ($RT::CorrespondAddress)
 #. ($RT::CommentAddress)
 msgid "(If left blank, will default to %1"
-msgstr "(Standard er %1);H
+msgstr "(Settes til standard %1 hvis blank)"
 
 #: NOT FOUND IN SOURCE
 msgid "(No Value)"
@@ -430,7 +428,7 @@
 
 #: bin/rt-commit-handler:755
 msgid "Aborting to avoid unintended ticket modifications.\\n"
-msgstr "Avbryter for  ung uønsket saksendring"
+msgstr "Avbryter for å ungå uånsket saksendring"
 
 #: html/User/Elements/Tabs:32
 msgid "About me"
@@ -491,7 +489,7 @@
 
 #: NOT FOUND IN SOURCE
 msgid "Add a keyword selection to this queue"
-msgstr "Legg til et nøkkelordvalg p denne køen"
+msgstr "Legg til et nøkkelordvalg på denne køen"
 
 #: NOT FOUND IN SOURCE
 msgid "Add a new a global scrip"
@@ -779,7 +777,7 @@
 
 #: html/Admin/Elements/EditScrip:88 html/Admin/Global/GroupRights.html:85 html/Admin/Global/Template.html:46 html/Admin/Global/UserRights.html:54 html/Admin/Groups/GroupRights.html:73 html/Admin/Groups/Members.html:81 html/Admin/Groups/Modify.html:56 html/Admin/Groups/UserRights.html:55 html/Admin/Queues/GroupRights.html:85 html/Admin/Queues/Template.html:45 html/Admin/Queues/UserRights.html:54 html/User/Groups/Modify.html:56
 msgid "Be sure to save your changes"
-msgstr "Sørg for  lagre endringene dine"
+msgstr "Sørg for å lagre endringene dine"
 
 #: html/Elements/SelectDateRelation:34 lib/RT/CurrentUser.pm:320
 msgid "Before"
@@ -1308,7 +1306,7 @@
 msgstr "Opprettet malen %1"
 
 #: html/Ticket/Elements/EditLinks:28
-msgid "Current Relationships"
+msgid "Current Links"
 msgstr "Eksisterende Forhold"
 
 #: html/Admin/Elements/EditScrips:30
@@ -1564,7 +1562,7 @@
 
 #: html/Elements/Refresh:30
 msgid "Don't refresh this page."
-msgstr "Ikke last denne siden p nytt"
+msgstr "Ikke last denne siden på nytt"
 
 #: html/Search/Elements/PickRestriction:114
 msgid "Don't show search results"
@@ -1580,7 +1578,7 @@
 
 #: NOT FOUND IN SOURCE
 msgid "Due date '%1' could not be parsed"
-msgstr "Innendato '%1' kunne ikke tolkes""
+msgstr "Innendato '%1' kunne ikke tolkes"
 
 #: bin/rt-commit-handler:754
 #. ($1, $msg)
@@ -1601,7 +1599,7 @@
 msgstr "Rediger fleksifelt for %1"
 
 #: html/Ticket/ModifyLinks.html:36
-msgid "Edit Relationships"
+msgid "Edit Links"
 msgstr "Rediger Forhold"
 
 #: html/Admin/Queues/Templates.html:42
@@ -1644,7 +1642,7 @@
 #: html/Admin/Groups/Members.html:32
 #. ($Group->Name)
 msgid "Editing membership for group %1"
-msgstr "Redigerer medlemsskap for gruppen %1""
+msgstr "Redigerer medlemsskap for gruppen %1"
 
 #: html/User/Groups/Members.html:129
 #. ($Group->Name)
@@ -1677,15 +1675,15 @@
 
 #: html/Admin/Elements/EditCustomField:51
 msgid "Enabled (Unchecking this box disables this custom field)"
-msgstr "Aktivt (Fjern merkingen for  deaktivere dette fleksifeltet)"
+msgstr "Aktivt (Fjern merkingen for å deaktivere dette fleksifeltet)"
 
 #: html/Admin/Groups/Modify.html:53 html/User/Groups/Modify.html:53
 msgid "Enabled (Unchecking this box disables this group)"
-msgstr "Aktiv (Fjern merkingen for  deaktivere denne gruppen)"
+msgstr "Aktiv (Fjern merkingen for å deaktivere denne gruppen)"
 
 #: html/Admin/Queues/Modify.html:84
 msgid "Enabled (Unchecking this box disables this queue)"
-msgstr "Aktiv (Fjern merkingen for  deaktivere denne køen)"
+msgstr "Aktiv (Fjern merkingen for å deaktivere denne køen)"
 
 #: html/Admin/Elements/EditCustomFields:99
 msgid "Enabled Custom Fields"
@@ -1795,7 +1793,7 @@
 
 #: NOT FOUND IN SOURCE
 msgid "Find new/open tickets"
-msgstr "Finn nye/Âpne saker"
+msgstr "Finn nye/åpne saker"
 
 #: html/Admin/Queues/People.html:57 html/Admin/Users/index.html:46 html/Ticket/Elements/EditPeople:30
 msgid "Find people whose"
@@ -1832,7 +1830,7 @@
 #: html/Search/Listing.html:106
 #. ($ticketcount)
 msgid "Found %quant(%1,ticket)"
-msgstr "Fant %quant(%1,sak)"
+msgstr "Fant %quant(%1) sak(er)"
 
 #: lib/RT/Interface/Web.pm:902
 msgid "Found Object"
@@ -2107,7 +2105,7 @@
 
 #: NOT FOUND IN SOURCE
 msgid "Items pending my approval"
-msgstr "Ting som venter p min godkjenning"
+msgstr "Ting som venter på min godkjenning"
 
 #: lib/RT/Date.pm:411
 msgid "Jan."
@@ -2651,7 +2649,7 @@
 msgstr "Ny, Venter på Godkjennelse"
 
 #: html/Ticket/Elements/EditLinks:111
-msgid "New Relationships"
+msgid "New Links"
 msgstr "Nye forhold"
 
 #: html/Ticket/Elements/Tabs:36
@@ -2842,7 +2840,7 @@
 
 #: html/Search/Bulk.html:149
 msgid "No search to operate on."
-msgstr "Ingen søk  behandle"
+msgstr "Ingen søk å behandle"
 
 #: NOT FOUND IN SOURCE
 msgid "No ticket id specified"
@@ -3136,7 +3134,7 @@
 
 #: html/Ticket/Elements/ShowSummary:45 html/Ticket/Elements/Tabs:96 html/Ticket/ModifyAll.html:51
 msgid "People"
-msgstr "Folk"
+msgstr "Personer"
 
 #: etc/initialdata:126
 msgid "Perform a user-defined action"
@@ -3377,11 +3375,11 @@
 #: html/Elements/Login:92
 #. ('2003')
 msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse at bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
-msgstr "RT er &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse at bestpractical.com&gt;. Den er distribuert under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>""
+msgstr "RT er &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse at bestpractical.com&gt;. Den er distribuert under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
 
 #: NOT FOUND IN SOURCE
 msgid "RT is &copy; Copyright 1996-2002 Jesse Vincent &lt;jesse at bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
-msgstr "RT er &copy; Copyright 1996-2002 Jesse Vincent &lt;jesse at bestpractical.com&gt;. Den er distribuert under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>""
+msgstr "RT er &copy; Copyright 1996-2002 Jesse Vincent &lt;jesse at bestpractical.com&gt;. Den er distribuert under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
 
 #: NOT FOUND IN SOURCE
 msgid "RT thinks this message may be a bounce"
@@ -3426,11 +3424,7 @@
 #: html/Elements/Refresh:36
 #. ($value/60)
 msgid "Refresh this page every %1 minutes."
-msgstr "Last siden p nytt hvert %1 minutt."
-
-#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:62 html/Ticket/ModifyAll.html:57
-msgid "Relationships"
-msgstr "Forhold"
+msgstr "Last siden på nytt hvert %1 minutt."
 
 #: html/Search/Bulk.html:93
 msgid "Remove AdminCc"
@@ -3450,11 +3444,11 @@
 
 #: lib/RT/Queue_Overlay.pm:85
 msgid "Reply to tickets"
-msgstr "Svar p sak"
+msgstr "Svar på sak"
 
 #: lib/RT/Queue_Overlay.pm:85
 msgid "ReplyToTicket"
-msgstr "SvarPÂSak"
+msgstr "SvarPåSak"
 
 #: etc/initialdata:44 html/Ticket/Update.html:40 lib/RT/ACE_Overlay.pm:87
 msgid "Requestor"
@@ -4873,7 +4867,3 @@
 msgid "years"
 msgstr "år"
 
-#: NOT FOUND IN SOURCE
-msgid "ニックネーム"
-msgstr "????"
-

Modified: rt/branches/rt-3.3/lib/RT/I18N/pt_br.po
==============================================================================
--- rt/branches/rt-3.3/lib/RT/I18N/pt_br.po	(original)
+++ rt/branches/rt-3.3/lib/RT/I18N/pt_br.po	Sun Jun 27 23:08:01 2004
@@ -1291,7 +1291,7 @@
 msgstr "Modelo %1 criado"
 
 #: html/Ticket/Elements/EditLinks:28
-msgid "Current Relationships"
+msgid "Current Links"
 msgstr "Relações atuais"
 
 #: html/Admin/Elements/EditScrips:30
@@ -1585,7 +1585,7 @@
 msgstr "Editar Campos Personalizados para %1"
 
 #: html/Ticket/ModifyLinks.html:36
-msgid "Edit Relationships"
+msgid "Edit Links"
 msgstr "Editar Relacionamentos"
 
 #: html/Admin/Queues/Templates.html:41
@@ -2630,7 +2630,7 @@
 msgstr "Nova Aprovação Pendente"
 
 #: html/Ticket/Elements/EditLinks:111
-msgid "New Relationships"
+msgid "New Links"
 msgstr "Novos Relacionamentos"
 
 #: html/Ticket/Elements/Tabs:36
@@ -3387,10 +3387,6 @@
 msgid "Refresh this page every %1 minutes."
 msgstr "Recarregar esta página a cada %1 minutos."
 
-#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:60 html/Ticket/ModifyAll.html:57
-msgid "Relationships"
-msgstr "Relacionamentos"
-
 #: html/Search/Bulk.html:93
 msgid "Remove AdminCc"
 msgstr "Remover AdminCc"

Modified: rt/branches/rt-3.3/lib/RT/I18N/ru.po
==============================================================================
--- rt/branches/rt-3.3/lib/RT/I18N/ru.po	(original)
+++ rt/branches/rt-3.3/lib/RT/I18N/ru.po	Sun Jun 27 23:08:01 2004
@@ -243,7 +243,6 @@
 msgid "'%1' not a recognized action. "
 msgstr "Что делать ? : '%1'"
 
-
 #: html/Admin/Elements/EditQueueWatchers:29 html/Admin/Elements/EditScrips:35 html/Admin/Elements/EditTemplates:36 html/Admin/Groups/Members.html:52 html/Ticket/Elements/EditLinks:33 html/Ticket/Elements/EditPeople:46 html/User/Groups/Members.html:55
 msgid "(Check box to delete)"
 msgstr "(Пометьте то, что хотите удалить)"
@@ -412,7 +411,6 @@
 msgid "Add Requestor"
 msgstr "Добавить просителя"
 
-
 #: html/Admin/Global/Scrip.html:55
 msgid "Add a scrip which will apply to all queues"
 msgstr "Добавить скрипт, который будет действовать на все очереди"
@@ -1154,7 +1152,7 @@
 msgstr "Создан шаблон %1"
 
 #: html/Ticket/Elements/EditLinks:28
-msgid "Current Relationships"
+msgid "Current Links"
 msgstr "Текущие связи"
 
 #: html/Admin/Elements/EditScrips:30
@@ -1428,7 +1426,7 @@
 msgstr "Изменение дополнительных полей для %1"
 
 #: html/Ticket/ModifyLinks.html:36
-msgid "Edit Relationships"
+msgid "Edit Links"
 msgstr "Изменение связей"
 
 #: html/Admin/Queues/Templates.html:41
@@ -2245,7 +2243,6 @@
 msgid "Modify global group rights."
 msgstr "Изменение глобальных прав группы"
 
-
 #: html/Admin/Global/UserRights.html:25 html/Admin/Global/UserRights.html:28 html/Admin/Global/index.html:60
 msgid "Modify global user rights"
 msgstr "Изменение глобальных прав пользователя"
@@ -2434,7 +2431,7 @@
 msgstr ""
 
 #: html/Ticket/Elements/EditLinks:111
-msgid "New Relationships"
+msgid "New Links"
 msgstr "Новые связи"
 
 #: html/Ticket/Elements/Tabs:36
@@ -3187,10 +3184,6 @@
 msgid "Refresh this page every %1 minutes."
 msgstr "Обновлять эту страницу каждые %1 минут."
 
-#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:60 html/Ticket/ModifyAll.html:57
-msgid "Relationships"
-msgstr "Связи"
-
 #: html/Search/Bulk.html:93
 msgid "Remove AdminCc"
 msgstr "Удалить административную копию"

Modified: rt/branches/rt-3.3/lib/RT/Interface/Web.pm
==============================================================================
--- rt/branches/rt-3.3/lib/RT/Interface/Web.pm	(original)
+++ rt/branches/rt-3.3/lib/RT/Interface/Web.pm	Sun Jun 27 23:08:01 2004
@@ -68,24 +68,10 @@
 =cut
 
 sub NewApacheHandler {
-    $RT::MasonHandlerClass ||= 'HTML::Mason::ApacheHandler';
-    my $ah = $RT::MasonHandlerClass->new( 
-    
-        comp_root                    => [
-            [ local    => $RT::MasonLocalComponentRoot ],
-            [ standard => $RT::MasonComponentRoot ]
-        ],
-        args_method => "CGI",
-        default_escape_flags => 'h',
-        allow_globals        => [qw(%session)],
-        data_dir => "$RT::MasonDataDir",
-        autoflush => 1,
-        @_
-    );
-
-    $ah->interp->set_escape( h => \&RT::Interface::Web::EscapeUTF8 );
-    
-    return ($ah);
+    require HTML::Mason::ApacheHandler;
+    return RT::Interface::Web::NewHandler('HTML::Mason::ApacheHandler',
+                                            args_method => "CGI",
+                                            @_);
 }
 
 # }}}
@@ -99,29 +85,20 @@
 =cut
 
 sub NewCGIHandler {
-    my %args = (
-        @_
-    );
+    return RT::Interface::Web::NewHandler('HTML::Mason::CGIHandler', at _);
+}
 
-    my $handler = HTML::Mason::CGIHandler->new(
-        comp_root                    => [
-            [ local    => $RT::MasonLocalComponentRoot ],
-            [ standard => $RT::MasonComponentRoot ]
-        ],
-        data_dir => "$RT::MasonDataDir",
-        default_escape_flags => 'h',
-        allow_globals        => [qw(%session)],
-        autoflush => 1,
+sub NewHandler {
+    my $class = shift;
+    my $handler = $class->new(
+        @DefaultHandlerArgs,
         @_
     );
   
-
     $handler->interp->set_escape( h => \&RT::Interface::Web::EscapeUTF8 );
-
-
-    return ($handler);
-
+    return($handler);
 }
+
 # }}}
 
 
@@ -350,33 +327,55 @@
         Starts          => $starts->ISO,
         MIMEObj         => $MIMEObj
     );
-    my ( $id, $Trans, $ErrMsg ) = $Ticket->Create(%create_args);
-    unless ( $id && $Trans ) {
-        Abort($ErrMsg);
+    foreach my $arg (%ARGS) {
+        if ($arg =~ /^CustomField-(\d+)(.*?)$/) {
+            next if ($arg =~ /-Magic$/);
+            $create_args{"CustomField-".$1} = $ARGS{"$arg"};
+        }
     }
-    my @linktypes = qw( DependsOn MemberOf RefersTo );
 
-    foreach my $linktype (@linktypes) {
-        foreach my $luri ( split ( / /, $ARGS{"new-$linktype"} ) ) {
-            $luri =~ s/\s*$//;    # Strip trailing whitespace
-            my ( $val, $msg ) = $Ticket->AddLink(
-                Target => $luri,
-                Type   => $linktype
-            );
-            push ( @Actions, $msg ) unless ($val);
-        }
+    # turn new link lists into arrays, and pass in the proper arguments
+    my (@dependson, @dependedonby, 
+	@parents, @children, 
+	@refersto, @referredtoby);
 
-        foreach my $luri ( split ( / /, $ARGS{"$linktype-new"} ) ) {
-            my ( $val, $msg ) = $Ticket->AddLink(
-                Base => $luri,
-                Type => $linktype
-            );
+    foreach my $luri ( split ( / /, $ARGS{"new-DependsOn"} ) ) {
+	$luri =~ s/\s*$//;    # Strip trailing whitespace
+	push @dependson, $luri;
+    }
+    $create_args{'DependsOn'} = \@dependson;
 
-            push ( @Actions, $msg ) unless ($val);
-        }
+    foreach my $luri ( split ( / /, $ARGS{"DependsOn-new"} ) ) {
+	push @dependedonby, $luri;
     }
+    $create_args{'DependedOnBy'} = \@dependedonby;
 
-    ProcessObjectCustomFieldUpdates(Object => $Ticket, ARGSRef => \%ARGS);
+    foreach my $luri ( split ( / /, $ARGS{"new-MemberOf"} ) ) {
+	$luri =~ s/\s*$//;    # Strip trailing whitespace
+	push @parents, $luri;
+    }
+    $create_args{'Parents'} = \@parents;
+
+    foreach my $luri ( split ( / /, $ARGS{"MemberOf-new"} ) ) {
+	push @children, $luri;
+    }
+    $create_args{'Children'} = \@children;
+
+    foreach my $luri ( split ( / /, $ARGS{"new-RefersTo"} ) ) {
+	$luri =~ s/\s*$//;    # Strip trailing whitespace
+	push @refersto, $luri;
+    }
+    $create_args{'RefersTo'} = \@refersto;
+
+    foreach my $luri ( split ( / /, $ARGS{"RefersTo-new"} ) ) {
+	push @referredtoby, $luri;
+    }
+    $create_args{'ReferredToBy'} = \@referredtoby;
+
+    my ( $id, $Trans, $ErrMsg ) = $Ticket->Create(%create_args);
+    unless ( $id && $Trans ) {
+        Abort($ErrMsg);
+    }
 
     push ( @Actions, split("\n", $ErrMsg) );
     unless ( $Ticket->CurrentUserHasRight('ShowTicket') ) {
@@ -434,7 +433,8 @@
     );
 
     #Make the update content have no 'weird' newlines in it
-    if ( $args{ARGSRef}->{'UpdateContent'} ||
+    if ( $args{ARGSRef}->{'UpdateTimeWorked'} ||
+	 $args{ARGSRef}->{'UpdateContent'} ||
 	 $args{ARGSRef}->{'UpdateAttachments'}) {
 
         if (
@@ -1042,6 +1042,8 @@
         }
     }
 
+    $ARGSRef->{'Status'} ||= $TicketObj->Status;
+    
     my @results = UpdateRecordObject(
         AttributesRef => \@attribs,
         Object        => $TicketObj,

Modified: rt/branches/rt-3.3/lib/RT/SearchBuilder.pm
==============================================================================
--- rt/branches/rt-3.3/lib/RT/SearchBuilder.pm	(original)
+++ rt/branches/rt-3.3/lib/RT/SearchBuilder.pm	Sun Jun 27 23:08:01 2004
@@ -264,7 +264,7 @@
 =cut
 
 sub FindAllRows {
-  shift->{'find_disabled_rows'} = 1;
+    shift->{'find_disabled_rows'} = 1;
 }
 
 # {{{ sub Limit 
@@ -278,24 +278,48 @@
 =cut
 
 sub Limit {
-	my $self = shift;
-	my %args = ( CASESENSITIVE => 1,
-		     @_ );
+    my $self = shift;
+    my %args = ( CASESENSITIVE => 1,
+                 @_ );
 
-   return $self->SUPER::Limit(%args);
+    return $self->SUPER::Limit(%args);
 }
 
 # }}}
 
-# {{{ sub ItemsArrayRef
+# {{{ sub ItemsOrderBy
 
-=item ItemsArrayRef
+=item ItemsOrderBy
 
-Return this object's ItemsArray.
 If it has a SortOrder attribute, sort the array by SortOrder.
 Otherwise, if it has a "Name" attribute, sort alphabetically by Name
-Otherwise, just give up and return it in the order it came from the db.
+Otherwise, just give up and return it in the order it came from the
+db.
+
+=cut
+
+sub ItemsOrderBy {
+    my $self = shift;
+    my $items = shift;
+  
+    if ($self->NewItem()->_Accessible('SortOrder','read')) {
+        $items = [ sort { $a->SortOrder <=> $b->SortOrder } @{$items} ];
+    }
+    elsif ($self->NewItem()->_Accessible('Name','read')) {
+        $items = [ sort { lc($a->Name) cmp lc($b->Name) } @{$items} ];
+    }
+
+    return $items;
+}
 
+# }}}
+
+# {{{ sub ItemsArrayRef
+
+=item ItemsArrayRef
+
+Return this object's ItemsArray, in the order that ItemsOrderBy sorts
+it.
 
 =begin testing
 
@@ -327,18 +351,7 @@
     my $self = shift;
     my @items;
     
-    if ($self->NewItem()->_Accessible('SortOrder','read')) {
-        @items = sort { $a->SortOrder <=> $b->SortOrder } @{$self->SUPER::ItemsArrayRef()};
-    }
-    elsif ($self->NewItem()->_Accessible('Name','read')) {
-        @items = sort { lc($a->Name) cmp lc($b->Name) } @{$self->SUPER::ItemsArrayRef()};
-    }
-    else {
-        @items = @{$self->SUPER::ItemsArrayRef()};
-    }
-
-    return(\@items);
-
+    return $self->ItemsOrderBy($self->SUPER::ItemsArrayRef());
 }
 
 # }}}

Modified: rt/branches/rt-3.3/lib/RT/Templates_Overlay.pm
==============================================================================
--- rt/branches/rt-3.3/lib/RT/Templates_Overlay.pm	(original)
+++ rt/branches/rt-3.3/lib/RT/Templates_Overlay.pm	Sun Jun 27 23:08:01 2004
@@ -137,5 +137,40 @@
 }
 # }}}
 
+# {{{ sub Next 
+
+=head2 Next
+
+Returns the next template that this user can see.
+
+=cut
+  
+sub Next {
+    my $self = shift;
+    
+    
+    my $templ = $self->SUPER::Next();
+    if ((defined($templ)) and (ref($templ))) {
+        
+        # If it's part of a queue, and the user can read templates in
+        # that queue, or the user can globally read templates, show it
+        if ($templ->Queue && $templ->CurrentUserHasQueueRight('ShowTemplate') or
+            $templ->CurrentUser->HasRight(Object => $RT::System, Right => 'ShowTemplate')) {
+	    return($templ);
+	}
+	
+	#If the user doesn't have the right to show this template
+	else {	
+	    return($self->Next());
+	}
+    }
+    #if there never was any template
+    else {
+	return(undef);
+    }	
+    
+}
+# }}}
+
 1;
 

Modified: rt/branches/rt-3.3/lib/RT/Ticket_Overlay.pm
==============================================================================
--- rt/branches/rt-3.3/lib/RT/Ticket_Overlay.pm	(original)
+++ rt/branches/rt-3.3/lib/RT/Ticket_Overlay.pm	Sun Jun 27 23:08:01 2004
@@ -137,7 +137,7 @@
 # }}}
 
 # {{{ LINKTYPEMAP
-# A helper table for relationships mapping to make it easier
+# A helper table for links mapping to make it easier
 # to build and parse links between tickets
 
 use vars '%LINKTYPEMAP';
@@ -169,7 +169,7 @@
 # }}}
 
 # {{{ LINKDIRMAP
-# A helper table for relationships mapping to make it easier
+# A helper table for links mapping to make it easier
 # to build and parse links between tickets
 
 use vars '%LINKDIRMAP';
@@ -553,7 +553,10 @@
           unless ( exists $params{$attr} && $params{$attr} );
     }
 
-    my ( $id, $ticket_message ) = $self->SUPER::Create(%params);
+    # Delete the time worked if we're counting it in the transaction
+    delete $params{TimeWorked} if $args{'_RecordTransaction'};
+    
+    my ($id,$ticket_message) = $self->SUPER::Create( %params);
     unless ($id) {
         $RT::Logger->crit( "Couldn't create a ticket: " . $ticket_message );
         $RT::Handle->Rollback();
@@ -681,9 +684,9 @@
 
         # {{{ Add a transaction for the create
         my ( $Trans, $Msg, $TransObj ) = $self->_NewTransaction(
-            Type      => "Create",
-            TimeTaken => 0,
-            MIMEObj   => $args{'MIMEObj'}
+                                                     Type      => "Create",
+                                                     TimeTaken => $args{'TimeWorked'},
+                                                     MIMEObj => $args{'MIMEObj'}
         );
 
         if ( $self->Id && $Trans ) {
@@ -1319,7 +1322,7 @@
 
 =head2 _CreateTicketGroups
 
-Create the ticket groups and relationships for this ticket. 
+Create the ticket groups and links for this ticket. 
 This routine expects to be called from Ticket->Create _inside of a transaction_
 
 It will create four groups for this ticket: Requestor, Cc, AdminCc and Owner.
@@ -1623,7 +1626,7 @@
         else {
             $RT::Logger->warn("$self -> DeleteWatcher got passed a bogus type");
             return ( 0,
-                     $self->loc('Error in parameters to Ticket->DelWatcher') );
+                     $self->loc('Error in parameters to Ticket->DeleteWatcher') );
         }
     }
 
@@ -3370,8 +3373,6 @@
           TimeEstimated      => { 'read' => 1,  'write' => 1 },
           TimeWorked      => { 'read' => 1,  'write' => 1 },
           TimeLeft        => { 'read' => 1,  'write' => 1 },
-          Created         => { 'read' => 1,  'auto'  => 1 },
-          Creator         => { 'read' => 1,  'auto'  => 1 },
           Told            => { 'read' => 1,  'write' => 1 },
           Resolved        => { 'read' => 1 },
           Type            => { 'read' => 1 },

Modified: rt/branches/rt-3.3/lib/RT/Tickets_Overlay.pm
==============================================================================
--- rt/branches/rt-3.3/lib/RT/Tickets_Overlay.pm	(original)
+++ rt/branches/rt-3.3/lib/RT/Tickets_Overlay.pm	Sun Jun 27 23:08:01 2004
@@ -284,7 +284,7 @@
 
 Meta Data:
   1: Direction (From,To)
-  2: Relationship Type (MemberOf, DependsOn,RefersTo)
+  2: Link Type (MemberOf, DependsOn,RefersTo)
 
 =cut
 
@@ -354,7 +354,7 @@
 Handle date fields.  (Created, LastTold..)
 
 Meta Data:
-  1: type of relationship.  (Probably not necessary.)
+  1: type of link.  (Probably not necessary.)
 
 =cut
 
@@ -1509,7 +1509,7 @@
 =head2 LimitLinkedTo
 
 LimitLinkedTo takes a paramhash with two fields: TYPE and TARGET
-TYPE limits the sort of relationship we want to search on
+TYPE limits the sort of link we want to search on
 
 TYPE = { RefersTo, MemberOf, DependsOn }
 
@@ -1545,7 +1545,7 @@
 =head2 LimitLinkedFrom
 
 LimitLinkedFrom takes a paramhash with two fields: TYPE and BASE
-TYPE limits the sort of relationship we want to search on
+TYPE limits the sort of link we want to search on
 
 
 BASE is the id or URI of the BASE of the link
@@ -1923,6 +1923,7 @@
             push ( @{ $self->{'items_array'} }, $item );
         }
         $self->GotoItem($placeholder);
+        $self->{'items_array'} = $self->ItemsOrderBy($self->{'items_array'});
     }
     return ( $self->{'items_array'} );
 }
@@ -2210,15 +2211,15 @@
 
     delete $self->{'item_map'};
     if ($items->[0]) {
-    $self->{'item_map'}->{'first'} = $items->[0]->EffectiveId;
-    while (my $item = shift @$items ) {
-        my $id = $item->EffectiveId;
-        $self->{'item_map'}->{$id}->{'defined'} = 1;
-        $self->{'item_map'}->{$id}->{prev}  = $prev;
-        $self->{'item_map'}->{$id}->{next}  = $items->[0]->EffectiveId if ($items->[0]);
-        $prev = $id;
-    }
-    $self->{'item_map'}->{'last'} = $prev;
+        $self->{'item_map'}->{'first'} = $items->[0]->EffectiveId;
+        while (my $item = shift @$items ) {
+            my $id = $item->EffectiveId;
+            $self->{'item_map'}->{$id}->{'defined'} = 1;
+            $self->{'item_map'}->{$id}->{prev}  = $prev;
+            $self->{'item_map'}->{$id}->{next}  = $items->[0]->EffectiveId if ($items->[0]);
+            $prev = $id;
+        }
+        $self->{'item_map'}->{'last'} = $prev;
     }
 } 
 
@@ -2229,14 +2230,14 @@
 
 $ItemMap->{'first'} = first ticketid found
 $ItemMap->{'last'} = last ticketid found
-$ItemMap->{$id}->{prev} = the tikcet id found before $id
-$ItemMap->{$id}->{next} = the tikcet id found after $id
+$ItemMap->{$id}->{prev} = the ticket id found before $id
+$ItemMap->{$id}->{next} = the ticket id found after $id
 
 =cut
 
 sub ItemMap {
     my $self = shift;
-    $self->_BuildItemMap() unless ($self->{'item_map'});
+    $self->_BuildItemMap() unless ($self->{'items_array'} and $self->{'item_map'});
     return ($self->{'item_map'});
 }
 


More information about the Rt-commit mailing list