Changeset 9439
- Timestamp:
- Oct 9, 2006, 3:11:06 PM (20 years ago)
- Location:
- trunk/ippMonitor
- Files:
-
- 24 edited
-
Makefile (modified) (2 diffs)
-
def/autocode.php (modified) (3 diffs)
-
def/detNormalizedExp.d (modified) (1 diff)
-
def/detNormalizedImfile.d (modified) (1 diff)
-
def/detProcessedExp.d (modified) (1 diff)
-
def/detResidExp.d (modified) (1 diff)
-
def/detRun.d (modified) (1 diff)
-
def/example.d (modified) (2 diffs)
-
def/masterDetrendFrames.d (modified) (2 diffs)
-
raw/DetrendSteps.php (modified) (1 diff)
-
raw/ImfileTables.php (modified) (1 diff)
-
raw/LoadSetup.php (modified) (1 diff)
-
raw/Login.php (modified) (5 diffs)
-
raw/ScienceSteps.php (modified) (1 diff)
-
raw/SelectProject.php (modified) (3 diffs)
-
raw/ipp.copy.dat (modified) (2 diffs)
-
raw/ipp.css (modified) (2 diffs)
-
raw/ipp.detrend.dat (modified) (2 diffs)
-
raw/ipp.imfiles.dat (modified) (2 diffs)
-
raw/ipp.menu.dat (modified) (2 diffs)
-
raw/ipp.php (modified) (9 diffs)
-
raw/ipp.science.dat (modified) (2 diffs)
-
raw/masterDetrendImfiles.php (modified) (2 diffs)
-
raw/phptest.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ippMonitor/Makefile
r9399 r9439 31 31 $(DESTBIN)/detMasterFrame.php \ 32 32 $(DESTBIN)/detMasterImfile.php \ 33 $(DESTBIN)/detNormalizedExp.php \ 33 34 $(DESTBIN)/detNormalizedImfile.php \ 34 35 $(DESTBIN)/detNormalizedStatImfile.php \ … … 58 59 59 60 PICTURES = \ 60 $(DESTBIN)/PScolorlogo2.jpg \ 61 $(DESTBIN)/flat_1_0.b1.jpeg \ 62 $(DESTBIN)/flat_1_0.b2.jpeg \ 63 $(DESTBIN)/pic.png 61 $(DESTBIN)/PScolorlogo2.jpg 64 62 65 DEMOPICS = \ 66 $(DESTBIN)/806237f.detresid.3.0.b1.jpg \ 67 $(DESTBIN)/806237f.detresid.3.0.b2.jpg \ 68 $(DESTBIN)/806238f.detresid.3.0.b1.jpg \ 69 $(DESTBIN)/806238f.detresid.3.0.b2.jpg \ 70 $(DESTBIN)/806239f.detresid.3.0.b1.jpg \ 71 $(DESTBIN)/806239f.detresid.3.0.b2.jpg \ 72 $(DESTBIN)/838749d.detresid.2.0.b1.jpg \ 73 $(DESTBIN)/838749d.detresid.2.0.b2.jpg \ 74 $(DESTBIN)/838790d.detresid.2.0.b1.jpg \ 75 $(DESTBIN)/838790d.detresid.2.0.b2.jpg \ 76 $(DESTBIN)/838791d.detresid.2.0.b1.jpg \ 77 $(DESTBIN)/838791d.detresid.2.0.b2.jpg \ 78 $(DESTBIN)/850131b.detresid.1.0.b1.jpg \ 79 $(DESTBIN)/850131b.detresid.1.0.b2.jpg \ 80 $(DESTBIN)/850132b.detresid.1.0.b1.jpg \ 81 $(DESTBIN)/850132b.detresid.1.0.b2.jpg \ 82 $(DESTBIN)/850133b.detresid.1.0.b1.jpg \ 83 $(DESTBIN)/850133b.detresid.1.0.b2.jpg 84 85 php: $(RAWSRC) $(DEFSRC) $(PICTURES) $(DEMOPICS) 63 php: $(RAWSRC) $(DEFSRC) $(PICTURES) 86 64 87 65 # dependancy rules for binary code ######################### -
trunk/ippMonitor/def/autocode.php
r9016 r9439 4 4 5 5 $ID = checkID (); 6 if ($ID['proj']) { 7 $db = dbconnect($ID['proj']); 8 } else { 9 $db = dbconnect('detrend'); 10 } 6 7 // require an explicit project 8 if (! $ID['proj']) { projectform ($ID); } 9 10 $db = dbconnect($ID['proj']); 11 11 12 12 if ($ID['menu']) { … … 16 16 } 17 17 18 menu($myMenu, '$TITLE', '$STYLE', $ID['link'] );18 menu($myMenu, '$TITLE', '$STYLE', $ID['link'], $ID['proj']); 19 19 20 20 echo "<p> $TITLE </p>"; … … 25 25 // query the database 26 26 if ($WHERE) { 27 $sql = "SELECT $FIELDS FROM $TABLE WHERE $WHERE LIMIT 20";27 $sql = "SELECT $FIELDS FROM $TABLE WHERE $WHERE LIMIT 40"; 28 28 } else { 29 $sql = "SELECT $FIELDS FROM $TABLE LIMIT 20";29 $sql = "SELECT $FIELDS FROM $TABLE LIMIT 40"; 30 30 } 31 31 -
trunk/ippMonitor/def/detNormalizedExp.d
r9323 r9439 4 4 MENU ipp.detrend.dat 5 5 6 # field name show link toextras7 FIELD det_id, 20,det_id8 FIELD iteration, 20, iteration9 FIELD bg , 20, bg10 FIELD bg_stdev, 20, bg_stdev11 FIELD bg_mean_stdev, 20, bg_mean_stdev12 FIELD b 1_uri, 20,b1_uri13 FIELD b2_uri, 20, b2_uri14 FIELD recipe, 20, recipe6 # field size name show link to extras 7 FIELD det_id, 7, det_id 8 FIELD bg, 8, backgnd 9 FIELD bg_mean_stdev, 8, [stdev] 10 FIELD bg_stdev, 8, stdev 11 FIELD iteration, 5, iteration 12 FIELD b2_uri, 8, image, image=$b2_uri, detNormalizedImfile.php, det_id=$det_id,iteration=$iteration,image=$b1_uri 13 #FIELD b1_uri, 20, b1_uri 14 #FIELD recipe, 20, recipe -
trunk/ippMonitor/def/detNormalizedImfile.d
r9323 r9439 4 4 MENU ipp.imfiles.dat 5 5 6 # field name show link to extras 7 FIELD det_id, 20, det_id 8 FIELD iteration, 20, iteration 9 FIELD class_id, 20, class_id 10 FIELD uri, 20, uri 11 FIELD bg, 20, bg 12 FIELD bg_stdev, 20, bg_stdev 13 FIELD bg_mean_stdev, 20, bg_mean_stdev 14 FIELD b1_uri, 20, b1_uri 15 FIELD b2_uri, 20, b2_uri 6 # field size name show link to extras 7 FIELD det_id, 7, det_id 8 FIELD class_id, 8, class_id 9 FIELD bg, 8, backgnd 10 FIELD bg_stdev, 8, stdev 11 FIELD iteration, 5, iteration 12 #FIELD uri, 20, uri 13 #FIELD bg_mean_stdev, 20, bg_mean_stdev 14 #FIELD b1_uri, 20, b1_uri 15 #FIELD b2_uri, 20, b2_uri 16 17 TAIL PHP insert_image ('image'); -
trunk/ippMonitor/def/detProcessedExp.d
r9347 r9439 8 8 FIELD exp_tag, 15, Exposure, value 9 9 FIELD b2_uri, 8, image, image=$b2_uri, detProcessedImfile.php, det_id=$det_id,exp_tag=$exp_tag,image=$b1_uri 10 FIELD bg, 10, bg, value 11 FIELD bg_stdev, 10, bg_stdev, value 10 FIELD bg, 8, backgnd, value 11 FIELD bg_mean_stdev, 8, [stdev], value 12 FIELD bg_stdev, 8, stdev, value 12 13 FIELD recipe, 15, Recipe, value 13 14 FIELD b1_uri, 20, b1_uri, none 14 # FIELD bg_mean_stdev, 20, bg_mean_stdev -
trunk/ippMonitor/def/detResidExp.d
r9347 r9439 4 4 MENU ipp.detrend.dat 5 5 6 # field sizename show link to extras7 FIELD det_id, 7,Det ID, value8 FIELD exp_tag, 15,Exposure, value, rawImfile.php, exp_tag=$exp_tag9 FIELD b2_uri, 8,image, image=$b2_uri, detResidImfile.php, det_id=$det_id,iteration=$iteration,exp_tag=$exp_tag,image=$b1_uri10 FIELD bg, 8,backgnd, value11 FIELD bg_ stdev, 8, bg_stdev, value12 FIELD iteration, 5, iter,value13 FIELD accept, 4, keep, value14 FIELD b1_uri, 20, b1_uri, none15 # FIELD bg_mean_stdev, 20, bg_mean_stdev 16 # FIELD recipe, 15,recipe, value6 # field size name show link to extras 7 FIELD det_id, 7, Det ID, value 8 FIELD exp_tag, 15, Exposure, value, rawImfile.php, exp_tag=$exp_tag 9 FIELD b2_uri, 8, image, image=$b2_uri, detResidImfile.php, det_id=$det_id,iteration=$iteration,exp_tag=$exp_tag,image=$b1_uri 10 FIELD bg, 8, backgnd, value 11 FIELD bg_mean_stdev, 8, [stdev] 12 FIELD bg_stdev, 8, stdev, value 13 FIELD iteration, 5, iter, value 14 FIELD accept, 4, keep, value 15 FIELD b1_uri, 20, b1_uri, none 16 # FIELD recipe, 15, recipe, value -
trunk/ippMonitor/def/detRun.d
r9323 r9439 5 5 6 6 # field name show link to extras 7 FIELD position, 20, det ID, value, detRunSummary.php, det_id=$position7 FIELD det_id, 20, det ID, value, detRunSummary.php, det_id=$det_id 8 8 FIELD iteration, 20, iteration 9 9 FIELD det_type, 20, det_type -
trunk/ippMonitor/def/example.d
r9136 r9439 9 9 # the following WHERE clauses are added to all queries joined by AND 10 10 WHERE detRunSummary.accept = 1 11 WHERE detRun. position= detRunSummary.det_id11 WHERE detRun.det_it = detRunSummary.det_id 12 12 WHERE detRun.iteration = detRunSummary.iteration 13 13 … … 26 26 # SELECT detRunSummary.det_id,detRunSummary.iteration,detRunSummary.iteration,detRun.det_type,detRunSummary.bg,detRunSummary.bg_stdev \ 27 27 # FROM detRunSummary, detRun \ 28 # WHERE detRunSummary.accept = 1 AND detRun. position= detRunSummary.det_id AND detRun.iteration = detRunSummary.iteration \28 # WHERE detRunSummary.accept = 1 AND detRun.det_id = detRunSummary.det_id AND detRun.iteration = detRunSummary.iteration \ 29 29 # LIMIT 20 -
trunk/ippMonitor/def/masterDetrendFrames.d
r9011 r9439 9 9 # the following WHERE clauses are added to all queries joined by AND 10 10 WHERE detRunSummary.accept = 1 11 WHERE detRun. position= detRunSummary.det_id11 WHERE detRun.det_id = detRunSummary.det_id 12 12 WHERE detRun.iteration = detRunSummary.iteration 13 13 14 # field width name show link to extras15 FIELD detRunSummary.det_id, 7, det_id, value, detRunSummary.php, det_id=$detRunSummary.det_id14 # field width name show link to extras 15 FIELD detRunSummary.det_id, 7, det_id, value, detRunSummary.php, det_id=$detRunSummary.det_id 16 16 FIELD detRunSummary.iteration, 5, iter 17 17 FIELD detRun.det_type, 5, type 18 FIELD *, 20, choose, value=files, masterDetrendImfiles.php,det_id=$detRunSummary.det_id,iteration=$detRunSummary.iteration19 FIELD *, 20, choose, value=input, detInputExp.php, det_id=$detRunSummary.det_id,iteration=$detRunSummary.iteration20 FIELD *, 20, choose, value=resid, detResidExp.php, det_id=$detRunSummary.det_id,iteration=$detRunSummary.iteration18 FIELD *, 20, choose, value=files, detNormalizedImfiles.php, det_id=$detRunSummary.det_id,iteration=$detRunSummary.iteration 19 FIELD *, 20, choose, value=input, detInputExp.php, det_id=$detRunSummary.det_id,iteration=$detRunSummary.iteration 20 FIELD *, 20, choose, value=resid, detResidExp.php, det_id=$detRunSummary.det_id,iteration=$detRunSummary.iteration 21 21 FIELD detRunSummary.bg, 20, bg 22 22 FIELD detRunSummary.bg_stdev, 20, bg_stdev … … 27 27 # SELECT detRunSummary.det_id,detRunSummary.iteration,detRunSummary.iteration,detRun.det_type,detRunSummary.bg,detRunSummary.bg_stdev \ 28 28 # FROM detRunSummary, detRun \ 29 # WHERE detRunSummary.accept = 1 AND detRun. position= detRunSummary.det_id AND detRun.iteration = detRunSummary.iteration \29 # WHERE detRunSummary.accept = 1 AND detRun.det_id = detRunSummary.det_id AND detRun.iteration = detRunSummary.iteration \ 30 30 # LIMIT 20 -
trunk/ippMonitor/raw/DetrendSteps.php
r9008 r9439 5 5 $ID = checkID (); 6 6 7 menu('ipp.detrend.dat', 'Detrend Steps', 'ipp.css', $ID['link']); 7 // require an explicit project 8 if (! $ID['proj']) { projectform ($ID); } 9 10 menu('ipp.detrend.dat', 'Detrend Steps', 'ipp.css', $ID['link'], $ID['proj']); 8 11 9 12 // document body -
trunk/ippMonitor/raw/ImfileTables.php
r8984 r9439 5 5 $ID = checkID (); 6 6 7 menu('ipp.imfiles.dat', 'Imfile Tables', 'ipp.css', $ID['link']); 7 // require an explicit project 8 if (! $ID['proj']) { projectform ($ID); } 9 10 menu('ipp.imfiles.dat', 'Imfile Tables', 'ipp.css', $ID['link'], $ID['proj']); 8 11 9 12 // document body -
trunk/ippMonitor/raw/LoadSetup.php
r8984 r9439 5 5 $ID = checkID (); 6 6 7 menu('ipp.copy.dat', 'Load and Setup', 'ipp.css', $ID['link']); 7 // require an explicit project 8 if (! $ID['proj']) { projectform ($ID); } 9 10 menu('ipp.copy.dat', 'Load and Setup', 'ipp.css', $ID['link'], $ID['proj']); 8 11 9 12 // document body -
trunk/ippMonitor/raw/Login.php
r8984 r9439 4 4 5 5 if (($_SERVER[REQUEST_METHOD] != 'POST') && ($_SERVER[REQUEST_METHOD] != 'GET')) { 6 menu ('ipp.menu.dat', 'Login', 'ipp.css', '' );6 menu ('ipp.menu.dat', 'Login', 'ipp.css', '', ''); 7 7 echo "Invalid Client Request<br>\n"; 8 8 menu_end (); … … 14 14 $ID = checkID (); 15 15 16 menu ('ipp.menu.dat', 'Login', 'ipp.css', $ID['link'] );16 menu ('ipp.menu.dat', 'Login', 'ipp.css', $ID['link'], $ID['proj']); 17 17 18 18 $pass = $ID['pass']; … … 34 34 $ID = checkLogin (); 35 35 36 menu ('ipp.menu.dat', 'Login', 'ipp.css', $ID['link'] );36 menu ('ipp.menu.dat', 'Login', 'ipp.css', $ID['link'], $ID['proj']); 37 37 echo "Login Accepted\n"; 38 38 menu_end(); … … 41 41 42 42 if (key_exists (logout, $_POST)) { 43 menu ('ipp.menu.dat', 'Login', 'ipp.css', '' );43 menu ('ipp.menu.dat', 'Login', 'ipp.css', '', ''); 44 44 echo "You are now logged out<br>\n"; 45 45 logintext (); … … 50 50 51 51 // missing a valid POST state (login or logout) 52 menu ('ipp.menu.dat', 'Login', 'ipp.css', '' );52 menu ('ipp.menu.dat', 'Login', 'ipp.css', '', ''); 53 53 echo "Invalid Client Post Request<br>\n"; 54 54 foreach ($_POST as $key => $value) { -
trunk/ippMonitor/raw/ScienceSteps.php
r8984 r9439 5 5 $ID = checkID (); 6 6 7 menu('ipp.science.dat', 'Science Steps', 'ipp.css', $ID['link']); 7 // require an explicit project 8 if (! $ID['proj']) { projectform ($ID); } 9 10 menu('ipp.science.dat', 'Science Steps', 'ipp.css', $ID['link'], $ID['proj']); 8 11 9 12 // document body -
trunk/ippMonitor/raw/SelectProject.php
r9017 r9439 4 4 5 5 if (($_SERVER[REQUEST_METHOD] != 'POST') && ($_SERVER[REQUEST_METHOD] != 'GET')) { 6 menu ('ipp.menu.dat', 'Select Project', 'ipp.css', '' );6 menu ('ipp.menu.dat', 'Select Project', 'ipp.css', '', ''); 7 7 echo "Invalid Client Request<br>\n"; 8 8 menu_end (); … … 13 13 14 14 if ($_SERVER[REQUEST_METHOD] == 'GET') { 15 menu ('ipp.menu.dat', 'Select Project', 'ipp.css', ''); 16 echo "<p> Select the project of interest </p>\n"; 17 echo "<form action=\"$myPage\" method=\"POST\">\n"; 18 echo "Project: <input type=\"text\" name=\"proj\"><br>\n"; 19 echo "<input type=\"submit\" name=\"project\">\n"; 20 21 $pass = $ID['pass']; 22 echo "<input type=\"hidden\" name=\"pass\" value=\"$pass\">\n"; 23 echo "</form>\n"; 24 25 menu_end (); 15 projectform ($ID); 26 16 } 27 17 … … 40 30 } 41 31 42 menu ('ipp.menu.dat', 'Select Project', 'ipp.css', $ID['link'] );32 menu ('ipp.menu.dat', 'Select Project', 'ipp.css', $ID['link'], $ID['proj']); 43 33 echo "New project is : $myProj<br>\n"; 44 34 menu_end(); -
trunk/ippMonitor/raw/ipp.copy.dat
r9003 r9439 15 15 menulink | menuselect | link | Login | Login.php 16 16 menulink | menuselect | link | Select Project | SelectProject.php 17 menulink | menuselect | link | [$PROJECT] | SelectProject.php 17 18 18 19 menutop | menutop | plain | | 19 menutop | menutop| link | Load and Setup | LoadSetup.php20 menutops | menutops | link | Load and Setup | LoadSetup.php 20 21 menutop | menutop | link | Science Steps | ScienceSteps.php 21 22 menutop | menutop | link | Detrend Steps | DetrendSteps.php … … 28 29 menulink | menuselect | link | Raw Detrend Exp | rawDetrendExp.php 29 30 menulink | menuselect | link | Raw Science Exp | rawScienceExp.php 30 31 menutop | menutop | plain | |32 menutop | menutop | plain | External Links | none33 menutop | menutop | link | test page | phptest.php -
trunk/ippMonitor/raw/ipp.css
r8980 r9439 10 10 11 11 a.menutop { text-decoration: none; color: #ffffff; font-weight: bold } 12 a.menutops { text-decoration: none; color: #80f0ff; font-weight: bold } 12 13 a.menuext { text-decoration: none; color: #ffffff; font-weight: bold } 13 14 a.menulink { text-decoration: none; font-weight: normal; color: #000000} … … 16 17 17 18 td.menutop { text-align: left; background: #0080c0; font-size: small; color: #ffffff; padding: 2px; } 19 td.menutops { text-align: left; background: #0080c0; font-size: small; color: #000000; padding: 2px; } 18 20 td.menuext { text-align: left; background: #303070; font-size: small; color: #ffffff; padding: 2px; } 19 21 td.menulink { text-align: left; background: #d0d0ff; font-size: small; color: #000000; padding: 2px; font-weight: normal; text-indent: 0px; } -
trunk/ippMonitor/raw/ipp.detrend.dat
r9347 r9439 15 15 menulink | menuselect | link | Login | Login.php 16 16 menulink | menuselect | link | Select Project | SelectProject.php 17 menulink | menuselect | link | [$PROJECT] | SelectProject.php 17 18 18 19 menutop | menutop | plain | | 19 20 menutop | menutop | link | Load and Setup | LoadSetup.php 20 21 menutop | menutop | link | Science Steps | ScienceSteps.php 21 menutop | menutop| link | Detrend Steps | DetrendSteps.php22 menutops | menutops | link | Detrend Steps | DetrendSteps.php 22 23 menutop | menutop | link | Imfile Tables | ImfileTables.php 23 24 24 25 menutop | menutop | plain | | 25 menulink | menuselect | link | Master Detrend Frames | masterDetrendFrames.php 26 menulink | menuselect | link | Master Detrend Imfiles | masterDetrendImfiles.php 26 menulink | menuselect | link | Detrend Frames | masterDetrendFrames.php 27 27 menulink | menuselect | link | Detrend Runs | detRunSummary.php 28 28 menulink | menuselect | link | Raw Detrend Exp | rawDetrendExp_detrend.php … … 30 30 menulink | menuselect | link | Proc Detrend Exp | detProcessedExp.php 31 31 menulink | menuselect | link | Resid Detrend Exp | detResidExp.php 32 33 menutop | menutop | plain | | 34 menutop | menutop | plain | External Links | none 35 menutop | menutop | link | test page | phptest.php 32 menulink | menuselect | link | Norm Detrend Exp | detNormalizedExp.php -
trunk/ippMonitor/raw/ipp.imfiles.dat
r9080 r9439 15 15 menulink | menuselect | link | Login | Login.php 16 16 menulink | menuselect | link | Select Project | SelectProject.php 17 menulink | menuselect | link | [$PROJECT] | SelectProject.php 17 18 18 19 menutop | menutop | plain | | … … 20 21 menutop | menutop | link | Science Steps | ScienceSteps.php 21 22 menutop | menutop | link | Detrend Steps | DetrendSteps.php 22 menutop | menutop| link | Imfile Tables | ImfileTables.php23 menutops | menutops | link | Imfile Tables | ImfileTables.php 23 24 24 25 menutop | menutop | plain | | -
trunk/ippMonitor/raw/ipp.menu.dat
r8984 r9439 15 15 menulink | menuselect | link | Login | Login.php 16 16 menulink | menuselect | link | Select Project | SelectProject.php 17 menulink | menuselect | link | [$PROJECT] | SelectProject.php 17 18 18 19 menutop | menutop | plain | | … … 21 22 menutop | menutop | link | Detrend Steps | DetrendSteps.php 22 23 menutop | menutop | link | Imfile Tables | ImfileTables.php 23 24 menutop | menutop | plain | |25 26 menutop | menutop | plain | External Links | none27 menutop | menutop | link | test page | phptest.php -
trunk/ippMonitor/raw/ipp.php
r9347 r9439 13 13 echo '<input type="submit" name="login" value="login">', "\n"; 14 14 echo '</form>', "\n\n"; 15 } 16 17 function projectform ($ID) { 18 menu ('ipp.menu.dat', 'Select Project', 'ipp.css', $ID['link'], $ID['proj']); 19 echo "<p> Please select the project of interest </p>\n"; 20 echo "<form action=\"SelectProject.php\" method=\"POST\">\n"; 21 echo "Project: <input type=\"text\" name=\"proj\"><br>\n"; 22 echo "<input type=\"submit\" name=\"project\">\n"; 23 24 $pass = $ID['pass']; 25 echo "<input type=\"hidden\" name=\"pass\" value=\"$pass\">\n"; 26 echo "</form>\n"; 27 28 menu_end (); 15 29 } 16 30 … … 54 68 $success = $qry->fetchInto($row); 55 69 if (!$success) { 56 menu ('ipp.menu.dat', 'Login', 'ipp.css', '' );70 menu ('ipp.menu.dat', 'Login', 'ipp.css', '', ''); 57 71 echo "Login Failed, please try again<br>\n"; 58 72 loginform (); … … 97 111 function checkID () { 98 112 113 $VERBOSE = 0; 114 99 115 // check for valid server method 100 116 if (($_SERVER[REQUEST_METHOD] != 'POST') && ($_SERVER[REQUEST_METHOD] != 'GET')) { 101 menu ('ipp.menu.dat', 'Login', 'ipp.css', '' );117 menu ('ipp.menu.dat', 'Login', 'ipp.css', '', ''); 102 118 echo "Invalid Client Request<br>\n"; 103 119 menu_end (); … … 110 126 $ID['proj'] = $_GET[proj]; 111 127 $ID['menu'] = $_GET[menu]; 112 // echo "using GET: ", $ID['pass'], $ID['proj']; 113 114 // echo "GET list<br>\n"; 115 // foreach ($_GET as $key => $value) { 116 // echo "$key : $value<br>\n"; 117 // } 128 129 if ($VERBOSE) { 130 echo "using GET: ", $ID['pass'], $ID['proj'], "<br>\n"; 131 echo "GET list<br>\n"; 132 foreach ($_GET as $key => $value) { 133 echo "$key : $value<br>\n"; 134 } 135 } 118 136 } 119 137 if ($_SERVER[REQUEST_METHOD] == 'POST') { … … 121 139 $ID['proj'] = $_POST[proj]; 122 140 $ID['menu'] = $_POST[menu]; 123 // echo "using POST: ", $ID['pass'], $ID['proj']; 124 125 // echo "POST list<br>\n"; 126 // foreach ($_POST as $key => $value) { 127 // echo "$key : $value<br>\n"; 128 // } 141 142 if ($VERBOSE) { 143 echo "using POST: ", $ID['pass'], $ID['proj'], "<br>\n"; 144 echo "POST list<br>\n"; 145 foreach ($_POST as $key => $value) { 146 echo "$key : $value<br>\n"; 147 } 148 } 129 149 } 130 150 131 151 // user is not logged in at all 132 152 if ($ID['pass'] == "") { 133 menu('ipp.menu.dat', 'Login', 'ipp.css', '' );153 menu('ipp.menu.dat', 'Login', 'ipp.css', '', ''); 134 154 logintext (); 135 155 loginform (); … … 153 173 $success = $qry->fetchInto($row); 154 174 if (! $success) { 155 menu('ipp.menu.dat', 'Login', 'ipp.css', '' );175 menu('ipp.menu.dat', 'Login', 'ipp.css', '', ''); 156 176 echo "unknown user, please login again<br>\n"; 157 177 loginform (); … … 170 190 } 171 191 172 function menu ($source, $title, $sheet, $append ) {192 function menu ($source, $title, $sheet, $append, $project) { 173 193 174 194 echo "<html><head><title> $title </title></head>\n\n"; … … 178 198 $root = "/phpipp"; 179 199 200 if (! $project) { $project = "none"; } 201 180 202 $file = fopen ($source, "r"); 181 203 … … 190 212 $name = trim($line[3]); 191 213 $base = trim($line[4]); 214 215 if (preg_match ('|\$PROJECT|', $name)) { 216 $name = preg_replace ('|\$PROJECT|', $project, $name); 217 } 192 218 193 219 if ($append) { -
trunk/ippMonitor/raw/ipp.science.dat
r9399 r9439 15 15 menulink | menuselect | link | Login | Login.php 16 16 menulink | menuselect | link | Select Project | SelectProject.php 17 menulink | menuselect | link | [$PROJECT] | SelectProject.php 17 18 18 19 menutop | menutop | plain | | 19 20 menutop | menutop | link | Load and Setup | LoadSetup.php 20 menutop | menutop| link | Science Steps | ScienceSteps.php21 menutops | menutops | link | Science Steps | ScienceSteps.php 21 22 menutop | menutop | link | Detrend Steps | DetrendSteps.php 22 23 menutop | menutop | link | Imfile Tables | ImfileTables.php … … 29 30 menulink | menuselect | link | P2 Pending Exp | p2PendingExp.php 30 31 menulink | menuselect | link | P3 Pending Exp | p3PendingExp.php 31 32 menutop | menutop | plain | |33 menutop | menutop | plain | External Links | none34 menutop | menutop | link | test page | phptest.php -
trunk/ippMonitor/raw/masterDetrendImfiles.php
r9080 r9439 4 4 5 5 $ID = checkID (); 6 if ($ID['proj']) { 7 $db = dbconnect($ID['proj']); 8 } else { 9 $db = dbconnect('detrend'); 10 } 6 // require an explicit project 7 if (! $ID['proj']) { projectform ($ID); } 8 9 $db = dbconnect($ID['proj']); 11 10 12 11 if ($ID['menu']) { … … 16 15 } 17 16 18 menu($myMenu, 'Master Detrend Imfiles', 'ipp.css', $ID['link'] );17 menu($myMenu, 'Master Detrend Imfiles', 'ipp.css', $ID['link'], $ID['proj']); 19 18 20 19 echo "<p> Master Detrend Imfiles </p>"; -
trunk/ippMonitor/raw/phptest.php
r8984 r9439 3 3 include 'ipp.php'; 4 4 5 menu('ipp.menu.dat', 'test.page', 'ipp.css', '' );5 menu('ipp.menu.dat', 'test.page', 'ipp.css', '', ''); 6 6 7 7 $varlist = array ('SERVER_NAME', 'GATEWAY_INTERFACE', 'SERVER_PROTOCOL',
Note:
See TracChangeset
for help on using the changeset viewer.
