- update to CCU3 3.38.8 version

- some code cleanup (WebUI)

WebUI/www/api/methods/user/restartlighttpd.tcl

@@ -7,7 +7,8 @@
 #
 # Rückgabewert: true
 
+exec -- /usr/bin/nohup /etc/init.d/S50lighttpd restart >/dev/null
 
-exec /etc/init.d/S50lighttpd restart
+#exec /etc/init.d/S50lighttpd restart
 
-jsonrpc_response true
+jsonrpc_response true

WebUI/www/config/cp_maintenance.cgi

@@ -561,9 +561,9 @@ proc action_put_page {} {
         }
         }
 
-        table_data {align="center"} {class="CLASS20904"} {
-        # puts "\${lblTDReGaVersionHelp}"
-        division {Class="StdTableBtnHelp"} {puts "<img id='showReGaVersionHelp' src='/ise/img/help.png'>"}
+        table_data {align="left"} {class="CLASS20904"} {
+        # division {Class="StdTableBtnHelp"} {puts "<img id='showReGaVersionHelp' src='/ise/img/help.png'>"}
+        division {Class="StdTableBtnHelp"} {puts "\${lblTDReGaVersionHelp}"}
         }
       }
 

WebUI/www/config/cp_security.cgi

@@ -499,13 +499,15 @@ proc action_backup_restore_go {} {
         # check the entered key against our current system key
         if { [catch {exec crypttool -v -t 3 -k "$key"}]} {
             #Der eingegebene System-Sicherheitsschlüssel entspricht nicht dem aktuellen System-Sicherheitsschlüssel der Zentrale.
+            cgi_javascript {puts "MessageBox.close();"}
             put_message "\${dialogSettingsSecurityMessageSysBackupSecurityErrorTitle}" "\${dialogSettingsSecurityMessageSysBackupSecurityError1Content}"
             return
         }
     }
     if { $config_has_user_key } {
         if { "$stored_signature" != "[exec crypttool -t 3 -k "$key" -s <usr_local.tar.gz]" } {
             # Der eingegebene System-Sicherheitsschl&uuml;ssel entspricht nicht dem zur Backup-Datei geh&ouml;renden System-Sicherheitsschl&uuml;ssel.
+            cgi_javascript {puts "MessageBox.close();"}
             put_message "\${dialogSettingsSecurityMessageSysBackupSecurityErrorTitle}" "\${dialogSettingsSecurityMessageSysBackupSecurityError2Content}"
             return
         }
@@ -515,7 +517,7 @@ proc action_backup_restore_go {} {
         # set msg "Das Einspielen des Backups ist nicht m&ouml;glich. Das vorliegende Backup basiert auf der Zentralen-Firmware $config_version.<br>\n"
         # append msg "Diese Firmware ist aktueller, als die derzeit auf der Zentrale installierte Version ($system_version).<br>\n"
         # append msg "F&uuml;hren Sie zun&auml;chst ein Update der Zentralen-Firmware durch und starten Sie dann das Einspielen des Systembackups erneut."
-
+        cgi_javascript {puts "MessageBox.close();"}
         put_message "\${dialogSettingsSecurityMessageSysBackupFWUpdateNecessaryTitle}" "\${dialogSettingsSecurityMessageSysBackupFWUpdateNecessaryContentA} $config_version \${dialogSettingsSecurityMessageSysBackupFWUpdateNecessaryContentB} ($system_version) \${dialogSettingsSecurityMessageSysBackupFWUpdateNecessaryContentC}"
         return
     }
@@ -713,8 +715,16 @@ proc action_backup_restore_go {} {
     cd /
   }
 
-  # Check if the backup can be used without problems
-  if {[file exists /etc/config/crRFD]} {
+
+  set source_version [read_version "/tmp/firmware_version"]
+
+  set source_version [split $source_version .]
+  set source_major [lindex $source_version 0]
+  set source_minor [lindex $source_version 1]
+  set source_patch [lindex $source_version 2]
+
+  # Check if a backup with HmIP support can be used without problems - A CCU with a version < 2.17.14 had no HmIP support. Therefore we don't check such backups
+  if {($source_major >= 3) || (($source_major == 2)  && ($source_minor > 17)) || (($source_major == 2) && ($source_minor == 17) && ($source_patch >= 14))} {
     set checkBackupState [checkUserBackupValidility $migration_mode]
     if {$checkBackupState != 10} {
       # It's not possible to use the backup
@@ -724,9 +734,8 @@ proc action_backup_restore_go {} {
       cgi_javascript {puts "homematic('User.restartHmIPServer');"}
       put_message "\${dialogSettingsSecurityMessageSysBackupErrorTitle}" "\${dialogSettingsSecurityMessageSysBackupErrorContent} [getBackupErrorMessage $checkBackupState]"
     }
-
-    cgi_javascript {puts "MessageBox.close();"}
   }
+  cgi_javascript {puts "MessageBox.close();"}
 
   if { "false" == $backuperror } {
         exec mount -o remount,ro /usr/local

WebUI/www/config/cp_software.cgi

@@ -253,7 +253,7 @@ proc action_put_page {} {
                     if { ! [file executable $s] } continue
                     array set sw_info ""
                     get_info $s sw_info
-                    if { ![info exists sw_info(Name) ] } continue
+                    if { ![info exists sw_info(Name)] } continue
                     table_row {class="CLASS21407"} {
                         table_data {class="CLASS21408"} {
                             puts "$sw_info(Name)"

WebUI/www/config/easymodes/DIMMER_VIRTUAL_RECEIVER/KEY_TRANSCEIVER.tcl

@@ -512,6 +512,12 @@ proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
   # RAMPOFF_TIME
   append HTML_PARAMS(separate_$prn) "[getTimeSelector RAMPOFF_TIME_FACTOR_DESCR ps PROFILE_$prn rampOnOff $prn $special_input_id SHORT_RAMPOFF_TIME TIMEBASE_LONG]"
 
+  set param SHORT_OUTPUT_BEHAVIOUR
+  if {[info exists ps($param)] == 1} {
+    incr pref
+    append HTML_PARAMS(separate_$prn) [getSelectColorElement PROFILE_$prn ${special_input_id} $param]
+  }
+
   if {$longKeypressAvailable} {
     incr pref
     append HTML_PARAMS(separate_$prn) "<td colspan =\"2\"><hr>\${description_longkey}</td>"

WebUI/www/config/easymodes/SWITCH_VIRTUAL_RECEIVER/HEATING_CLIMATECONTROL_SWITCH_TRANSMITTER.tcl

@@ -72,17 +72,14 @@ set PROFILE_2(UI_HINT)  2
 
 set PROFILE_3(SHORT_COND_VALUE_HI)          150
 set PROFILE_3(SHORT_COND_VALUE_LO)           50
-
-set PROFILE_3(SHORT_CT_OFF)       0
-set PROFILE_3(SHORT_CT_OFFDELAY)  0
-set PROFILE_3(SHORT_CT_ON)        2
-set PROFILE_3(SHORT_CT_ONDELAY)   2
-
-set PROFILE_3(SHORT_JT_OFF)      1
-set PROFILE_3(SHORT_JT_OFFDELAY)  3
-set PROFILE_3(SHORT_JT_ON)      4
-set PROFILE_3(SHORT_JT_ONDELAY)   6
-
+set PROFILE_3(SHORT_CT_OFF)                   1
+set PROFILE_3(SHORT_CT_OFFDELAY)              1
+set PROFILE_3(SHORT_CT_ON)                    1
+set PROFILE_3(SHORT_CT_ONDELAY)               2
+set PROFILE_3(SHORT_JT_OFF)                   3
+set PROFILE_3(SHORT_JT_OFFDELAY)              3
+set PROFILE_3(SHORT_JT_ON)                    3
+set PROFILE_3(SHORT_JT_ONDELAY)               6
 set PROFILE_3(SHORT_OFFDELAY_TIME_BASE)       {0 range 0 - 7}
 set PROFILE_3(SHORT_OFFDELAY_TIME_FACTOR)     {0 range 0 - 31}
 set PROFILE_3(SHORT_OFF_TIME_BASE)            {7 range 0 - 7}