Bugfix 789461: Terminate answer-driven Survey

docs/upgrades/upgrade_5.5.0-5.5.1.sql

@@ -4,4 +4,5 @@ DELETE FROM international WHERE internationalId=71 and namespace='USS' and langu
 INSERT INTO international VALUES (71,'USS',1,'User Submission Systems are a great way to add a sense of community to any site as well as get free content from your users.\r\n<br><br>\r\n\r\n<b>Main Template</b><br>\r\nChoose a layout for this USS.\r\n<p/>\r\n\r\n\r\n<b>Filter Content</b><br>\r\nSelect the level of content filtering you wish to perform on all submitted content.\r\n<p>\r\n\r\n<b>Submission Template</b><br/>\r\nChoose a layout for the individual submissions.\r\n<p/>\r\n\r\n<b>Who can approve?</b><br>\r\nWhat group is allowed to approve and deny content?\r\n<br><br>\r\n\r\n<b>Who can contribute?</b><br>\r\nWhat group is allowed to contribute content?\r\n<br><br>\r\n\r\n<b>Submissions Per Page</b><br>\r\nHow many submissions should be listed per page in the submissions index?\r\n<br><br>\r\n\r\n<b>Sort By</b><br>\r\nThe field to sort the submission list by.\r\n<p>\r\n\r\n<b>Sort Order</b><br>\r\nThe direction to sort the submission list by.\r\n<p>\r\n\r\n<b>Default Status</b><br>\r\nShould submissions be set to <i>Approved</i>, <i>Pending</i>, or <i>Denied</i> by default?\r\n<br><br>\r\n<i>Note:</i> If you set the default status to Pending, then be prepared to monitor your message log for new submissions.\r\n<p>\r\n\r\n<b>Karma Per Submission</b><br>\r\nHow much karma should be given to a user when they contribute to this user submission system?\r\n<p>\r\n\r\n\r\n<b>Allow discussion?</b><br>\r\nChecking this box will enable responses to your article much like Articles on Slashdot.org.\r\n<p>\r\n\r\n\r\n',1066637303,NULL);
 DELETE FROM international WHERE internationalId=1055 and namespace='WebGUI' and languageId = 1;
 INSERT INTO international VALUES (1055,'WebGUI',1,'WebGUI has a very powerful built-in discussion system. It can be attached to anything and is attached to many wobjects.\r\n<p>\r\nForums (aka Discussions) have many settable properties. The following is a comprehensive list:\r\n<p>\r\n\r\n<b>Forum Template</b><br>\r\nA template that controls the layout of the forum view.\r\n<p>\r\n\r\n<b>Thread Template</b><br>\r\nA template that controls the layout of the thread view.\r\n<p>\r\n\r\n<b>Post Template</b><br>\r\nA template that controls the layout of the post view.\r\n<p>\r\n\r\n<b>Search Template</b><br>\r\nA template that controls the layout of the search engine interface and search results.\r\n<p>\r\n\r\n<b>Post Form Template</b><br>\r\nA template that controls the form that users see when posting a new message.\r\n<p>\r\n\r\n<b>Notification Template</b><br>\r\nA template that controls the layout of subscription notification messages sent to users.\r\n<p>\r\n\r\n<b>Archive After</b><br>\r\nIf a thread hasn\'t had a new message after this interval has expired then it will be flagged as \"archived\" and will only be accessible via the search engine.\r\n<p>\r\n\r\n<b>Edit Timeout</b><br>\r\nThe interval of time that the user has to edit their message after their inital post.\r\n<p>\r\n<i>NOTE:</i> Don\'t set this limit too high. One of the great things about discussions is that they are an accurate record of who said what. If you allow editing for a long time, then a user has a chance to go back and change his/her mind a long time after the original statement was made.\r\n<p>\r\n\r\n<b>Add edit stamp to posts?</b><br>\r\nIf set to yes then a string will be added to the bottom of a post each time its edited.\r\n<p>\r\n\r\n<b>Allow rich edit?</b><br>\r\nIf set to yes then users will be able to use a rich editor when writing their posts.\r\n<p>\r\n\r\n<b>Allow replacements?</b><br>\r\nIf set to yes then users will be able to use replacements in thier posts. Replacements can be managed from the settings.\r\n<p>\r\n\r\n<b>Filter Post</b><br>\r\nSelect what types of content you will filter from a user\'s post.\r\n<p>\r\n\r\n<b>Posts Per Page</b><br>\r\nThe number of posts to display on a single page.\r\n<p>\r\n\r\n<b>Karma Per Post</b><br>\r\nHow much karma should be given to a user when they post a message?\r\n<p>\r\n\r\n<b>Who can post?</b><br>\r\nA group that is allowed to post new messages.\r\n<p>\r\n\r\n<b>Moderate posts?</b><br>\r\nIf set to yes then posts will be set to pending by default and will not be displayed until a moderator approves the message.\r\n<p>\r\n\r\n<b>Who can moderate?</b><br>\r\nA group that is allowed to moderate messages.\r\n<p>\r\n',1068708617,NULL);
+INSERT INTO international VALUES (82,'Survey',1,'Terminate Survey',1068901816,'');
 

lib/WebGUI/Wobject/Survey.pm

@@ -331,6 +331,7 @@ sub www_editAnswer {
 	if ($_[0]->get("questionOrder") eq "response") {
 		$question = WebGUI::SQL->buildHashRef("select Survey_questionId,question 
 			from Survey_question where Survey_id=".$_[0]->get("Survey_id")." order by sequenceNumber");
+		$question = { ('-1' => WebGUI::International::get(82,$_[0]->get("namespace")),%$question) };
 		$f->select(
 			-name=>"gotoQuestion",
 			-options=>$question,
@@ -621,6 +622,7 @@ sub www_view {
 				} else {
 					$questionOrder = "sequential";
 				}
+				undef $question if ($responseDriver < 0);	# Terminate Survey
 			} 
 			if ($questionOrder eq "sequential" && $previousResponse->{Survey_questionId}) {
 				my $previousQuestion = $_[0]->getCollateral("Survey_question","Survey_questionId",