From 199bb625e95471b9c1a3270e67cbb7265a6fedd9 Mon Sep 17 00:00:00 2001 From: JT Smith Date: Wed, 29 May 2002 23:59:33 +0000 Subject: [PATCH] Added a setting for selecting the default page. --- docs/upgrades/upgrade_3.8.0-3.9.0.sql | 23 +++++++++++++++++++---- lib/WebGUI/Macro/H_homeLink.pm | 4 +++- lib/WebGUI/Operation/Settings.pm | 8 +++++--- lib/WebGUI/Session.pm | 2 +- 4 files changed, 28 insertions(+), 9 deletions(-) diff --git a/docs/upgrades/upgrade_3.8.0-3.9.0.sql b/docs/upgrades/upgrade_3.8.0-3.9.0.sql index 524e4c432..3b4308e0a 100644 --- a/docs/upgrades/upgrade_3.8.0-3.9.0.sql +++ b/docs/upgrades/upgrade_3.8.0-3.9.0.sql @@ -682,7 +682,7 @@ INSERT INTO international VALUES (496,'WebGUI','Dansk','Hvilken editor bruges'); INSERT INTO international VALUES (497,'WebGUI','Dansk','Start dato'); INSERT INTO international VALUES (498,'WebGUI','Dansk','Slut dato'); INSERT INTO international VALUES (499,'WebGUI','Dansk','Wobject ID'); -INSERT INTO international VALUES (518,'WebGUI','English','INBOX Notifications'); +INSERT INTO international VALUES (518,'WebGUI','English','Inbox Notifications'); INSERT INTO international VALUES (519,'WebGUI','English','I would not like to be notified.'); INSERT INTO international VALUES (520,'WebGUI','English','I would like to be notified via email.'); INSERT INTO international VALUES (521,'WebGUI','English','I would like to be notified via email to pager.'); @@ -692,9 +692,24 @@ INSERT INTO international VALUES (523,'WebGUI','English','Notification'); INSERT INTO international VALUES (524,'WebGUI','English','Add edit stamp to posts?'); INSERT INTO international VALUES (525,'WebGUI','English','Edit Content Settings'); INSERT INTO international VALUES (526,'WebGUI','English','Remove only JavaScript.'); - - - +delete from international where internationalId=136 and namespace='WebGUI'; +delete from international where internationalId=137 and namespace='WebGUI'; +INSERT INTO international VALUES (527,'WebGUI','English','Default Home Page'); +delete from international where internationalId=83 and namespace='WebGUI'; +delete from international where internationalId=150 and namespace='WebGUI'; +delete from international where internationalId=382 and namespace='WebGUI'; +delete from international where internationalId=344 and namespace='WebGUI'; +INSERT INTO international VALUES (468,'WebGUI','English','Edit User Profile Category'); +INSERT INTO international VALUES (468,'WebGUI','Svenska','Redigera Användar Profil Kattegorier'); +INSERT INTO international VALUES (468,'WebGUI','Dansk','Rediger bruger profil kategori'); +INSERT INTO international VALUES (471,'WebGUI','English','Edit User Profile Field'); +INSERT INTO international VALUES (471,'WebGUI','Svenska','Redigera Användar Profil Attribut'); +INSERT INTO international VALUES (471,'WebGUI','Dansk','Rediger bruger profil felt'); +INSERT INTO international VALUES (159,'WebGUI','English','Inbox'); +INSERT INTO international VALUES (351,'WebGUI','English','Message'); +INSERT INTO international VALUES (353,'WebGUI','English','You have no messages in your Inbox at this time.'); +INSERT INTO international VALUES (354,'WebGUI','English','View Inbox.'); +INSERT INTO settings VALUES ('defaultPage','1'); diff --git a/lib/WebGUI/Macro/H_homeLink.pm b/lib/WebGUI/Macro/H_homeLink.pm index 44c3f9c42..900fcda39 100644 --- a/lib/WebGUI/Macro/H_homeLink.pm +++ b/lib/WebGUI/Macro/H_homeLink.pm @@ -14,12 +14,14 @@ use strict; use WebGUI::International; use WebGUI::Macro; use WebGUI::Session; +use WebGUI::SQL; #------------------------------------------------------------------- sub _replacement { my (@param, $temp); @param = WebGUI::Macro::getParams($1); - $temp = WebGUI::URL::gateway('home'); + ($temp) = WebGUI::SQL->quickArray("select urlizedTitle from page where pageId=$session{setting}{defaultPage}"); + $temp = WebGUI::URL::gateway($temp); if ($param[0] ne "linkonly") { $temp = ''; if ($param[0] ne "") { diff --git a/lib/WebGUI/Operation/Settings.pm b/lib/WebGUI/Operation/Settings.pm index 671d11e11..88fb8d5f3 100644 --- a/lib/WebGUI/Operation/Settings.pm +++ b/lib/WebGUI/Operation/Settings.pm @@ -103,17 +103,18 @@ sub www_editCompanyInformationSave { #------------------------------------------------------------------- sub www_editContentSettings { - my ($output, %notFoundPage, %htmlFilter, %editor, $f); + my ($output, %htmlFilter, %editor, $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), 'javascript'=>WebGUI::International::get(526), 'all'=>WebGUI::International::get(419)); - %notFoundPage = (1=>WebGUI::International::get(136), 4=>WebGUI::International::get(137)); %editor = ('built-in'=>WebGUI::International::get(495), 'edit-on-pro'=>WebGUI::International::get(494)); if (WebGUI::Privilege::isInGroup(3)) { $output .= helpIcon(29); $output .= '

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

'; $f = WebGUI::HTMLForm->new; $f->hidden("op","editContentSettingsSave"); - $f->select("notFoundPage",\%notFoundPage,WebGUI::International::get(141),[$session{setting}{notFoundPage}]); + $f->select("defaultPage",$pages,WebGUI::International::get(527),[$session{setting}{defaultPage}]); + $f->select("notFoundPage",$pages,WebGUI::International::get(141),[$session{setting}{notFoundPage}]); $f->text("docTypeDec",WebGUI::International::get(398),$session{setting}{docTypeDec}); $f->yesNo("addEditStampToPosts",WebGUI::International::get(524),$session{setting}{addEditStampToPosts}); $f->select("filterContributedHTML",\%htmlFilter,WebGUI::International::get(418),[$session{setting}{filterContributedHTML}]); @@ -133,6 +134,7 @@ sub www_editContentSettings { sub www_editContentSettingsSave { if (WebGUI::Privilege::isInGroup(3)) { _saveSetting("addEditStampToPosts"); + _saveSetting("defaultPage"); _saveSetting("notFoundPage"); _saveSetting("docTypeDec"); _saveSetting("filterContributedHTML"); diff --git a/lib/WebGUI/Session.pm b/lib/WebGUI/Session.pm index cc0363365..f0a7aaf5a 100644 --- a/lib/WebGUI/Session.pm +++ b/lib/WebGUI/Session.pm @@ -47,7 +47,7 @@ sub _getPageInfo { $session{header}{status} = '404'; } } else { - $pageId = 1; + $pageId = $session{setting}{defaultPage}; } } %page = WebGUI::SQL->quickHash("select * from page where pageId='".$pageId."'",$_[1]);