SlatePermutate Changeset - 9a492df56347 · protofusion repositories

Changeset - 9a492df56347

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Nathan Brink (binki) - 13 years ago 2012-10-25 00:04:37
ohnobinki@ohnopublishing.net

Fix qTips not appearing for certain courses because of partial XML underquoting.

Some courses which had ampersands in their titles would cause XML parsing errors in
the browser when trying to display the qTip, resulting in the qTip not showing
for those courses. This is because the qTip’s content is inserted as XHTML into
the document, so it needs to be doubly encoded.

1 file changed with 7 insertions and 6 deletions:

inc/class.schedule.php

0 comments (0 inline, 0 general)

inc/class.schedule.php

➞

Show inline comments

@@ @@ -721,111 +721,112 @@ class Schedule @@
                   if ($dayLoop < 0)
                     $dayLoop = 6;
 		  /* Makes sure there is not a class already in progress */
 		  if($rowspan[$dayLoop] <= 0)
+		    {
 		      for($j = 0; $j < count($this->courses); $j++)
+			{
 			  $course = $this->courses[$j];
 			  foreach ($course as $course_slot)
+			    {
 			      $section_index = $this->storage[$i][$j];
 			      $section = $course_slot->section_get_i($section_index);
 			      /* iterate through all of a class's meeting times */
 			      $meetings = $section->getMeetings();
 				  /* find any meeting which are going on at this time */
 				  $current_meeting = NULL;
 				  foreach ($meetings as $meeting)
+				    {
 				      if ($meeting->getDay($dayLoop)
 					  && $meeting->getStartTime() >= $time[$r]
 					  && $meeting->getStartTime() < $time[$r+1])
+					{
 					  $current_meeting = $meeting;
+					}
+				    }
 				  if ($current_meeting)
+				    {
 				      /* calculate how many rows this section should span */
 				      for ($my_r = $r;
 					   $my_r < (count($time)-1) && $current_meeting->getEndTime() > $time[$my_r];
 					   $my_r ++)
+					;
 				      $rowspan[$dayLoop] = $my_r - $r;
 				      $single_multi = 'single';
 				      if ($rowspan[$dayLoop] > 1)
 					$single_multi = 'multi';
 				      $title = $course->title_get();
 				      if (empty($title))
 					$title = '';
 				      else
 					$title .= ' ';
-				      $carret = '&#013;' . htmlentities("<br />");
+				      $carret = '&#013;<br />';
 				      echo '            <td rowspan="' . $rowspan[$dayLoop]
 					. '" class="qTipCell ' . $single_multi . ' class' . $j
 					. '" title="' . htmlentities($title, ENT_QUOTES) . $carret
 					. 'Prof: ' . htmlentities($current_meeting->instructor_get(), ENT_QUOTES) . $carret
 					. 'Room: ' . htmlentities($current_meeting->getLocation(), ENT_QUOTES) . $carret
                                         . 'Type: ' . htmlentities($current_meeting->type_get(), ENT_QUOTES) . $carret;
 					. '" title="' . htmlentities(
                                           htmlentities($title, ENT_QUOTES) . $carret
                                           . 'Prof: ' . htmlentities($current_meeting->instructor_get(), ENT_QUOTES) . $carret
                                           . 'Room: ' . htmlentities($current_meeting->getLocation(), ENT_QUOTES) . $carret
                                           . 'Type: ' . htmlentities($current_meeting->type_get(), ENT_QUOTES) . $carret, ENT_QUOTES);
                                       $section_credit_hours = $section->credit_hours_get();
                                       if ($section_credit_hours >= 0)
+                                        {
                                           $credit_hours[$section->getSynonym()] = $section_credit_hours;
                                           $have_credit_hours = TRUE;
                                           echo 'Credits: ' . htmlentities($section_credit_hours, ENT_QUOTES) . $carret;
+                                          echo htmlentities('Credits: ' . htmlentities($section_credit_hours, ENT_QUOTES) . $carret, ENT_QUOTES);
+                                        }
                                       echo '">'
 					. '<span class="course-title block">' . htmlentities($title) . '</span>' . PHP_EOL
 					. htmlentities($course->getName(), ENT_QUOTES) . '-'
 					. htmlentities($section->getLetter(), ENT_QUOTES) . "\n"
 					. '<span class="prof block">' . htmlentities($current_meeting->instructor_get(), ENT_QUOTES) . "</span>\n"
 					. '<span class="location block">' . htmlentities($current_meeting->getLocation(), ENT_QUOTES) . "</span>\n"
 					. '<span class="synonym block">' . htmlentities($section->getSynonym(), ENT_QUOTES) . "</span>\n"
                                         . '<span class="credit-hours block">' . htmlentities($section_credit_hours, ENT_QUOTES) . ' Credits</span>' . PHP_EOL
 					. "</td>\n";
 				      /* for the ``Registration Codes'' dialogue: */
 				      if (empty($permutations_courses[$j]))
+					{
 					  $singleton_course = new Course($course->getName(), $course->title_get());
 					  $singleton_course->section_add($section, $course_slot->id_get());
 					  $permutation_courses[$j] = $singleton_course->to_json_array();
+					}
 				      $filled = TRUE;
+				    }
 			    } /* $course_slot */
+			}
+		    }
 		  if ($rowspan[$dayLoop] > 0)
+		    {
 		      $filled = TRUE;
 		      $rowspan[$dayLoop] --;
+		    }
 		  /* If the cell was not filled, fill it with an empty cell. */
 			if(!$filled)
+			{
 				echo "            <td class=\"none\">&nbsp;</td>\n";
+			}
 			$filled = FALSE;
+		}
 		// End of row
 		echo "          </tr>\n";
+	      }
 	    // End of table
 	    echo "        </table>\n";
             if ($have_credit_hours)
               echo '        <p>Credit Hours: ' . sum($credit_hours) . '</p>' . PHP_EOL;

0 comments (0 inline, 0 general)