FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-25 22:09:21 +00:00
Code Issues Releases Wiki Activity

fhem.pl: devspec2array: changed regexp to allow utf8 in roomname

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@4905 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2014-02-13 08:04:53 +00:00
parent 730de658ce
commit 1d8c21f09f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fhem/fhem.pl
View File

@ -814,12 +814,12 @@ AnalyzeCommand($$;$)
return undef if(!$cmd); return undef if(!$cmd);
if($cmd =~ m/^{.*}$/s) { # Perl code if($cmd =~ m/^{.*}$/s) { # Perl code
return( "Forbidden command $cmd." ) if( $allowed && $allowed !~ m/\bperl\b/ ); return "Forbidden command $cmd." if($allowed && $allowed !~ m/\bperl\b/);
return AnalyzePerlCommand($cl, $cmd); return AnalyzePerlCommand($cl, $cmd);
} }
if($cmd =~ m/^"(.*)"$/s) { # Shell code in bg, to be able to call us from it if($cmd =~ m/^"(.*)"$/s) { # Shell code in bg, to be able to call us from it
return( "Forbidden command $cmd." ) if( $allowed && $allowed !~ m/\bshell\b/ ); return "Forbidden command $cmd." if($allowed && $allowed !~ m/\bshell\b/);
if($evalSpecials) { if($evalSpecials) {
map { $ENV{substr($_,1)} = $evalSpecials->{$_}; } keys %{$evalSpecials}; map { $ENV{substr($_,1)} = $evalSpecials->{$_}; } keys %{$evalSpecials};
} }
@ -851,7 +851,7 @@ AnalyzeCommand($$;$)
$fn = $cmds{$fn}{ReplacedBy} $fn = $cmds{$fn}{ReplacedBy}
if(defined($cmds{$fn}) && defined($cmds{$fn}{ReplacedBy})); if(defined($cmds{$fn}) && defined($cmds{$fn}{ReplacedBy}));
return( "Forbidden command $fn." ) if( $allowed && $allowed !~ m/\b$fn\b/ ); return "Forbidden command $fn." if($allowed && $allowed !~ m/\b$fn\b/);
############# #############
# autoload commands. # autoload commands.
@ -926,7 +926,7 @@ devspec2array($)
} }
$val="" if(!defined($val)); $val="" if(!defined($val));
my $lre = ($n eq "room" ? "\\b$re\\b" : "^$re\$"); my $lre = ($n eq "room" ? "(^|,)$re(,|\$)" : "^$re\$");
eval { # a bad regexp is deadly eval { # a bad regexp is deadly
if(($op eq "=" && $val =~ m/$lre/) || if(($op eq "=" && $val =~ m/$lre/) ||
($op eq "!=" && $val !~ m/$lre/)) { ($op eq "!=" && $val !~ m/$lre/)) {