# HG changeset patch # User devi # Date 1131969468 -7200 # Node ID 5f60fe514d49c01ca3275a353358da8b9064ab3b # Parent 34f3ce44c3653be328393f355722759067eeb935 *** empty log message *** diff -r 34f3ce44c365 -r 5f60fe514d49 l3-frontend --- a/l3-frontend Mon Nov 14 09:17:49 2005 +0200 +++ b/l3-frontend Mon Nov 14 13:57:48 2005 +0200 @@ -161,7 +161,7 @@ $command =~ s/'//g; $CommandsFDistribution{$command}++; if (!$Commands_Description{$command}) { - my $mywi; + my $mywi=""; $mywi = mywi_client ($command); $mywi = join ("\n", grep(/\([18]\)/, split(/\n/, $mywi))); $mywi =~ s/\s+/ /; @@ -268,8 +268,8 @@ for my $i (@Command_Lines_Index) { my $cl = \$Command_Lines[$i]; - @{${$cl}->{"new_commands"}} =(); - @{${$cl}->{"new_files"}} =(); + #@{${$cl}->{"new_commands"}} =(); + #@{${$cl}->{"new_files"}} =(); $$cl->{"class"} = ""; if ($$cl->{"err"}) { @@ -418,6 +418,10 @@ next COMMAND_LINE unless $Sessions{$cl->{local_session_id}}->{hostname} eq $filter{hostname}; } + if ($filter{user}) { + next COMMAND_LINE unless $Sessions{$cl->{local_session_id}}->{user} eq $filter{user}; + } + #for my $filter_field (keys %filter) { # next COMMAND_LINE unless $Sessions{$cl->{local_session_id}}->{$filter_field} eq $filter{$filter_field}; #} @@ -445,6 +449,8 @@ if ($cl->{class} eq "note") { my $note = $cl->{note}; $note = join ("\n", map ("

$_

", split (/-\n/, $note))); + $note =~ s@(http:[a-zA-Z.0-9/?%-]*)@$1@g; + $note =~ s@(www\.[a-zA-Z.0-9/?%-]*)@$1@g; $Result{"body"} .= ""; $Result{"body"} .= "

".$cl->{note_title}."

" if $cl->{note_title}; $Result{"body"} .= "".$note."

"; @@ -590,6 +596,8 @@ if ( $Config{"show_notes"} =~ /^y/i && $cl->{"note"}) { my $note=$cl->{"note"}; $note =~ s/\n/\n/msg; + $note =~ s@(http:[a-zA-Z.0-9/?%-]*)@$1@g; + $note =~ s@(www\.[a-zA-Z.0-9/?%-]*)@$1@g; # Ширину пока не используем # $Result{"body"} .= ""; $Result{"body"} .= "
"; diff -r 34f3ce44c365 -r 5f60fe514d49 lm --- a/lm Mon Nov 14 09:17:49 2005 +0200 +++ b/lm Mon Nov 14 13:57:48 2005 +0200 @@ -497,8 +497,8 @@ ###install-pm scp PM/* $ssh_user@$host:/tmp -#ssh $ssh_user@$host 'cd /tmp; tar xfz Term-VT102*.gz; cd Term-VT102*[^z]; perl Makefile.PL; make ; make install' -ssh $ssh_user@$host 'cd /tmp; tar xfz Text-Iconv*.gz; cd Text-Iconv*[^z]; perl Makefile.PL; make ; make install' +ssh $ssh_user@$host 'cd /tmp; tar xfz Term-VT102*.gz; cd Term-VT102*[^z]; perl Makefile.PL; make ; make install' +#ssh $ssh_user@$host 'cd /tmp; tar xfz Text-Iconv*.gz; cd Text-Iconv*[^z]; perl Makefile.PL; make ; make install' ###copy-lablogs for i in $dirs