diff --git a/src/webui/www/api/methods.conf b/src/webui/www/api/methods.conf index 6e3e27bf..b5bffa71 100644 --- a/src/webui/www/api/methods.conf +++ b/src/webui/www/api/methods.conf @@ -1235,20 +1235,6 @@ User.setLanguage { ARGUMENTS {_session_id_ userName userLang} } -User.getReGaVersion { - LEVEL NONE - SCRIPT_FILE user/getregaversion.tcl - INFO {Ermittelt die gewählte ReGaVersion} - ARGUMENTS {} -} - -User.setReGaVersion { - LEVEL USER - SCRIPT_FILE user/setregaversion.tcl - INFO {Speichert die gewählte ReGaVersion} - ARGUMENTS {_session_id_ ReGaVersion} -} - User.existsCertificate { LEVEL ADMIN SCRIPT_FILE user/existscertificate.tcl diff --git a/src/webui/www/api/methods/user/getregaversion.tcl b/src/webui/www/api/methods/user/getregaversion.tcl deleted file mode 100644 index 743f0ae0..00000000 --- a/src/webui/www/api/methods/user/getregaversion.tcl +++ /dev/null @@ -1,26 +0,0 @@ -## -# User.getReGaVersion -# Ermittelt die gewählte ReGaVersion -# -# Parameter: kein -# -# Rückgabewert: Gewählte ReGaVersion -## - - set defaultVersion "COMMUNITY" - - if {[catch {set fp [open "/etc/config/ReGaHssVersion" r]}] == 0} { - set data [read $fp] - set version [split $data "\n"] - close $fp - } else { - set version $defaultVersion - } - - set version [lindex $version 0] - - if {[string equal $version LEGACY]} { - set version $defaultVersion - } - - jsonrpc_response [json_toString $version] diff --git a/src/webui/www/api/methods/user/setregaversion.tcl b/src/webui/www/api/methods/user/setregaversion.tcl deleted file mode 100644 index 3344dcf4..00000000 --- a/src/webui/www/api/methods/user/setregaversion.tcl +++ /dev/null @@ -1,13 +0,0 @@ -## -# User.setReGaVersion -# Speichert die gewählte ReGaVersion -# -# Parameter: -# ReGaVersion: [string] ReGa Version -# -# Rückgabewert: kein -## - -exec echo $args(ReGaVersion) > /etc/config/ReGaHssVersion - -jsonrpc_response "" diff --git a/src/webui/www/config/cp_maintenance.cgi b/src/webui/www/config/cp_maintenance.cgi index 1dd4a316..f38b744e 100644 --- a/src/webui/www/config/cp_maintenance.cgi +++ b/src/webui/www/config/cp_maintenance.cgi @@ -539,85 +539,6 @@ proc action_put_page {} { } } - # Version Logikschicht - table_row {class="CLASS20902 j_noForcedUpdate j_fwUpdateOnly"} { - - table_data {class="CLASS20903"} $styleMaxWidth { - puts "\${lblTDRegaVersion}" - } - - table_data {class="CLASS20904"} { - - table {class="CLASS20909"} { - table_row { - table_data { - puts "\${dialogHelpInfoLblVersion}" - } - table_data {align="left"} { - puts "" - } - } - - table_row { - table_data {} - table_data {align="left"} { - division {class="popupControls CLASS20905"} { - division {class="CLASS20919"} {style="margin-top:10px; margin-left:0px;"} {onClick="saveRegaVersion(this);"} { - puts "\${btnSave}" - } - } - } - } - } - } - - table_data {align="left"} {class="CLASS20904"} { - # division {Class="StdTableBtnHelp"} {puts ""} - division {Class="StdTableBtnHelp"} {puts "\${lblTDReGaVersionHelp}"} - } - } - - cgi_javascript { - puts "var url = \"$env(SCRIPT_NAME)?sid=\" + SessionId;" - puts { - - jQuery("#showReGaVersionHelp").click(function() { - MessageBox.show(translateKey("tooltipHelp"), translateKey("lblTDReGaVersionHelp"), "", 600, 250); - }); - - homematic("User.getReGaVersion",{}, function(result) { - if (result) { - jQuery("#selectedReGaVersion").val(result); - } else { - jQuery("#selectedReGaVersion").val("NORMAL"); - } - }); - - saveRegaVersion = function(elm) { - jQuery(elm).css({"border-width" : "2px"}); - var selectedReGa = jQuery("#selectedReGaVersion").val(); - homematic("User.setReGaVersion", {"ReGaVersion": selectedReGa}, function() { - jQuery(elm).css({"border-width" : "1px"}); - - var dlgYesNo = new YesNoDialog(translateKey("dialogPerformRebootTitle"), translateKey("dialogRestart2ChanceReGaVersion"), function(result) { - if (result == YesNoDialog.RESULT_YES) - { - dlgPopup.hide(); - dlgPopup.setWidth(400); - dlgPopup.LoadFromFile(url, "action=reboot_confirm"); - } - }); - dlgYesNo.btnTextYes(translateKey("dialogBtnPerformRestart")); - dlgYesNo.btnTextNo(translateKey("dialogBtnPerformLaterRestart")); - }); - } - } - } - table_row {class="CLASS20902 j_noForcedUpdate j_fwUpdateOnly"} { table_data {class="CLASS20903"} $styleMaxWidth { #puts "Fehler-
" diff --git a/src/webui/www/webui/js/lang/de/translate.lang.extension.js b/src/webui/www/webui/js/lang/de/translate.lang.extension.js index c7bf8a68..42b1e890 100644 --- a/src/webui/www/webui/js/lang/de/translate.lang.extension.js +++ b/src/webui/www/webui/js/lang/de/translate.lang.extension.js @@ -726,7 +726,6 @@ jQuery.extend(true,langJSON, { "btnPresenceDetectionFalse" : "Pr%E4senzerkennung einschalten", "btnPresenceDetectionTrue" : "Pr%E4senzerkennung ausschalten", "btnResetPresence" : "Reset Status", - "dialogRestart2ChanceReGaVersion" : "Damit die %C4nderung der Logikschicht-Version wirksam wird, muss die " +HMIdentifier.de.CCUShortName + " neu gestartet werden.", "dialogBtnPerformLaterRestart" : "Sp%E4ter", "dialogLblAckSecurityHint" : "Ich habe die obige Warnung gelesen!", "btnNext" : "Weiter", diff --git a/src/webui/www/webui/js/lang/de/translate.lang.help.js b/src/webui/www/webui/js/lang/de/translate.lang.help.js index 1f13a14e..b99dd68b 100644 --- a/src/webui/www/webui/js/lang/de/translate.lang.help.js +++ b/src/webui/www/webui/js/lang/de/translate.lang.help.js @@ -25,7 +25,6 @@ jQuery.extend(true, langJSON, { "
Diese Einstellung hat nur Auswirkungen auf große Zeitr%E4ume (Woche/Monat/Jahr)
", "helpOsramLightify" : "Hier stellen Sie die Kopplung zwischen "+HMIdentifier.de.CCUShortName+" und OSRAM-Lightify her. Mehr Informationen finden Sie hier:", "helpPhilipsHue" : "Hier stellen Sie die Kopplung zwischen "+HMIdentifier.de.CCUShortName+" und Philips-Hue her. Mehr Informationen finden Sie hier:", - "lblTDReGaVersionHelp" : "Hier k%F6nnen Sie festlegen, welche Version der Logikschicht in der CCU verwendet werden soll. Wechseln Sie zur Version Kompatibilit%E4tsmodus, wenn Sie Probleme mit %E4lteren Homematic Skripten haben.", "helpPartyModeWithinPrograms" : "Wenn Sie den Urlaubsmodus w%E4hlen, m%FCssen Sie zus%E4tzlich folgende Parameter setzen:", "dialogSettingsCMHintSoftwareUpdate3a" : "Bringen Sie eventuell installierte Zusatzmodule vor dem Update auf die aktuelle Version!", diff --git a/src/webui/www/webui/js/lang/de/translate.lang.label.js b/src/webui/www/webui/js/lang/de/translate.lang.label.js index 746a93f1..d97c0b44 100644 --- a/src/webui/www/webui/js/lang/de/translate.lang.label.js +++ b/src/webui/www/webui/js/lang/de/translate.lang.label.js @@ -309,7 +309,6 @@ jQuery.extend(true,langJSON, { "lblSysConfCoupling1" : "DESCRIPTION", "lblSysConfSetPowerCost" : "Energiekostenverwaltung", "lblSystemKey" : "Systemtaste", - "lblTDRegaVersion" : "Logikschicht
Version", "lblTeachInKEY" : "KEY", "lblTeachInSGTIN" : "SGTIN", "lblText" : "Text", diff --git a/src/webui/www/webui/js/lang/de/translate.lang.option.js b/src/webui/www/webui/js/lang/de/translate.lang.option.js index cec594bf..0429bca4 100644 --- a/src/webui/www/webui/js/lang/de/translate.lang.option.js +++ b/src/webui/www/webui/js/lang/de/translate.lang.option.js @@ -100,9 +100,6 @@ jQuery.extend(true, langJSON, { "optionRGBWControllerPrg6" : "TV-Simulation", "optionRadiator" : "Radiator", "optionRainbow" : "Regenbogen", - "optionReGaCOMMUNITY" : "Standard", - "optionReGaLEGACY" : "Legacy", - "optionReGaNORMAL" : "Kompatibilit%E4tsmodus", "optionRelayInactive" : "Ger%E4t nicht aktiv", "optionRelayOffDelay05S" : "Standby nach 0,5 s.", "optionRelayOffDelay10S" : "Standby nach 10 s.", diff --git a/src/webui/www/webui/js/lang/en/translate.lang.extension.js b/src/webui/www/webui/js/lang/en/translate.lang.extension.js index 37552a77..b05a850e 100644 --- a/src/webui/www/webui/js/lang/en/translate.lang.extension.js +++ b/src/webui/www/webui/js/lang/en/translate.lang.extension.js @@ -724,7 +724,6 @@ jQuery.extend(true, langJSON, { "btnPresenceDetectionFalse" : "Switch on presence detection", "btnPresenceDetectionTrue" : "Switch off presence detection", "btnResetPresence" : "Reset status", - "dialogRestart2ChanceReGaVersion" : "For the change of the logic tier version to apply, the " +HMIdentifier.en.CCUShortName + " must be restarted.", "dialogBtnPerformLaterRestart" : "Later", "dialogLblAckSecurityHint" : "I have read the above warning", "btnNext" : "Next", diff --git a/src/webui/www/webui/js/lang/en/translate.lang.help.js b/src/webui/www/webui/js/lang/en/translate.lang.help.js index b0e09174..dd882681 100644 --- a/src/webui/www/webui/js/lang/en/translate.lang.help.js +++ b/src/webui/www/webui/js/lang/en/translate.lang.help.js @@ -26,7 +26,6 @@ jQuery.extend(true, langJSON, { "helpOsramLightify" : "You can create the pairing between the "+HMIdentifier.en.CCUShortName+" and OSRAM Lightify here. Please find further information here:", "helpPhilipsHue" : "You can create the pairing between the "+HMIdentifier.en.CCUShortName+" and Philips Hue here. Please find further information here:", - "lblTDReGaVersionHelp" : "Here you can define, which logic layer version of the CCU should be used. You can change to Compatibility mode if you have problems with older Homematic scripts.", "helpPartyModeWithinPrograms" : "If you select the holiday mode, you have to set the following parameters as well:", "dialogSettingsCMHintSoftwareUpdate3a" : "Update any additional modules installed to the latest version before installation of the update!", diff --git a/src/webui/www/webui/js/lang/en/translate.lang.label.js b/src/webui/www/webui/js/lang/en/translate.lang.label.js index f440a6de..4181a372 100644 --- a/src/webui/www/webui/js/lang/en/translate.lang.label.js +++ b/src/webui/www/webui/js/lang/en/translate.lang.label.js @@ -309,7 +309,6 @@ jQuery.extend(true,langJSON, { "lblSysConfCoupling1" : "DESCRIPTION", "lblSysConfSetPowerCost" : "Set the price per kWh", "lblSystemKey" : "System button", - "lblTDRegaVersion" : "Logic tier
version", "lblTeachInKEY" : "KEY", "lblTeachInSGTIN" : "SGTIN", "lblText" : "Text", diff --git a/src/webui/www/webui/js/lang/en/translate.lang.option.js b/src/webui/www/webui/js/lang/en/translate.lang.option.js index e947aa70..d83415a3 100644 --- a/src/webui/www/webui/js/lang/en/translate.lang.option.js +++ b/src/webui/www/webui/js/lang/en/translate.lang.option.js @@ -100,9 +100,6 @@ jQuery.extend(true, langJSON, { "optionRGBWControllerPrg6" : "TV simulation", "optionRadiator" : "Radiator", "optionRainbow" : "Rainbow", - "optionReGaCOMMUNITY" : "Standard", - "optionReGaLEGACY" : "Legacy", - "optionReGaNORMAL" : "Compatibility mode", "optionRelayInactive" : "Device not active", "optionRelayOffDelay05S" : "Standby after 0,5 s.", "optionRelayOffDelay10S" : "Standby after 10 s.",