Index: trunk/ippMonitor/raw/ipp.php =================================================================== --- trunk/ippMonitor/raw/ipp.php (revision 9347) +++ trunk/ippMonitor/raw/ipp.php (revision 9439) @@ -13,4 +13,18 @@ echo '', "\n"; echo '', "\n\n"; +} + +function projectform ($ID) { + menu ('ipp.menu.dat', 'Select Project', 'ipp.css', $ID['link'], $ID['proj']); + echo "

Please select the project of interest

\n"; + echo "
\n"; + echo "Project:
\n"; + echo "\n"; + + $pass = $ID['pass']; + echo "\n"; + echo "
\n"; + + menu_end (); } @@ -54,5 +68,5 @@ $success = $qry->fetchInto($row); if (!$success) { - menu ('ipp.menu.dat', 'Login', 'ipp.css', ''); + menu ('ipp.menu.dat', 'Login', 'ipp.css', '', ''); echo "Login Failed, please try again
\n"; loginform (); @@ -97,7 +111,9 @@ function checkID () { + $VERBOSE = 0; + // check for valid server method if (($_SERVER[REQUEST_METHOD] != 'POST') && ($_SERVER[REQUEST_METHOD] != 'GET')) { - menu ('ipp.menu.dat', 'Login', 'ipp.css', ''); + menu ('ipp.menu.dat', 'Login', 'ipp.css', '', ''); echo "Invalid Client Request
\n"; menu_end (); @@ -110,10 +126,12 @@ $ID['proj'] = $_GET[proj]; $ID['menu'] = $_GET[menu]; - // echo "using GET: ", $ID['pass'], $ID['proj']; - - // echo "GET list
\n"; - // foreach ($_GET as $key => $value) { - // echo "$key : $value
\n"; - // } + + if ($VERBOSE) { + echo "using GET: ", $ID['pass'], $ID['proj'], "
\n"; + echo "GET list
\n"; + foreach ($_GET as $key => $value) { + echo "$key : $value
\n"; + } + } } if ($_SERVER[REQUEST_METHOD] == 'POST') { @@ -121,15 +139,17 @@ $ID['proj'] = $_POST[proj]; $ID['menu'] = $_POST[menu]; - // echo "using POST: ", $ID['pass'], $ID['proj']; - - // echo "POST list
\n"; - // foreach ($_POST as $key => $value) { - // echo "$key : $value
\n"; - // } + + if ($VERBOSE) { + echo "using POST: ", $ID['pass'], $ID['proj'], "
\n"; + echo "POST list
\n"; + foreach ($_POST as $key => $value) { + echo "$key : $value
\n"; + } + } } // user is not logged in at all if ($ID['pass'] == "") { - menu('ipp.menu.dat', 'Login', 'ipp.css', ''); + menu('ipp.menu.dat', 'Login', 'ipp.css', '', ''); logintext (); loginform (); @@ -153,5 +173,5 @@ $success = $qry->fetchInto($row); if (! $success) { - menu('ipp.menu.dat', 'Login', 'ipp.css', ''); + menu('ipp.menu.dat', 'Login', 'ipp.css', '', ''); echo "unknown user, please login again
\n"; loginform (); @@ -170,5 +190,5 @@ } -function menu ($source, $title, $sheet, $append) { +function menu ($source, $title, $sheet, $append, $project) { echo " $title \n\n"; @@ -178,4 +198,6 @@ $root = "/phpipp"; + if (! $project) { $project = "none"; } + $file = fopen ($source, "r"); @@ -190,4 +212,8 @@ $name = trim($line[3]); $base = trim($line[4]); + + if (preg_match ('|\$PROJECT|', $name)) { + $name = preg_replace ('|\$PROJECT|', $project, $name); + } if ($append) {