From 78438193cceedc1f533c0bb3a1836c9fa3940b23 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Mon, 17 May 2004 03:23:06 +0000 Subject: [PATCH] Working STR page with SQLite. --- www/data/mxml.db | Bin 11264 -> 7168 bytes www/phplib/common.php | 235 ++++++++++++++++++++ www/phplib/db.php | 42 ++-- www/phplib/html.php | 6 +- www/str.php | 487 ++++++++++++++++++++--------------------- www/strfiles/.htaccess | 2 + www/style.css | 54 ++++- www/swfiles/.htaccess | 2 + 8 files changed, 551 insertions(+), 277 deletions(-) create mode 100644 www/phplib/common.php create mode 100644 www/strfiles/.htaccess create mode 100644 www/swfiles/.htaccess diff --git a/www/data/mxml.db b/www/data/mxml.db index f6e25a14b1f1321fda3890c66b8214740a8c5153..39c0e55718a6f5007c8439b466c398b1013f9ea3 100644 GIT binary patch literal 7168 zcmeI1&rcIU6vtmn16460gb+fAnRsf;reO<~R*j)Hs}g}=X;4nhvYoY~`^%jv(8L4} z9=&id@x+mn2mc7xih8cd$XTO7ivQU2Jp%D%_v3cXnCz_JT)q4y|TPos%)X> z#+K%ql;N<}ZPf^^13H3t=VMnj6GVv67Zh;-T>}ljFObg_k`2uHuB*q;Y9-WxEbJQ7EEXiVIS?7Dk zmMivoQh;1`&f4KM=yQdI#r*tyu?VZgYM9tT8@m`Y^w1@5 z@e)6~MR&87?>@Rr*H3r3tmwIu8smSjv7i?Q)mU7(xa&}`_D!y&La8c>z||nYgC>uS zuIZVtd9>~m39JzFSW!C_Fxs|0yHop1Rsv7c|}2F!ZBlOM4C zFv<}i;vv?+h?`vG+i0^qJBxzQe}gS1|A3$x!pzFvz6nc$bpld6FCq2B+j??cJ%jAs n|Fs^Wsw{JL$9l>q^bC?9SoK3J6PLorwT~)SAb_g!9|`;h6VWpl2993E2TM^aUGKZca@#BXit8F zKo9vO{U|;4+Aq*!k9{+)E_8)nB5cW%*?-rM*8y?xG<%dB-R73;~qVD7*Vx%3s| zKKt;#Aw$6qo>WCh z_z%(-#!lNlhm&T#)~d5s?Ny`BbUa&j+1YuEy=$Jmtu-&$oBD<0aTSW7J$vFv)gF#I zeW|X6F?CeP!;#Wn&M=UJK!y`DQSM+UX1_+B$AbwA#W-}-sG}wr&|@EK&6Cqw)2<#I zl`u-s{wx9|2Y&qEu;ldQcm36IOZ@mSZwapb^3ezxY7%UkTRZO6P^H$lvG z;V|+$Mb4MnFPpbEw|6cVw9p3g!|RI#F^ss3nU)g)i!+>yEk*C!$^tn0efhk#Uv`{0 zPqPpFU0b~fN0IL@%=K3LuIH_--M!mIuEq*qZ|=v5d`;wkWSl55ZauR~CbeLJ`oia) zh^vO>M1{vX(VWS)qVp_hjg?BQQGX4IYUo9%K7}vt`OIJU!j1Od&^jO8EOZ)6)H(C0 zCWM;scPUhF%fb&8Yt=usO7OB_wB6;U0Kf5zpg{zPz" to front of message +{ + $len = strlen($text); + $col = 0; + + if ($quote) + $qtext = "> "; + else + $qtext = ""; + + for ($i = 0; $i < $len; $i ++) + { + switch ($text[$i]) + { + case '<' : + $col ++; + $qtext .= "<"; + break; + + case '>' : + $col ++; + $qtext .= ">"; + break; + + case '&' : + $col ++; + $qtext .= "&"; + break; + + case "\n" : + if ($quote) + $qtext .= "\n> "; + else + $qtext .= "
"; + + $col = 0; + break; + + case "\r" : + break; + + case "\t" : + if ($col == 0) + $qtext .= "        "; + else + $qtext .= " "; + break; + + case " " : + if ($col == 0 || $text[$i + 1] == " ") + $qtext .= " "; + else if ($col > 65 && $quote) + { + $qtext .= "\n> "; + $col = 0; + } + else + $qtext .= " "; + + if ($col > 0) + $col ++; + break; + + case 'f' : + case 'h' : + if (substr($text, $i, 7) == "http://" || + substr($text, $i, 8) == "https://" || + substr($text, $i, 6) == "ftp://") + { + // Extract the URL and make this a link... + for ($j = $i; $j < $len; $j ++) + if ($text[$j] == " " || $text[$j] == "\n" || $text[$j] == "\r" || + $text[$j] == "\t" || $text[$j] == "\'" || $text[$j] == "'") + break; + + $count = $j - $i; + $url = substr($text, $i, $count); + $qtext .= "$url"; + $col += $count; + $i = $j - 1; + break; + } + + default : + $col ++; + $qtext .= $text[$i]; + break; + } + } + + return $qtext; +} + + +// +// 'sanitize_email()' - Convert an email address to something a SPAMbot +// can't read... +// + +function // O - Sanitized email +sanitize_email($email, // I - Email address + $html = 1) // I - HTML format? +{ + $nemail = ""; + $len = strlen($email); + + for ($i = 0; $i < $len; $i ++) + { + switch ($email[$i]) + { + case '@' : + if ($i > 0) + $i = $len; + else if ($html) + $nemail .= " at "; + else + $nemail .= " at "; + break; + + case '<' : + if ($i > 0) + $i = $len; + break; + + case '>' : + break; + + case '&' ; + $nemail .= "&"; + break; + + default : + $nemail .= $email[$i]; + break; + } + } + + return trim($nemail); +} + + +// +// 'sanitize_text()' - Sanitize text. +// + +function // O - Sanitized text +sanitize_text($text) // I - Original text +{ + $len = strlen($text); + $word = ""; + $qtext = ""; + + for ($i = 0; $i < $len; $i ++) + { + switch ($text[$i]) + { + case "\n" : + if (!strncmp($word, "http://", 7) || + !strncmp($word, "https://", 8) || + !strncmp($word, "ftp://", 6)) + $qtext .= "$word"; + else if (strchr($word, '@')) + $qtext .= sanitize_email($word); + else + $qtext .= quote_text($word); + + $qtext .= "
"; + $word = ""; + break; + + case "\r" : + break; + + case "\t" : + case " " : + if (!strncmp($word, "http://", 7) || + !strncmp($word, "https://", 8) || + !strncmp($word, "ftp://", 6)) + $qtext .= "$word"; + else if (strchr($word, '@')) + $qtext .= sanitize_email($word); + else + $qtext .= quote_text($word); + + if ($word) + $qtext .= " "; + else + $qtext .= " "; + + $word = ""; + break; + + default : + $word .= $text[$i]; + break; + } + } + + if (!strncmp($word, "http://", 7) || + !strncmp($word, "https://", 8) || + !strncmp($word, "ftp://", 6)) + $qtext .= "$word"; + else if (strchr($word, '@')) + $qtext .= sanitize_email($word); + else + $qtext .= quote_text($word); + + return $qtext; +} + + +// +// End of "$Id: common.php,v 1.1 2004/05/17 03:23:06 mike Exp $". +// +?> diff --git a/www/phplib/db.php b/www/phplib/db.php index 9d79b68..23425b8 100644 --- a/www/phplib/db.php +++ b/www/phplib/db.php @@ -1,6 +1,6 @@ $SQL_QUERY

\n"); + return (sqlite_query($DB_CONN, $SQL_QUERY)); } @@ -205,6 +207,6 @@ db_seek($result, // I - Result of query // -// End of "$Id: db.php,v 1.1 2004/05/17 02:14:55 mike Exp $". +// End of "$Id: db.php,v 1.2 2004/05/17 03:23:06 mike Exp $". // ?> diff --git a/www/phplib/html.php b/www/phplib/html.php index 0875839..700d3d0 100644 --- a/www/phplib/html.php +++ b/www/phplib/html.php @@ -1,6 +1,6 @@ \n" - ."" + ."" ."\n"); - print("" + print("" ."\n"); } - print("" + print("" ."" .""); if ($REMOTE_USER) print(""); print("\n"); - $bgcolor = "#eeeebb"; + $line = 0; if ($REMOTE_USER) $sumlen = 80; else $sumlen = 40; - db_data_seek($result, $index); + db_seek($result, $index); for ($i = 0; $i < $STR_PAGE_MAX && $row = db_next($result); $i ++) { - $date = date("M d, Y", $row->modify_date); - $summary = htmlspecialchars($row->summary, ENT_QUOTES); - $summabbr = htmlspecialchars(abbreviate($row->summary, $sumlen), ENT_QUOTES); - $prtext = $priority_text[$row->priority]; - $sttext = $status_text[$row->status]; - $sctext = $scope_text[$row->scope]; - - if ($row->is_published) - print(""); - else if ($bgcolor == "#eeeebb") - print(""); - else - print(""); + $date = date("M d, Y", $row['modify_date']); + $summary = htmlspecialchars($row['summary'], ENT_QUOTES); + $summabbr = htmlspecialchars(abbreviate($row['summary'], $sumlen), ENT_QUOTES); + $prtext = $priority_text[$row['priority']]; + $sttext = $status_text[$row['status']]; + $sctext = $scope_text[$row['scope']]; + + if ($row['is_published']) + print(""); + else + print(""); print("" + print(""); + print("" + ."$row[id]" ."" ."" ."" - ."" - ."" + ."" + ."" .""); if ($REMOTE_USER) { - if ($row->manager_email != "") - $email = sanitize_email($row->manager_email); + if ($row['manager_email'] != "") + $email = sanitize_email($row['manager_email']); else $email = "Unassigned"; @@ -899,21 +888,19 @@ switch ($op) } print("\n"); - if ($REMOTE_USER && $row->status >= $STR_STATUS_PENDING) + if ($REMOTE_USER && $row['status'] >= $STR_STATUS_PENDING) { $textresult = db_query("SELECT * FROM strtext " - ."WHERE str_id = $row->id " + ."WHERE str_id = $row[id] " ."ORDER BY id DESC LIMIT 1"); if ($textresult && db_count($textresult) > 0) { $textrow = db_next($textresult); - if ($row->is_published) - print(""); - else if ($bgcolor == "#eeeebb") - print(""); - else - print(""); + if ($row['is_published']) + print(""); + else + print(""); $email = sanitize_email($textrow->email); $contents = quote_text(abbreviate($textrow->contents, 128)); @@ -926,17 +913,14 @@ switch ($op) } } - if ($bgcolor == "#ddddaa") - $bgcolor = "#eeeebb"; - else - $bgcolor = "#ddddaa"; + $line = 1 - $line; } db_free($result); if ($REMOTE_USER) { - print("\n"); } else - print("\n"); if ($count > $STR_PAGE_MAX) @@ -1011,28 +995,28 @@ switch ($op) case 'M' : // Modify STR if ($REQUEST_METHOD == "POST") { - if (array_key_exists("STATUS", $HTTP_POST_VARS)) + if (array_key_exists("STATUS", $_POST)) { $time = time(); - $master_id = (int)$HTTP_POST_VARS["MASTER_ID"]; - $summary = db_escape_string($HTTP_POST_VARS["SUMMARY"]); - $subsystem = db_escape_string($HTTP_POST_VARS["SUBSYSTEM"]); - $create_email = db_escape_string($HTTP_POST_VARS["CREATE_EMAIL"]); - $manager_email = db_escape_string($HTTP_POST_VARS["MANAGER_EMAIL"]); - $modify_email = db_escape_string($managers[$REMOTE_USER]); - $contents = db_escape_string(trim($HTTP_POST_VARS["CONTENTS"])); - $message = $HTTP_POST_VARS["MESSAGE"]; + $master_id = (int)$_POST["MASTER_ID"]; + $summary = db_escape($_POST["SUMMARY"]); + $subsystem = db_escape($_POST["SUBSYSTEM"]); + $create_email = db_escape($_POST["CREATE_EMAIL"]); + $manager_email = db_escape($_POST["MANAGER_EMAIL"]); + $modify_email = db_escape($managers[$REMOTE_USER]); + $contents = db_escape(trim($_POST["CONTENTS"])); + $message = $_POST["MESSAGE"]; db_query("UPDATE str SET " ."master_id = $master_id, " - ."is_published = $HTTP_POST_VARS[IS_PUBLISHED], " - ."status = $HTTP_POST_VARS[STATUS], " - ."priority = $HTTP_POST_VARS[PRIORITY], " - ."scope = $HTTP_POST_VARS[SCOPE], " + ."is_published = $_POST[IS_PUBLISHED], " + ."status = $_POST[STATUS], " + ."priority = $_POST[PRIORITY], " + ."scope = $_POST[SCOPE], " ."summary = '$summary', " ."subsystem = '$subsystem', " - ."str_version = '$HTTP_POST_VARS[STR_VERSION]', " - ."fix_version = '$HTTP_POST_VARS[FIX_VERSION]', " + ."str_version = '$_POST[STR_VERSION]', " + ."fix_version = '$_POST[FIX_VERSION]', " ."create_email = '$create_email', " ."manager_email = '$manager_email', " ."modify_date = $time, " @@ -1041,16 +1025,16 @@ switch ($op) if ($contents != "") { - db_query("INSERT INTO strtext VALUES(0,$id,1,$time," + db_query("INSERT INTO strtext VALUES(NULL,$id,1,$time," ."'$modify_email','$contents')"); - $contents = trim($HTTP_POST_VARS["CONTENTS"]) . "\n\n"; + $contents = trim($_POST["CONTENTS"]) . "\n\n"; } if ($message != "") { - $contents = db_escape_string($messages[$message]); + $contents = db_escape($messages[$message]); - db_query("INSERT INTO strtext VALUES(0,$id,1,$time," + db_query("INSERT INTO strtext VALUES(NULL,$id,1,$time," ."'$modify_email','$contents')"); $contents = $messages[$message] . "\n\n"; @@ -1060,19 +1044,19 @@ switch ($op) notify_creator($id, "updated", $contents); } - else if (array_key_exists("FILE_ID", $HTTP_POST_VARS)) + else if (array_key_exists("FILE_ID", $_POST)) { db_query("UPDATE strfile SET " - ."is_published = $HTTP_POST_VARS[IS_PUBLISHED] " - ."WHERE id = $HTTP_POST_VARS[FILE_ID]"); + ."is_published = $_POST[IS_PUBLISHED] " + ."WHERE id = $_POST[FILE_ID]"); header("Location: $PHP_SELF?M$id$options"); } - else if (array_key_exists("TEXT_ID", $HTTP_POST_VARS)) + else if (array_key_exists("TEXT_ID", $_POST)) { db_query("UPDATE strtext SET " - ."is_published = $HTTP_POST_VARS[IS_PUBLISHED] " - ."WHERE id = $HTTP_POST_VARS[TEXT_ID]"); + ."is_published = $_POST[IS_PUBLISHED] " + ."WHERE id = $_POST[TEXT_ID]"); header("Location: $PHP_SELF?M$id$options"); } @@ -1100,20 +1084,20 @@ switch ($op) $row = db_next($result); - $create_email = htmlspecialchars($row->create_email); - $manager_email = htmlspecialchars($row->manager_email); - $summary = htmlspecialchars($row->summary, ENT_QUOTES); + $create_email = htmlspecialchars($row['create_email']); + $manager_email = htmlspecialchars($row['manager_email']); + $summary = htmlspecialchars($row['summary'], ENT_QUOTES); print("" ."

[ " ."Home | " ."Documentation | " @@ -114,7 +114,7 @@ function html_footer() { print("
Copyright 2003-2004 by Michael Sweet. This library is free " ."software; you can redistribute it and/or modify it " ."under the terms of the GNU Library General Public " diff --git a/www/str.php b/www/str.php index 1942817..b281109 100644 --- a/www/str.php +++ b/www/str.php @@ -2,6 +2,7 @@ // Standard stuff... include_once "phplib/html.php"; +include_once "phplib/common.php"; include_once "phplib/db.php"; // STR constants... @@ -110,13 +111,14 @@ $scope_long = array( ); // Global web vars... -global $PHP_SELF; -global $HTTP_COOKIE_VARS; -global $HTTP_POST_FILES; -global $HTTP_POST_VARS; -global $REMOTE_USER; -global $REQUEST_METHOD; -global $SERVER_NAME; +global $_COOKIE, $_FILES, $_POST, $_SERVER; + +$argc = $_SERVER["argc"]; +$argv = $_SERVER["argv"]; +$PHP_SELF = $_SERVER["PHP_SELF"]; +$REMOTE_USER = $_SERVER["PHP_AUTH_USER"]; +$REQUEST_METHOD = $_SERVER["REQUEST_METHOD"]; +$SERVER_NAME = $_SERVER["SERVER_NAME"]; // Function to abbreviate long strings... function abbreviate($text, $maxlen = 32) @@ -140,31 +142,31 @@ function notify_creator($id, $what = "updated", $contents = "") { $contents = wordwrap($contents); $row = db_next($result); - $prtext = $priority_long[$row->priority]; - $sttext = $status_long[$row->status]; - $sctext = $scope_long[$row->scope]; + $prtext = $priority_long[$row['priority']]; + $sttext = $status_long[$row['status']]; + $sctext = $scope_long[$row['scope']]; - if ($row->subsystem != "") - $subsystem = $row->subsystem; + if ($row['subsystem'] != "") + $subsystem = $row['subsystem']; else $subsystem = "Unassigned"; - if ($row->fix_version != "") - $fix_version = $row->fix_version; + if ($row['fix_version'] != "") + $fix_version = $row['fix_version']; else $fix_version = "Unassigned"; - if ($row->create_email != $row->modify_email && - $row->create_email != $manager) - mail($row->create_email, "Mini-XML STR #$id $what", + if ($row['create_email'] != $row['modify_email'] && + $row['create_email'] != $manager) + mail($row['create_email'], "Mini-XML STR #$id $what", "Your software trouble report #$id has been $what. You can check\n" ."the status of the report and add additional comments and/or files\n" ."at the following URL:\n" ."\n" ." http://www.easysw.com/str.php?L$id\n" ."\n" - ." Summary: $row->summary\n" - ." Version: $row->str_version\n" + ." Summary: $row[summary]\n" + ." Version: $row[str_version]\n" ." Status: $sttext\n" ." Priority: $prtext\n" ." Scope: $sctext\n" @@ -187,8 +189,8 @@ function notify_creator($id, $what = "updated", $contents = "") ."\n" ." http://www.easysw.com/str.php?L$id\n" ."\n" - ." Summary: $row->summary\n" - ." Version: $row->str_version\n" + ." Summary: $row[summary]\n" + ." Version: $row[str_version]\n" ." Status: $sttext\n" ." Priority: $prtext\n" ." Scope: $sctext\n" @@ -203,12 +205,12 @@ function notify_creator($id, $what = "updated", $contents = "") db_free($ccresult); } - if ($row->manager_email != "") - $manager = $row->manager_email; + if ($row['manager_email'] != "") + $manager = $row['manager_email']; else $manager = "mxml"; - if ($row->modify_email != $manager) + if ($row['modify_email'] != $manager) mail($manager, "Mini-XML STR #$id $what", "The software trouble report #$id assigned to you has been $what.\n" ."You can manage the report and add additional comments and/or files\n" @@ -216,8 +218,8 @@ function notify_creator($id, $what = "updated", $contents = "") ."\n" ." http://www.easysw.com/private/str.php?L$id\n" ."\n" - ." Summary: $row->summary\n" - ." Version: $row->str_version\n" + ." Summary: $row[summary]\n" + ." Version: $row[str_version]\n" ." Status: $sttext\n" ." Priority: $prtext\n" ." Scope: $sctext\n" @@ -261,11 +263,6 @@ $search = ""; $index = 0; $femail = 0; -global $argc, $argv; - -print("

argc=$argc

\n"); -print("

argv=$argv

\n"); - if ($argc) { $op = $argv[0][0]; @@ -353,16 +350,16 @@ else if ($REQUEST_METHOD == "POST") { - if (array_key_exists("FPRIORITY", $HTTP_POST_VARS)) - $priority = (int)$HTTP_POST_VARS["FPRIORITY"]; - if (array_key_exists("FSTATUS", $HTTP_POST_VARS)) - $status = (int)$HTTP_POST_VARS["FSTATUS"]; - if (array_key_exists("FSCOPE", $HTTP_POST_VARS)) - $scope = (int)$HTTP_POST_VARS["FSCOPE"]; - if (array_key_exists("FEMAIL", $HTTP_POST_VARS)) - $femail = (int)$HTTP_POST_VARS["FEMAIL"]; - if (array_key_exists("SEARCH", $HTTP_POST_VARS)) - $search = $HTTP_POST_VARS["SEARCH"]; + if (array_key_exists("FPRIORITY", $_POST)) + $priority = (int)$_POST["FPRIORITY"]; + if (array_key_exists("FSTATUS", $_POST)) + $status = (int)$_POST["FSTATUS"]; + if (array_key_exists("FSCOPE", $_POST)) + $scope = (int)$_POST["FSCOPE"]; + if (array_key_exists("FEMAIL", $_POST)) + $femail = (int)$_POST["FEMAIL"]; + if (array_key_exists("SEARCH", $_POST)) + $search = $_POST["SEARCH"]; } $options = "+P$priority+S$status+C$scope+I$index+E$femail+Q" . urlencode($search); @@ -385,20 +382,20 @@ switch ($op) break; } - if (array_key_exists("STATUS", $HTTP_POST_VARS) && - ($HTTP_POST_VARS["STATUS"] != "" || - $HTTP_POST_VARS["PRIORITY"] != "" || - $HTTP_POST_VARS["MANAGER_EMAIL"] != "" || - $HTTP_POST_VARS["MESSAGE"] != "")) + if (array_key_exists("STATUS", $_POST) && + ($_POST["STATUS"] != "" || + $_POST["PRIORITY"] != "" || + $_POST["MANAGER_EMAIL"] != "" || + $_POST["MESSAGE"] != "")) { $time = time(); - $manager_email = db_escape_string($HTTP_POST_VARS["MANAGER_EMAIL"]); - $modify_email = db_escape_string($managers[$REMOTE_USER]); - $message = $HTTP_POST_VARS["MESSAGE"]; + $manager_email = db_escape($_POST["MANAGER_EMAIL"]); + $modify_email = db_escape($managers[$REMOTE_USER]); + $message = $_POST["MESSAGE"]; if ($message != "") { - $contents = db_escape_string($messages[$message]); + $contents = db_escape($messages[$message]); $mailmsg = $messages[$message] . "\n\n"; } else @@ -409,15 +406,15 @@ switch ($op) $query = "modify_date = $time, modify_email = '$modify_email'"; - if ($HTTP_POST_VARS["STATUS"] != "") - $query .= ", status = $HTTP_POST_VARS[STATUS]"; - if ($HTTP_POST_VARS["PRIORITY"] != "") - $query .= ", priority = $HTTP_POST_VARS[PRIORITY]"; + if ($_POST["STATUS"] != "") + $query .= ", status = $_POST[STATUS]"; + if ($_POST["PRIORITY"] != "") + $query .= ", priority = $_POST[PRIORITY]"; if ($manager_email != "") $query .= ", manager_email = '$manager_email'"; - reset($HTTP_POST_VARS); - while (list($key, $val) = each($HTTP_POST_VARS)) + reset($_POST); + while (list($key, $val) = each($_POST)) if (substr($key, 0, 3) == "ID_") { $id = (int)substr($key, 3); @@ -426,7 +423,7 @@ switch ($op) if ($contents != "") { - db_query("INSERT INTO strtext VALUES(0,$id,1,$time," + db_query("INSERT INTO strtext VALUES(NULL,$id,1,$time," ."'$modify_email','$contents')"); notify_creator($id, "updated", $mailmsg); @@ -455,7 +452,7 @@ switch ($op) print("

" ."[ Return to STR List"); - if ($row->status >= $STR_STATUS_ACTIVE) + if ($row['status'] >= $STR_STATUS_ACTIVE) print(" | Post Text" ." | Post File"); @@ -464,15 +461,15 @@ switch ($op) print(" ]

\n"); - $create_email = sanitize_email($row->create_email); - $manager_email = sanitize_email($row->manager_email); - $subsystem = $row->subsystem; - $summary = htmlspecialchars($row->summary, ENT_QUOTES); - $prtext = $priority_long[$row->priority]; - $sttext = $status_long[$row->status]; - $sctext = $scope_long[$row->scope]; - $str_version = $row->str_version; - $fix_version = $row->fix_version; + $create_email = sanitize_email($row['create_email']); + $manager_email = sanitize_email($row['manager_email']); + $subsystem = $row['subsystem']; + $summary = htmlspecialchars($row['summary'], ENT_QUOTES); + $prtext = $priority_long[$row['priority']]; + $sttext = $status_long[$row['status']]; + $sctext = $scope_long[$row['scope']]; + $str_version = $row['str_version']; + $fix_version = $row['fix_version']; if ($manager_email == "") $manager_email = "Unassigned"; @@ -485,12 +482,12 @@ switch ($op) print("

\n"); - if ($row->master_id > 0) + if ($row['master_id'] > 0) print("" - ."\n"); + ."\n"); - if (!$row->is_published) + if (!$row['is_published']) print("\n"); @@ -507,8 +504,8 @@ switch ($op) if ($REMOTE_USER) $email = htmlspecialchars($managers[$REMOTE_USER]); - else if (array_key_exists("FROM", $HTTP_COOKIE_VARS)) - $email = htmlspecialchars($HTTP_COOKIE_VARS["FROM"]); + else if (array_key_exists("FROM", $_COOKIE)) + $email = htmlspecialchars($_COOKIE["FROM"]); else $email = ""; @@ -525,7 +522,7 @@ switch ($op) db_free($result); print("

Trouble Report Files:"); - if ($row->status >= $STR_STATUS_ACTIVE) + if ($row['status'] >= $STR_STATUS_ACTIVE) print(" [ Post File ]"); print("

\n"); @@ -538,27 +535,24 @@ switch ($op) { print("

Duplicate Of:STR " - ."#$row->master_id
STR " + ."#$row[master_id]
This STR is " ."currently hidden from public view.
\n" - ."" + ."" ."\n"); - $bgcolor = "#eeeebb"; + $line = 0; while ($row = db_next($result)) { - $date = date("M d, Y", $row->date); - $time = date("H:m", $row->date); - $email = sanitize_email($row->email); - $filename = htmlspecialchars($row->filename); + $date = date("M d, Y", $row['date']); + $time = date("H:m", $row['date']); + $email = sanitize_email($row['email']); + $filename = htmlspecialchars($row['filename']); - print("" + print("" ."" ."" ."\n"); - if ($bgcolor == "#ddddaa") - $bgcolor = "#eeeebb"; - else - $bgcolor = "#ddddaa"; + $line = 1 - $line; } print("
Name/Time/Date
Name/Time/DateFilename
$email
$time $date		" ."$filename

\n"); } @@ -566,7 +560,7 @@ switch ($op) db_free($result); print("

Trouble Report Dialog:"); - if ($row->status >= $STR_STATUS_ACTIVE) + if ($row['status'] >= $STR_STATUS_ACTIVE) print(" [ Post Text ]"); print("

\n"); @@ -579,27 +573,24 @@ switch ($op) { print("

\n" - ."" + ."" ."\n"); - $bgcolor = "#eeeebb"; + $line = 0; while ($row = db_next($result)) { - $date = date("M d, Y", $row->date); - $time = date("H:m", $row->date); - $email = sanitize_email($row->email); - $contents = quote_text($row->contents); + $date = date("M d, Y", $row['date']); + $time = date("H:m", $row['date']); + $email = sanitize_email($row['email']); + $contents = quote_text($row['contents']); - print("" + print("" ."" ."" ."\n"); - if ($bgcolor == "#ddddaa") - $bgcolor = "#eeeebb"; - else - $bgcolor = "#ddddaa"; + $line = 1 - $line; } print("
Name/Time/Date
Name/Time/DateText
$email
$time $date		$contents

\n"); } @@ -658,7 +649,7 @@ switch ($op) } print("\n"); - if ($REMOTE_USER || array_key_exists("FROM", $HTTP_COOKIE_VARS)) + if ($REMOTE_USER || array_key_exists("FROM", $_COOKIE)) { print("Show: 
IdPriority
IdPriorityStatusScopeSummaryVersionLast UpdatedAssigned To
"); if ($REMOTE_USER) - print(""); - print("" - ."$row->id$prtext$sttext$sctext$summabbr$row->str_version$summabbr$row[str_version]$date
"); + print("
"); print("Status: 
" + print("
" ."
\n"); print("" ."\n"); + ."value='$row[master_id]' size='6'>\n"); print("" ."\n"); + ."value='$row[str_version]'>\n"); print("" ."\n"); print("
Duplicate Of:
Published:"); print("
Version:
Created By:manager_email == $val) + if ($row['manager_email'] == $val) print(" selected"); print(">$temp"); } @@ -1211,7 +1195,7 @@ switch ($op) while (list($key, $val) = each($versions)) { print(""); } @@ -1249,23 +1233,23 @@ switch ($op) { print("

\n" - ."" + ."" ."\n"); - $bgcolor = "#eeeebb"; + $line = 0; while ($row = db_next($result)) { - $date = date("M d, Y", $row->date); - $time = date("H:m", $row->date); - $email = sanitize_email($row->email); - $filename = htmlspecialchars($row->filename); + $date = date("M d, Y", $row['date']); + $time = date("H:m", $row['date']); + $email = sanitize_email($row['email']); + $filename = htmlspecialchars($row['filename']); - print("" + print("" ."" ."\n"); - if ($bgcolor == "#ddddaa") - $bgcolor = "#eeeebb"; - else - $bgcolor = "#ddddaa"; + $line = 1 - $line; } print("
Name/Time/Date
Name/Time/DateFilename
$email
$time $date
" ."" - .""); + .""); - if ($row->is_published) + if ($row['is_published']) print("" .""); else @@ -1277,10 +1261,7 @@ switch ($op) ."$filename

\n"); } @@ -1300,24 +1281,24 @@ switch ($op) { print("

\n" - ."" + ."" ."\n"); - $bgcolor = "#eeeebb"; + $line = 0; while ($row = db_next($result)) { - $date = date("M d, Y", $row->date); - $time = date("H:m", $row->date); - $email = sanitize_email($row->email); - $contents = quote_text($row->contents); + $date = date("M d, Y", $row['date']); + $time = date("H:m", $row['date']); + $email = sanitize_email($row['email']); + $contents = quote_text($row['contents']); - print("" + print("" ."" ."\n"); - if ($bgcolor == "#ddddaa") - $bgcolor = "#eeeebb"; - else - $bgcolor = "#ddddaa"; + $line = 1 - $line; } print("
Name/Time/Date
Name/Time/DateText
$email
$time $date
" ."" - .""); + .""); - if ($row->is_published) + if ($row['is_published']) print("" .""); else @@ -1328,10 +1309,7 @@ switch ($op) ."		$contents

\n"); } @@ -1345,17 +1323,17 @@ switch ($op) case 'T' : // Post text for STR # if ($REQUEST_METHOD == "POST") { - $contents = $HTTP_POST_VARS["CONTENTS"]; + $contents = $_POST["CONTENTS"]; - if (array_key_exists("EMAIL", $HTTP_POST_VARS)) + if (array_key_exists("EMAIL", $_POST)) { - $email = $HTTP_POST_VARS["EMAIL"]; + $email = $_POST["EMAIL"]; setcookie("FROM", "$email", time() + 57600, $PHP_SELF, $SERVER_NAME); } else if ($REMOTE_USER) $email = $managers[$REMOTE_USER]; - else if (array_key_exists("FROM", $HTTP_COOKIE_VARS)) - $email = $HTTP_COOKIE_VARS["FROM"]; + else if (array_key_exists("FROM", $_COOKIE)) + $email = $_COOKIE["FROM"]; else $email = ""; @@ -1370,7 +1348,7 @@ switch ($op) if ($REMOTE_USER) $email = $managers[$REMOTE_USER]; else - $email = $HTTP_COOKIE_VARS["FROM"]; + $email = $_COOKIE["FROM"]; $contents = ""; @@ -1381,10 +1359,10 @@ switch ($op) if ($REQUEST_METHOD == "POST" && $havedata) { $time = time(); - $temail = db_escape_string($email); - $tcontents = db_escape_string($contents); + $temail = db_escape($email); + $tcontents = db_escape($contents); - db_query("INSERT INTO strtext VALUES(0,$id,1,$time,'$temail'," + db_query("INSERT INTO strtext VALUES(NULL,$id,1,$time,'$temail'," ."'$tcontents')"); db_query("UPDATE str SET modify_date=$time, modify_email='$temail' " @@ -1454,24 +1432,24 @@ switch ($op) case 'F' : // Post file for STR # if ($REQUEST_METHOD == "POST") { - if (array_key_exists("EMAIL", $HTTP_POST_VARS)) + if (array_key_exists("EMAIL", $_POST)) { - $email = $HTTP_POST_VARS["EMAIL"]; + $email = $_POST["EMAIL"]; setcookie("FROM", "$email", time() + 57600, $PHP_SELF, $SERVER_NAME); } else if ($REMOTE_USER) $email = $managers[$REMOTE_USER]; - else if (array_key_exists("FROM", $HTTP_COOKIE_VARS)) - $email = $HTTP_COOKIE_VARS["FROM"]; + else if (array_key_exists("FROM", $_COOKIE)) + $email = $_COOKIE["FROM"]; else $email = ""; if (ereg("Anonymous.*", $email)) $email = ""; - if (array_key_exists("STRFILE", $HTTP_POST_FILES)) + if (array_key_exists("STRFILE", $_FILES)) { - $filename = $HTTP_POST_FILES['STRFILE']['name']; + $filename = $_FILES['STRFILE']['name']; if ($filename[0] == '.' || $filename[0] == '/') $filename = ""; } @@ -1486,7 +1464,7 @@ switch ($op) if ($REMOTE_USER) $email = $managers[$REMOTE_USER]; else - $email = $HTTP_COOKIE_VARS["FROM"]; + $email = $_COOKIE["FROM"]; $filename = ""; @@ -1497,10 +1475,10 @@ switch ($op) if ($REQUEST_METHOD == "POST" && $havedata) { $time = time(); - $temail = db_escape_string($email); - $tmp_name = $HTTP_POST_FILES['STRFILE']['tmp_name']; - $name = $HTTP_POST_FILES['STRFILE']['name']; - $tname = db_escape_string($name); + $temail = db_escape($email); + $tmp_name = $_FILES['STRFILE']['tmp_name']; + $name = $_FILES['STRFILE']['name']; + $tname = db_escape($name); $infile = fopen($tmp_name, "rb"); @@ -1529,7 +1507,7 @@ switch ($op) fclose($infile); fclose($outfile); - db_query("INSERT INTO strfile VALUES(0,$id,1,$time,'$temail'," + db_query("INSERT INTO strfile VALUES(NULL,$id,1,$time,'$temail'," ."'$tname')"); db_query("UPDATE str SET modify_date=$time, modify_email='$temail' " @@ -1584,7 +1562,7 @@ switch ($op) ."maxsize='128'>
"); - if (array_key_exists("STRFILE", $HTTP_POST_FILES)) + if (array_key_exists("STRFILE", $_FILES)) print("File:"); else print("${hstart}File:$hend"); @@ -1603,27 +1581,27 @@ switch ($op) if ($REQUEST_METHOD == "POST") { - $npriority = $HTTP_POST_VARS["PRIORITY"]; - $nscope = $HTTP_POST_VARS["SCOPE"]; - $summary = $HTTP_POST_VARS["SUMMARY"]; - $version = $HTTP_POST_VARS["VERSION"]; - $contents = $HTTP_POST_VARS["CONTENTS"]; + $npriority = $_POST["PRIORITY"]; + $nscope = $_POST["SCOPE"]; + $summary = $_POST["SUMMARY"]; + $version = $_POST["VERSION"]; + $contents = $_POST["CONTENTS"]; - if (array_key_exists("EMAIL", $HTTP_POST_VARS)) + if (array_key_exists("EMAIL", $_POST)) { - $email = $HTTP_POST_VARS["EMAIL"]; + $email = $_POST["EMAIL"]; setcookie("FROM", "$email", time() + 57600, $PHP_SELF, $SERVER_NAME); } else if ($REMOTE_USER) $email = $managers[$REMOTE_USER]; - else if (array_key_exists("FROM", $HTTP_COOKIE_VARS)) - $email = $HTTP_COOKIE_VARS["FROM"]; + else if (array_key_exists("FROM", $_COOKIE)) + $email = $_COOKIE["FROM"]; else $email = ""; - if (array_key_exists("STRFILE", $HTTP_POST_FILES)) + if (array_key_exists("STRFILE", $_FILES)) { - $filename = $HTTP_POST_FILES['STRFILE']['name']; + $filename = $_FILES['STRFILE']['name']; if ($filename[0] == '.' || $filename[0] == '/') $filename = ""; } @@ -1639,7 +1617,7 @@ switch ($op) if ($REMOTE_USER) $email = $managers[$REMOTE_USER]; else - $email = $HTTP_COOKIE_VARS["FROM"]; + $email = $_COOKIE["FROM"]; $npriority = 0; $nscope = 0; @@ -1655,25 +1633,25 @@ switch ($op) if ($REQUEST_METHOD == "POST" && $havedata) { $time = time(); - $temail = db_escape_string($email); - $tsummary = db_escape_string($summary); - $tcontents = db_escape_string($contents); + $temail = db_escape($email); + $tsummary = db_escape($summary); + $tcontents = db_escape($contents); - db_query("INSERT INTO str VALUES(0,0," - ."$HTTP_POST_VARS[IS_PUBLISHED],$STR_STATUS_NEW," + db_query("INSERT INTO str VALUES(NULL,0," + ."$_POST[IS_PUBLISHED],$STR_STATUS_NEW," ."$npriority,$nscope,'$tsummary','','$version','',''," ."$time,'$temail',$time,'$temail')"); - $id = db_insertID(); + $id = db_insert_id(); - db_query("INSERT INTO strtext VALUES(0,$id,1,$time,'$temail'," + db_query("INSERT INTO strtext VALUES(NULL,$id,1,$time,'$temail'," ."'$tcontents')"); if ($filename != "") { - $tmp_name = $HTTP_POST_FILES['STRFILE']['tmp_name']; - $name = $HTTP_POST_FILES['STRFILE']['name']; - $tname = db_escape_string($name); + $tmp_name = $_FILES['STRFILE']['tmp_name']; + $name = $_FILES['STRFILE']['name']; + $tname = db_escape($name); $infile = fopen($tmp_name, "rb"); @@ -1702,7 +1680,7 @@ switch ($op) fclose($infile); fclose($outfile); - db_query("INSERT INTO strfile VALUES(0,$id,1,$time,'$temail'," + db_query("INSERT INTO strfile VALUES(NULL,$id,1,$time,'$temail'," ."'$tname')"); } @@ -1727,9 +1705,12 @@ switch ($op) } else { - print("

This form is for reporting bugs and requesting features " - ."in the Mini-XML software. Thank you for helping us " - ."to make Mini-XML a better product!

\n"); + print("

Please use this form to report all bugs and request " + ."features in the Mini-XML software. Be sure to include " + ."the operating system, compiler, sample programs and/or " + ."files, and any other information you can about your " + ."problem. Thank you for helping us to make Mini-XML " + ."a better library!

\n"); $hstart = ""; $hend = ""; @@ -1856,8 +1837,8 @@ switch ($op) exit(); } - $notification = $HTTP_POST_VARS["NOTIFICATION"]; - $email = $HTTP_POST_VARS["EMAIL"]; + $notification = $_POST["NOTIFICATION"]; + $email = $_POST["EMAIL"]; if (($notification != "ON" && $notification != "OFF") || $email == "") { @@ -1882,7 +1863,7 @@ switch ($op) ."notification list for STR #$id!

\n"); else { - db_query("INSERT INTO strcc VALUES(0,$id,'$email')"); + db_query("INSERT INTO strcc VALUES(NULL,$id,'$email')"); print("

Your email address has been added to the notification list " ."for STR #$id.

\n"); diff --git a/www/strfiles/.htaccess b/www/strfiles/.htaccess new file mode 100644 index 0000000..6537b6a --- /dev/null +++ b/www/strfiles/.htaccess @@ -0,0 +1,2 @@ +DirectoryIndex off + diff --git a/www/style.css b/www/style.css index 1bb21db..94eaea1 100644 --- a/www/style.css +++ b/www/style.css @@ -1,30 +1,82 @@ BODY { background: #ffffff; - font-family: sans-serif; + color: #000000; + font-family: serif; text-align: justify; } +P, TD, TH { + color: #000000; + font-family: serif; +} + +H1, H2, H3, H4, H5, H6 { + color: #000000; + font-family: sans-serif; +} + +KBD { + color: #006600; + font-family: monospace; + font-weight: bold; +} + +PRE { + color: #000000; + font-family: monospace; +} + +PRE.command { + margin-left: 2em; + font-size: smaller; +} + +SUB, SUP { + font-size: smaller; +} + +TR.header, TR.header TH, TH.header { + background-color: #cccccc; +} + +TR.data0, TD.data0 { + background-color: #eeeeee; +} + +TR.data1, TD.data1 { + background-color: #dddddd; +} + +INPUT[TYPE="TEXT"], TEXTAREA { + font-family: monospace; +} + A:link { + font-family: sans-serif; font-weight: bold; text-decoration: none; color: #00007f; } A:visited { + font-family: sans-serif; font-weight: bold; text-decoration: none; color: #0000ff; } A:hover { + font-family: sans-serif; font-weight: bold; text-decoration: none; color: #7f0000; } A:active { + font-family: sans-serif; font-weight: bold; text-decoration: underline; color: #ff0000; } + diff --git a/www/swfiles/.htaccess b/www/swfiles/.htaccess new file mode 100644 index 0000000..6537b6a --- /dev/null +++ b/www/swfiles/.htaccess @@ -0,0 +1,2 @@ +DirectoryIndex off +