Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
major bug fix for group assessment attempts overwriting attempts on o…
…ther assessments

add sanity check on clear wiki revision history

git-svn-id: http://imathas.googlecode.com/svn/trunk@641 c89b4f0b-ac2a-0410-9773-c9071ee4f95d
  • Loading branch information
drlippman committed May 27, 2010
1 parent 2919f95 commit fe8ce07
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion assessment/testutil.php
Expand Up @@ -419,7 +419,7 @@ function recordtestdata($limit=false) {
}
}
if ($testsettings['isgroup']>0 && $sessiondata['groupid']>0 && !$isreview) {
$query .= "WHERE agroupid='{$sessiondata['groupid']}'";
$query .= "WHERE agroupid='{$sessiondata['groupid']}' AND assessmentid='{$testsettings['id']}'";
} else {
$query .= "WHERE id='$testid' LIMIT 1";
}
Expand Down
10 changes: 5 additions & 5 deletions course/gb-viewasid.php
Expand Up @@ -96,7 +96,7 @@
//deleteasidfilesbyquery(array($qp[0]=>$qp[1]),1);

$query = "DELETE FROM imas_assessment_sessions";// WHERE id='{$_GET['asid']}'";
$query .= " WHERE {$qp[0]}='{$qp[1]}'";
$query .= " WHERE {$qp[0]}='{$qp[1]}' AND assessmentid='{$qp[2]}'";
//$query .= getasidquery($_GET['asid']);
mysql_query($query) or die("Query failed : " . mysql_error());

Expand Down Expand Up @@ -148,7 +148,7 @@
$qp = getasidquery($_GET['asid']);
//deleteasidfilesbyquery(array($qp[0]=>$qp[1]),1);
deleteasidfilesbyquery2($qp[0],$qp[1],$qp[2],1);
$whereqry = " WHERE {$qp[0]}='{$qp[1]}'";
$whereqry = " WHERE {$qp[0]}='{$qp[1]}' AND assessmentid='{$qp[2]}'";
$query = "SELECT seeds,lastanswers,bestlastanswers FROM imas_assessment_sessions $whereqry";
$result = mysql_query($query) or die("Query failed : " . mysql_error());
$seeds = explode(',',mysql_result($result,0,0));
Expand Down Expand Up @@ -188,7 +188,7 @@
if (isset($_GET['clearq']) && isset($_GET['asid']) && $isteacher) {
if ($_GET['confirmed']=="true") {
$qp = getasidquery($_GET['asid']);
$whereqry = " WHERE {$qp[0]}='{$qp[1]}'";
$whereqry = " WHERE {$qp[0]}='{$qp[1]}' AND assessmentid='{$qp[2]}'";
//$whereqry = getasidquery($_GET['asid']);

$query = "SELECT attempts,lastanswers,reattempting,scores,bestscores,bestattempts,bestlastanswers FROM imas_assessment_sessions $whereqry"; //WHERE id='{$_GET['asid']}'";
Expand Down Expand Up @@ -287,7 +287,7 @@
$query = "UPDATE imas_assessment_sessions SET bestscores='$scorelist',feedback='$feedback'";
if (isset($_POST['updategroup'])) {
$qp = getasidquery($_GET['asid']);
$query .= " WHERE {$qp[0]}='{$qp[1]}'";
$query .= " WHERE {$qp[0]}='{$qp[1]}' AND assessmentid='{$qp[2]}'";
//$query .= getasidquery($_GET['asid']);
} else {
$query .= "WHERE id='{$_GET['asid']}'";
Expand Down Expand Up @@ -326,7 +326,7 @@
$query = "UPDATE imas_assessment_sessions SET starttime='{$_GET['starttime']}' ";//WHERE id='{$_GET['asid']}'";
//$query .= getasidquery($_GET['asid']);
$qp = getasidquery($_GET['asid']);
$query .= " WHERE {$qp[0]}='{$qp[1]}'";
$query .= " WHERE {$qp[0]}='{$qp[1]}' AND assessmentid='{$qp[2]}'";
mysql_query($query) or die("Query failed : $query " . mysql_error());
}

Expand Down
8 changes: 5 additions & 3 deletions wikis/viewwiki.php
Expand Up @@ -52,9 +52,11 @@
if ($_GET['delrev']=='true') {
$query = "SELECT id FROM imas_wiki_revisions WHERE wikiid='$id' AND stugroupid='$groupid' ORDER BY id DESC LIMIT 1";
$result = mysql_query($query) or die("Query failed : $query " . mysql_error());
$curid = mysql_result($result,0,0);
$query = "DELETE FROM imas_wiki_revisions WHERE wikiid='$id' AND stugroupid='$groupid' AND id<$curid";
mysql_query($query) or die("Query failed : $query " . mysql_error());
if (mysql_num_rows($result)>0) {
$curid = mysql_result($result,0,0);
$query = "DELETE FROM imas_wiki_revisions WHERE wikiid='$id' AND stugroupid='$groupid' AND id<$curid";
mysql_query($query) or die("Query failed : $query " . mysql_error());
}
header("Location: http://" . $_SERVER['HTTP_HOST'] . rtrim(dirname($_SERVER['PHP_SELF']), '/\\') . "/viewwiki.php?cid=$cid&id=$id&grp=$groupid");
exit;
} else {
Expand Down

0 comments on commit fe8ce07

Please sign in to comment.