Skip to content

Commit

Permalink
Dev : better answer in error for browse response
Browse files Browse the repository at this point in the history 
git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@9955 b72ed6b6-b9f8-46b5-92b4-906544132732
  • Loading branch information
@Shnoulle
Shnoulle committed Apr 3, 2011
1 parent e8239ae commit e5b8704
Showing 1 changed file with 48 additions and 64 deletions.
112 changes: 48 additions & 64 deletions admin/browse.php
View file
Expand Up @@ -24,61 +24,17 @@
//Ensure script is not run directly, avoid path disclosure
if (!isset($dbprefix) || isset($_REQUEST['dbprefix'])) {die("Cannot run this script directly");}

//Check if results table exists
if (tableExists('survey_'.$surveyid)==false)
{
$browseoutput = "\t<div class='messagebox ui-corner-all'><div class='header ui-widget-header'>"
. $clang->gT("Browse Responses")."</div><div class='warningheader'>"
.$clang->gT("Error")."\t</div>\n"
. $clang->gT("The defined LimeSurvey database does not exist")."<br />\n"
. $clang->gT("Either your selected database has not yet been created or there is a problem accessing it.")."<br /><br />\n"
."<input type='submit' value='".$clang->gT("Main Admin Screen")."' onclick=\"window.open('$scriptname', '_top')\" /><br />\n"
."</div>";
return;
}

$surveyinfo=getSurveyInfo($surveyid);
require_once(dirname(__FILE__).'/sessioncontrol.php');

// Set language for questions and labels to base language of this survey

if (isset($browselang) && $browselang!='')
{
$_SESSION['browselang']=$browselang;
$language=$_SESSION['browselang'];
}
elseif (isset($_SESSION['browselang']))
{
$language=$_SESSION['browselang'];
$languagelist = GetAdditionalLanguagesFromSurveyID($surveyid);
$languagelist[]=GetBaseLanguageFromSurveyID($surveyid);
if (!in_array($language,$languagelist))
{
$language = GetBaseLanguageFromSurveyID($surveyid);
}
}
else
{
$language = GetBaseLanguageFromSurveyID($surveyid);
}

$surveyoptions = browsemenubar($clang->gT("Browse Responses"));
$browseoutput = "";

// Some test in response table
if (!$surveyid && !$subaction) //NO SID OR ACTION PROVIDED
{
$browseoutput .= "\t<div class='messagebox ui-corner-all'><div class='header ui-widget-header'>"
$browseoutput = "\t<div class='messagebox ui-corner-all'><div class='header ui-widget-header'>"
. $clang->gT("Browse Responses")."</div><div class='warningheader'>"
.$clang->gT("Error")."\t</div>\n"
. $clang->gT("You have not selected a survey to browse.")."<br />\n"
."<input type='submit' value='".$clang->gT("Main Admin Screen")."' onclick=\"window.open('$scriptname', '_top')\" /><br />\n"
."</div>";
return;
}

$js_admin_includes[]='scripts/browse.js';


//CHECK IF SURVEY IS ACTIVATED AND EXISTS
$actquery = "SELECT * FROM ".db_table_name('surveys')." as a inner join ".db_table_name('surveys_languagesettings')." as b on (b.surveyls_survey_id=a.sid and b.surveyls_language=a.language) WHERE a.sid=$surveyid";

Expand All @@ -101,34 +57,62 @@

$surveyname = "{$actrow['surveyls_title']}";
if ($actrow['active'] == "N") //SURVEY IS NOT ACTIVE YET
{
$browseoutput .= "\t<tr><td colspan='2' height='4'><strong>"
. $clang->gT("Browse Responses").":</strong> $surveyname</td></tr>\n"
."\t<tr><td align='center'>\n"
."<strong><font color='red'>".$clang->gT("Error")."</font></strong><br />\n"
. $clang->gT("This survey has not been activated. There are no results to browse.")."<br /><br />\n"
."<input type='submit' value='"
. $clang->gT("Main Admin Screen")."' onclick=\"window.open('$scriptname?sid=$surveyid', '_top')\" /><br />\n"
."</td></tr></table>\n"
."</body>\n</html>";
{
$browseoutput = "\t<div class='messagebox ui-corner-all'><div class='header ui-widget-header'>"
. $clang->gT("Browse Responses")."</div><div class='warningheader'>"
.$clang->gT("Error")."\t</div>\n"
. $clang->gT("This survey has not been activated. There are no results to browse.")."<br />\n"
."<input type='submit' value='".$clang->gT("Main Admin Screen")."' onclick=\"window.open('$scriptname?sid=$surveyid', '_top')\" /><br />\n"
."</div>";
return;
}
}
}
else //SURVEY MATCHING $surveyid DOESN'T EXIST
{
$browseoutput .= "\t<tr><td colspan='2' height='4'><strong>"
. $clang->gT("Browse Responses")."</strong></td></tr>\n"
."\t<tr><td align='center'>\n"
."<strong><font color='red'>".$clang->gT("Error")."</font></strong><br />\n"
. $clang->gT("There is no matching survey.")." ($surveyid)<br /><br />\n"
."<input type='submit' value='".$clang->gT("Main Admin Screen")."' onclick=\"window.open('$scriptname', '_top')\" /><br />\n"
."</td></tr></table>\n"
."</body>\n</html>";
$browseoutput = "\t<div class='messagebox ui-corner-all'><div class='header ui-widget-header'>"
. $clang->gT("Browse Responses")."</div><div class='warningheader'>"
.$clang->gT("Error")."\t</div>\n"
. $clang->gT("There is no matching survey.")."<br />\n"
."<input type='submit' value='".$clang->gT("Main Admin Screen")."' onclick=\"window.open('$scriptname', '_top')\" /><br />\n"
."</div>";
return;
}

//OK. IF WE GOT THIS FAR, THEN THE SURVEY EXISTS AND IT IS ACTIVE, SO LETS GET TO WORK.

$surveyinfo=getSurveyInfo($surveyid);
require_once(dirname(__FILE__).'/sessioncontrol.php');

// Set language for questions and labels to base language of this survey

if (isset($browselang) && $browselang!='')
{
$_SESSION['browselang']=$browselang;
$language=$_SESSION['browselang'];
}
elseif (isset($_SESSION['browselang']))
{
$language=$_SESSION['browselang'];
$languagelist = GetAdditionalLanguagesFromSurveyID($surveyid);
$languagelist[]=GetBaseLanguageFromSurveyID($surveyid);
if (!in_array($language,$languagelist))
{
$language = GetBaseLanguageFromSurveyID($surveyid);
}
}
else
{
$language = GetBaseLanguageFromSurveyID($surveyid);
}

$surveyoptions = browsemenubar($clang->gT("Browse Responses"));
$browseoutput = "";

$js_admin_includes[]='scripts/browse.js';



$qulanguage = GetBaseLanguageFromSurveyID($surveyid);


Expand Down

0 comments on commit e5b8704

Please sign in to comment.