merging 5.2.6 bug fixes

This commit is contained in:
JT Smith 2003-05-13 01:20:11 +00:00
parent 9da632147e
commit 07aa610a8f
5 changed files with 12 additions and 7 deletions

View file

@ -36,6 +36,7 @@ Contributing Translators.............AGOFER Ltda.
Natalia Almazova
Joeri de Bruin / ProcoliX
Jose Caneira
Junying Du / WDI
Andreas Graf
Emiliano Grilli / Webopen
Ehab Heikal

View file

@ -0,0 +1,4 @@
insert into webguiVersion values ('5.2.6','upgrade',unix_timestamp());
update language set language='繁体中文 (Chinese Traditional)' where languageId=9;
update language set language='简体中文 (Chinese Simplified)' where languageId=7;

View file

@ -38,7 +38,7 @@ sub _submenu {
#-------------------------------------------------------------------
sub www_editUserSettings {
WebGUI::Privilege::adminOnly() unless (WebGUI::Privilege::isInGroup(3));
return WebGUI::Privilege::adminOnly() unless (WebGUI::Privilege::isInGroup(3));
my ($output, $f, $cmd, $html, $options);
$output .= helpIcon(2);
$output .= '<h1>'.WebGUI::International::get(117).'</h1>';
@ -64,7 +64,7 @@ sub www_editUserSettings {
#-------------------------------------------------------------------
sub www_editCompanyInformation {
WebGUI::Privilege::adminOnly() unless (WebGUI::Privilege::isInGroup(3));
return WebGUI::Privilege::adminOnly() unless (WebGUI::Privilege::isInGroup(3));
my ($output, $f);
$output .= helpIcon(6);
$output .= '<h1>'.WebGUI::International::get(124).'</h1>';
@ -80,7 +80,7 @@ sub www_editCompanyInformation {
#-------------------------------------------------------------------
sub www_editContentSettings {
WebGUI::Privilege::adminOnly() unless (WebGUI::Privilege::isInGroup(3));
return WebGUI::Privilege::adminOnly() unless (WebGUI::Privilege::isInGroup(3));
my ($output, %htmlFilter, $f, $pages);
$pages = WebGUI::SQL->buildHashRef("select pageId,menuTitle from page order by menuTitle");
%htmlFilter = ('none'=>WebGUI::International::get(420), 'most'=>WebGUI::International::get(421),
@ -130,7 +130,7 @@ sub www_editContentSettings {
#-------------------------------------------------------------------
sub www_editMessagingSettings {
WebGUI::Privilege::adminOnly() unless (WebGUI::Privilege::isInGroup(3));
return WebGUI::Privilege::adminOnly() unless (WebGUI::Privilege::isInGroup(3));
my ($output, $f);
$output .= helpIcon(13);
$output .= '<h1>'.WebGUI::International::get(133).'</h1>';
@ -147,7 +147,7 @@ sub www_editMessagingSettings {
#-------------------------------------------------------------------
sub www_editMiscSettings {
WebGUI::Privilege::adminOnly() unless (WebGUI::Privilege::isInGroup(3));
return WebGUI::Privilege::adminOnly() unless (WebGUI::Privilege::isInGroup(3));
my ($output, $f);
$output .= helpIcon(24);
$output .= '<h1>'.WebGUI::International::get(140).'</h1>';
@ -163,7 +163,7 @@ sub www_editMiscSettings {
#-------------------------------------------------------------------
sub www_manageSettings {
WebGUI::Privilege::adminOnly() unless (WebGUI::Privilege::isInGroup(3));
return WebGUI::Privilege::adminOnly() unless (WebGUI::Privilege::isInGroup(3));
my ($output);
$output .= helpIcon(12);
$output .= '<h1>'.WebGUI::International::get(143).'</h1>';
@ -180,7 +180,7 @@ sub www_manageSettings {
#-------------------------------------------------------------------
sub www_saveSettings {
WebGUI::Privilege::adminOnly() unless (WebGUI::Privilege::isInGroup(3));
return WebGUI::Privilege::adminOnly() unless (WebGUI::Privilege::isInGroup(3));
my ($key, $value);
foreach $key (keys %{$session{form}}) {
$value = $session{form}{$key};