Skip to content

Commit

Permalink
New Feature: Welcome screen can be skipped by using a setting at surv…
Browse files Browse the repository at this point in the history 
…ey level

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@9099 b72ed6b6-b9f8-46b5-92b4-906544132732
  • Loading branch information
@mennodekker
mennodekker committed Sep 1, 2010
1 parent 0694960 commit fecb055
Show file tree
Hide file tree
Showing 14 changed files with 32 additions and 9 deletions.
2 changes: 1 addition & 1 deletion admin/admin.php
View file
Expand Up @@ -409,7 +409,7 @@
!isset($importoldresponsesoutput) && !isset($exportroutput) && !isset($vvoutput) &&
!isset($tokenoutput) && !isset($exportoutput) && !isset($templatesoutput) &&
!isset($iteratesurveyoutput) && (substr($action,0,4)!= 'ajax') && ($action!='update') &&
(isset($surveyid) || $action == "" || preg_match('/^(listsurveys|personalsettings|statistics|copysurvey|importsurvey|editsurveysettings|editsurveylocalesettings|updatesurveysettingsandeditlocalesettings|updatedefaultvalues|ordergroups|dataentry|newsurvey|listsurveys|globalsettings|editusergroups|editusergroup|exportspss|surveyrights|quotas|editusers|login|browse|vvimport|vvexport|setuserrights|modifyuser|setusertemplates|deluser|adduser|userrights|usertemplates|moduser|addusertogroup|deleteuserfromgroup|globalsettingssave|savepersonalsettings|addusergroup|editusergroupindb|usergroupindb|delusergroup|mailusergroup|mailsendusergroup)$/',$action)))
(isset($surveyid) || $action == "" || preg_match('/^(listsurveys|personalsettings|statistics|copysurvey|importsurvey|editsurveysettings|editsurveylocalesettings|updatesurveysettings|updatesurveysettingsandeditlocalesettings|updatedefaultvalues|ordergroups|dataentry|newsurvey|listsurveys|globalsettings|editusergroups|editusergroup|exportspss|surveyrights|quotas|editusers|login|browse|vvimport|vvexport|setuserrights|modifyuser|setusertemplates|deluser|adduser|userrights|usertemplates|moduser|addusertogroup|deleteuserfromgroup|globalsettingssave|savepersonalsettings|addusergroup|editusergroupindb|usergroupindb|delusergroup|mailusergroup|mailsendusergroup)$/',$action)))
{
if ($action=='editsurveysettings' || $action=='editsurveylocalesettings')
{
Expand Down
2 changes: 2 additions & 0 deletions admin/database.php
View file
Expand Up @@ -1093,6 +1093,7 @@ function get_max_question_order($gid)
'showgroupinfo'=>$_POST['showgroupinfo'],
'showqnumcode'=>$_POST['showqnumcode'],
'shownoanswer'=>$_POST['shownoanswer'],
'showwelcome'=>$_POST['showwelcome'],
'allowprev'=>$_POST['allowprev'],
'listpublic'=>$_POST['public'],
'htmlemail'=>$_POST['htmlemail'],
Expand Down Expand Up @@ -1344,6 +1345,7 @@ function get_max_question_order($gid)
'showgroupinfo'=>$_POST['showgroupinfo'],
'showqnumcode'=>$_POST['showqnumcode'],
'shownoanswer'=>$_POST['shownoanswer'],
'showwelcome'=>$_POST['showwelcome'],
'allowprev'=>$_POST['allowprev'],
'printanswers'=>$_POST['printanswers'],
// 'usetokens'=>$_POST['usetokens'],
Expand Down
5 changes: 2 additions & 3 deletions admin/html.php
View file
Expand Up @@ -2567,7 +2567,7 @@
//Fetch survey info
$esquery = "SELECT * FROM {$dbprefix}surveys WHERE sid=$surveyid";
$esresult = db_execute_assoc($esquery); //Checked
while ($esrow = $esresult->FetchRow()) {
if ($esrow = $esresult->FetchRow()) {
$esrow = array_map('htmlspecialchars', $esrow);
}

Expand Down Expand Up @@ -2764,7 +2764,7 @@
. "<img alt='" . $clang->gT("Template preview image") . "' id='preview' src='$publicurl/templates/{$esrow['template']}/preview.png' />\n"
. "</li>\n";

/*//SHOW WELCOMESCRN
//SHOW WELCOMESCRN
$editsurvey .= "<li><label for='showwelcome'>" . $clang->gT("Show welcome screen?") . "</label>\n"
. "<select id='showwelcome' name='showwelcome'>\n"
. "<option value='Y'";
Expand All @@ -2778,7 +2778,6 @@
}
$editsurvey .= ">" . $clang->gT("No") . "</option>\n"
. "</select></li>\n";
*/

//ALLOW SAVES
$editsurvey .= "<li><label for='allowsave'>" . $clang->gT("Allow Saves?") . "</label>\n"
Expand Down
1 change: 1 addition & 0 deletions admin/install/create-mssql.sql
View file
Expand Up @@ -247,6 +247,7 @@ CREATE TABLE [prefix_surveys] (
[showgroupinfo] char(1) default 'B',
[shownoanswer] char(1) default 'Y',
[showqnumcode] char(1) default 'X',
[showwelcome] char(1) default 'Y',
[allowprev] char(1) default 'Y',
[printanswers] char(1) default 'N',
[ipaddr] char(1) default 'N',
Expand Down
1 change: 1 addition & 0 deletions admin/install/create-mssqlnative.sql
View file
Expand Up @@ -247,6 +247,7 @@ CREATE TABLE [prefix_surveys] (
[showgroupinfo] char(1) default 'B',
[shownoanswer] char(1) default 'Y',
[showqnumcode] char(1) default 'X',
[showwelcome] char(1) default 'Y',
[allowprev] char(1) default 'Y',
[printanswers] char(1) default 'N',
[ipaddr] char(1) default 'N',
Expand Down
1 change: 1 addition & 0 deletions admin/install/create-mysql.sql
View file
Expand Up @@ -206,6 +206,7 @@ CREATE TABLE `prefix_surveys` (
`showgroupinfo` char(1) default 'B',
`shownoanswer` char(1) default 'Y',
`showqnumcode` char(1) default 'X',
`showwelcome` char(1) default 'Y',
`allowprev` char(1) default 'Y',
`printanswers` char(1) default 'N',
`ipaddr` char(1) default 'N',
Expand Down
1 change: 1 addition & 0 deletions admin/install/create-postgres.sql
View file
Expand Up @@ -275,6 +275,7 @@ CREATE TABLE prefix_surveys (
showgroupinfo character(1) DEFAULT 'B'::bpchar,
shownoanswer character(1) DEFAULT 'Y'::bpchar,
showqnumcode character(1) DEFAULT 'X'::bpchar,
showwelcome character(1) DEFAULT 'Y'::bpchar,
allowprev character(1) DEFAULT 'Y'::bpchar,
ipaddr character(1) DEFAULT 'N'::bpchar,
refurl character(1) DEFAULT 'N'::bpchar,
Expand Down
1 change: 1 addition & 0 deletions admin/update/upgrade-mssql.php
View file
Expand Up @@ -413,6 +413,7 @@ function db_upgrade($oldversion) {
modify_database("", "ALTER TABLE [prefix_surveys] ADD bounceaccountpass VARCHAR(20) NULL"); echo $modifyoutput; flush();
modify_database("", "ALTER TABLE [prefix_surveys] ADD bounceaccountencryption VARCHAR(4) NULL"); echo $modifyoutput; flush();
modify_database("", "ALTER TABLE [prefix_surveys] ADD bounceaccountuser VARCHAR(20) NULL"); echo $modifyoutput; flush();
modify_database("", "ALTER TABLE [prefix_surveys] ADD showwelcome CHAR(1) NULL default 'Y'"); echo $modifyoutput; flush();

//Now add an index to the questions table to speed up subquestions
modify_database("", "create index [parent_qid] on [prefix_questions] ([parent_qid])"); echo $modifyoutput; flush();
Expand Down
1 change: 1 addition & 0 deletions admin/update/upgrade-mssqlnative.php
View file
Expand Up @@ -413,6 +413,7 @@ function db_upgrade($oldversion) {
modify_database("", "ALTER TABLE [prefix_surveys] ADD bounceaccountpass VARCHAR(20) NULL "); echo $modifyoutput; flush();
modify_database("", "ALTER TABLE [prefix_surveys] ADD bounceaccountencryption VARCHAR(4) NULL "); echo $modifyoutput; flush();
modify_database("", "ALTER TABLE [prefix_surveys] ADD bounceaccountuser VARCHAR(320) NULL "); echo $modifyoutput; flush();
modify_database("", "ALTER TABLE [prefix_surveys] ADD showwelcome CHAR(1) NULL default 'Y' "); echo $modifyoutput; flush();

//Now add an index to the questions table to speed up subquestions
modify_database("", "create index [parent_qid] on [prefix_questions] ([parent_qid])"); echo $modifyoutput; flush();
Expand Down
1 change: 1 addition & 0 deletions admin/update/upgrade-mysql.php
View file
Expand Up @@ -397,6 +397,7 @@ function db_upgrade($oldversion) {
modify_database("", "ALTER TABLE `prefix_surveys` ADD `bounceaccountpass` VARCHAR(20) NULL"); echo $modifyoutput; flush();
modify_database("", "ALTER TABLE `prefix_surveys` ADD `bounceaccountencryption` VARCHAR(4) NULL"); echo $modifyoutput; flush();
modify_database("", "ALTER TABLE `prefix_surveys` ADD `bounceaccountuser` VARCHAR(320) NULL"); echo $modifyoutput; flush();
modify_database("", "ALTER TABLE `prefix_surveys` ADD `showwelcome` CHAR(1) NULL default 'Y'"); echo $modifyoutput; flush();

//Now add an index to the questions table to speed up subquestions
modify_database("", "create INDEX parent_qid on prefix_questions( parent_qid );"); echo $modifyoutput; flush();
Expand Down
1 change: 1 addition & 0 deletions admin/update/upgrade-postgres.php
View file
Expand Up @@ -239,6 +239,7 @@ function db_upgrade($oldversion) {
modify_database("", "ALTER TABLE prefix_surveys ADD bounceaccounthost VARCHAR(20) NULL"); echo $modifyoutput; flush();
modify_database("", "ALTER TABLE prefix_surveys ADD bounceaccountencryption VARCHAR(4) NULL"); echo $modifyoutput; flush();
modify_database("", "ALTER TABLE prefix_surveys ADD bounceaccounttype VARCHAR(4) NULL"); echo $modifyoutput; flush();
modify_database("", "ALTER TABLE prefix_surveys ADD showwelcome CHAR(1) NULL default 'Y'"); echo $modifyoutput; flush();

//Now add an index to the questions table to speed up subquestions
modify_database("", "create INDEX parent_qid on prefix_questions( parent_qid );"); echo $modifyoutput; flush();
Expand Down
9 changes: 7 additions & 2 deletions group.php
View file
Expand Up @@ -275,8 +275,13 @@
if (!isset($_SESSION['step']) || !$_SESSION['step'])
{
$totalquestions = buildsurveysession();
display_first_page();
exit;
if(isset($thissurvey['showwelcome']) && $thissurvey['showwelcome'] == 'N') {
//If explicitply set, hide the welcome screen
$_SESSION['step'] = 1;
} else {
display_first_page();
exit;
}
}

//******************************************************************************************************
Expand Down
9 changes: 7 additions & 2 deletions question.php
View file
Expand Up @@ -75,8 +75,13 @@
if (!isset($_SESSION['step']) || !$_SESSION['step'])
{
$totalquestions = buildsurveysession();
display_first_page();
exit;
if(isset($thissurvey['showwelcome']) && $thissurvey['showwelcome'] == 'N') {
//If explicitply set, hide the welcome screen
$_SESSION['step'] = 1;
} else {
display_first_page();
exit;
}
}
//******************************************************************************************************
//PRESENT SURVEY
Expand Down
6 changes: 5 additions & 1 deletion survey.php
View file
Expand Up @@ -338,7 +338,11 @@

// <-- END FEATURE - SAVE

echo templatereplace(file_get_contents("$thistpl/welcome.pstpl"))."\n";
if(isset($thissurvey['showwelcome']) && $thissurvey['showwelcome'] == 'N') {
//Hide the welcome screen if explicitly set
} else {
echo templatereplace(file_get_contents("$thistpl/welcome.pstpl"))."\n";
}

if ($thissurvey['private'] == "Y")
{
Expand Down

0 comments on commit fecb055

Please sign in to comment.