Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

: minor code cleanup

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21552 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen 2020-03-31 11:21:04 +00:00
parent 09357f54df
commit e808ff4abc
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fhem/FHEM/98_GoogleAuth.pm
View File

@ -82,7 +82,7 @@ use URI::Escape;
use Crypt::URandom qw( urandom ); use Crypt::URandom qw( urandom );
sub GoogleAuth_Initialize($) { sub GoogleAuth_Initialize {
my ($hash) = @_; my ($hash) = @_;
$hash->{DefFn} = "GoogleAuth_Define"; $hash->{DefFn} = "GoogleAuth_Define";
@ -98,7 +98,7 @@ sub GoogleAuth_Initialize($) {
"$readingFnAttributes"; "$readingFnAttributes";
} }
sub GoogleAuth_Define($$) { sub GoogleAuth_Define {
my ($hash, $def) = @_; my ($hash, $def) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my @a = split("[ \t][ \t]*", $def); my @a = split("[ \t][ \t]*", $def);
@ -109,12 +109,12 @@ sub GoogleAuth_Define($$) {
return undef; return undef;
} }
sub GoogleAuth_Delete($$) { sub GoogleAuth_Delete {
my ($hash,$name) = @_; my ($hash,$name) = @_;
setKeyValue("googleAuth$name",undef); setKeyValue("googleAuth$name",undef);
} }
sub GoogleAuth_Set($$@) { sub GoogleAuth_Set {
my ($hash, $name, $cmd, @args) = @_; my ($hash, $name, $cmd, @args) = @_;
my $usage = "Unknown argument, choose one of new:noArg revoke:noArg"; my $usage = "Unknown argument, choose one of new:noArg revoke:noArg";
@ -136,7 +136,7 @@ sub GoogleAuth_Set($$@) {
return undef; return undef;
} }
sub GoogleAuth_Get($$@) { sub GoogleAuth_Get {
my ($hash, $name, $cmd, $given_token) = @_; my ($hash, $name, $cmd, $given_token) = @_;
my $usage = "Unknown argument, choose one of check"; my $usage = "Unknown argument, choose one of check";
@ -167,7 +167,7 @@ sub GoogleAuth_Get($$@) {
return $usage; return $usage;
} }
sub GoogleAuth_Detail($@) { sub GoogleAuth_Detail {
my ($FW_wname, $name, $room, $pageHash) = @_; my ($FW_wname, $name, $room, $pageHash) = @_;
my $qr_url = _ga_make_url($name); my $qr_url = _ga_make_url($name);
my $secret_base32 = getKeyValue("googleAuth$name"); # read from fhem keystore my $secret_base32 = getKeyValue("googleAuth$name"); # read from fhem keystore
@ -188,7 +188,7 @@ sub GoogleAuth_Detail($@) {
# helper functions # helper functions
sub _ga_make_url($) { sub _ga_make_url {
my ($name) = @_; my ($name) = @_;
my $label = AttrVal($name,'ga_labelName',"FHEM Authentication $name"); my $label = AttrVal($name,'ga_labelName',"FHEM Authentication $name");
$label =~ s/\s/\%20/g; $label =~ s/\s/\%20/g;
@ -201,7 +201,7 @@ sub _ga_make_url($) {
return $qr_url; return $qr_url;
} }
sub _ga_make_token_6($) { sub _ga_make_token_6 {
my $token = shift; my $token = shift;
while (length $token < 6) { while (length $token < 6) {
$token = "0$token"; $token = "0$token";
@ -209,7 +209,7 @@ sub _ga_make_token_6($) {
return $token; return $token;
} }
sub gAuth($$) { sub gAuth {
my($name,$token) = @_; my($name,$token) = @_;
return CommandGet(undef,"$name check $token"); return CommandGet(undef,"$name check $token");
} }

18
fhem/FHEM/98_fheminfo.pm
View File

@ -33,7 +33,7 @@ my @noModelList = qw(readingsgroup lacrosse zwdongle wol weekdaytimer
cul_rfr solarview lw12 tscul knx dummy at archetype pushover twilight cul_rfr solarview lw12 tscul knx dummy at archetype pushover twilight
notify cloneDummy structure FHEMWEB hminfo); notify cloneDummy structure FHEMWEB hminfo);
sub fheminfo_Initialize($$) { sub fheminfo_Initialize {
my %hash = ( my %hash = (
Fn => "CommandFheminfo", Fn => "CommandFheminfo",
Hlp => "[send],show or send Fhem statistics", Hlp => "[send],show or send Fhem statistics",
@ -42,7 +42,7 @@ sub fheminfo_Initialize($$) {
$cmds{fheminfo} = \%hash; $cmds{fheminfo} = \%hash;
} }
sub CommandFheminfo($$) { sub CommandFheminfo {
my ($cl,$param) = @_; my ($cl,$param) = @_;
my @args = split("[ \t]+", $param); my @args = split("[ \t]+", $param);
$args[0] = defined($args[0]) ? lc($args[0]) : ""; $args[0] = defined($args[0]) ? lc($args[0]) : "";
@ -73,7 +73,7 @@ sub CommandFheminfo($$) {
################################################################ ################################################################
# tools # tools
# #
sub _fi2_Count() { sub _fi2_Count {
my $uniqueID = getUniqueId(); my $uniqueID = getUniqueId();
my $os = $^O; my $os = $^O;
my $perl = sprintf("%vd", $^V); my $perl = sprintf("%vd", $^V);
@ -154,7 +154,7 @@ sub _fi2_Count() {
return; return;
} }
sub _fi2_Send($) { sub _fi2_Send {
my ($cl) = shift; my ($cl) = shift;
$cl //= undef; $cl //= undef;
my $sendType = defined($cl) ? 'nonblocking' : 'blocking'; my $sendType = defined($cl) ? 'nonblocking' : 'blocking';
@ -188,7 +188,7 @@ sub _fi2_Send($) {
return; return;
} }
sub _fi2_TelnetTable($) { sub _fi2_TelnetTable {
my ($doSend) = shift; my ($doSend) = shift;
my $str; my $str;
$str .= "Following statistics data will be sent to server:\n(see Logfile level 4 for server response)\n\n" if($doSend == 1); $str .= "Following statistics data will be sent to server:\n(see Logfile level 4 for server response)\n\n" if($doSend == 1);
@ -214,7 +214,7 @@ sub _fi2_TelnetTable($) {
return $str; return $str;
} }
sub _fi2_HtmlTable($) { sub _fi2_HtmlTable {
my ($doSend) = shift; my ($doSend) = shift;
my $result = "<html><table>"; my $result = "<html><table>";
$result .= "<tr><td colspan='3'>Following statistics data will be sent to server:</br>(see Logfile level 4 for server response)</td></tr>" if($doSend == 1); $result .= "<tr><td colspan='3'>Following statistics data will be sent to server:</br>(see Logfile level 4 for server response)</td></tr>" if($doSend == 1);
@ -242,7 +242,7 @@ sub _fi2_HtmlTable($) {
return $result; return $result;
} }
sub _fi2_findRev() { sub _fi2_findRev {
my $cf = 'controls_fhem.txt'; my $cf = 'controls_fhem.txt';
my $filename = (-e "./$cf") ? "./$cf" : AttrVal("global","modpath",".")."/FHEM/$cf"; my $filename = (-e "./$cf") ? "./$cf" : AttrVal("global","modpath",".")."/FHEM/$cf";
my ($err, @content) = FileRead({FileName => $filename, ForceType => "file"}); my ($err, @content) = FileRead({FileName => $filename, ForceType => "file"});
@ -251,7 +251,7 @@ sub _fi2_findRev() {
return $rev; return $rev;
} }
sub _fi2_zwave($) { sub _fi2_zwave {
my ($zwave) = @_; my ($zwave) = @_;
local *getVal = sub { return $_[0] =~ m/$_[1]\s*=\s*"([^"]*)"/ ? $1 : "unknown" }; local *getVal = sub { return $_[0] =~ m/$_[1]\s*=\s*"([^"]*)"/ ? $1 : "unknown" };
@ -288,7 +288,7 @@ sub _fi2_zwave($) {
return $zwave; return $zwave;
} }
sub _fi2_shortId() { sub _fi2_shortId {
return substr($fhemInfo{$c_system}{'uniqueID'},0,3)."..."; return substr($fhemInfo{$c_system}{'uniqueID'},0,3)."...";
} }