From c6ea6bad2accd35178e8e176ea51ab92f5e3eeeb Mon Sep 17 00:00:00 2001
From: Frank Dillon <frank@plainblack.com>
Date: Mon, 22 Dec 2003 00:27:57 +0000
Subject: [PATCH] no message

---
 docs/upgrades/upgrade_5.5.3-6.0.0.pl  | 22 +++++++++++++++++-----
 docs/upgrades/upgrade_5.5.3-6.0.0.sql |  4 ++--
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/docs/upgrades/upgrade_5.5.3-6.0.0.pl b/docs/upgrades/upgrade_5.5.3-6.0.0.pl
index f7835a429..92464b94c 100644
--- a/docs/upgrades/upgrade_5.5.3-6.0.0.pl
+++ b/docs/upgrades/upgrade_5.5.3-6.0.0.pl
@@ -434,18 +434,30 @@ $conf->set("wobjects"=>\@newWobjects);
 $conf->write;
 
 
+#--------------------------------------------
+print "\tUpdating Authentication.\n" unless ($quiet);
+WebGUI::SQL->write("delete from authentication where authMethod='WebGUI' and fieldName='passwordLastUpdated'");
+WebGUI::SQL->write("delete from authentication where authMethod='WebGUI' and fieldName='passwordTimeout'");
+my $authSth = WebGUI::SQL->read("select userId from users where authMethod='WebGUI'");
+while (my $authHash = $authSth->hashRef){
+   WebGUI::SQL->write("insert into authentication (userId,authMethod,fieldName,fieldData) values ('".$authHash->userId."','WebGUI','passwordLastUpdated','".time()."');
+   WebGUI::SQL->write("insert into authentication (userId,authMethod,fieldName,fieldData) values ('".$authHash->userId."','WebGUI','passwordTimeout','3122064000');
+}
+
 
 #--------------------------------------------
-print "\tRemoving unneeded files.\n" unless ($quiet);
+print "\tRemoving unneeded files and directories.\n" unless ($quiet);
 unlink("../../lib/WebGUI/Operation/Style.pm");
 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/Authentication.pm");
+unlink("../../lib/WebGUI/Operation/Account.pm");
+unlink("../../lib/WebGUI/Authentication/WebGUI.pm");
+unlink("../../lib/WebGUI/Authentication/LDAP.pm");
+unlink("../../lib/WebGUI/Authentication/SMB.pm");
+rmdir("../../lib/WebGUI/Authentication")
 WebGUI::Session::close();
 
 
diff --git a/docs/upgrades/upgrade_5.5.3-6.0.0.sql b/docs/upgrades/upgrade_5.5.3-6.0.0.sql
index 6d89b6efc..5b61f2660 100644
--- a/docs/upgrades/upgrade_5.5.3-6.0.0.sql
+++ b/docs/upgrades/upgrade_5.5.3-6.0.0.sql
@@ -1,4 +1,4 @@
-insert into webguiVersion values ('6.0.0','upgrade',unix_timestamp());
+insert into webguiVersion values ('6.0.0','upgrade',unix_timestamp());
 delete from international where internationalId=158 and namespace='WebGUI';
 delete from international where internationalId=803 and namespace='WebGUI';
 delete from international where internationalId=804 and namespace='WebGUI';
@@ -12,7 +12,7 @@ delete from international where internationalId=501 and namespace='WebGUI';
 delete from international where internationalId=154 and namespace='WebGUI';
 delete from international where internationalId=157 and namespace='WebGUI';
 delete from international where internationalId=398 and namespace='WebGUI';
-delete from style where name='Reserved';
+#delete from style where name='Reserved';
 delete from international where internationalId=654 and namespace='WebGUI';
 delete from international where internationalId=609 and namespace='WebGUI';
 delete from international where internationalId=659 and namespace='WebGUI';