Incorporated changes for release 1.3.2

distfiles/writeups.php

@@ -8,12 +8,20 @@
 */
 
 include("common.php");
+if (array_key_exists('print',$_REQUEST)) {
+	$print=true;
+} else {
+	$print=false;
+}
 
 // import session variables
-if (isset($_SESSION['userid'])) $userid=$_SESSION['userid'];
+if (isset($_SESSION['userid'])) {
+	$userid=$_SESSION['userid'];
+} else {
+	$userid=NULL;
+}
 
 // import incoming arrays
-$print=$_REQUEST['print'];
 if ($print) {
     // if printer friendly was clicked, values will be passed in serialized
     // form as "all_parameters" so we need to load those into $incoming[]
@@ -24,20 +32,24 @@ if ($print) {
     $incoming=arrayCopy($_REQUEST);
 }
 
-// load variables from incoming array
+// extract incoming array keys into variables
+extract($incoming, EXTR_SKIP);
+/*
+ * possible keys are:
+ * 
+ * view
+ * start_date
+ * end_date
+ * showtoday
+ * showyesterday
+ * show7day
+ * show30day
+ * viewtype
+ * togroup
+ * addtogroup
+ * selectedids
+*/
 
-$view=$incoming['view'];
-$start_date=$incoming['start_date'];
-$end_date=$incoming['end_date'];
-$showtoday=$incoming['showtoday'];
-$showyesterday=$incoming['showyesterday'];
-$show7day=$incoming['show7day'];
-$show30day=$incoming['show30day'];
-$viewtype=$incoming['viewtype'];
-
-$togroup=$incoming['togroup'];
-$addtogroup=$incoming['addtogroup'];
-$selectedids=$incoming['selectedids'];
 
 // assign variables from constants
 $appname=APP_NAME;
@@ -51,14 +63,14 @@ if ($print) {
 $role=dblookup($drs_db,"users","id","role",$userid);
 
 // define local functions
-function opentable($start_date,$end_date,$print,$drs_db,$viewtype="summary") {
-    // grab some important global variables
+function opentable($incoming,$start_date,$end_date,$print,$drs_db,$viewtype="summary") {
+	// grab some important global variables
     global $device_term;
     global $discovered_term, $discovered_term_short, $disc_drop_data;
     global $functional_term, $functional_term_short;
     global $functional_yes, $functional_no;
     global $functional_yes_short, $functional_no_short;
-    
+        
     // show date range selector
     echo "
     <form method=post action=\"writeups.php\">
@@ -161,11 +173,11 @@ function opentable($start_date,$end_date,$print,$drs_db,$viewtype="summary") {
         }
         echo "</table>\n";
     } else {
-        if ($_REQUEST['showyesterday']) {
+        if (array_key_exists('showyesterday',$incoming)) {
             $datespec="yesterday";
-        } elseif ($_REQUEST['show7day']) {
+        } elseif (array_key_exists('show7day',$incoming)) {
             $datespec="the last 7 days";
-        } elseif ($_REQUEST['show30day']) {
+        } elseif (array_key_exists('show30day',$incoming)) {
             $datespec="the last 30 days";
         } else {
             $datespec="today";
@@ -359,30 +371,31 @@ function viewtable($start_date,$end_date,$print,$drs_db,$viewtype="summary",$rol
 
 // use default date values if not supplied
 $today = date("Y-m-d");
-if ($start_date=="") $start_date=$today;
-if ($end_date=="") $end_date=$today;
-if ($showtoday) {
+if (!isset($start_date)) $start_date=$today;
+if (!isset($end_date)) $end_date=$today;
+if (isset($showtoday)) {
     $start_date=$today;
     $end_date=$today;
 }
-if ($showyesterday) {
+if (isset($showyesterday)) {
     $start_date=mysqli_fetch_row(mysqli_query($drs_db,"select date_sub(curdate(),interval 1 day)"))[0];
     $end_date=$start_date;
 }
-if ($show7day) {
+if (isset($show7day)) {
     $start_date=mysqli_fetch_row(mysqli_query($drs_db,"select date_sub(curdate(),interval 7 day)"))[0];
     $end_date=$today;
 }
-if ($show30day) {
+if (isset($show30day)) {
     $start_date=mysqli_fetch_row(mysqli_query($drs_db,"select date_sub(curdate(),interval 30 day)"))[0];
     $end_date=$today;
 }
 
-if ($view) {
+if (isset($view)) {
     $pgtitle="Recent Writeups";
 } else {
     $pgtitle="Open Writeups";
 }
+
 framework("begin","$appname",$pgtitle,$print);
 
 //echo "_REQUEST array <br>";
@@ -393,7 +406,7 @@ framework("begin","$appname",$pgtitle,$print);
 
 // ******** begin database manipulation ********
 
-if ($addtogroup && $togroup && $selectedids && $role) {
+if (isset($addtogroup) && isset($togroup) && isset($selectedids) && $role!=NULL) {
     $fail=false;
     if ($togroup=="newgroup") {
         // Create a new group
@@ -424,7 +437,7 @@ pageblock("right","begin");
 banner($print); 
 echo "<br>";
 
-if ($addtogroup) {
+if (isset($addtogroup)) {
     if (count($selectedids) > 1) {
         $plural="s";
     } else {
@@ -436,14 +449,14 @@ if ($addtogroup) {
         format_message(2,"<strong>An error was encountered when adding writeup$plural.</strong> The error was \" $fail \"");
     }
 }
-if (!$viewtype) $viewtype="summary";
+if (!isset($viewtype)) $viewtype="summary";
 
-if ($view==1) {
+if (isset($view)) {
     // show writeup table
     viewtable($start_date,$end_date,$print,$drs_db,$viewtype,$role);
 } else {
     // show open table
-    opentable($start_date,$end_date,$print,$drs_db,$viewtype);
+    opentable($incoming,$start_date,$end_date,$print,$drs_db,$viewtype);
 }
 
 echo "<br>";