[Adding ChkNet internal anchors and SATYR recent closed page
tony@tonywhitmore.co.uk**20050620214046] {
hunk ./CHANGELOG 5
-* SATYR:		Fixed SATYR/help.php to include correctly worded reference to search page.
-* SATYR:		Fixed bug in SATYR functions.inc that meant support requests submitted with usernames containing apostrophes broke detail.php.
+* SATYR:	Fixed SATYR/help.php to include correctly worded reference to search page.
+* SATYR:	Fixed bug in SATYR functions.inc that meant support requests submitted with usernames containing apostrophes broke detail.php.
+* SATYR:	Added page for reviewing recently closed support requests.
hunk ./CHANGELOG 13
-* SATYR:		Changed all references to the nickname field to "Support Request Summary" for consistency and, hopefully, clarity.
-* Login:		Added pass_reset.php, based on mailpass.php, to allow users to request a password reset.
+* ChkNet:	Added support for internal page anchors
+* SATYR:	Changed all references to the nickname field to "Support Request Summary" for consistency and, hopefully, clarity.
+* Login:	Added pass_reset.php, based on mailpass.php, to allow users to request a password reset.
+* Login:	Added a clarification note to resetpass.php ensuring that it's clear that the user will be forced to reset their password when the login.
hunk ./CHANGELOG 196
+
hunk ./SATYR/recent.php 22
-// Page detailing all a user/ICT team member's closed jobs.
+// Page detailing support requests recently submitted.
hunk ./SATYR/recent.php 48
-refresh_page("recent.php");
+if ( isset($_GET['closed']) ) {
+	refresh_page("recent.php?closed=1");
+	}
+else refresh_page("recent.php");
hunk ./SATYR/recent.php 64
-if ( isset($_SESSION['SATYRrecentview']) )
-	{
+if ( isset($_SESSION['SATYRrecentview']) ) {
hunk ./SATYR/recent.php 67
-else
-	{
+else {
hunk ./SATYR/recent.php 73
-// Include a table detailing all closed jobs.
-produce_table("RecentAll","teamMember");
+// Include a table detailing all recently closed or recently submitted support requests.
+if ( isset($_GET['closed']) ) {
+	produce_table("AllRecentClosed","teamMember");
+	}
+else produce_table("RecentAll","teamMember");
hunk ./SATYR/recent.php 80
+
hunk ./TODO 45
+Interal anchors for groups
hunk ./TODO 55
-* Remove all those extra \"" instances
+* Remove all those extra \"" instances?
hunk ./TODO 58
+
hunk ./chknet/intro.php 69
-			echo "<a href='http://		" . $device['hostname'] . "'>" . $device['hostname'] . "</a>)\n";
+			echo "<a href='http://" . $device['hostname'] . "'>" . $device['hostname'] . "</a>)\n";
hunk ./chknet/intro.php 86
-		echo "<h2>" . $row['name'] . "</h2>\n";
+		echo "<h2><a name='" . $row['id'] . "'></a><a href='intro.php?grp=" . $row['id'] . "#" . $row['id'] . "'>" . $row['name'] . "</h2>\n";
hunk ./chknet/intro.php 141
-		
hunk ./chknet/intro.php 169
-					<h4>This function has not yet been implemented due to the lack of a test platform.\n";
+				<h4>This function has not yet been implemented due to the lack of a test platform.\n";
hunk ./chknet/intro.php 186
-	refresh_page("intro.php");
+	if ( isset($_GET['grp']) ) {
+		refresh_page($_SERVER['REQUEST_URI'] . "#" . $_GET['grp']);
+		}
+	else refresh_page($_SERVER['REQUEST_URI']);
hunk ./chknet/intro.php 209
-   all_device_table();
+	all_device_table();
hunk ./chknet/intro.php 219
+
hunk ./includes/STORM/SATYR/html/ict_nav.inc 35
-// Start the cell for the first navigation element.
+// Start the cell for the nav element.
hunk ./includes/STORM/SATYR/html/ict_nav.inc 50
-// Start the cell for the second navigation element.
+// Start the cell for the nav element.
hunk ./includes/STORM/SATYR/html/ict_nav.inc 66
-// Start the cell for the third navigation element.
+// Start the cell for the nav element.
hunk ./includes/STORM/SATYR/html/ict_nav.inc 74
-	echo "Review recent Support Requests\n";
+	echo "Review recently submitted Support Requests\n";
hunk ./includes/STORM/SATYR/html/ict_nav.inc 80
+
+// Start the cell for the nav element.
+	echo "<td align='center' bgcolor='#cc3333'>\n";
+	echo "<a href='";
+	if ( isset($unlock) )
+		{
+		echo $unlock_target . "?job_id=" . $job_id . "&dest=";
+		}	
+	echo "recent.php?closed=1' class='ictnavigation'>\n";
+	echo "Review recently closed Support Requests\n";
+	echo "</a>\n";
+	echo "</td>\n";
+	
+// Start and end the spacer cell between navigation elements.
+	echo "<td width='5%'></td>\n";
hunk ./includes/STORM/SATYR/html/ict_nav.inc 96
-// Start the cell for the third navigation element.
+// Start the cell for the nav element.
hunk ./includes/STORM/SATYR/html/ict_nav.inc 111
-// Start the cell for the fourth navigation element.
+// Start the cell for the nav element.
hunk ./includes/STORM/SATYR/html/ict_nav.inc 127
-// Start the cell for the fifth navigation element.
+// Start the cell for the nav element.
hunk ./includes/STORM/SATYR/html/ict_nav.inc 142
-// Start the cell for the sixth navigation element.
+// Start the cell for the nav element.
hunk ./includes/STORM/SATYR/misc/functions.inc 48
-	if ( $tabletype == "Search" )
-		{ // OK, this is a kludge. The viewby variable is abused here to carry the search array
+	if ( $tabletype == "Search" ) { 
+		// OK, this is a kludge. The viewby variable is abused here to carry the search array
hunk ./includes/STORM/SATYR/misc/functions.inc 52
-	else
-		{
+	else {
hunk ./includes/STORM/SATYR/misc/functions.inc 61
-   elseif ( $tabletype == "NewOpen" AND $viewby == "username")
+   	elseif ( $tabletype == "NewOpen" AND $viewby == "username")
hunk ./includes/STORM/SATYR/misc/functions.inc 74
-		echo "Recently submitted support requests\n";		
-   elseif ( $tabletype == "Search" )
-      echo "<tablebanner>Support requests matching the search queries</tablebanner>\n";
-   else
-   	{
-   	echo "<alert>An unknown error has occured in " . $_SERVER['PHP_SELF'] . "</alert>";
-   	exit();
-   	}
+		echo "Recently submitted support requests\n";
+	elseif ( $tabletype == "AllRecentClosed" AND $viewby == "teamMember")
+		echo "Recently closed support requests\n";	
+	elseif ( $tabletype == "Search" )
+		echo "<tablebanner>Support requests matching the search queries</tablebanner>\n";
+	else {
+	   	echo "<alert>An unknown error has occured in " . $_SERVER['PHP_SELF'] . "</alert>";
+	   	exit();
+		}
hunk ./includes/STORM/SATYR/misc/functions.inc 86
-	if ( $tabletype == "New" AND $viewby == "evaluate" )
-      {
-      echo "Click on the Support Request Summary to evaluate the support request\n";
-      }	
-	else
-      {
-      echo "Click on the Support Request Summary for more details...\n";
-      }
+	if ( $tabletype == "New" AND $viewby == "evaluate" ) {
+		echo "Click on the Support Request Summary to evaluate the support request\n";
+		}	
+	else {
+		echo "Click on the Support Request Summary for more details...\n";
+		}
hunk ./includes/STORM/SATYR/misc/functions.inc 103
-	if ( $viewby != "username" )
-		{
+	if ( $viewby != "username" ) {
hunk ./includes/STORM/SATYR/misc/functions.inc 107
-	if ( $tabletype == "Search" )
-   	{
-   	echo "<th>Room</th>\n";
-   	}
+	if ( $tabletype == "Search" ) {
+	   	echo "<th>Room</th>\n";
+   		}
hunk ./includes/STORM/SATYR/misc/functions.inc 114
-	if ( $tabletype != "New" )
-	   {
-	   echo "<th>Evaluated</th>\n";
-	   }
-	if ( $viewby != "teamMember" OR $tabletype == "RecentAll" )
-		{
+	if ( $tabletype != "New" ) {
+		echo "<th>Evaluated</th>\n";
+		}
+	if ( $viewby != "teamMember" OR $tabletype == "RecentAll" OR $tabletype == "AllRecentClosed" ) {
hunk ./includes/STORM/SATYR/misc/functions.inc 121
-	if ( $tabletype == "Closed" OR $tabletype == "Search" OR $tabletype == "RecentClosed" OR $tabletype == "RecentAll" )
-	   {
+	if ( $tabletype == "Closed" OR $tabletype == "Search" OR $tabletype == "RecentClosed" OR $tabletype == "RecentAll" OR $tabletype == "AllRecentClosed")  {
hunk ./includes/STORM/SATYR/misc/functions.inc 128
-	if ($num_rows != "0" )
-   	{
-	// Set up a while loop that will process all the available rows if there are some.
-	while ( $row = $result->fetchRow())
-			{
-         extract($row);
+	if ($num_rows != "0" ) {
+		// Set up a while loop that will process all the available rows if there are some.
+		while ( $row = $result->fetchRow()) {
+			extract($row);
hunk ./includes/STORM/SATYR/misc/functions.inc 133
-			if ($status == "New" )
-            {
-            echo "<tr class='newrow'>\n";
-            }
-       	elseif ($status == "Open" )
-            {
-            echo "<tr class='openrow'>\n";
-            }
-			elseif ($status == "Closed" )
-				{
-            echo "<tr class='closedrow'>\n";
-            }
+			if ( $status == "New" ) {
+				echo "<tr class='newrow'>\n";
+				}
+			elseif ( $status == "Open" ) {
+				echo "<tr class='openrow'>\n";
+				}
+			elseif ( $status == "Closed" ) {
+				echo "<tr class='closedrow'>\n";
+				}
hunk ./includes/STORM/SATYR/misc/functions.inc 146
-			if ( $viewby == "evaluate" )
-				{
+			if ( $viewby == "evaluate" ) {
hunk ./includes/STORM/SATYR/misc/functions.inc 149
-			else
-				{
+			else {
hunk ./includes/STORM/SATYR/misc/functions.inc 153
-			if ( $viewby != "username" )
-				{
+			if ( $viewby != "username" ) {
hunk ./includes/STORM/SATYR/misc/functions.inc 157
-			if ($tabletype == "Search" )
-				{
+			if ($tabletype == "Search" ) {
hunk ./includes/STORM/SATYR/misc/functions.inc 165
-			if ( $status != "New" )
-				{
+			if ( $status != "New" ) {
hunk ./includes/STORM/SATYR/misc/functions.inc 169
-			elseif ($tabletype == "NewOpen" OR $tabletype == "Search" OR $tabletype == "RecentAll" )
-       		{
-       		echo "<td></td>\n";
-       		}
+			elseif ( $tabletype == "NewOpen" OR $tabletype == "Search" OR $tabletype == "RecentAll" ) {
+				echo "<td></td>\n";
+				}
hunk ./includes/STORM/SATYR/misc/functions.inc 173
-			if ( $viewby != "teamMember" OR $tabletype == "RecentAll" )
-				{
+			if ( $viewby != "teamMember" OR $tabletype == "RecentAll" OR $tabletype == "AllRecentClosed" ) {
hunk ./includes/STORM/SATYR/misc/functions.inc 177
-			if ( $tabletype == "Closed" OR $tabletype == "RecentClosed" )
-       		{
-       		$closeDate = formatdate($closeDate);
+			if ( $tabletype == "Closed" OR $tabletype == "RecentClosed" OR $tabletype == "AllRecentClosed" ) {
+				$closeDate = formatdate($closeDate);
hunk ./includes/STORM/SATYR/misc/functions.inc 181
-			elseif ( $tabletype == "Search" AND $status == "Closed" )
-       		{
-       		$closeDate = formatdate($closeDate);
+			elseif ( $tabletype == "Search" AND $status == "Closed" ) {
+      				$closeDate = formatdate($closeDate);
hunk ./includes/STORM/SATYR/misc/functions.inc 185
-			elseif ( $tabletype == "RecentAll" )
-       		{
-       		echo "<td>";
-    			if ( $closeDate != "0000-00-00 00:00:00" AND $closeDate != "" )
-    				{
-    				$closeDate = formatdate($closeDate);
-    				echo $closeDate;
-     				}
+			elseif ( $tabletype == "RecentAll" ) {
+		       		echo "<td>";
+				if ( $closeDate != "0000-00-00 00:00:00" AND $closeDate != "" )	{
+					$closeDate = formatdate($closeDate);
+					echo $closeDate;
+					}
hunk ./includes/STORM/SATYR/misc/functions.inc 193
-			elseif ( $tabletype == "Search" AND $status != "Closed" )
-				{
+			elseif ( $tabletype == "Search" AND $status != "Closed" ) {
hunk ./includes/STORM/SATYR/misc/functions.inc 196
-	      }
-      }     
-		// Set up the else section of the if loop that produces the "no records found" row.
+			}
+		}     
+	// Set up the else section of the if loop that produces the "no records found" row.
+	else {
+		echo "<tr><td class='norows' colspan='30'>\n";
+		// Evaluate the tabletype variable and produce the appropriate wording.
+		if ( $tabletype == "Search" ) {
+	            	echo "<center>Your search produced no results!</center>\n";
+	            	}
hunk ./includes/STORM/SATYR/misc/functions.inc 206
-            echo "<tr><td class='norows' colspan='30'>\n";
-				// Evaluate the tabletype variable and produce the appropriate wording.
-				if ( $tabletype == "Search" )
-            	{
-            	echo "<center>Your search produced no results!</center>\n";
-            	}
-            else
-             	{
-             	echo "<center>No support requests were found for this table!</center>\n";
-             	}
-				echo "</td></tr>\n";
-            }
	echo "</table>\n";
+	             	echo "<center>No support requests were found for this table!</center>\n";
+             		}
+		echo "</td></tr>\n";
+		}
	echo "</table>\n";
hunk ./includes/STORM/SATYR/misc/functions.inc 259
-   elseif ( $viewby == "teamMember" AND $tabletype != "RecentAll" )
+   elseif ( $viewby == "teamMember" AND ( $tabletype != "RecentAll" AND $tabletype != "AllRecentClosed" ))
hunk ./includes/STORM/SATYR/misc/functions.inc 264
-	if ( $query != $initialquery AND $tabletype == "New" )
+   if ( $query != $initialquery AND $tabletype == "New" )
hunk ./includes/STORM/SATYR/misc/functions.inc 273
-	if ( $query != $initialquery AND $tabletype == "Open" )
+   if ( $query != $initialquery AND $tabletype == "Open" )
hunk ./includes/STORM/SATYR/misc/functions.inc 282
-	if ( $query != $initialquery AND $tabletype == "Closed" )
+   if ( $query != $initialquery AND $tabletype == "Closed" )
hunk ./includes/STORM/SATYR/misc/functions.inc 291
-	if ( $query != $initialquery AND $tabletype == "RecentClosed" )
+   if ( $query != $initialquery AND ($tabletype == "RecentClosed" OR $tabletype == "AllRecentClosed") )
hunk ./includes/STORM/SATYR/misc/functions.inc 295
-   if ( $tabletype == "RecentClosed" )
+   if ( $tabletype == "RecentClosed" OR $tabletype == "AllRecentClosed" )
hunk ./includes/STORM/SATYR/misc/functions.inc 322
-	if ( $tabletype == "RecentClosed" OR $tabletype == "Closed" )
+   if ( $tabletype == "RecentClosed" OR $tabletype == "Closed" OR $tabletype == "AllRecentClosed")
hunk ./includes/STORM/SATYR/misc/functions.inc 326
-   elseif ( $tabletype == "RecentAll" )
+   elseif ( $tabletype == "RecentAll" OR $tabletype == "AllRecentClosed" )
hunk ./includes/STORM/SATYR/misc/functions.inc 338
-	$result = $db->query($query);
+   $result = $db->query($query);
hunk ./includes/STORM/SATYR/misc/functions.inc 344
+
hunk ./includes/STORM/chknet/misc/functions.inc 223
-function refresh_page($target)
-			{
-			// Call database connection
-         global $db;			
-			$query = "SELECT value FROM chknet_settings WHERE function='refresh'";
-			$result = $db->query($query);
-			if (DB::isError($db)) {die($db->getMessage());}
-			$row = $result->fetchRow();
-		   echo "<META HTTP-EQUIV='Refresh' content='" . $row['value'] . ";URL=" . $target . "'>\n";
-			}
+function refresh_page($target) {
+	// Call database connection
+	global $db;			
+	$query = "SELECT value FROM chknet_settings WHERE function='refresh'";
+	$result = $db->query($query);
+	if (DB::isError($db)) {die($db->getMessage());}
+	$row = $result->fetchRow();
+	echo "<META HTTP-EQUIV='Refresh' content='" . $row['value'] . ";URL=" . $target . "'>\n";
+	}
hunk ./includes/STORM/chknet/misc/functions.inc 234
+
hunk ./login/resetpass.php 108
+	echo "<h4>The user will be automatically prompted to change their password when they log in using the above password.</h4>\n";
hunk ./login/resetpass.php 117
+
}