Index: trunk/ippMonitor/raw/ipp.php
===================================================================
--- trunk/ippMonitor/raw/ipp.php (revision 8980)
+++ trunk/ippMonitor/raw/ipp.php (revision 8984)
@@ -33,4 +33,5 @@
// - pass (NOT the same as the user password: randomly generated for the session and given a timeout)
+// have this function take the current menu and style?
function checkLogin () {
@@ -42,5 +43,5 @@
if (!$success) {
- menu ('Login', 'ipp.css', '');
+ menu ('ipp.menu.dat', 'Login', 'ipp.css', '');
echo "Login Failed, please try again
\n";
loginform ();
@@ -67,5 +68,5 @@
// check for valid server method
if (($_SERVER[REQUEST_METHOD] != 'POST') && ($_SERVER[REQUEST_METHOD] != 'GET')) {
- menu ('Login', 'ipp.css', '');
+ menu ('ipp.menu.dat', 'Login', 'ipp.css', '');
echo "Invalid Client Request
\n";
menu_end ();
@@ -77,15 +78,15 @@
$ID['pass'] = $_GET[pass];
$ID['proj'] = $_GET[proj];
- echo "using GET: ", $ID['pass'], $ID['proj'];
+ // echo "using GET: ", $ID['pass'], $ID['proj'];
}
if ($_SERVER[REQUEST_METHOD] == 'POST') {
$ID['pass'] = $_POST[pass];
$ID['proj'] = $_POST[proj];
- echo "using POST: ", $ID['pass'], $ID['proj'];
+ // echo "using POST: ", $ID['pass'], $ID['proj'];
}
// user is not logged in at all
if ($ID['pass'] == "") {
- menu('Login', 'ipp.css', '');
+ menu('ipp.menu.dat', 'Login', 'ipp.css', '');
logintext ();
loginform ();
@@ -95,5 +96,5 @@
// user supplied an invalid pass
if ($ID['pass'] != "foobar") {
- menu('Login', 'ipp.css', '');
+ menu('ipp.menu.dat', 'Login', 'ipp.css', '');
echo "unknown user, please login again
\n";
loginform ();
@@ -113,5 +114,5 @@
}
-function menu ($title, $sheet, $append) {
+function menu ($source, $title, $sheet, $append) {
echo " $title \n\n";
@@ -121,5 +122,5 @@
$root = "/phpipp";
- $file = fopen ("ipp.menu.dat", "r");
+ $file = fopen ($source, "r");
echo "