| '.$weekDay[$d].' | ';
foreach my $h (sort { $a <=> $b } keys %{$p->{ENDTIME}{$d}}) {
- $s .= ''.$p->{ENDTIME}{$d}{$h}.' / '.$p->{TEMPERATURE}{$d}{$h}.' | ';
+ $s .= ''.$p->{ENDTIME}{$d}{$h}.' / '.$p->{TEMPERATURE}{$d}{$h}.' | ';
last if ($p->{ENDTIME}{$d}{$h} eq '24:00');
}
$s .= '
';
@@ -9680,17 +9653,9 @@ sub HMCCU_BuildURL ($$)
my $name = $hash->{NAME};
my $url = '';
-
- my $username = '';
- my $password = '';
- my $authorization = '';
- my ($erruser, $encuser) = getKeyValue ($name.'_username');
- my ($errpass, $encpass) = getKeyValue ($name.'_password');
- if (!defined($erruser) && !defined($errpass) && defined($encuser) && defined($encpass)) {
- $username = HMCCU_Decrypt ($encuser);
- $password = HMCCU_Decrypt ($encpass);
- $authorization = encode_base64 ("$username:$password", '');
- }
+
+ my ($username, $password) = HMCCU_GetCredentials ($hash);
+ my $authorization = $username ne '' && $password ne '' ? encode_base64 ("$username:$password", '') : '';
if ($backend eq 'rega') {
$url = $hash->{prot}."://".$hash->{host}.':'.
@@ -10303,6 +10268,68 @@ sub HMCCU_MaxHashEntries ($$)
return \%result;
}
+######################################################################
+# Set or delete credentials
+#######################################################################
+
+sub HMCCU_SetCredentials ($@)
+{
+ my ($ioHashOrName, $key, $username, $password) = @_;
+ $key //= '_';
+
+ my $name = ref($ioHashOrName) eq 'HASH' ? $ioHashOrName->{NAME} : $ioHashOrName;
+ my $userkey = $name.$key.'username';
+ my $passkey = $name.$key.'password';
+ my $rc;
+
+ # Delete CCU credentials
+ if (!defined($username)) {
+ my ($erruser, $encuser) = getKeyValue ($userkey);
+ my ($errpass, $encpass) = getKeyValue ($passkey);
+ $rc = setKeyValue ($userkey, undef) if (!defined($erruser) && defined($encuser));
+ return $rc if (defined($rc));
+ $rc = setKeyValue ($passkey, undef) if (!defined($errpass) && defined($encpass));
+ return $rc if (defined($rc));
+ }
+ elsif (defined($password)) {
+ my $encuser = HMCCU_Encrypt ($username);
+ return 'Cannot encrypt username' if ($encuser eq '');
+ my $encpass = HMCCU_Encrypt ($password);
+ return 'Cannot encrypt password' if ($encpass eq '');
+ $rc = setKeyValue ($userkey, $encuser);
+ return $rc if (defined($rc));
+ $rc = setKeyValue ($passkey, $encpass);
+ return $rc if (defined($rc));
+ }
+ else {
+ return 'Missing password';
+ }
+
+ return undef;
+}
+
+######################################################################
+# Read credentials
+#######################################################################
+
+sub HMCCU_GetCredentials ($@)
+{
+ my ($ioHashOrName, $key) = @_;
+ $key //= '_';
+
+ my $name = ref($ioHashOrName) eq 'HASH' ? $ioHashOrName->{NAME} : $ioHashOrName;
+ my $userkey = $name.$key.'username';
+ my $passkey = $name.$key.'password';
+
+ my ($erruser, $encuser) = getKeyValue ($userkey);
+ my ($errpass, $encpass) = getKeyValue ($passkey);
+
+ my $username = defined($encuser) ? HMCCU_Decrypt ($encuser) : '';
+ my $password = defined($encpass) ? HMCCU_Decrypt ($encpass) : '';
+
+ return ($username, $password);
+}
+
1;
@@ -10365,9 +10392,9 @@ sub HMCCU_MaxHashEntries ($$)