-
-
Notifications
You must be signed in to change notification settings - Fork 187
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
bumped OCCU to 3.41.11-6 with latest ReGaHss R1.00.0388.0204 beta
version included and applied WebUI index.htm change
- Loading branch information
Showing
8 changed files
with
265 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
124 changes: 124 additions & 0 deletions
124
buildroot-external/patches/occu/0001-RaspberryMatic/occu/WebUI/www/rega/index.htm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,124 @@ | ||
| <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> | ||
| <html xmlns="http://www.w3.org/1999/xhtml"> | ||
| <head> | ||
|
|
||
| <meta http-equiv="Content-Language" content="de"> | ||
| <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> | ||
| <meta http-equiv="cache-control" content="no-cache"> | ||
| <meta http-equiv="pragma" content="no-cache"> | ||
| <!-- <meta http-equiv="expires" content="-1"> --> | ||
| <meta http-equiv="Expires" content="01 Jan 2015 00:00:00 GMT" /> | ||
|
|
||
| <% | ||
|
|
||
| string devtype = "pc"; | ||
| system.LoginPage("/login.htm"); | ||
|
|
||
| %> | ||
|
|
||
| <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> | ||
|
|
||
| <script type="text/javascript"> | ||
|
|
||
| STARTPAGE_ERROR = "NoAjaxBrowser.htm"; | ||
| STARTPAGE_PC = "pages/index.htm"; | ||
|
|
||
| USERCLIENT_PC = 0; | ||
|
|
||
| /** | ||
| * Erstellt eine Instanz des XMLHttpRequest-Objekts. | ||
| */ | ||
| createXMLHttpRequest = function() | ||
| { | ||
| var xmlHttp = null; | ||
|
|
||
| if ( window.XMLHttpRequest ) | ||
| { | ||
| xmlHttp = new XMLHttpRequest(); | ||
| } | ||
| else if ( window.ActiveXObject ) | ||
| { | ||
| try | ||
| { | ||
| xmlHttp = new ActiveXObject("Msxml2.XMLHTTP"); | ||
| } | ||
| catch (ex) | ||
| { | ||
| try | ||
| { | ||
| xmlHttp = new ActiveXObject("Microsoft.XMLHTTP"); | ||
| } | ||
| catch (ex) | ||
| { | ||
| // leer | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return xmlHttp; | ||
| }; | ||
|
|
||
| /** | ||
| * Prüft, ob der Browser die Anforderungen für die HomeMatic WebUI erfüllt. | ||
| */ | ||
| checkBrowser = function() | ||
| { | ||
| // Test auf AJAX-Unterstützung | ||
| var xmlHttp = createXMLHttpRequest(); | ||
| if ( !xmlHttp ) | ||
| { | ||
| xmlHttp = null; | ||
| return false; | ||
| } | ||
|
|
||
| return true; | ||
| }; | ||
|
|
||
| /** | ||
| * Leitet den Anwender auf die enstprechende Startseite weiter. | ||
| * Die Startseite ist abhängig vom gewählten Endgerät. | ||
| * | ||
| * Anmerkung: | ||
| * Falls der Anwender nicht automatisch angemeldet wird, leitet der ReGa | ||
| * Webserver die Anfrage auf die Loginseite um. Auch die Loginseite ist | ||
| * vom jeweiligen Endgerät abhängig. | ||
| */ | ||
| onLoad = function() | ||
| { | ||
| var sStartPage = STARTPAGE_ERROR; | ||
|
|
||
| if (true == checkBrowser()) | ||
| { | ||
| if(typeof(SessionId) === 'undefined') { | ||
| sStartPage = STARTPAGE_PC; | ||
| } else { | ||
| sStartPage = STARTPAGE_PC + "?sid=" + SessionId; | ||
| } | ||
| <% | ||
| if ( (false == system.IsVar("NoAutoLogin")) || (false == system.GetVar("NoAutoLogin")) ) | ||
| { | ||
| var oUsers = dom.GetObject(ID_USERS); | ||
| var id = oUsers.UsersDefaultLogin(dwcPC); | ||
| if ( (id) && (dom.GetObject(id)) ) | ||
| { | ||
| WriteLine("sStartPage += '&client=" # dwcPC # "';"); | ||
| } | ||
| } | ||
| %> | ||
| } | ||
|
|
||
| top.window.location.href = sStartPage; | ||
| }; | ||
|
|
||
| </script> | ||
| </head> | ||
| <body onload="onLoad();"> | ||
|
|
||
| <noscript> | ||
| <div align="center"> | ||
| <p>Um die HomeMatic WebUI nutzen zu können, muss JavaScript in Ihrem Browser aktiviert sein.</p> | ||
| </div> | ||
| </noscript> | ||
|
|
||
| </body> | ||
| </html> |
120 changes: 120 additions & 0 deletions
120
buildroot-external/patches/occu/0001-RaspberryMatic/occu/WebUI/www/rega/index.htm.orig
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> | ||
| <html xmlns="http://www.w3.org/1999/xhtml"> | ||
| <head> | ||
|
|
||
| <meta http-equiv="Content-Language" content="de"> | ||
| <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> | ||
| <meta http-equiv="cache-control" content="no-cache"> | ||
| <meta http-equiv="pragma" content="no-cache"> | ||
| <!-- <meta http-equiv="expires" content="-1"> --> | ||
| <meta http-equiv="Expires" content="01 Jan 2015 00:00:00 GMT" /> | ||
|
|
||
| <% | ||
|
|
||
| string devtype = "pc"; | ||
| system.LoginPage("/login.htm"); | ||
|
|
||
| %> | ||
|
|
||
| <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> | ||
|
|
||
| <script type="text/javascript"> | ||
|
|
||
| STARTPAGE_ERROR = "NoAjaxBrowser.htm"; | ||
| STARTPAGE_PC = "pages/index.htm"; | ||
|
|
||
| USERCLIENT_PC = 0; | ||
|
|
||
| /** | ||
| * Erstellt eine Instanz des XMLHttpRequest-Objekts. | ||
| */ | ||
| createXMLHttpRequest = function() | ||
| { | ||
| var xmlHttp = null; | ||
|
|
||
| if ( window.XMLHttpRequest ) | ||
| { | ||
| xmlHttp = new XMLHttpRequest(); | ||
| } | ||
| else if ( window.ActiveXObject ) | ||
| { | ||
| try | ||
| { | ||
| xmlHttp = new ActiveXObject("Msxml2.XMLHTTP"); | ||
| } | ||
| catch (ex) | ||
| { | ||
| try | ||
| { | ||
| xmlHttp = new ActiveXObject("Microsoft.XMLHTTP"); | ||
| } | ||
| catch (ex) | ||
| { | ||
| // leer | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return xmlHttp; | ||
| }; | ||
|
|
||
| /** | ||
| * Pr�ft, ob der Browser die Anforderungen f�r die HomeMatic WebUI erf�llt. | ||
| */ | ||
| checkBrowser = function() | ||
| { | ||
| // Test auf AJAX-Unterst�tzung | ||
| var xmlHttp = createXMLHttpRequest(); | ||
| if ( !xmlHttp ) | ||
| { | ||
| xmlHttp = null; | ||
| return false; | ||
| } | ||
|
|
||
| return true; | ||
| }; | ||
|
|
||
| /** | ||
| * Leitet den Anwender auf die enstprechende Startseite weiter. | ||
| * Die Startseite ist abh�ngig vom gew�hlten Endger�t. | ||
| * | ||
| * Anmerkung: | ||
| * Falls der Anwender nicht automatisch angemeldet wird, leitet der ReGa | ||
| * Webserver die Anfrage auf die Loginseite um. Auch die Loginseite ist | ||
| * vom jeweiligen Endger�t abh�ngig. | ||
| */ | ||
| onLoad = function() | ||
| { | ||
| var sStartPage = STARTPAGE_ERROR; | ||
|
|
||
| if (true == checkBrowser()) | ||
| { | ||
| sStartPage = STARTPAGE_PC + "?sid=" + SessionId; | ||
| <% | ||
| if ( (false == system.IsVar("NoAutoLogin")) || (false == system.GetVar("NoAutoLogin")) ) | ||
| { | ||
| var oUsers = dom.GetObject(ID_USERS); | ||
| var id = oUsers.UsersDefaultLogin(dwcPC); | ||
| if ( (id) && (dom.GetObject(id)) ) | ||
| { | ||
| WriteLine("sStartPage += '&client=" # dwcPC # "';"); | ||
| } | ||
| } | ||
| %> | ||
| } | ||
|
|
||
| top.window.location.href = sStartPage; | ||
| }; | ||
|
|
||
| </script> | ||
| </head> | ||
| <body onload="onLoad();"> | ||
|
|
||
| <noscript> | ||
| <div align="center"> | ||
| <p>Um die HomeMatic WebUI nutzen zu können, muss JavaScript in Ihrem Browser aktiviert sein.</p> | ||
| </div> | ||
| </noscript> | ||
|
|
||
| </body> | ||
| </html> |