update to 3.45.7

eq-3 · Apr 19, 2019 · 970c1f4 · 970c1f4
1 parent 170982c
commit 970c1f4
Show file tree

Hide file tree

Showing 201 changed files with 4,921 additions and 1,332 deletions.
diff --git a/HMserver/opt/HMServer/HMIPServer.jar b/HMserver/opt/HMServer/HMIPServer.jar
diff --git a/HMserver/opt/HMServer/HMServer.jar b/HMserver/opt/HMServer/HMServer.jar
diff --git a/WebUI/www/api/methods.conf b/WebUI/www/api/methods.conf
@@ -1072,50 +1072,50 @@ BidCoS.changeLanGatewayKey {
   ARGUMENTS {_session_id_ lgwclass lgwserial lgwip newkey curkey}
 }
 User.getUserFirstName {
-        LEVEL NONE
+        LEVEL USER
         SCRIPT_FILE user/getuserfirstname.tcl
         INFO {Gibt den Username zur�ck}
         ARGUMENTS {_session_id_ userID}
 }
 
 User.getUserName {
-        LEVEL NONE
+        LEVEL USER
         SCRIPT_FILE user/getusername.tcl
         INFO {Gibt den Username zur�ck}
         ARGUMENTS {_session_id_ userID}
 }
 
 User.getUserPWD {
-        LEVEL NONE
+        LEVEL USER
         SCRIPT_FILE user/getuserpwd.tcl
         INFO {Gibt UserPWD zur�ck}
         ARGUMENTS {_session_id_ userID}
 }
 
 User.setUserPWD {
-        LEVEL NONE
+        LEVEL USER
         SCRIPT_FILE user/setuserpwd.tcl
         INFO {Setzt das User Passwort}
         ARGUMENTS {_session_id_ userID pwd}
 }
 
 User.isNoExpert {
-        LEVEL NONE
+        LEVEL USER
         SCRIPT_FILE user/isnoexpert.tcl
         INFO {Ermittelt, ob ein Benutzer Experte ist}
         ARGUMENTS {_session_id_ id}
 }
 User.getLanguage {
-        LEVEL NONE 
+        LEVEL USER
         SCRIPT_FILE user/getlanguage.tcl
         INFO {Ermittelt die gew�hlte Sprache des Benutzers}
-        ARGUMENTS {userID}
+        ARGUMENTS {_session_id_ userID}
 }
 User.setLanguage {
-        LEVEL NONE 
+        LEVEL USER 
         SCRIPT_FILE user/setlanguage.tcl
         INFO {Setzt die gew�hlte Sprache des Benutzers}
-        ARGUMENTS {userName userLang}
+        ARGUMENTS {_session_id_ userName userLang}
 }
 
 User.getReGaVersion {
@@ -1126,10 +1126,10 @@ User.getReGaVersion {
 }
 
 User.setReGaVersion {
-        LEVEL NONE
+        LEVEL USER
         SCRIPT_FILE user/setregaversion.tcl
         INFO {Speichert die gew�hlte ReGaVersion}
-        ARGUMENTS {ReGaVersion}
+        ARGUMENTS {_session_id_ ReGaVersion}
 }
 
 User.existsCertificate {
@@ -1159,16 +1159,3 @@ User.restartHmIPServer {
         INFO {Restartet den HmIPServer}
         ARGUMENTS {_session_id_}
 }
-
-Diagram.getDiagrams {
-        LEVEL NONE
-        SCRIPT_FILE diagram/getDiagrams.tcl
-        INFO {Ermittelt die zur Verf�gung stehenden Messwert-Diagramme}
-        ARGUMENTS {}
-}
-Diagram.getDataSourceGroups {
-        LEVEL NONE
-        SCRIPT_FILE diagram/getDataSourceGroups.tcl
-        INFO {Ermittelt alle bekannten Gruppen von Datenquellen}
-        ARGUMENTS {}
-}
diff --git a/WebUI/www/config/control_panel.cgi b/WebUI/www/config/control_panel.cgi
@@ -118,35 +118,47 @@ if {![isOldCCU]} {
     <tr>
   }
 }
-puts {
-    <!-- Firewall Konfiguration -->
+
+
+if {[getProduct] >= 3} {
+  puts {
     <td>
       <div class="cpButton">
         <div class="StdTableBtn CLASS21701" onclick="new FirewallConfigDialog();">${btnSysConfFirewallConfig}</div>
         <div class="StdTableBtnHelp"><img id="newFirewallConfigDialogHelp" src="/ise/img/help.png"></div>
       </div>
     </td>
-
-    <!-- BidCoS-RF Konfiguration -->
+  }
+} else {
+  puts {
     <td>
+      <div class="cpButton">
+        <div class="StdTableBtn CLASS21701" onclick="new FirewallConfigDialog_CCU2();">${btnSysConfFirewallConfig}</div>
+        <div class="StdTableBtnHelp"><img id="newFirewallConfigDialogHelp" src="/ise/img/help.png"></div>
+      </div>
+    </td>
+  }
 }
+
 if {[isOldCCU]} {
   puts {
-        <div class="StdTableBtn CLASS21701" onclick="ConfigData.check(function() { WebUI.enter(BidcosRfPage); });">${btnSysConfBidCosConfig}</div>
-        <ul>
-          <li>${lblSysConfBidCosConfig1}</li> <!-- interne Antenne konfigurieren -->
-          <li>${lblSysConfBidCosConfig2}</li> <!-- HomeMatic Funk-LAN-Gateways verwalten -->
-        </ul>
+    <td>
+      <div class="StdTableBtn CLASS21701" onclick="ConfigData.check(function() { WebUI.enter(BidcosRfPage); });">${btnSysConfBidCosConfig}</div>
+      <ul>
+        <li>${lblSysConfBidCosConfig1}</li> <!-- interne Antenne konfigurieren -->
+        <li>${lblSysConfBidCosConfig2}</li> <!-- HomeMatic Funk-LAN-Gateways verwalten -->
+      </ul>
   }
 } else {
   puts {
-        <div class="cpButton">
-          <div class="StdTableBtn CLASS21701" onclick="ConfigData.check(function() { WebUI.enter(BidcosRfPage); });">${btnSysConfLANGateway}</div>
+    <td>
+      <div class="cpButton">
+        <div class="StdTableBtn CLASS21701" onclick="ConfigData.check(function() { WebUI.enter(BidcosRfPage); });">${btnSysConfLANGateway}</div>
   }
 }
 
   puts {
-    <div class="StdTableBtnHelp"><img id="showBidCosConfigHelp" src="/ise/img/help.png"></div>
+        <div class="StdTableBtnHelp"><img id="showBidCosConfigHelp" src="/ise/img/help.png"></div>
       </div>
     </td>
 
@@ -209,6 +221,16 @@ if { "[read_var /etc/config/tweaks CP_DEVCONFIG]" != "" } {
   puts "<div class=\"StdTableBtn CLASS21701\" onclick=\"window.open('/tools/devconfig.cgi?sid=$sid');\">devconfig</div>"
   puts "<div class=\"StdTableBtnHelp\"></div></td>"
   incr i
+
+  if { $i == $COL_COUNT } {
+    puts {
+      <td class="_CLASS21702"></td>
+      </tr>
+      <tr>
+    }
+    set i 0
+  }
+
 }
 
 array set addons [::HomeMatic::Addon::GetAll]

diff --git a/WebUI/www/config/cp_maintenance.cgi b/WebUI/www/config/cp_maintenance.cgi
@@ -1140,6 +1140,7 @@ proc action_reboot {} {
   catch { exec lcdtool {Saving   Data...  } }
   rega system.Save()
   catch { exec lcdtool {Reboot...       } }
+  exec sleep 5
   exec /sbin/reboot
 }
 proc action_shutdown {} {

diff --git a/WebUI/www/config/devdescr/DEVDB.tcl b/WebUI/www/config/devdescr/DEVDB.tcl
diff --git a/...easymodes/ACOUSTIC_SIGNAL_VIRTUAL_RECEIVER/localization/de/MOTIONDETECTOR_TRANSCEIVER.txt b/...easymodes/ACOUSTIC_SIGNAL_VIRTUAL_RECEIVER/localization/de/MOTIONDETECTOR_TRANSCEIVER.txt
@@ -1,3 +1,3 @@
 "description_1" : "<span class=\"translated\">Beim Ausl&ouml;sen des Sensors wird die gew&auml;hlte MP3-Datei abwechselnd abgespielt und beendet (Toggle-Funktion).</span><br/><br/>",
 "description_2" : "<span class=\"translated\">Beim Ausl&ouml;sen des Sensors wird die gew&auml;hlte MP3-Datei f&uuml;r die festgelegte Zeit eingeschaltet.</span><br/><br/>",
-"description_3" : "<span class=\"translated\">Der Bewegungsmelder ist nicht aktiv</span>",
+"description_3" : "<span class=\"translated\">Das Profil ist nicht aktiv</span>",
diff --git a/...symodes/ACOUSTIC_SIGNAL_VIRTUAL_RECEIVER/localization/de/PRESENCEDETECTOR_TRANSCEIVER.txt b/...symodes/ACOUSTIC_SIGNAL_VIRTUAL_RECEIVER/localization/de/PRESENCEDETECTOR_TRANSCEIVER.txt
@@ -1,3 +1,3 @@
 "description_1" : "<span class=\"translated\">Beim Ausl&ouml;sen des Sensors wird die gew&auml;hlte MP3-Datei abwechselnd abgespielt und beendet (Toggle-Funktion).</span><br/><br/>",
 "description_2" : "<span class=\"translated\">Beim Ausl&ouml;sen des Sensors wird die gew&auml;hlte MP3-Datei f&uuml;r die festgelegte Zeit eingeschaltet.</span><br/><br/>",
-"description_3" : "<span class=\"translated\">Der Bewegungsmelder ist nicht aktiv</span>",
+"description_3" : "<span class=\"translated\">Das Profil ist nicht aktiv</span>",
diff --git a/...easymodes/ACOUSTIC_SIGNAL_VIRTUAL_RECEIVER/localization/en/MOTIONDETECTOR_TRANSCEIVER.txt b/...easymodes/ACOUSTIC_SIGNAL_VIRTUAL_RECEIVER/localization/en/MOTIONDETECTOR_TRANSCEIVER.txt
@@ -1,4 +1,4 @@
 "description_1" : "<span class=\"translated\">When the sensor is triggered, the selected MP3 file is played and stopped in turn (toggle function).</span><br/><br/>",
 "description_2" : "<span class=\"translated\">When the sensor is triggered, the selected MP3 file is switched on for the defined time.</span><br/><br/>",
-"description_3" : "<span class=\"translated\">The motion detector is not active.</span><br/><br/>",
+"description_3" : "<span class=\"translated\">The profile is not active.</span><br/><br/>",
 
diff --git a/...symodes/ACOUSTIC_SIGNAL_VIRTUAL_RECEIVER/localization/en/PRESENCEDETECTOR_TRANSCEIVER.txt b/...symodes/ACOUSTIC_SIGNAL_VIRTUAL_RECEIVER/localization/en/PRESENCEDETECTOR_TRANSCEIVER.txt
@@ -1,3 +1,3 @@
 "description_1" : "<span class=\"translated\">When the sensor is triggered, the selected MP3 file is played and stopped in turn (toggle function).</span><br/><br/>",
 "description_2" : "<span class=\"translated\">When the sensor is triggered, the selected MP3 file is switched on for the defined time.</span><br/><br/>",
-"description_3" : "<span class=\"translated\">The motion detector is not active.</span><br/><br/>",
+"description_3" : "<span class=\"translated\">The profile is not active.</span><br/><br/>",
diff --git a/WebUI/www/config/easymodes/ACTOR_SECURITY/KEY.tcl b/WebUI/www/config/easymodes/ACTOR_SECURITY/KEY.tcl
@@ -4,78 +4,78 @@ source [file join $env(DOCUMENT_ROOT) config/easymodes/em_common.tcl]
 source [file join $env(DOCUMENT_ROOT) config/easymodes/EnterFreeValue.tcl]
 source [file join $env(DOCUMENT_ROOT) config/easymodes/etc/options.tcl]
 
-set PROFILES_MAP(0)	"\${expert}"
-set PROFILES_MAP(1)	"\${security_on}"
-set PROFILES_MAP(2)	"\${security_off}"
-set PROFILES_MAP(3)	"\${security_toggle}"
-set PROFILES_MAP(4)	"\${no_action}"
+set PROFILES_MAP(0)  "\${expert}"
+set PROFILES_MAP(1)  "\${security_on}"
+set PROFILES_MAP(2)  "\${security_off}"
+set PROFILES_MAP(3)  "\${security_toggle}"
+set PROFILES_MAP(4)  "\${no_action}"
 
-set PROFILE_0(UI_HINT)	0
-set PROFILE_0(UI_DESCRIPTION)		"Expertenprofil"
-set PROFILE_0(UI_TEMPLATE)			"Expertenprofil"
+set PROFILE_0(UI_HINT)  0
+set PROFILE_0(UI_DESCRIPTION)    "Expertenprofil"
+set PROFILE_0(UI_TEMPLATE)      "Expertenprofil"
 
 
-set PROFILE_1(SHORT_JT_OFF)			  1
-set PROFILE_1(SHORT_JT_ON)			  1
-set PROFILE_1(SHORT_ON_TIME)			111600
-set PROFILE_1(UI_DESCRIPTION)	""
-set PROFILE_1(UI_TEMPLATE)		$PROFILE_1(UI_DESCRIPTION)
-set PROFILE_1(UI_HINT)	1
+set PROFILE_1(SHORT_JT_OFF)        1
+set PROFILE_1(SHORT_JT_ON)        1
+set PROFILE_1(SHORT_ON_TIME)      111600
+set PROFILE_1(UI_DESCRIPTION)  ""
+set PROFILE_1(UI_TEMPLATE)    $PROFILE_1(UI_DESCRIPTION)
+set PROFILE_1(UI_HINT)  1
 
-set PROFILE_2(SHORT_JT_OFF)			  2
-set PROFILE_2(SHORT_JT_ON)			  2
-set PROFILE_2(UI_DESCRIPTION)	""
-set PROFILE_2(UI_TEMPLATE)		$PROFILE_2(UI_DESCRIPTION)
-set PROFILE_2(UI_HINT)	2
+set PROFILE_2(SHORT_JT_OFF)        2
+set PROFILE_2(SHORT_JT_ON)        2
+set PROFILE_2(UI_DESCRIPTION)  ""
+set PROFILE_2(UI_TEMPLATE)    $PROFILE_2(UI_DESCRIPTION)
+set PROFILE_2(UI_HINT)  2
 
-set PROFILE_3(SHORT_JT_OFF)			  1
-set PROFILE_3(SHORT_JT_ON)			  2
-set PROFILE_3(SHORT_ON_TIME)			111600
-set PROFILE_3(UI_DESCRIPTION)	""
-set PROFILE_3(UI_TEMPLATE)		$PROFILE_3(UI_DESCRIPTION)
-set PROFILE_3(UI_HINT)	3
+set PROFILE_3(SHORT_JT_OFF)        1
+set PROFILE_3(SHORT_JT_ON)        2
+set PROFILE_3(SHORT_ON_TIME)      111600
+set PROFILE_3(UI_DESCRIPTION)  ""
+set PROFILE_3(UI_TEMPLATE)    $PROFILE_3(UI_DESCRIPTION)
+set PROFILE_3(UI_HINT)  3
 
-set PROFILE_4(SHORT_JT_OFF)			  0
-set PROFILE_4(SHORT_JT_ON)			  0
-set PROFILE_4(UI_DESCRIPTION)	""
-set PROFILE_4(UI_TEMPLATE)		$PROFILE_4(UI_DESCRIPTION)
-set PROFILE_4(UI_HINT)	4
+set PROFILE_4(SHORT_JT_OFF)        0
+set PROFILE_4(SHORT_JT_ON)        0
+set PROFILE_4(UI_DESCRIPTION)  ""
+set PROFILE_4(UI_TEMPLATE)    $PROFILE_4(UI_DESCRIPTION)
+set PROFILE_4(UI_HINT)  4
 
 proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
 
-	global dev_descr_sender dev_descr_receiver  
-	upvar PROFILES_MAP  PROFILES_MAP
-	upvar HTML_PARAMS   HTML_PARAMS
-	upvar PROFILE_PNAME PROFILE_PNAME
-	upvar $pps          ps      
-	upvar $pps_descr    ps_descr
-	
-	foreach pro [array names PROFILES_MAP] {
-		upvar PROFILE_$pro PROFILE_$pro
-	}
-	 		
-	set cur_profile [get_cur_profile2 ps PROFILES_MAP PROFILE_TMP $peer_type]
-	
-	#global SUBSETS
+  global dev_descr_sender dev_descr_receiver  
+  upvar PROFILES_MAP  PROFILES_MAP
+  upvar HTML_PARAMS   HTML_PARAMS
+  upvar PROFILE_PNAME PROFILE_PNAME
+  upvar $pps          ps      
+  upvar $pps_descr    ps_descr
+  
+  foreach pro [array names PROFILES_MAP] {
+    upvar PROFILE_$pro PROFILE_$pro
+  }
+       
+  set cur_profile [get_cur_profile2 ps PROFILES_MAP PROFILE_TMP $peer_type]
+  
+  #global SUBSETS
 
-#	die Texte der Platzhalter einlesen
-	puts "<script type=\"text/javascript\">getLangInfo('$dev_descr_sender(TYPE)', '$dev_descr_receiver(TYPE)');</script>"
-	set prn 0	
-	append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
-	append HTML_PARAMS(separate_$prn) [cmd_link_paramset2 $iface $address ps_descr ps "LINK" ${special_input_id}_$prn]
-	append HTML_PARAMS(separate_$prn) "</textarea></div>"
+#  die Texte der Platzhalter einlesen
+  puts "<script type=\"text/javascript\">getLangInfo('$dev_descr_sender(TYPE)', '$dev_descr_receiver(TYPE)');</script>"
+  set prn 0  
+  append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+  append HTML_PARAMS(separate_$prn) [cmd_link_paramset2 $iface $address ps_descr ps "LINK" ${special_input_id}_$prn]
+  append HTML_PARAMS(separate_$prn) "</textarea></div>"
 #1
-	incr prn
-	set pref 1
-	append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
-	append HTML_PARAMS(separate_$prn) "\${description_$prn}"
-	append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\" >"
-		append HTML_PARAMS(separate_$prn) "<tr><td>\${ON_TIME}</td><td>"
-  	option LENGTH_OF_STAY
-  	append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ON_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ON_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
-  	EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ON_TIME
-  	append HTML_PARAMS(separate_$prn) "</td></tr>"
-	append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
+  incr prn
+  set pref 1
+  append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+  append HTML_PARAMS(separate_$prn) "\${description_$prn}"
+  append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\" >"
+    append HTML_PARAMS(separate_$prn) "<tr><td>\${ON_TIME}</td><td>"
+    option LENGTH_OF_STAY
+    append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ON_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ON_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+    EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ON_TIME
+    append HTML_PARAMS(separate_$prn) "</td></tr>"
+  append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
 
 #2
   incr prn
@@ -90,18 +90,18 @@ proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
   append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
   append HTML_PARAMS(separate_$prn) "\${description_$prn}"
   append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\" >"
-		append HTML_PARAMS(separate_$prn) "<tr><td>\${ON_TIME}</td><td>"
-  	option LENGTH_OF_STAY
-  	append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ON_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ON_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
-  	EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ON_TIME
-  	append HTML_PARAMS(separate_$prn) "</td></tr>"
+    append HTML_PARAMS(separate_$prn) "<tr><td>\${ON_TIME}</td><td>"
+    option LENGTH_OF_STAY
+    append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ON_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ON_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+    EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ON_TIME
+    append HTML_PARAMS(separate_$prn) "</td></tr>"
   append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
 
 #4
-	incr prn
-	append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
-	append HTML_PARAMS(separate_$prn) "\${description_$prn}"
-	append HTML_PARAMS(separate_$prn) "</textarea></div>"
+  incr prn
+  append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+  append HTML_PARAMS(separate_$prn) "\${description_$prn}"
+  append HTML_PARAMS(separate_$prn) "</textarea></div>"
 }
 
 constructor