mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-03-03 16:56:54 +00:00
:for debug only
git-svn-id: https://svn.fhem.de/fhem/trunk@18722 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
7ef6cd70d5
commit
a5c3b8fa9c
@ -1718,7 +1718,6 @@ sub Calendar_Define($$) {
|
|||||||
my $url = $a[4];
|
my $url = $a[4];
|
||||||
|
|
||||||
$url =~ /(^https?:\/\/)(.*:.*@)?(.*)/;
|
$url =~ /(^https?:\/\/)(.*:.*@)?(.*)/;
|
||||||
#$1 = https:// $2 = user:password@ $3 = url
|
|
||||||
if($2) {
|
if($2) {
|
||||||
# credentials found in url, store them in keystore
|
# credentials found in url, store them in keystore
|
||||||
setKeyValue($name,$2);
|
setKeyValue($name,$2);
|
||||||
@ -1726,15 +1725,11 @@ sub Calendar_Define($$) {
|
|||||||
$hash->{DEF} = "$a[2] $a[3] $url";
|
$hash->{DEF} = "$a[2] $a[3] $url";
|
||||||
}
|
}
|
||||||
|
|
||||||
$url =~ /(^https?:\/\/.*google.*)(\/private-.*\/)(.*)/;
|
$url =~ /(^https?:\/\/.*google.*\/)(private-.*)(\/.*)/;
|
||||||
#$1 = https:// $2 = /private-.*/ $3 = url
|
|
||||||
if($2) {
|
if($2) {
|
||||||
# private key found in url, store them in keystore
|
# private key found in url, store it in keystore
|
||||||
$url = $1.'/credentials@/'.$3;
|
setKeyValue($name,$2);
|
||||||
my $cred = $2;
|
$url = $1.'credentials@'.$3;
|
||||||
$cred =~ s/^\/|\/$//g;
|
|
||||||
Debug $cred;
|
|
||||||
setKeyValue($name,$cred);
|
|
||||||
$hash->{DEF} = "$a[2] $a[3] $url";
|
$hash->{DEF} = "$a[2] $a[3] $url";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user