Changeset 9016

Timestamp:

Sep 27, 2006, 4:57:39 PM (20 years ago)

Author:

eugene

Message:

adding login, cookie tables, database selection

Location:

trunk/ippMonitor

Files:

• def/autocode.php (modified) (2 diffs)
• def/detInputExp.d (modified) (2 diffs)
• raw/SelectProject.php (modified) (2 diffs)
• raw/ipp.detrend.dat (modified) (1 diff)
• raw/ipp.php (modified) (5 diffs)

trunk/ippMonitor/def/autocode.php

@@ -4 +4 @@
 
 $ID = checkID ();
+if ($ID['proj']) {
+  $db = dbconnect($ID['proj']);
+} else {
+  $db = dbconnect('detrend');
+}
 
 if ($ID['menu']) {
@@ -14 +19 @@
 
 echo "<p> $TITLE </p>";
-
-$db = dbconnect();
 
 // define restrictiosn to the queries

trunk/ippMonitor/def/detInputExp.d

@@ -4 +4 @@
 MENU  ipp.detrend.dat
 
-HEAD HTML  test head 1 <br>
-HEAD HTML  test head 2 <br>
-HEAD HTML  test head 3 <br>
+# HEAD HTML  test head 1 <br>
 
 #     field      width  name        show  link to                 extras
@@ -15 +13 @@
 FIELD include,   7,     include
 
-TAIL HTML test tail 1 <br>
-TAIL HTML test tail 2 <br>
-TAIL HTML test tail 3 <br>
+# TAIL HTML  test tail 1 <br>

trunk/ippMonitor/raw/SelectProject.php

@@ -3 +3 @@
 include 'ipp.php';
 
-checkID ();
+if (($_SERVER[REQUEST_METHOD] != 'POST') && ($_SERVER[REQUEST_METHOD] != 'GET')) {
+  menu ('ipp.menu.dat', 'Select Project', 'ipp.css', '');
+  echo "Invalid Client Request<br>\n";
+  menu_end ();
+  exit ();
+}
+
+$ID = checkID ();
 
 if ($_SERVER[REQUEST_METHOD] == 'GET') { 
-    menu ('ipp.menu.dat', 'Project', 'ipp.css', '');
+    menu ('ipp.menu.dat', 'Select Project', 'ipp.css', '');
     echo "<p> Select the project of interest </p>\n";
     echo "<form action=\"$myPage\" method=\"POST\">\n";
     echo "Project: <input type=\"text\" name=\"proj\"><br>\n";
     echo "<input type=\"submit\" name=\"project\">\n";
+
+    $pass = $ID['pass'];
+    echo "<input type=\"hidden\" name=\"pass\" value=\"$pass\">\n";
     echo "</form>\n";
 
@@ -16 +26 @@
 }
 
-if ($_SERVER[REQUEST_METHOD] != 'POST') { 
-  menu ('ipp.menu.dat', 'Project', 'ipp.css', '');
-  echo "Invalid Client Request<br>\n";
-  menu_end ();
+if ($_SERVER[REQUEST_METHOD] == 'POST') { 
+
+  if (key_exists (project, $_POST)) {
+    $myProj = $_POST[proj];
+    $ID['proj'] = $myProj;
+    // validate the existence of the project
+
+    // update ID['link']
+    // $link is attached to every nav link
+    $ID['link'] = "pass=" . $ID['pass'];
+    if ($ID['proj']) {
+      $ID['link'] = $ID['link'] . "&proj=" . $ID['proj'];
+    }
+
+    menu ('ipp.menu.dat', 'Select Project', 'ipp.css', $ID['link']);
+    echo "New project is : $myProj<br>\n";
+
+    echo "ID list<br>\n";
+    foreach ($ID as $key => $value) {
+      echo "$key : $value<br>\n";
+    }
+
+    menu_end();
+  }
 }
-
-if (key_exists (project, $_POST)) {
-  $myProj = $_POST[proj];
-  # validate the existence of the project
-  $_GET[proj] = $myProj;
-  menu ('ipp.menu.dat', 'Project', 'ipp.css', '');
-  echo "New project is : $myProj\n";
-  menu_end();
-}
-  
-menu ('ipp.menu.dat', 'Project', 'ipp.css', '');
-echo "Invalid Client Post Request<br>\n";
-foreach ($_POST as $key => $value) {
-  echo "$key : $value<br>\n";
-}
-menu_end ();
-
 ?>

trunk/ippMonitor/raw/ipp.detrend.dat

@@ -24 +24 @@
 menutop   | menutop      | plain   |                         | 
 menulink  | menuselect   | link    | Master Detrend Frames        | masterDetrendFrames.php
+menulink  | menuselect   | link    | Master Detrend Imfiles       | masterDetrendImfiles.php
 menulink  | menuselect   | link    | Detrend Runs                 | detRunSummary.php             
+menulink  | menuselect   | link    | Raw Detrend Exp              | rawDetrendExp.php
 menulink  | menuselect   | link    | Input Detrend Exp            | detInputExp.php                    
 menulink  | menuselect   | link    | Resid Detrend Exp            | detResidExp.php                       

trunk/ippMonitor/raw/ipp.php

@@ -15 +15 @@
 }
 
-function dbconnect () {
+function dbconnect ($database) {
 
   // connect to the database
   require_once('DB.php');
-  // $db = DB::connect("mysql://ipp:ipp@localhost/ipp");
-  $db = DB::connect("mysql://ipp:ipp@localhost/detrend");
+  $db = DB::connect("mysql://ipp:ipp@alala/$database");
   if (DB::iserror($db)) {
     echo "<b>error accessing database</b><br>\n";
@@ -40 +39 @@
   $password = $_POST[password];
 
+  $db = dbconnect('ippadmin');
+
   // make this a DB lookup
-  $success = (($username == "eugene") && ($password == "test"));
-
+  $sql = "SELECT username FROM users WHERE username = '$username' AND password = '$password'";
+
+  $qry = $db->query($sql);
+  if (DB::iserror($db)) {
+    echo "<b>error reading users table</b><br>\n";
+    echo "Login Failed, please try again<br>\n";
+    loginform ();
+    menu_end();
+  }
+  
+  $success = $qry->fetchInto($row);
   if (!$success) {  
     menu ('ipp.menu.dat', 'Login', 'ipp.css', '');
@@ -53 +63 @@
   // generate an random ephemeral ID
   $ID['name'] = $username;
-  $ID['pass'] = "foobar";
   $ID['proj'] = "";
+
+  // generate a cookie for the user
+  $sql = "SELECT username,cookie FROM cookies WHERE username = '$username'";
+  $qry = $db->query($sql);
+  if (DB::iserror($db)) {
+    echo "Cookie Failed, please try again<br>\n";
+    menu_end();
+  }
+
+  if ($qry->fetchInto($row)) {
+    $ID['pass'] = $row[1];
+  } else {
+    $cookie = rand(0,100000);
+    $ID['pass'] = $cookie;
+    $sql = "INSERT into cookies (username, cookie) values ('$username', '$cookie')";
+    $qry = $db->query($sql);
+    if (DB::iserror($db)) {
+      echo "Cookie Failed, please try again<br>\n";
+      menu_end();
+    }
+  }
 
   // the link is attached to every nav link
@@ -107 +137 @@
   }
 
-  // user supplied an invalid pass
-  if ($ID['pass'] != "foobar") {
+  $db = dbconnect ('ippadmin');
+
+  // make this a DB lookup
+  $pass = $ID['pass'];
+  $sql = "SELECT username FROM cookies WHERE cookie = '$pass'";
+  $qry = $db->query($sql);
+  if (DB::iserror($db)) {
+    echo "<b>error reading users table</b><br>\n";
+    echo "Login Failed, please try again<br>\n";
+    loginform ();
+    menu_end();
+  }
+  
+  # $success = (($username == "eugene") && ($password == "test"));
+  $success = $qry->fetchInto($row);
+  if (! $success) {
     menu('ipp.menu.dat', 'Login', 'ipp.css', '');
     echo "unknown user, please login again<br>\n";
@@ -114 +158 @@
     menu_end ();
   }
-
   // use the pass value to find the corresponding user
-  $ID['name'] = "eugene";
+  $ID['name'] = $row[0];
 
   // $link is attached to every nav link
   $ID['link'] = "pass=" . $ID['pass'];
   if ($ID['proj']) {
-    $ID['link'] = $link . "&proj=" . $ID['proj'];
-  }
-
+    $ID['link'] = $ID['link'] . "&proj=" . $ID['proj'];
+  }
+  
   return $ID;
 }