5d837d61083dbcab8a41e629536e156ffab13694 braney Mon Aug 22 16:36:41 2011 -0700 add the ability to put the hgHubConnect contact email address in hg.conf (by request of the Lowe lab) diff --git src/hg/hgHubConnect/hgHubConnect.c src/hg/hgHubConnect/hgHubConnect.c index ffce0cf..8bd6d10 100644 --- src/hg/hgHubConnect/hgHubConnect.c +++ src/hg/hgHubConnect/hgHubConnect.c @@ -9,30 +9,31 @@ #include "dystring.h" #include "jksql.h" #include "cheapcgi.h" #include "htmshell.h" #include "hdb.h" #include "hui.h" #include "cart.h" #include "dbDb.h" #include "web.h" #include "trackHub.h" #include "hubConnect.h" #include "dystring.h" #include "hPrint.h" #include "jsHelper.h" #include "obscure.h" +#include "hgConfig.h" #define hgHub "hgHub_" /* prefix for all control variables */ #define hgHubDo hgHub "do_" /* prefix for all commands */ #define hgHubDoClear hgHubDo "clear" #define hgHubDoDisconnect hgHubDo "disconnect" #define hgHubDoReset hgHubDo "reset" struct cart *cart; /* The user's ui state. */ struct hash *oldVars = NULL; static char *destUrl = "../cgi-bin/hgTracks"; static char *pageTitle = "Import Tracks from Data Hubs"; char *database = NULL; char *organism = NULL; @@ -405,31 +406,35 @@ printf("<FORM ACTION=\"%s\" METHOD=\"POST\" NAME=\"mainForm\">\n", destUrl); cartSaveSession(cart); // we have two tabs for the public and unlisted hubs printf("<div id=\"tabs\">" "<ul> <li><a href=\"#publicHubs\">Public Hubs</a></li>" "<li><a href=\"#unlistedHubs\">My Hubs</a></li> " "</ul> "); hgHubConnectPublic(); hgHubConnectUnlisted(); printf("</div>"); printf("<div class=\"tabFooter\">"); cgiMakeButton("Submit", "Load Selected Hubs"); -printf("<span class=\"small\">Contact <A HREF=\"mailto:genome@soe.ucsc.edu\">genome@soe.ucsc.edu</A> to add a public hub.</span>\n"); + +char *emailAddress = cfgOptionDefault("hub.emailAddress","genome@soe.ucsc.edu"); +printf("<span class=\"small\">" + "Contact <A HREF=\"mailto:%s\">%s</A> to add a public hub." + "</span>\n", emailAddress,emailAddress); printf("</div>"); if ((newId != 0) || gotDisconnect) // make MyHubs the default tab { printf("<script type='text/javascript'>\n "); printf("var $tabs = $('#tabs').tabs();\n"); printf(" $tabs.tabs('select',1);\n"); printf("</script>\n"); } cgiMakeHiddenVar(hgHubConnectRemakeTrackHub, "on"); printf("</div>\n"); puts("</FORM>"); cartWebEnd();