Merge branch 'sachin'

Dragoon-Lab · Jul 24, 2015 · 8cdfe74 · 8cdfe74
2 parents 2b3d808 + a298240
commit 8cdfe74
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/www/js/main.js b/www/js/main.js
@@ -110,7 +110,11 @@ define([
 			}
 		}
 	}
-
+
+	//due to a recent change of adding activities, a work around to add query.a in case its not given
+	if(!query.a){
+		query.a = "construction";
+	}
 	//Load Activity Parameters
 	//query.a gives the input activity through url
 	var activity_config;

diff --git a/www/task_fetcher.php b/www/task_fetcher.php
@@ -57,7 +57,7 @@
      if(isset($_GET['u']) && isset($_GET['m'])){
       $user = mysqli_real_escape_string($mysqli,$_GET['u']);
       $mode = $_GET['m'];
-      $activity = $_GET['a'];
+      $activity = !empty($_GET['a'])?$_GET['a']:"construction";
       $query = <<<EOT
       SELECT * FROM session WHERE session.user = '$user' AND session.section = '$section' AND session.mode = '$mode' AND session.activity = '$activity' AND session.problem = '$shortProblemName' ORDER BY session.time DESC LIMIT 1
 EOT;
@@ -198,4 +198,4 @@ function printModel($row){
   header("Location: http://$host$uri/$extra");
 }
 mysqli_close($mysqli);
-?>
+?>