SlatePermutate Changeset - 0f858c9808fd · protofusion repositories

Changeset - 0f858c9808fd

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Nathan Brink (binki) - 14 years ago 2012-02-19 00:32:05
ohnobinki@ohnopublishing.net

On the school selection page, show the user the school which slate_permutate thinks he should use (the `detected' school).

1 file changed with 22 insertions and 5 deletions:

inc/school.inc

0 comments (0 inline, 0 general)

inc/school.inc

➞

Show inline comments

@@ @@ -125,32 +125,35 @@ function school_load($school_id, $load_a @@
  *   callback script, where the user is not loading a page himself but
  *   the current school is being specified in the URL
  *   parameters... thus updating the session value here would be a
  *   side-effect. We're doing this so that the user can do
  *   autocomplete for two different school/semester pairs in two
  *   different browser tabs under the same session.
+ *
  * \param $pure_guess
  *   Ignore $_SESSION and $_REQUEST. Used for informing the browser of
  *   what we would guess if his session/URI did not predispose us
  *   toward something else.
  * \return
  *   A school profile or NULL if the school isn't in the session and
  *   can't be guessed.
  */
 function school_load_guess($update_session = TRUE)
+function school_load_guess($update_session = TRUE, $pure_guess = FALSE)
+{
   if (isset($_REQUEST['school']))
+  if (isset($_REQUEST['school']) && !$pure_guess)
+    {
       $school = school_load($_REQUEST['school']);
       if ($school)
+	{
 	  if ($update_session)
 	    $_SESSION['school'] = $school['id'];
 	  return $school;
+	}
+    }
   /* assume that we stored a valid school in the $_SESSION */
   if (isset($_SESSION['school']))
+  if (isset($_SESSION['school']) && !$pure_guess)
     return school_load($_SESSION['school']);
   if (isset($_SERVER['REMOTE_HOST']) || isset($_SERVER['REMOTE_ADDR']))
+    {
       $addr = NULL;
       /* http://ietf.org/rfc/rfc3875 */
@@ @@ -238,20 +241,34 @@ function school_list_html($highlight = N @@
     $linkto .= '?';
   elseif (strpos('?&', strstr($linkto, -1)) !== FALSE)
     $linkto .= '&';
   $linkto .= 'school=';
   $linkto = htmlentities($linkto);
   $pure_guess = school_load_guess(FALSE, TRUE);
   $html = "<ul>\n";
   foreach ($school_list as $school_id => $school_info)
+    {
       $attributes = array();
       $class_highlight = '';
       if ($school_id == $highlight)
+	{
 	$class_highlight = ' highlight';
 	  $attributes[] = 'current';
+	}
       if ($school_id == $pure_guess['id'])
+	{
 	  $class_highlight .= ' detected';
 	  $attributes[] = 'detected';
+	}
       $html .= '<li class="school' . $class_highlight . '"><a href="' . $linkto . $school_id . '">'
 	. htmlentities($school_info['name']) . "</a></li>\n";
 	. htmlentities($school_info['name']) . '</a>';
       if (!empty($attributes))
 	$html .= ' [' . implode(', ', $attributes) . ']';
       $html .= "</li>\n";
+    }
   $html .= "</ul>\n";
   return $html;
+}

0 comments (0 inline, 0 general)