From ff427682129359316ddf59f98e2dff6712fe657e Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Fri, 30 May 2008 03:12:38 +0000
Subject: [PATCH] Temporarily disable OpenID functionality for release

---
 citadel/modules/openid/serv_openid_rp.c | 9 +++++++++
 webcit/auth.c                           | 3 +--
 webcit/mainmenu.c                       | 6 +++---
 webcit/openid.c                         | 2 --
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/citadel/modules/openid/serv_openid_rp.c b/citadel/modules/openid/serv_openid_rp.c
index 1c98d5372..542947477 100644
--- a/citadel/modules/openid/serv_openid_rp.c
+++ b/citadel/modules/openid/serv_openid_rp.c
@@ -41,7 +41,9 @@ struct ctdl_openid {
 };
 
 
+/* This is all disabled temporarily */
 
+#if 0
 
 
 /**************************************************************************/
@@ -622,3 +624,10 @@ CTDL_MODULE_INIT(openid_rp)
 
 
 /* FIXME ... we have to add the new openid database to serv_vandelay.c */
+
+
+#endif
+CTDL_MODULE_INIT(openid_rp)
+{
+	return "$Id$";
+}
diff --git a/webcit/auth.c b/webcit/auth.c
index b923dd9db..2af65ac1e 100644
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -78,7 +78,7 @@ void display_login(char *mesg)
 		svput("NEWUSER_BUTTON_POST", WCS_STRING, "");
 	}
 
-#ifdef TECH_PREVIEW
+#if 0
 		svprintf(HKEY("OFFER_OPENID_LOGIN"), WCS_STRING,
 			"<div align=center>"
 			"<a href=\"display_openid_login\">"
@@ -99,7 +99,6 @@ void display_login(char *mesg)
 
 
 
-
 /* 
  * Display the openid-enabled login screen
  * mesg = the error message if last attempt failed.
diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index cf1ea9bf2..1a3f76fa3 100644
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -118,15 +118,15 @@ void display_main_menu(void)
 	wprintf("</td></tr>"
 		"<tr valign=top><td width=50%%>");
 
-	print_menu_box(_("Your info"), "adminitems", 8,
+	print_menu_box(_("Your info"), "adminitems", /* 8 */ 7,
 		       "display_preferences", _("Change your preferences and settings"),
 		       "display_reg", _("Update your contact information"),
 		       "display_changepw", _("Change your password"),
 		       "display_editbio", _("Enter your 'bio'"),
 		       "display_editpic", _("Edit your online photo"), 
 		       "display_sieve", _("View/edit server-side mail filters"),
-		       "display_pushemail", _("Edit your push email settings"),
-		       "display_openids", _("Manage your OpenIDs")
+		       "display_pushemail", _("Edit your push email settings") /* ,
+		       "display_openids", _("Manage your OpenIDs") */
 	);
 
 	wprintf("</td><td width=50%%>");
diff --git a/webcit/openid.c b/webcit/openid.c
index 519100d92..728beb7a0 100644
--- a/webcit/openid.c
+++ b/webcit/openid.c
@@ -74,5 +74,3 @@ void openid_attach(void) {
 	/* If we get to this point then something failed. */
 	display_openids();
 }
-
-
-- 
2.30.2