diff -rupBw -x '*.svn' -x '*.project' -x config.php /home/amit/workspace/limesurvey/source/limesurvey/admin/browse.php ./admin/browse.php --- /home/amit/workspace/limesurvey/source/limesurvey/admin/browse.php 2010-03-08 23:53:40.000000000 +0530 +++ ./admin/browse.php 2010-03-16 02:40:58.000000000 +0530 @@ -145,15 +145,28 @@ if ($subaction == "id") // Looking at a $fncount = 0; $fnrows = array(); //Create an empty array in case fetch_array does not return any rows - while ($fnrow = $fnresult->FetchRow()) {++$fncount; $fnrows[] = $fnrow; $private = $fnrow['private']; $datestamp=$fnrow['datestamp']; $ipaddr=$fnrow['ipaddr']; $refurl=$fnrow['refurl'];} // Get table output into array + while ($fnrow = $fnresult->FetchRow()) + { + ++$fncount; + $fnrows[] = $fnrow; + $private = $fnrow['private']; + $datestamp = $fnrow['datestamp']; + $ipaddr = $fnrow['ipaddr']; + $refurl = $fnrow['refurl']; + } // Get table output into array // Perform a case insensitive natural sort on group name then question title of a multidimensional array usort($fnrows, 'CompareGroupThenTitle'); $fnames[] = array("id", "id", "id"); - if ($private == "N") //add token to top ofl ist is survey is not private + if ($private == "N") //add token to top of list if the survey is not private { + + $tokentable = db_table_name("tokens_".$surveyid); $fnames[] = array("token", "token", $clang->gT("Token ID")); + $fnames[] = array("firstname", $clang->gT("First Name"), $clang->gT("First Name"), "0", ''); + $fnames[] = array("lastname", $clang->gT("Last Name"), $clang->gT("Last Name"), "0", ''); + $fnames[] = array("email", $clang->gT("Email"), $clang->gT("Email"), "0", ''); } $fnames[] = array("completed", "Completed", $clang->gT("Completed"), "0"); @@ -287,9 +300,19 @@ if ($subaction == "id") // Looking at a } $nfncount = count($fnames)-1; //SHOW INDIVIDUAL RECORD - $idquery = "SELECT *, CASE WHEN submitdate IS NULL THEN 'N' ELSE 'Y' END as completed FROM $surveytable WHERE "; - if (incompleteAnsFilterstate() == "inc") {$idquery .= "(submitdate = ".$connect->DBDate('1980-01-01'). " OR submitdate IS NULL) AND ";} - elseif (incompleteAnsFilterstate() == "filter") {$idquery .= "submitdate >= ".$connect->DBDate('1980-01-01'). " AND ";} + $idquery = "SELECT *, CASE WHEN submitdate IS NULL THEN 'N' ELSE 'Y' END as completed FROM $surveytable "; + $idquery .= ($private == "N") ? " , $tokentable WHERE " : " WHERE "; + if (incompleteAnsFilterstate() == "inc") + { + $idquery .= "(submitdate = ".$connect->DBDate('1980-01-01'). " OR submitdate IS NULL) AND "; + if ($private == "N") {$idquery .= " $surveytable.token = $tokentable.token AND ";} + } + elseif (incompleteAnsFilterstate() == "filter") + { + $idquery .= "submitdate >= ".$connect->DBDate('1980-01-01'). " AND "; + if ($private == "N") {$idquery .= " $surveytable.token = $tokentable.token AND ";} + } + elseif ($private == "N") {$idquery .= " $surveytable.token = $tokentable.token AND ";} if ($id<1) {$id=1;} if (isset($_POST['sql']) && $_POST['sql']) { @@ -406,7 +429,11 @@ elseif ($subaction == "all") if ($private == "N") //Add token to list { + $tokentable = db_table_name("tokens_".$surveyid); $fnames[] = array("token", $clang->gT("Token"), $clang->gT("Token ID"), "0", ''); + $fnames[] = array("firstname", $clang->gT("First Name"), $clang->gT("First Name"), "0", ''); + $fnames[] = array("lastname", $clang->gT("Last Name"), $clang->gT("Last Name"), "0", ''); + $fnames[] = array("email", $clang->gT("Email"), $clang->gT("Email"), "0", ''); } $fnames[] = array("completed", "Completed", $clang->gT("Completed"), "0", 'D'); @@ -615,19 +642,37 @@ elseif ($subaction == "all") if ($_POST['sql'] == "NULL") { $dtquery = "SELECT *, CASE WHEN submitdate IS NULL THEN 'N' ELSE 'Y' END as completed FROM $surveytable "; - if (incompleteAnsFilterstate() == "inc") {$dtquery .= "WHERE submitdate is null";} - elseif (incompleteAnsFilterstate() == "filter") {$dtquery .= " WHERE submitdate is not null ";} + if ($private == "N") {$dtquery .= ", $tokentable ";} + if (incompleteAnsFilterstate() == "inc") + { + $dtquery .= "WHERE submitdate is null"; + if ($private == "N") {$dtquery .= " AND $surveytable.token = $tokentable.token ";} + } + elseif (incompleteAnsFilterstate() == "filter") + { + $dtquery .= " WHERE submitdate is not null "; + if ($private == "N") {$dtquery .= " AND $surveytable.token = $tokentable.token ";} + } + elseif ($private == "N") {$dtquery .= " AND $surveytable.token = $tokentable.token ";} $dtquery .= " ORDER BY id"; } else { - $dtquery = "SELECT *, CASE WHEN submitdate IS NULL THEN 'N' ELSE 'Y' END as completed FROM $surveytable WHERE "; + $dtquery = "SELECT *, CASE WHEN submitdate IS NULL THEN 'N' ELSE 'Y' END as completed FROM $surveytable"; + $dtquery .= ($private == "N") ? " , $tokentable WHERE " : " WHERE "; if (incompleteAnsFilterstate() == "inc") { $dtquery .= "submitdate is null "; + if ($private == "N") {$dtquery .= " AND $surveytable.token = $tokentable.token ";} if (stripcslashes($_POST['sql']) !== "") { $dtquery .= " AND "; } } elseif (incompleteAnsFilterstate() == "filter") { $dtquery .= " submitdate is not null "; + if ($private == "N") {$dtquery .= " AND $surveytable.token = $tokentable.token ";} + if (stripcslashes($_POST['sql']) !== "") { $dtquery .= " AND "; } + } + elseif ($private == "N") + { + $dtquery .= " AND $surveytable.token = $tokentable.token "; if (stripcslashes($_POST['sql']) !== "") { $dtquery .= " AND "; } } if (stripcslashes($_POST['sql']) !== "") { $dtquery .= stripcslashes($_POST['sql'])." "; } @@ -637,8 +682,18 @@ elseif ($subaction == "all") else { $dtquery = "SELECT *, CASE WHEN submitdate IS NULL THEN 'N' ELSE 'Y' END as completed FROM $surveytable "; - if (incompleteAnsFilterstate() == "inc") {$dtquery .= " WHERE submitdate is null ";} - elseif (incompleteAnsFilterstate() == "filter") {$dtquery .= " WHERE submitdate is not null ";} + if ($private == "N") {$dtquery .= ", $tokentable ";} + if (incompleteAnsFilterstate() == "inc") + { + $dtquery .= " WHERE submitdate is null "; + if ($private == "N") {$dtquery .= "AND $surveytable.token = $tokentable.token ";} + } + elseif (incompleteAnsFilterstate() == "filter") + { + $dtquery .= " WHERE submitdate is not null "; + if ($private == "N") {$dtquery .= "AND $surveytable.token = $tokentable.token ";} + } + elseif ($private == "N") {$dtquery .= " WHERE $surveytable.token = $tokentable.token ";} $dtquery .= " ORDER BY id"; } if ($order == "desc") {$dtquery .= " DESC";}