SlatePermutate Changeset - 34aabb706e18 · protofusion repositories

Changeset - 34aabb706e18

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Nathan Brink (binki) - 15 years ago 2011-03-22 00:32:41
ohnobinki@ohnopublishing.net

Fix some php errors by removing empty courses completely.

This case was not caught before because courses may appear to be nonempty during the parsing of POST data. Thus, an additional filtering process was added.

2 files changed with 14 insertions and 1 deletions:

inc/class.schedule.php

process.php

0 comments (0 inline, 0 general)

inc/class.schedule.php

➞

Show inline comments

@@ @@ -133,48 +133,61 @@ class Schedule @@
     foreach ($this->courses as $course)
       if (!strcmp($course_name, $course->getName()))
+	{
 	  $section = $course->section_get($letter);
 	  if (!$section)
+	    {
 	      $section = new Section($letter, array(), $synonym, $faculty);
 	      $course->section_add($section);
+	    }
 	  $section->meeting_add(new SectionMeeting($days, $time_start, $time_end, $location, $type));
 	  return;
+	}
     error_log('Could not find class when parsing schedule from postData: ' . $course_name);
     echo 'Could not find class: ' . $course_name . "<br />\n";
+  }
   //--------------------------------------------------
   // Finds all of the possible permutations and stores
   // the results in the storage array.
   //--------------------------------------------------
 	function findPossibilities()
+	{
 	  /*
 	   * Clean crud (completely empty courses) out of the
 	   * schedule. For some crud, it's much easier to detect that
 	   * it's crud now than during parsing of postData[].
 	   */
 	  foreach ($this->courses as $i => $course)
 	    if (!$course->getnsections())
+	      {
 		unset($this->courses[$i]);
 		$this->courses = array_values($this->courses);
 		return $this->findPossibilities();
+	      }
 		$this->possiblePermutations = 1;
 		/* special case: there is nothing entered into the schedule and thus there is one, NULL permutation */
 		if (!count($this->courses))
+		{
 			/* have an empty schedule */
 			$this->nPermutations = 1;
 			return;
+		}
 		$position = 0;
 		$counter = 0;
 		$i = 0;
 		foreach ($this->courses as $course)
+		{
 			$this->possiblePermutations = $this->possiblePermutations * $course->getnsections();
 			$cs[$i] = 0;	// Sets the counter array to all zeroes.
 			$i ++;
+		}
 		// Checks for conflicts in given classes, stores if none found
 		do
+		{
 			$conflict = false;

process.php

➞

Show inline comments

@@ @@ -157,49 +157,49 @@ if(!$DEBUG) @@
 	    /* Detect bad parent_schedule reference. */
 	    if (empty($parent_schedule))
 	      $parent_schedule_id = NULL;
+	  }
 	$allClasses = new Schedule($name, $parent_schedule_id);
 	$errors = array();
 		foreach($_POST['postData'] as $class)
+		{
 		  /*
 		   * Only add classes if the user added at least one
 		   * section to the class. We know that $class['name']
 		   * is not a section, so count() needs to be > 1 and
 		   * we need to skip over 'name' in our loop.
 		   */
 			if(is_array($class) && count($class) > 1)
+			{
 				$allClasses->addCourse($class['name']);
 				foreach($class as $section)
 				  /* Skip the section name, which isn't a section */
 					if(is_array($section))
+					  {
 					    $error_string = $allClasses->addSection($class['name'], $section['letter'], $section['start'], $section['end'], arrayToDays($section['days'], 'alpha'), $section['synonym'], $section['professor'], $section['location'], $section['type']);
+					    $error_string = $allClasses->addSection($class['name'], $section['letter'], $section['start'], $section['end'], arrayToDays(empty($section['days']) ? array() : $section['days'], 'alpha'), $section['synonym'], $section['professor'], $section['location'], $section['type']);
 					    if ($error_string !== NULL)
 					      $errors[] = $error_string;
+					  }
+			}
+		}
 		/*
 		 * Tell the user that his input is erroneous and
 		 * require him to fix it.
 		 */
 		if (count($errors))
+		  {
 		    $error_page = new Page('Process Schedule — Errors');
 		    echo '        <p>' . PHP_EOL
 		      . '          You have the following errors in your input:' . PHP_EOL
 		      . '        </p>' . PHP_EOL
 		      . '        <ul>' . PHP_EOL;
 		    foreach ($errors as $error)
 		      echo '          <li>' . $error . '</li>' . PHP_EOL;
 		    echo '        </ul>' . PHP_EOL
 		      . '        <h3>Solving Errors</h3>' . PHP_EOL
 		      . '        <ul>' . PHP_EOL
 		      . '          <li>Most importantly, click the <em>Fix</em> button below to return to the schedule editing page to resolve these errors. Hitting your browser\'s <em>Back</em> button will cause your input to be lost.</li>' . PHP_EOL

0 comments (0 inline, 0 general)