1.1 --- a/l3-frontend	Sun Dec 04 18:44:21 2005 +0200
     1.2 +++ b/l3-frontend	Wed Dec 21 19:31:00 2005 +0200
     1.3 @@ -124,7 +124,7 @@
     1.4  
     1.5  sub close_mywi_socket
     1.6  {
     1.7 -    close ($Mywi_Socket);
     1.8 +    close ($Mywi_Socket) if $Mywi_Socket ;
     1.9  }
    1.10  
    1.11  
    1.12 @@ -162,7 +162,7 @@
    1.13          $CommandsFDistribution{$command}++;
    1.14          if (!$Commands_Description{$command}) {
    1.15              my $mywi="";
    1.16 -            $mywi = mywi_client ($command);
    1.17 +            $mywi = mywi_client ($command) || "";
    1.18              $mywi = join ("\n", grep(/\([18]\)/, split(/\n/, $mywi)));
    1.19              $mywi =~ s/\s+/ /;
    1.20              if ($mywi !~ /^\s*$/) {
    1.21 @@ -415,10 +415,11 @@
    1.22              }
    1.23  
    1.24              for my $filter_key (keys %filter) {
    1.25 -                next COMMAND_LINE unless (
    1.26 -                    not defined($cl->{local_session_id}) 
    1.27 -                    || not defined($Sessions{$cl->{local_session_id}}->{$filter_key}) 
    1.28 -                    || $Sessions{$cl->{local_session_id}}->{$filter_key} eq $filter{$filter_key});
    1.29 +                next COMMAND_LINE if 
    1.30 +                    defined($cl->{local_session_id}) 
    1.31 +                    && defined($Sessions{$cl->{local_session_id}}->{$filter_key}) 
    1.32 +                    && $Sessions{$cl->{local_session_id}}->{$filter_key} ne $filter{$filter_key};
    1.33 +		#print $filter_key,"\n";	
    1.34              }
    1.35  
    1.36              #if ($filter{user}) {
    1.37 @@ -452,8 +453,8 @@
    1.38          if ($cl->{class} eq "note") {
    1.39              my $note = $cl->{note};
    1.40              $note = join ("\n", map ("<p>$_</p>", split (/-\n/, $note)));
    1.41 -            $note =~ s@(http:[a-zA-Z.0-9/?%-]*)@<a href='$1'>$1</a>@g;
    1.42 -            $note =~ s@(www\.[a-zA-Z.0-9/?%-]*)@<a href='$1'>$1</a>@g;
    1.43 +            $note =~ s@(http:[a-zA-Z.0-9/?\_%-]*)@<a href='$1'>$1</a>@g;
    1.44 +            $note =~ s@(www\.[a-zA-Z.0-9/?\_%-]*)@<a href='$1'>$1</a>@g;
    1.45              $Result{"body"} .= "<tr><td colspan='6'>";
    1.46              $Result{"body"} .= "<h4 id='note$note_number'>".$cl->{note_title}."</h4>" if $cl->{note_title};
    1.47              $Result{"body"} .= "".$note."<p/><p/></td></td>";
    1.48 @@ -602,8 +603,9 @@
    1.49          if ( $Config{"show_notes"} =~ /^y/i && $cl->{"note"}) {
    1.50              my $note=$cl->{"note"};
    1.51              $note =~ s/\n/<br\/>\n/msg;
    1.52 -            $note =~ s@(http:[a-zA-Z.0-9/?%-]*)@<a href='$1'>$1</a>@g;
    1.53 -            $note =~ s@(www\.[a-zA-Z.0-9/?%-]*)@<a href='$1'>$1</a>@g;
    1.54 +            if (not $note =~ s@(http:[a-zA-Z.0-9/_?%-]*)@<a href='$1'>$1</a>@g) {
    1.55 +		     $note =~ s@(www\.[a-zA-Z.0-9/_?%-]*)@<a href='$1'>$1</a>@g;
    1.56 +	    };
    1.57          #   Ширину пока не используем
    1.58          #   $Result{"body"} .= "<table width='$Config{note_width}' class='note'>";
    1.59              $Result{"body"} .= "<table class='note'>";