various patches added

This commit is contained in:
JT Smith 2004-07-12 04:45:38 +00:00
parent 2e791c9dd5
commit c0bf7e46f0
16 changed files with 136 additions and 108 deletions

View file

@ -18,6 +18,29 @@ GetOptions(
WebGUI::Session::open("../..",$configFile);
#--------------------------------------------
print "\tUpdating config file.\n" unless ($quiet);
my $pathToConfig = '../../etc/'.$configFile;
my $conf = Parse::PlainConfig->new('DELIM' => '=', 'FILE' => $pathToConfig);
$conf->set("templateCacheType"=>"file");
my $macros = $conf->get("macros");
delete $macros->{"\\"};
$macros->{"\\\\"} = "Backslash_pageUrl";
$macros->{"Navigation"} = "Navigation";
my %newMacros;
foreach my $macro (keys %{$macros}) {
unless (
$macros->{$macro} eq "ThumbnailLinker"
) {
$newMacros{$macro} = $macros->{$macro};
}
}
$conf->set("macros"=>\%newMacros);
$conf->write;
#--------------------------------------------
print "\tRemoving unneeded files and directories.\n" unless ($quiet);
unlink("../../lib/WebGUI/Operation/International.pm");
@ -25,6 +48,7 @@ unlink("../../lib/WebGUI/Wobject/Item.pm");
unlink("../../lib/WebGUI/Wobject/LinkList.pm");
unlink("../../lib/WebGUI/Wobject/FAQ.pm");
unlink("../../lib/WebGUI/Wobject/ExtraColumn.pm");
unlink("../../lib/WebGUI/Macro/ThumbnailLinker.pm");
unlink("../../lib/WebGUI/Macro/m_currentMenuHorizontal.pm");
unlink("../../lib/WebGUI/Macro/M_currentMenuVertical.pm");
unlink("../../lib/WebGUI/Macro/s_specificMenuHorizontal.pm");
@ -44,6 +68,7 @@ unlink("../../lib/WebGUI/Macro/TopDropMenu.pm");
unlink("../../lib/WebGUI/Macro/Question_search.pm");
#--------------------------------------------
print "\tResetting user languages.\n" unless ($quiet);
my ($defaultLangId) = WebGUI::SQL->quickArray("select dataDefault from userProfileField where fieldName='language'");
$defaultLangId =~ s/\[//;
@ -75,6 +100,7 @@ foreach my $key (keys %{$langs}) {
WebGUI::SQL->write("update page set languageId=".quote($langs->{$key})." where languageId=".$key);
}
#--------------------------------------------
print "\tConverting page tree to the Nested Set model.\n";
sub walk_down {
my($pageId, $o) = @_[0,1];

View file

@ -4,7 +4,16 @@ drop table international;
drop table help;
alter table WSClient add sharedCache tinyint unsigned not null default '0';
alter table WSClient add cacheTTL smallint(5) unsigned NOT NULL default '60';
INSERT INTO template VALUES (1,'Default Account','<a class="myAccountLink" href="<tmpl_var account.url>"><tmpl_var account.text></a>','Macro/a_account',1,1);
INSERT INTO template VALUES (1,'Default Editable Toggle','<a href="<tmpl_var toggle.url>"><tmpl_var toggle.text></a>','Macro/EditableToggle',1,1);
INSERT INTO template VALUES (1,'Default Admin Toggle','<a href="<tmpl_var toggle.url>"><tmpl_var toggle.text></a>','Macro/AdminToggle',1,1);
INSERT INTO template VALUES (1,'Default Account Macro','<a class="myAccountLink" href="<tmpl_var account.url>"><tmpl_var account.text></a>','Macro/a_account',1,1);
INSERT INTO template VALUES (1,'Default Editable Toggle Macro','<a href="<tmpl_var toggle.url>"><tmpl_var toggle.text></a>','Macro/EditableToggle',1,1);
INSERT INTO template VALUES (1,'Default Admin Toggle Macro','<a href="<tmpl_var toggle.url>"><tmpl_var toggle.text></a>','Macro/AdminToggle',1,1);
INSERT INTO template VALUES (1,'Default File Macro','<a href="<tmpl_var file.url>"><img src="<tmpl_var file.icon>" align="middle" border="0" /><tmpl_var file.name></a>','Macro/File',1,1);
INSERT INTO template VALUES (2,'File no icon','<a href="<tmpl_var file.url>"><tmpl_var file.name></a>','Macro/File',1,1);
INSERT INTO template VALUES (3,'File with size','<a href="<tmpl_var file.url>"><img src="<tmpl_var file.icon>" align="middle" border="0" /><tmpl_var file.name></a>(<tmpl_var file.size>)','Macro/File',1,1);
INSERT INTO template VALUES (1,'Default Group Add Macro','<a href="<tmpl_var group.url>"><tmpl_var group.text></a>','Macro/GroupAdd',1,1);
INSERT INTO template VALUES (1,'Default Group Delete Macro','<a href="<tmpl_var group.url>"><tmpl_var group.text></a>','Macro/GroupDelete',1,1);
INSERT INTO template VALUES (1,'Default Homelink','<a class="homeLink" href="<tmpl_var homeLink.url>"><tmpl_var homeLink.text></a>','Macro/H_homeLink',1,1);
INSERT INTO template VALUES (1,'Default Make Printable','<a class="makePrintableLink" href="<tmpl_var printable.url>"><tmpl_var printable.text></a>','Macro/r_printable',1,1);
INSERT INTO template VALUES (1,'Default LoginToggle','<a class="loginToggleLink" href="<tmpl_var toggle.url>"><tmpl_var toggle.text></a>','Macro/LoginToggle',1,1);