# HG changeset patch
# User Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
# Date 2012-02-09 17:20:01
# Node ID 50ef4e0d73dcba08f5a8bc78a40488f2b3db4ac3
# Parent  3c2d5e03082f3d09e000a94fb330d18e3b77a1e5

Clean up Previous and Next links when viewing a paginated list of possible schedules.

diff --git a/inc/class.schedule.php b/inc/class.schedule.php
--- a/inc/class.schedule.php
+++ b/inc/class.schedule.php
@@ -624,11 +624,11 @@ class Schedule
 	echo "    <div id=\"pagers\">\n";
 	/* Previous button */
 	if ($page > 0)
-	  echo '      <div id="pager-previous" class="pager left"><a href="' . htmlentities($this->my_url($page - 1)) . '">&laquo; Previous</a></div>' . "\n";
+	  echo '      <div id="pager-previous" class="pager left"><a href="' . htmlentities($this->my_url($page - 1), ENT_QUOTES) . '" rel="prev prefetch">&laquo; Previous</a></div>' . "\n";
 
 	/* Next button */
 	if ($page + 1 < $npages)
-	  echo '      <div id="pager-next" class="pager right"><a href="' . htmlentities($this->my_url($page + 1)) . '">Next &raquo;</a></div>' . "\n";
+	  echo '      <div id="pager-next" class="pager right"><a href="' . htmlentities($this->my_url($page + 1), ENT_QUOTES) . '" rel="next prefetch">Next &raquo;</a></div>' . "\n";
 	echo "    </div> <!-- id=\"pagers\" -->\n";
 
 
@@ -941,18 +941,26 @@ class Schedule
   {
     global $clean_urls;
 
-    $url = '';
-    if (!$clean_urls)
-      $url .= 'process.php?s=';
-
-    $url .= (int)$id;
+    $query = array();
     if ($clean_urls)
-      $url .= '?';
+      $url = (int)$id;
     else
-      $url .= '&';
+      {
+        $url = 'process.php';
+        $query['s'] = (int)$id;
+      }
 
     if ($page)
-      $url .= 'page=' . (int)$page . '&';
+      $query['page'] = (int)$page;
+
+    if (!empty($query))
+      {
+        $query_processed = array();
+        foreach ($query as $key => $value)
+          $query_processed[] = $key . '=' . rawurlencode($value);
+
+        $url .= '?' . implode('&', $query_processed);
+      }
 
     return $url;
   }