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

A few database changes for Sybase compatibility.

Browse source
This commit is contained in:
JT Smith 2003-01-07 00:38:10 +00:00
parent b3c71232d0
commit fe17974eb2
4 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/upgrades/upgrade_5.0.1-5.0.2.sql
View file

@ -990,5 +990,9 @@ insert into international (internationalId,languageId,namespace,message,lastUpda
INSERT INTO international VALUES (73,'MailForm',1,'Send',1039776778); INSERT INTO international VALUES (73,'MailForm',1,'Send',1039776778);
INSERT INTO international VALUES (73,'MailForm',3,'Verstuur',1039776778); INSERT INTO international VALUES (73,'MailForm',3,'Verstuur',1039776778);
INSERT INTO international VALUES (73,'MailForm',2,'Versend',1039776778); INSERT INTO international VALUES (73,'MailForm',2,'Versend',1039776778);
alter table Survey_answer change goto gotoQuestion int;
alter table pageStatistics change function wobjectFunction varchar(60);
alter table EventsCalendar_event change EventsCalendar_recurringEventId EventsCalendar_recurringId int not null default 0;
update incrementer set incrementerId='EventsCalendar_recurringId' where incrementerId='EventsCalendar_recurringEventId';

2
lib/WebGUI.pm
View file

@ -244,7 +244,7 @@ sub page {
} }
if ($operationOutput eq "" && $session{setting}{trackPageStatistics} && $session{form}{wid} ne "new") { if ($operationOutput eq "" && $session{setting}{trackPageStatistics} && $session{form}{wid} ne "new") {
WebGUI::SQL->write("insert into pageStatistics (dateStamp, userId, username, ipAddress, userAgent, referer, WebGUI::SQL->write("insert into pageStatistics (dateStamp, userId, username, ipAddress, userAgent, referer,
pageId, pageTitle, wobjectId, function) values (".time().",".$session{user}{userId} pageId, pageTitle, wobjectId, wobjectFunction) values (".time().",".$session{user}{userId}
.",".quote($session{user}{username}).", .",".quote($session{user}{username}).",
".quote($session{env}{REMOTE_ADDR}).", ".quote($session{env}{HTTP_USER_AGENT}).", ".quote($session{env}{REMOTE_ADDR}).", ".quote($session{env}{HTTP_USER_AGENT}).",
".quote($session{env}{HTTP_REFERER}).", ".$session{page}{pageId}.", ".quote($session{env}{HTTP_REFERER}).", ".$session{page}{pageId}.",

14
lib/WebGUI/Wobject/EventsCalendar.pm
View file

@ -61,7 +61,7 @@ sub _drawBigCalendar {
$message = ""; $message = "";
if ($canEdit) { if ($canEdit) {
$message = deleteIcon('func=deleteEvent&wid='.$_[0]->get("wobjectId").'&eid='.$event{EventsCalendar_eventId} $message = deleteIcon('func=deleteEvent&wid='.$_[0]->get("wobjectId").'&eid='.$event{EventsCalendar_eventId}
.'&rid='.$event{EventsCalendar_recurringEventId}) .'&rid='.$event{EventsCalendar_recurringId})
.editIcon('func=editEvent&wid='.$_[0]->get("wobjectId").'&eid='.$event{EventsCalendar_eventId}) .editIcon('func=editEvent&wid='.$_[0]->get("wobjectId").'&eid='.$event{EventsCalendar_eventId})
.' '; .' ';
} }
@ -151,11 +151,11 @@ sub duplicate {
paginateAfter=>$_[0]->get("paginateAfter") paginateAfter=>$_[0]->get("paginateAfter")
}); });
$sth = WebGUI::SQL->read("select * from EventsCalendar_event where wobjectId=" $sth = WebGUI::SQL->read("select * from EventsCalendar_event where wobjectId="
.$_[0]->get("wobjectId")." order by EventsCalendar_recurringEventId"); .$_[0]->get("wobjectId")." order by EventsCalendar_recurringId");
while (@row = $sth->array) { while (@row = $sth->array) {
$newEventId = getNextId("EventsCalendar_eventId"); $newEventId = getNextId("EventsCalendar_eventId");
if ($row[6] > 0 && $row[6] != $previousRecurringEventId) { if ($row[6] > 0 && $row[6] != $previousRecurringEventId) {
$row[6] = getNextId("EventsCalendar_recurringEventId"); $row[6] = getNextId("EventsCalendar_recurringId");
$previousRecurringEventId = $row[6]; $previousRecurringEventId = $row[6];
} }
WebGUI::SQL->write("insert into EventsCalendar_event values ($newEventId, ".$w->get("wobjectId").", ". WebGUI::SQL->write("insert into EventsCalendar_event values ($newEventId, ".$w->get("wobjectId").", ".
@ -196,7 +196,7 @@ sub www_deleteEvent {
sub www_deleteEventConfirm { sub www_deleteEventConfirm {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage()); return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
if ($session{form}{rid} > 0) { if ($session{form}{rid} > 0) {
$_[0]->deleteCollateral("EventsCalendar_event","EventsCalendar_recurringEventId",$session{form}{rid}); $_[0]->deleteCollateral("EventsCalendar_event","EventsCalendar_recurringId",$session{form}{rid});
} else { } else {
$_[0]->deleteCollateral("EventsCalendar_event","EventsCalendar_eventId",$session{form}{eid}); $_[0]->deleteCollateral("EventsCalendar_event","EventsCalendar_eventId",$session{form}{eid});
} }
@ -371,7 +371,7 @@ sub www_editEventSave {
if ($session{form}{recursEvery} eq "never") { if ($session{form}{recursEvery} eq "never") {
$recurringEventId = 0; $recurringEventId = 0;
} else { } else {
$recurringEventId = getNextId("EventsCalendar_recurringEventId"); $recurringEventId = getNextId("EventsCalendar_recurringId");
while ($startDate[$i] < $until) { while ($startDate[$i] < $until) {
$i++; $i++;
$eventId[$i] = getNextId("EventsCalendar_eventId"); $eventId[$i] = getNextId("EventsCalendar_eventId");
@ -499,7 +499,7 @@ sub www_view {
"list.url"=>WebGUI::URL::page('func=viewEvent&wid='.$_[0]->get("wobjectId").'&eid=' "list.url"=>WebGUI::URL::page('func=viewEvent&wid='.$_[0]->get("wobjectId").'&eid='
.$event->{EventsCalendar_eventId}), .$event->{EventsCalendar_eventId}),
"list.controls"=>deleteIcon('func=deleteEvent&wid='.$_[0]->get("wobjectId").'&eid=' "list.controls"=>deleteIcon('func=deleteEvent&wid='.$_[0]->get("wobjectId").'&eid='
.$event->{EventsCalendar_eventId}.'&rid='.$event->{EventsCalendar_recurringEventId}) .$event->{EventsCalendar_eventId}.'&rid='.$event->{EventsCalendar_recurringId})
.editIcon('func=editEvent&wid='.$_[0]->get("wobjectId").'&eid='.$event->{EventsCalendar_eventId}) .editIcon('func=editEvent&wid='.$_[0]->get("wobjectId").'&eid='.$event->{EventsCalendar_eventId})
}); });
} }
@ -527,7 +527,7 @@ sub www_viewEvent {
$var{"edit.url"} = WebGUI::URL::page('func=editEvent&eid='.$session{form}{eid}.'&wid='.$session{form}{wid}); $var{"edit.url"} = WebGUI::URL::page('func=editEvent&eid='.$session{form}{eid}.'&wid='.$session{form}{wid});
$var{"edit.label"} = WebGUI::International::get(575); $var{"edit.label"} = WebGUI::International::get(575);
$var{"delete.url"} = WebGUI::URL::page('func=deleteEvent&eid='.$session{form}{eid}.'&wid=' $var{"delete.url"} = WebGUI::URL::page('func=deleteEvent&eid='.$session{form}{eid}.'&wid='
.$session{form}{wid}.'&rid='.$event{EventsCalendar_recurringEventId}); .$session{form}{wid}.'&rid='.$event{EventsCalendar_recurringId});
$var{"delete.label"} = WebGUI::International::get(576); $var{"delete.label"} = WebGUI::International::get(576);
($id) = WebGUI::SQL->quickArray("select EventsCalendar_eventId from EventsCalendar_event ($id) = WebGUI::SQL->quickArray("select EventsCalendar_eventId from EventsCalendar_event
where EventsCalendar_eventId<>$event{EventsCalendar_eventId} and where EventsCalendar_eventId<>$event{EventsCalendar_eventId} and

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

@ -308,9 +308,9 @@ sub www_editAnswer {
$question = WebGUI::SQL->buildHashRef("select Survey_questionId,question $question = WebGUI::SQL->buildHashRef("select Survey_questionId,question
from Survey_question where Survey_id=".$_[0]->get("Survey_id")." order by sequenceNumber"); from Survey_question where Survey_id=".$_[0]->get("Survey_id")." order by sequenceNumber");
$f->select( $f->select(
-name=>"goto", -name=>"gotoQuestion",
-options=>$question, -options=>$question,
-value=>[$answer->{goto}], -value=>[$answer->{gotoQuestion}],
-label=>WebGUI::International::get(21,$namespace) -label=>WebGUI::International::get(21,$namespace)
); );
} }
@ -342,7 +342,7 @@ sub www_editAnswerSave {
answer => $session{form}{answer}, answer => $session{form}{answer},
isCorrect => $session{form}{isCorrect}, isCorrect => $session{form}{isCorrect},
Survey_id=>$_[0]->get("Survey_id"), Survey_id=>$_[0]->get("Survey_id"),
goto => $session{form}{goto} gotoQuestion => $session{form}{gotoQuestion}
},1,0,"Survey_Id"); },1,0,"Survey_Id");
if ($session{form}{proceed} eq "addQuestion") { if ($session{form}{proceed} eq "addQuestion") {
$session{form}{qid} = "new"; $session{form}{qid} = "new";
@ -586,7 +586,7 @@ sub www_view {
} }
} }
if ($questionOrder eq "response" && $previousResponse->{Survey_answerId}) { if ($questionOrder eq "response" && $previousResponse->{Survey_answerId}) {
my ($responseDriver) = WebGUI::SQL->quickArray("select goto from Survey_answer where my ($responseDriver) = WebGUI::SQL->quickArray("select gotoQuestion from Survey_answer where
Survey_answerId=".$previousResponse->{Survey_answerId}); Survey_answerId=".$previousResponse->{Survey_answerId});
if ($responseDriver) { if ($responseDriver) {
$question = $_[0]->getCollateral("Survey_question","Survey_questionId",$responseDriver); $question = $_[0]->getCollateral("Survey_question","Survey_questionId",$responseDriver);