[Rt-commit] [svn] r851 - in rt/branches/rt-3.3: . bin html/Admin/Queues lib lib/RT

[jesse at pallas.eruditorum.org]

Author: jesse
Date: Thu May  6 21:03:05 2004
New Revision: 851

Modified:
   rt/branches/rt-3.3/   (props changed)
   rt/branches/rt-3.3/bin/rt.in
   rt/branches/rt-3.3/html/Admin/Queues/Scrip.html
   rt/branches/rt-3.3/lib/RT.pm.in
   rt/branches/rt-3.3/lib/RT/Tickets_Overlay.pm
Log:
Merging forward from rt-3.1

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	Thu May  6 21:03:05 2004
@@ -150,8 +150,9 @@
             my $title = $item->[2]{Title};
             my @titles = ref $title eq 'ARRAY' ? @$title : $title;
 
-        foreach $title (grep $_, @titles) {
-            $help{$title} = $item->[2]{Text};
+            foreach $title (grep $_, @titles) {
+                $help{$title} = $item->[2]{Text};
+            }
         }
     }
 
@@ -243,7 +244,7 @@
     }
     return help("list", $type) if $bad;
 
-    my $r = submit("$REST/search/$type", { query => $q, %data, orderby => $orderby || "" });
+    my $r = submit("$REST/search/$type", { query => $q, %data, orderby => $data{orderby} || "" });
     print $r->content;
 }
 
@@ -854,7 +855,7 @@
     sub cookie {
         my ($self) = @_;
         my $cookie = $self->{sids}{$s}{$u};
-        return defined $cookie ? "RT_SID=$cookie" : undef;
+        return defined $cookie ? "RT_SID_$cookie" : undef;
     }
 
     # Deletes the current session cookie.
@@ -877,7 +878,7 @@
         my ($self, $response) = @_;
         my $cookie = $response->header("Set-Cookie");
 
-        if (defined $cookie && $cookie =~ /^RT_SID=([0-9A-Fa-f]+);/) {
+        if (defined $cookie && $cookie =~ /^RT_SID_(.[^;,\s]+=[0-9A-Fa-f]+);/) {
             $self->{sids}{$s}{$u} = $1;
         }
     }
@@ -894,7 +895,7 @@
             while (<F>) {
                 chomp;
                 next if /^$/ || /^#/;
-                next unless m#^https?://[^ ]+ \w+ [0-9A-Fa-f]+$#;
+                next unless m#^https?://[^ ]+ \w+ [^;,\s]+=[0-9A-Fa-f]+$#;
                 my ($server, $user, $cookie) = split / /, $_;
                 $sids->{$server}{$user} = $cookie;
             }

Modified: rt/branches/rt-3.3/html/Admin/Queues/Scrip.html
==============================================================================
--- rt/branches/rt-3.3/html/Admin/Queues/Scrip.html	(original)
+++ rt/branches/rt-3.3/html/Admin/Queues/Scrip.html	Thu May  6 21:03:05 2004
@@ -51,7 +51,7 @@
 if ($id) {
     $current_subtab = "Admin/Queues/Scrip.html?id=".$id."&Queue=".$QueueObj->id;
     $title = loc("Modify a scrip for queue [_1]", $QueueObj->Name);
-    $subtabs->{"C"} = { title => loc("Scrip #[_1]",$QueueObj->id),
+    $subtabs->{"C"} = { title => loc("Scrip #[_1]",$id),
 			path => "Admin/Queues/Scrip.html?id=$id&Queue=".$QueueObj->id };
 } else {
     $current_subtab = "Admin/Queues/Scrip.html?create=1&Queue=".$QueueObj->id;

Modified: rt/branches/rt-3.3/lib/RT.pm.in
==============================================================================
--- rt/branches/rt-3.3/lib/RT.pm.in	(original)
+++ rt/branches/rt-3.3/lib/RT.pm.in	Thu May  6 21:03:05 2004
@@ -169,21 +169,23 @@
     $RT::Logger=Log::Dispatch->new();
     
     if ($RT::LogToFile) {
-
-    unless (-d $RT::LogDir && -w $RT::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 directory $RT::LogDir not found or couldn't be written.\n RT can't run.");
-    }
-
-	my $filename;
+	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.");
+    }
+
     require Log::Dispatch::File;
 
 

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	Thu May  6 21:03:05 2004
@@ -101,8 +101,8 @@
     Filename        => ['TRANSFIELD',],
     TransactionDate => ['TRANSDATE',],
     Requestor       => ['WATCHERFIELD' => 'Requestor',],
-    CC              => ['WATCHERFIELD' => 'Cc',],
-    AdminCC         => ['WATCHERFIELD' => 'AdminCC',],
+    Cc              => ['WATCHERFIELD' => 'Cc',],
+    AdminCc         => ['WATCHERFIELD' => 'AdminCC',],
     Watcher	    => ['WATCHERFIELD'],
     LinkedTo	    => ['LINKFIELD',],
     CustomFieldValue =>['CUSTOMFIELD',],