# HG changeset patch # User olof@olof-desktop # Date 1223198219 -7200 # Node ID 4fc7027ebc67a20e78b9988c50fa35e88dd7592f # Parent d874567c40c240fcf97170a7951233bd5591cddc Make login html adaptable, first application specific, then login, and finally defailt. diff -r d874567c40c2 -r 4fc7027ebc67 r/setup.php --- a/r/setup.php Sun Oct 05 11:07:26 2008 +0200 +++ b/r/setup.php Sun Oct 05 11:16:59 2008 +0200 @@ -33,8 +33,13 @@ echo "
Login failed, your username or password is not correct.

"; } - echo '
Login
'; - echo 'Password
'; - echo ' 
'; + // Find the most specific login page and include it to be shown to the user. + if (file_exists($_SESSION["configLocation"]."login.html")) { + include_once($_SESSION["configLocation"]."login.html"); + } else if (file_exists("../local/login.html")) { + include_once("../local/login.html"); + } else { + include_once("../share/login.html"); + } } ?> \ No newline at end of file diff -r d874567c40c2 -r 4fc7027ebc67 share/login.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/login.html Sun Oct 05 11:16:59 2008 +0200 @@ -0,0 +1,10 @@ +
+ Login + +
+ Password + +
+   + +