[Changes to using _REQUEST tony@tonywhitmore.co.uk**20060301215236 * SATYR: Tidied up settings table code. * SATYR: Renamed editcategory.php to category.php and amended menu entries appropriately. Reworked form code. * SATYR: Updated ICT and admin help page. * ChkNet: Moved to using _REQUEST array for transferring data between pages. * Login: Added support to login.php for HelpDesk phone number as held in settings table. ] { move ./SATYR/editcategory.php ./SATYR/category.php hunk ./CHANGELOG 11 -* SATYR: Added page for reviewing recently closed support requests. +* SATYR: Added page for reviewing recently closed support requests. +* SATYR: Tidied up settings table code. +* SATYR: Renamed editcategory.php to category.php and amended menu entries appropriately. Reworked form code. +* SATYR: Updated ICT and admin help page. hunk ./CHANGELOG 24 +* ChkNet: Moved to using _REQUEST array for transferring data between pages. hunk ./CHANGELOG 29 -* Login: Fixed ICT Support Team Members table header +* Login: Fixed ICT Support Team Members table header. +* Login: Added support to login.php for HelpDesk phone number as held in settings table. hunk ./SATYR/cancel.php 44 -$query = "UPDATE SATYR SET activeEdit = \"0\" WHERE job_id = '" . $_GET['job_id'] . "'"; +$query = "UPDATE SATYR SET activeEdit = \"0\" WHERE job_id = '" . $_REQUEST['job_id'] . "'"; hunk ./SATYR/cancel.php 49 -echo "
\n"; + echo "
\n"; hunk ./SATYR/category.php 54 - echo "\n -
\n"; + echo "\n\n"; - echo "\n"; - echo "\n"; - echo "\n"; - } + { + extract ($row); + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + } hunk ./SATYR/settings.php 117 - // Produce the special row for allowing mail integration tick box - $query = "SELECT * FROM SATYR_settings WHERE function = 'allow_mail_integration'"; - $result = $db->query($query); - if (DB::isError($db)) {die($db->getMessage());} - while ( $row = $result->fetchRow() ) - { - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - } - hunk ./SATYR/settings.php 118 - echo "\n"; hunk ./SATYR/stats.php 97 - - hunk ./SATYR/submit.php 29 - include ("STORM/common/html/htmlheader.inc"); +include ("STORM/common/html/htmlheader.inc"); hunk ./SATYR/submit.php 32 - include ("STORM/common/misc/functions.inc"); - include ("STORM/SATYR/misc/functions.inc"); +include ("STORM/common/misc/functions.inc"); +include ("STORM/SATYR/misc/functions.inc"); hunk ./SATYR/submit.php 36 - sessionchk(); +sessionchk(); hunk ./SATYR/submit.php 40 - // Include the connection to the database server details. + // Include the connection to the database server details. hunk ./SATYR/submit.php 70 - echo "value=\"" . $_POST['username'] . "\""; + echo "value=\"" . $_REQUEST['username'] . "\""; hunk ./SATYR/submit.php 83 - echo "value=\"" . $_POST['nickname'] . "\""; + echo "value=\"" . $_REQUEST['nickname'] . "\""; hunk ./SATYR/submit.php 97 - create_drop_down_list("room","name","roomlist",$_POST['room']); + create_drop_down_list("room","name","roomlist",$_REQUEST['room']); hunk ./SATYR/submit.php 111 - echo "value=\"" . $_POST['machineNumber'] . "\""; + echo "value=\"" . $_REQUEST['machineNumber'] . "\""; hunk ./SATYR/submit.php 125 - echo "value=\"" . $_POST['systemID'] . "\""; + echo "value=\"" . $_REQUEST['systemID'] . "\""; hunk ./SATYR/submit.php 142 - echo "\n"; +echo "\n"; hunk ./includes/STORM/SATYR/html/admin_nav.inc 40 - echo "\n"; +echo "\n"; hunk ./includes/STORM/SATYR/html/admin_nav.inc 43 - echo "\n"; - +echo "\n"; + hunk ./includes/STORM/SATYR/html/admin_nav.inc 50 - echo "\n"; - +echo "\n"; + hunk ./includes/STORM/SATYR/html/admin_nav.inc 53 - echo "\n"; +echo "\n"; hunk ./includes/STORM/SATYR/html/admin_nav.inc 60 - echo "\n"; +echo "\n"; hunk ./includes/STORM/SATYR/html/admin_nav.inc 63 - echo "\n"; +echo "\n"; hunk ./includes/STORM/SATYR/html/admin_nav.inc 70 - echo "\n"; +echo "\n"; hunk ./includes/STORM/SATYR/html/admin_nav.inc 73 - echo "\n"; +echo "\n"; hunk ./includes/STORM/SATYR/html/admin_nav.inc 80 - echo "\n"; - +echo "\n"; + hunk ./includes/STORM/SATYR/html/admin_nav.inc 83 - echo "\n"; +echo "\n"; hunk ./includes/STORM/SATYR/html/admin_nav.inc 90 - echo "\n"; - +echo "\n"; + hunk ./includes/STORM/SATYR/html/admin_nav.inc 93 - echo "\n"; - +echo "\n"; + hunk ./includes/STORM/SATYR/html/admin_nav.inc 100 - echo "\n"; +echo "\n"; + hunk ./includes/STORM/SATYR/html/admin_nav.inc 103 - echo "
\n"; hunk ./SATYR/category.php 104 + echo "\n"; hunk ./SATYR/category.php 113 - // Update database with POSTed data + // Update SATYRcategory table data hunk ./SATYR/category.php 121 - if ( $_POST[$i] == "" ) - {//If the POSTed version of the category name is blank, drop it + if ( $_REQUEST[$i] == "" ) + {//If the submitted version of the category name is blank, drop it hunk ./SATYR/category.php 128 - { - $query1 = "UPDATE SATYRcategory SET name = '" . $_POST[$i] . "' WHERE name = '" . $row['name'] . "'"; + { // Otherwise update the category name + $query1 = "UPDATE SATYRcategory SET name = '" . $_REQUEST[$i] . "' WHERE name = '" . $row['name'] . "'"; hunk ./SATYR/category.php 136 - while ( $i != 3 ) + while ( $i < 3 ) + { + $i++; + if ( $_REQUEST['new'.$i] != "" ) hunk ./SATYR/category.php 141 - $i++; - if ( $_POST['new'.$i] != "" ) - { - $query = "INSERT INTO SATYRcategory (name) VALUES ('" . $_POST['new'.$i] . "')"; - $result = $db->query($query); - if (DB::isError($db)) {die($db->getMessage());} - } + $query = "INSERT INTO SATYRcategory (name) VALUES ('" . $_REQUEST['new'.$i] . "')"; + $result = $db->query($query); + if (DB::isError($db)) {die($db->getMessage());} hunk ./SATYR/category.php 145 + } hunk ./SATYR/deletejob.php 47 -echo "
\n"; -echo "
\n"; -echo "
\n"; +echo "


\n"; hunk ./SATYR/deletejob.php 50 - // Produce the HTML to start the form and to format the positioning of the submittal form. echo "\n"; + // Produce the HTML to start the form and to format the positioning of the submittal form. echo "\n"; hunk ./SATYR/deletejob.php 72 -if ( !isset($_POST['job_id']) ) +if ( !isset($_REQUEST['job_id']) ) hunk ./SATYR/deletejob.php 79 -if ( $_POST['job_id'] == "" ) +if ( $_REQUEST['job_id'] == "" ) hunk ./SATYR/deletejob.php 81 - echo "You must enter the numher of the support request to be deleted!\n"; + echo "
You must enter the number of the support request to be deleted!
\n"; hunk ./SATYR/deletejob.php 88 -$query = "SELECT * FROM SATYR WHERE job_id='" . $_POST['job_id'] . "'"; +$query = "SELECT * FROM SATYR WHERE job_id='" . $_REQUEST['job_id'] . "'"; hunk ./SATYR/deletejob.php 93 - echo "The support request number you entered could not be found!\n"; + echo "
The support request number you entered could not be found!
\n"; hunk ./SATYR/deletejob.php 100 -// Delete the support request identfied by _POST['job_id'] from the database. - $query = "DELETE FROM SATYR WHERE job_id='" . $_POST['job_id'] . "'"; +// Delete the support request identfied by _REQUEST['job_id'] from the database. + $query = "DELETE FROM SATYR WHERE job_id='" . $_REQUEST['job_id'] . "'"; hunk ./SATYR/deletejob.php 106 - echo "

Support request number " . $_POST['job_id'] . " has been deleted!

\n"; + echo "

Support request number " . $_REQUEST['job_id'] . " has been deleted!

\n"; hunk ./SATYR/detail.php 60 -$row = extract_one_job($_GET['job_id']); +$row = extract_one_job($_REQUEST['job_id']); hunk ./SATYR/detail.php 216 - echo "\n"; + echo "\n"; hunk ./SATYR/detail.php 226 -echo "What does the "Review Recent Support Requests" button do? +

What does the "Review recently submitted Support Requests" button do? hunk ./SATYR/help.php 144 + +

What does the "Review recently closed Support Requests " button do? +
This feature allows members of the ICT Support Team to review all support request closed within a given number of days, the default being 14. hunk ./SATYR/help.php 221 + +

What does the "Edit Support Request Categories" button do? +
This feature allows the SATYR administrator to add, amend and delete the categories that appear in the "Category" drop-down box. Removing an entry removes it from the table, although any support requests still in that category will not be altered. + +

What does the "SATYR Settings" button do? +
This feature allows the SATYR administrator to alter system settings specific to the SATYR module SATYR. The settings available here complement the system-wide settings. hunk ./SATYR/intro.php 58 - echo "

SATYR Statistics

\n"; + echo "

SATYR Statistics

\n"; hunk ./SATYR/intro.php 193 - refresh_page("intro.php"); +refresh_page("intro.php"); hunk ./SATYR/intro.php 213 -echo "See your older closed Support Requests\n"; +echo "See your older closed Support Requests\n"; hunk ./SATYR/joblock.php 47 -echo "
\n"; -echo "
\n"; -echo "
\n"; +echo "


\n"; hunk ./SATYR/joblock.php 70 -if ( !isset($_POST['job_id']) AND !isset($_POST['activeEdit']) ) +if ( !isset($_REQUEST['job_id']) AND !isset($_REQUEST['activeEdit']) ) hunk ./SATYR/joblock.php 78 -if ( !isset($_POST['job_id']) OR $_POST['job_id'] == "" ) +if ( !isset($_REQUEST['job_id']) OR $_REQUEST['job_id'] == "" ) hunk ./SATYR/joblock.php 88 -$query = "SELECT activeEdit FROM SATYR WHERE job_id = '" . $_POST['job_id'] . "'"; +$query = "SELECT activeEdit FROM SATYR WHERE job_id = '" . $_REQUEST['job_id'] . "'"; hunk ./SATYR/joblock.php 96 - echo "There is no support request with that number!\n"; + echo "
There is no support request with that number!\n"; hunk ./SATYR/joblock.php 107 -if ( !isset($_POST['activeEdit']) ) +if ( !isset($_REQUEST['activeEdit']) ) hunk ./SATYR/joblock.php 110 - echo "Support request " . $_POST['job_id'] . " is "; + echo "Support request " . $_REQUEST['job_id'] . " is "; hunk ./SATYR/joblock.php 129 - echo "\n"; + echo "\n"; hunk ./SATYR/joblock.php 135 - echo "\n"; + echo "\n"; hunk ./SATYR/joblock.php 142 - $query = "SELECT activeEdit FROM SATYR WHERE job_id = '" . $_POST['job_id'] . "'"; + $query = "SELECT activeEdit FROM SATYR WHERE job_id = '" . $_REQUEST['job_id'] . "'"; hunk ./SATYR/joblock.php 148 - // Produce HTML showing the current lock status. echo "Support request " . $_POST['job_id'] . " was "; + // Produce HTML showing the current lock status. echo "Support request " . $_REQUEST['job_id'] . " was "; hunk ./SATYR/joblock.php 150 - { - echo "locked.\n"; - } + { echo "locked.\n"; } hunk ./SATYR/joblock.php 152 - { - echo "unlocked.\n"; - } + { echo "unlocked.\n"; } hunk ./SATYR/joblock.php 155 - // Update the database with the new activeEdit value. $query = "UPDATE SATYR SET activeEdit = '" . $_POST['activeEdit'] . "' WHERE job_id = '" . $_POST['job_id'] . "'"; + // Update the database with the new activeEdit value. $query = "UPDATE SATYR SET activeEdit = '" . $_REQUEST['activeEdit'] . "' WHERE job_id = '" . $_REQUEST['job_id'] . "'"; hunk ./SATYR/joblock.php 164 - if ($_POST['activeEdit'] == "1" ) + if ($_REQUEST['activeEdit'] == "1" ) hunk ./SATYR/joblock.php 166 - elseif ($_POST['activeEdit'] == "0" ) + elseif ($_REQUEST['activeEdit'] == "0" ) hunk ./SATYR/recent.php 29 - include ("STORM/common/html/htmlheader.inc"); +include ("STORM/common/html/htmlheader.inc"); hunk ./SATYR/recent.php 32 - include ("STORM/common/misc/functions.inc"); - include ("STORM/SATYR/misc/functions.inc"); +include ("STORM/common/misc/functions.inc"); +include ("STORM/SATYR/misc/functions.inc"); hunk ./SATYR/recent.php 36 - sessionchk(); +sessionchk(); hunk ./SATYR/recent.php 39 - { - exit(); - } + { exit(); } hunk ./SATYR/recent.php 46 -// Refresh page at interval determined by system wide variable -if ( isset($_GET['closed']) ) { +// Add Meta tag for automatic refresh at SATYR default interval +if ( isset($_REQUEST['closed']) ) { hunk ./SATYR/recent.php 52 -// Check if the form is being reloaded -if ( isset($_POST['days']) ) - { - $_SESSION['SATYRrecentview'] = $_POST['days']; - } +// If the number of days to view has changed, update the setting. +if ( isset($_REQUEST['days']) ) + { $_SESSION['SATYRrecentview'] = $_REQUEST['days']; } hunk ./SATYR/recent.php 57 -echo ""; +echo ""; hunk ./SATYR/recent.php 75 -if ( isset($_GET['closed']) ) { +if ( isset($_REQUEST['closed']) ) { hunk ./SATYR/settings.php 47 -// Update the settings using POSTed data -if ( isset($_POST['not_new']) ) +// Update the SATYR_settings table using data in the REQUEST array. +if ( isset($_REQUEST['not_new']) ) hunk ./SATYR/settings.php 56 - $query1 = "UPDATE SATYR_settings SET value='" . $_POST[$row['function']] . "' WHERE function='" . $row['function'] . "'"; + $query1 = "UPDATE SATYR_settings SET value='" . $_REQUEST[$row['function']] . "' WHERE function='" . $row['function'] . "'"; hunk ./SATYR/settings.php 66 - if ( !isset($_POST[$row['function']]) ) + if ( !isset($_REQUEST[$row['function']]) ) hunk ./SATYR/settings.php 68 - $_POST[$row['function']] = "0"; + $_REQUEST[$row['function']] = "0"; hunk ./SATYR/settings.php 70 - $query1 = "UPDATE SATYR_settings SET value='" . $_POST[$row['function']] . "' WHERE function='" . $row['function'] . "'"; + $query1 = "UPDATE SATYR_settings SET value='" . $_REQUEST[$row['function']] . "' WHERE function='" . $row['function'] . "'"; hunk ./SATYR/settings.php 95 - $query = "SELECT * FROM SATYR_settings WHERE function != 'allow_mail_integration'"; + $query = "SELECT * FROM SATYR_settings"; hunk ./SATYR/settings.php 99 - { - extract ($row); - echo "
\n"; - echo ""; - // Small if loop that presents a nice version of the variable name - if ( $function == "page_refresh" ) - { - echo "Automatic refresh period for SATYR pages (in seconds):"; - } - else - { - echo $function; - } - echo "\n"; - echo "\n"; - echo "\n"; - echo "
\n"; + echo "" . $description . "\n"; + echo "\n"; + if ( $function == 'allow_mail_integration' ) { + echo ""; + } + else echo "\n"; + echo "
\n"; - echo "Allow SATYR module to send mail to users:\n"; - echo "\n"; - echo ""; - echo "
\n"; - echo "\n"; - echo "SATYR Start Page\n"; - echo "\n"; - echo "\n"; +echo "\n"; +echo "SATYR Start Page\n"; +echo "\n"; +echo "\n"; - echo "\n"; - echo "Unlock/lock a Support Request\n"; - echo "\n"; - echo "\n"; +echo "\n"; +echo "Unlock/lock a Support Request\n"; +echo "\n"; +echo "\n"; - echo "\n"; - echo "Delete a Support Request\n"; - echo "\n"; - echo "\n"; +echo "\n"; +echo "Delete a Support Request\n"; +echo "\n"; +echo "\n"; - echo "\n"; - echo "Edit Support Request Categories\n"; - echo "\n"; - echo "\n"; +echo "\n"; +echo "Edit Support Request Categories\n"; +echo "\n"; +echo "\n"; - echo "\n"; - echo "SATYR Settings\n"; - echo "\n"; - echo "\n"; +echo "\n"; +echo "SATYR Settings\n"; +echo "\n"; +echo "\n"; - echo "\n"; - echo "Get help with SATYR\n"; - echo "\n"; - echo "\n"; +echo "\n"; +echo "Get help with SATYR\n"; +echo "\n"; +echo "\n"; - echo "\n"; - echo "Back to
STORM Menu\n"; - echo "\n"; - echo "		\n"; +echo "\n"; +echo "Back to
STORM Menu\n"; +echo "\n"; +echo "
\n"; +echo "
\n"; hunk ./includes/STORM/SATYR/html/users_nav.inc 25 - include ("STORM/SATYR/html/banner.inc"); +include ("STORM/SATYR/html/banner.inc"); hunk ./includes/STORM/SATYR/html/users_nav.inc 30 - echo "\n"; +echo "
\n"; hunk ./includes/STORM/SATYR/html/users_nav.inc 32 - echo "\n"; +echo "\n"; hunk ./includes/STORM/SATYR/html/users_nav.inc 35 - echo "\n"; +echo "\n"; hunk ./includes/STORM/SATYR/html/users_nav.inc 43 - echo "\n"; +echo "\n"; hunk ./includes/STORM/SATYR/html/users_nav.inc 46 - echo "\n"; +echo "\n"; hunk ./includes/STORM/SATYR/html/users_nav.inc 54 - echo "\n"; +echo "\n"; hunk ./includes/STORM/SATYR/html/users_nav.inc 57 - echo "\n"; +echo "\n"; hunk ./includes/STORM/SATYR/html/users_nav.inc 65 - echo "\n"; - +echo "\n"; + hunk ./includes/STORM/SATYR/html/users_nav.inc 68 - echo "\n"; +echo "\n"; hunk ./includes/STORM/SATYR/html/users_nav.inc 76 - echo "\n"; +echo "\n"; + hunk ./includes/STORM/SATYR/html/users_nav.inc 79 - echo "
\n"; - echo "\n"; - echo "SATYR
Start Page\n"; - echo "\n"; +echo "		\n"; +echo "\n"; +echo "SATYR
Start Page\n\n"; + hunk ./includes/STORM/SATYR/html/users_nav.inc 40 - echo "		\n"; - echo "\n"; - echo "Submit a new\n"; - echo "
\n"; - echo "Support Request\n"; - echo "\n"; +echo "		\n"; +echo "\n"; +echo "Submit a new
Support Request\n"; + hunk ./includes/STORM/SATYR/html/users_nav.inc 51 - echo "		\n"; - echo "\n"; - echo "Get help with SATYR\n"; - echo "\n"; +echo "\n"; +echo "\n"; +echo "Get help with SATYR\n"; + hunk ./includes/STORM/SATYR/html/users_nav.inc 62 - echo "\n"; - echo "\n"; - echo "Back to
STORM Menu\n"; - echo "\n"; +echo "		\n"; +echo "\n"; +echo "Back to
STORM Menu\n"; + hunk ./includes/STORM/SATYR/html/users_nav.inc 73 - echo "
\n"; +echo "\n"; hunk ./includes/STORM/common/html/htmlheader.inc 35 - echo "\n"; + echo "\n"; hunk ./login/login.php 48 - + +// Include the connection to the database. +include ("STORM/common/db/connect.inc"); + +// Query the database and check for a username and password match. +$query = "SELECT value FROM settings WHERE function = \"helpdeskPhone\""; +$result = $db->query($query); +if (DB::isError($db)) {die($db->getMessage());} +$row = $result->fetchrow(); +$helpdeskPhone = $row['value']; + hunk ./login/login.php 89 - Have you forgotten your password? Get a new password or contact the ICT Support Team on extension XXXX. + Have you forgotten your password? Get a new password or contact the ICT Support Team on extension " . $helpdeskPhone . ". hunk ./login/menu.php 84 - // Data from the returned row is passed into a variable determined by the column name. + // Data from the returned row is passed into an array. }