From 40bb7fed597df20016b75bf77d30c4ca1c40579b Mon Sep 17 00:00:00 2001 From: JT Smith Date: Sat, 16 Feb 2002 19:20:00 +0000 Subject: [PATCH] WebGUI 3.2.4 release --- docs/create.sql | 3 +++ docs/previousVersion.sql | 10 +++++----- docs/upgrades/upgrade_3.2.3-3.2.4.sql | 3 +++ lib/WebGUI.pm | 2 +- lib/WebGUI/Operation/Account.pm | 7 ++++--- lib/WebGUI/Operation/User.pm | 2 +- lib/WebGUI/Widget/EventsCalendar.pm | 27 +++++++++++++++------------ 7 files changed, 32 insertions(+), 22 deletions(-) create mode 100644 docs/upgrades/upgrade_3.2.3-3.2.4.sql diff --git a/docs/create.sql b/docs/create.sql index 60fa478aa..527941a21 100644 --- a/docs/create.sql +++ b/docs/create.sql @@ -2781,3 +2781,6 @@ CREATE TABLE widget ( INSERT INTO widget VALUES (-1,4,'SiteMap',0,'Page Not Found',1,'The page you were looking for could not be found on this system. Perhaps it has been deleted or renamed. The following list is a site map of this site. If you don\'t find what you\'re looking for on the site map, you can always start from the Home Page.',1,1001744792,3,1013215663,3,'A'); +insert into international values (403,'WebGUI','English','Prefer not to say.'); +alter table users change column gender gender varchar(6) not null default 'neuter'; + diff --git a/docs/previousVersion.sql b/docs/previousVersion.sql index d65e68d4a..60fa478aa 100644 --- a/docs/previousVersion.sql +++ b/docs/previousVersion.sql @@ -1475,11 +1475,11 @@ INSERT INTO international VALUES (37,'WebGUI','Dutch','Geen toegang!'); INSERT INTO international VALUES (37,'WebGUI','English','Permission Denied!'); INSERT INTO international VALUES (37,'WebGUI','Español','Permiso Denegado!'); INSERT INTO international VALUES (37,'WebGUI','Português','Permissão negada!'); -INSERT INTO international VALUES (38,'WebGUI','Deutsch','Sie sind nicht berechtigt, diese Aktion auszuführen. Melden Sie sich bitte mit einem Benutzernamen an, der über ausreichende Rechte verfügt.'); -INSERT INTO international VALUES (38,'WebGUI','Dutch','U heeft niet voldoende privileges om deze operatie te doen. Log in als een gebruiker met voldoende privileges.'); -INSERT INTO international VALUES (38,'WebGUI','English','You do not have sufficient privileges to perform this operation. Please log in with an account that has sufficient privileges before attempting this operation.'); -INSERT INTO international VALUES (38,'WebGUI','Español','\"No tiene privilegios suficientes para realizar ésta operación. Por favor ingrese con una cuenta que posea los privilegios suficientes antes de intentar ésta operación.\"'); -INSERT INTO international VALUES (38,'WebGUI','Português','\"Não tem privilégios para essa operação. Identifique-se na entrada com uma conta que permita essa operação.\"'); +INSERT INTO international VALUES (38,'WebGUI','Deutsch','Sie sind nicht berechtigt, diese Aktion auszuführen. ^a(Melden Sie sich bitte mit einem Benutzernamen an);, der über ausreichende Rechte verfügt.'); +INSERT INTO international VALUES (38,'WebGUI','Dutch','U heeft niet voldoende privileges om deze operatie te doen. ^a(Log in); als een gebruiker met voldoende privileges.'); +INSERT INTO international VALUES (38,'WebGUI','English','You do not have sufficient privileges to perform this operation. Please ^a(log in with an account); that has sufficient privileges before attempting this operation.'); +INSERT INTO international VALUES (38,'WebGUI','Español','\"No tiene privilegios suficientes para realizar ésta operación. Por favor ^a(ingrese con una cuenta); que posea los privilegios suficientes antes de intentar ésta operación.\"'); +INSERT INTO international VALUES (38,'WebGUI','Português','\"Não tem privilégios para essa operação. ^a(Identifique-se na entrada); com uma conta que permita essa operação.\"'); INSERT INTO international VALUES (39,'WebGUI','Deutsch','Sie sind nicht berechtigt, diese Seite anzuschauen.'); INSERT INTO international VALUES (39,'WebGUI','Dutch','U heeft niet voldoende privileges om deze pagina op te vragen.'); INSERT INTO international VALUES (39,'WebGUI','English','You do not have sufficient privileges to access this page.'); diff --git a/docs/upgrades/upgrade_3.2.3-3.2.4.sql b/docs/upgrades/upgrade_3.2.3-3.2.4.sql new file mode 100644 index 000000000..9b251df8c --- /dev/null +++ b/docs/upgrades/upgrade_3.2.3-3.2.4.sql @@ -0,0 +1,3 @@ +insert into international values (403,'WebGUI','English','Prefer not to say.'); +alter table users change column gender gender varchar(6) not null default 'neuter'; + diff --git a/lib/WebGUI.pm b/lib/WebGUI.pm index fc333fcea..3cc4c2042 100644 --- a/lib/WebGUI.pm +++ b/lib/WebGUI.pm @@ -1,5 +1,5 @@ package WebGUI; -our $VERSION = "3.2.3"; +our $VERSION = "3.2.4"; #------------------------------------------------------------------- # WebGUI is Copyright 2001-2002 Plain Black Software. diff --git a/lib/WebGUI/Operation/Account.pm b/lib/WebGUI/Operation/Account.pm index 96441730a..cd1a795ed 100644 --- a/lib/WebGUI/Operation/Account.pm +++ b/lib/WebGUI/Operation/Account.pm @@ -287,7 +287,7 @@ sub www_displayLogin { #------------------------------------------------------------------- sub www_editProfile { my ($output, %gender, @array); - %gender = ('male'=>WebGUI::International::get(339),'female'=>WebGUI::International::get(340)); + %gender = ('neuter'=>WebGUI::International::get(403),'male'=>WebGUI::International::get(339),'female'=>WebGUI::International::get(340)); if ($session{user}{userId} != 1) { $output .= '

'.WebGUI::International::get(338).'

'; $output .= formHeader(); @@ -526,7 +526,8 @@ sub www_viewMessageLog { #------------------------------------------------------------------- sub www_viewProfile { - my ($output, %user); + my ($output, %user, %gender); + %gender = ('neuter'=>WebGUI::International::get(403),'male'=>WebGUI::International::get(339),'female'=>WebGUI::International::get(340)); %user = WebGUI::SQL->quickHash("select * from users where userId='$session{form}{uid}'"); if ($user{username} eq "") { WebGUI::Privilege::notMember(); @@ -579,7 +580,7 @@ sub www_viewProfile { } if ($session{setting}{profileMisc}) { if ($user{gender} ne "") { - $output .= ''.WebGUI::International::get(335).''.$user{gender}.''; + $output .= ''.WebGUI::International::get(335).''.$gender{$user{gender}}.''; } if ($user{birthdate} ne "") { $output .= ''.WebGUI::International::get(336).''.$user{birthdate}.''; diff --git a/lib/WebGUI/Operation/User.pm b/lib/WebGUI/Operation/User.pm index 85bb07e4a..165647bc8 100644 --- a/lib/WebGUI/Operation/User.pm +++ b/lib/WebGUI/Operation/User.pm @@ -188,7 +188,7 @@ sub www_editUser { tie %hash, 'Tie::CPHash'; tie %data, 'Tie::IxHash'; if (WebGUI::Privilege::isInGroup(3)) { - %gender = ('male'=>WebGUI::International::get(339),'female'=>WebGUI::International::get(340)); + %gender = ('neuter'=>WebGUI::International::get(403),'male'=>WebGUI::International::get(339),'female'=>WebGUI::International::get(340)); %user = WebGUI::SQL->quickHash("select * from users where userId=$session{form}{uid}"); $output .= '
'; $output .= helpLink(5); diff --git a/lib/WebGUI/Widget/EventsCalendar.pm b/lib/WebGUI/Widget/EventsCalendar.pm index 5ffa58957..cb6372f09 100644 --- a/lib/WebGUI/Widget/EventsCalendar.pm +++ b/lib/WebGUI/Widget/EventsCalendar.pm @@ -51,7 +51,7 @@ sub _calendarLayout { $calendar->addcontent(epochToHuman($event{startDate},"%D"),$message); } else { $nextDate = $event{startDate}; - while($nextDate < $event{endDate}) { + while($nextDate <= $event{endDate}) { if (epochToHuman($nextDate,"%M %y") eq $thisMonth) { $calendar->addcontent(epochToHuman($nextDate,"%D"),$message); } @@ -409,30 +409,33 @@ sub www_view { while (%event = $sth->hash) { unless ($event{startDate} == $previous{startDate} && $event{endDate} == $previous{endDate}) { - $output .= "".epochToHuman($event{startDate},"%c %D"); + $row[$i] = "".epochToHuman($event{startDate},"%c %D"); if (epochToHuman($event{startDate},"%y") ne epochToHuman($event{endDate},"%y")) { - $output .= ", ".epochToHuman($event{startDate},"%y"); + $row[$i] .= ", ".epochToHuman($event{startDate},"%y"); $flag = 1; } if ($flag || epochToHuman($event{startDate},"%c") ne epochToHuman($event{endDate},"%c")) { - $output .= " - ".epochToHuman($event{endDate},"%c %D"); + $row[$i] .= " - ".epochToHuman($event{endDate},"%c %D"); } elsif (epochToHuman($event{startDate},"%D") ne epochToHuman($event{endDate},"%D")) { - $output .= " - ".epochToHuman($event{endDate},"%D"); + $row[$i] .= " - ".epochToHuman($event{endDate},"%D"); } $flag = 0; - $output .= ", ".epochToHuman($event{endDate},"%y"); - $output .= ""; - $output .= "
"; + $row[$i] .= ", ".epochToHuman($event{endDate},"%y"); + $row[$i] .= ""; + $row[$i] .= "
"; } %previous = %event; - $output .= ''.$event{name}.''; + $row[$i] .= ''.$event{name}.''; if ($event{description} ne "") { - $output .= ' - '; - $output .= ''.$event{description}; + $row[$i] .= ' - '; + $row[$i] .= ''.$event{description}; } - $output .= '

'; + $row[$i] .= '

'; + $i++; } $sth->finish; + ($dataRows, $prevNextBar) = paginate($data{paginateAfter},WebGUI::URL::page(),\@row); + $output .= $dataRows.$prevNextBar; } if ($data{processMacros}) { $output = WebGUI::Macro::process($output);