From a8ad826c76ed982b6562f98c2cad192991f8f18d Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Fri, 13 Dec 2002 05:32:27 +0000
Subject: [PATCH] Postgres fixes.

---
 docs/upgrades/upgrade_4.9.2-4.9.3.sql | 1 +
 lib/WebGUI/Operation/Account.pm       | 2 +-
 lib/WebGUI/Operation/Page.pm          | 1 +
 lib/WebGUI/Wobject/Survey.pm          | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/upgrades/upgrade_4.9.2-4.9.3.sql b/docs/upgrades/upgrade_4.9.2-4.9.3.sql
index efc202146..5712c0759 100644
--- a/docs/upgrades/upgrade_4.9.2-4.9.3.sql
+++ b/docs/upgrades/upgrade_4.9.2-4.9.3.sql
@@ -1483,6 +1483,7 @@ delete from international where languageId=3 and namespace='WebGUI' and internat
 insert into international (internationalId,languageId,namespace,message,lastUpdated) values (669,3,'WebGUI','Macros, Gebruiken', 1038484152);
 delete from template where templateId=3 and namespace='USS';
 INSERT INTO template VALUES (3,'Weblog','<tmpl_if displayTitle>\r\n    <h1><tmpl_var title></h1>\r\n</tmpl_if>\r\n\r\n<tmpl_if description>\r\n    <tmpl_var description><p />\r\n</tmpl_if>\r\n\r\n\r\n<tmpl_if session.scratch.search>\r\n <tmpl_var search.form>\r\n</tmpl_if>\r\n\r\n\r\n<tmpl_if canPost>\r\n   <a href=\"<tmpl_var post.url>\"><tmpl_var post.label></a> &middot;\r\n</tmpl_if>\r\n\r\n\r\n<a href=\"<tmpl_var search.url>\"><tmpl_var search.label></a>\r\n<p />\r\n<table width=\"100%\" cellpadding=2 cellspacing=1 border=0>\r\n\r\n<tmpl_loop submissions_loop>\r\n\r\n<tr><td class=\"tableHeader\"><tmpl_var submission.title>\r\n  <tmpl_if submission.currentUser>\r\n            (<tmpl_var submission.status>)\r\n  </tmpl_if>\r\n</td></tr><tr><td class=\"tableData\"><b>\r\n  <tmpl_if submission.thumbnail>\r\n    <a href=\"<tmpl_var submission.url>\"><img src=\"<tmpl_var submission.thumbnail>\" border=\"0\" align=\"right\"/></a>\r\n   </tmpl_if>\r\n <tmpl_var by.label> <a href=\"<tmpl_var submission.userProfile>\"><tmpl_var submission.username></a>  - <tmpl_var submission.date></b><br />\r\n<tmpl_var submission.content>\r\n<p /> ( <a href=\"<tmpl_var submission.url>\"><tmpl_var readmore.label></a>\r\n                <tmpl_if submission.responses>\r\n                         | <tmpl_var submission.responses> <tmpl_var responses.label>\r\n                </tmpl_if>\r\n         )<p/>\r\n</td></tr>\r\n\r\n</tmpl_loop>\r\n\r\n</table>\r\n\r\n<tmpl_if multiplePages>\r\n  <div class=\"pagination\">\r\n    <tmpl_var previousPage>  &middot; <tmpl_var nextPage>\r\n  </div>\r\n</tmpl_if>\r\n','USS');
+alter table users change status status varchar(35) not null default 'Active';
 
 
 
diff --git a/lib/WebGUI/Operation/Account.pm b/lib/WebGUI/Operation/Account.pm
index 332bbeb17..1c7392ddd 100644
--- a/lib/WebGUI/Operation/Account.pm
+++ b/lib/WebGUI/Operation/Account.pm
@@ -399,7 +399,7 @@ sub www_login {
                 _logLogin($uid,"success");
 		return "";
 	} else {
-		_logLogin($uid, $success);
+		_logLogin($uid, "failure");
 		WebGUI::ErrorHandler::security("login to account ".$session{form}{username}." with invalid information.");
 		return "<h1>".WebGUI::International::get(70)."</h1>".$success.www_displayLogin();
 	}
diff --git a/lib/WebGUI/Operation/Page.pm b/lib/WebGUI/Operation/Page.pm
index 8a50ae950..4b681b0c9 100644
--- a/lib/WebGUI/Operation/Page.pm
+++ b/lib/WebGUI/Operation/Page.pm
@@ -208,6 +208,7 @@ sub www_deletePageConfirm {
 sub www_editPage {
         my ($f, $endDate, $output, $subtext, $childCount, %hash, %page);
 	tie %hash, "Tie::IxHash";
+	tie %page, "Tie::CPHash";
         if (WebGUI::Privilege::canEditPage($session{form}{npp})) {
 		$f = WebGUI::HTMLForm->new;
 		if ($session{form}{npp} ne "") {
diff --git a/lib/WebGUI/Wobject/Survey.pm b/lib/WebGUI/Wobject/Survey.pm
index b3ebaaba0..8ff7b35ef 100644
--- a/lib/WebGUI/Wobject/Survey.pm
+++ b/lib/WebGUI/Wobject/Survey.pm
@@ -690,7 +690,7 @@ sub www_viewGradebook {
 	$output = '<h1>'.WebGUI::International::get(71,$namespace).'</h1>';
 	$p = WebGUI::Paginator->new('func=viewGradebook&wid='.$_[0]->get("wobjectId"));
 	$p->setDataByQuery("select userId,username,ipAddress from Survey_response 
-		group by userId,ipAddress order by username,ipAddress");
+		group by userId,username,ipAddress order by username,ipAddress");
 	$users = $p->getPageData;
 	my ($questionCount) = WebGUI::SQL->quickArray("select count(*) from Survey_question
         	where Survey_id=".$_[0]->get("Survey_id"));