oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bugfix [ 956219 ] can't delete survey question

Browse source
This commit is contained in:
JT Smith 2004-05-25 20:58:54 +00:00
parent e519054234
commit 732eb630c4
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/changelog/6.x.x.txt
View file

@ -15,6 +15,9 @@
- Bugfix [ 949923 ] Collateral changes owner when editing
- Bugfix [ 948050 ] Correct email address not accepted (fix)
- Bugfix [ 938211 ] FIX: DeleteExpiredEvents.pm ignores offset
- Bugfix [ 951061 ] Login from AOL
- Bugfix [ 956219 ] can't delete survey question

2
lib/WebGUI/Session.pm
View file

@ -109,7 +109,7 @@ sub _setupSessionVars {
tie %vars, 'Tie::CPHash';
if ($_[0] ne "") {
%vars = WebGUI::SQL->quickHash("select * from userSession where sessionId='$_[0]'");
if ($vars{expires} < _time() || $vars{lastIP} ne $session{env}{REMOTE_ADDR}) {
if ($vars{expires} < _time() ) { #|| $vars{lastIP} ne $session{env}{REMOTE_ADDR}) { # had to remove for revolving ip proxies
%vars = ();
WebGUI::Session::end($_[0]);
}

4
lib/WebGUI/Wobject/Survey.pm
View file

@ -453,10 +453,10 @@ sub www_deleteQuestion {
sub www_deleteQuestionConfirm {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditWobject($_[0]->get("wobjectId")));
WebGUI::SQL->write("delete from Survey_answer where Survey_questionId=".quote($session{form}{qid}));
WebGUI::SQL->write("delete from Survey_response where Survey_questionId=".quote($session{form}{qid}));
WebGUI::SQL->write("delete from Survey_questionResponse where Survey_questionId=".quote($session{form}{qid}));
$_[0]->deleteCollateral("Survey_question","Survey_questionId",$session{form}{qid});
$_[0]->reorderCollateral("Survey_question","Survey_questionId","Survey_id");
return $_[0]->www_edit;
return "";
}
#-------------------------------------------------------------------