bb80896672df4d1abffbf67e8340166347627e70 chinhli Thu Jun 6 12:48:26 2013 -0700 Minor editing per CR review 10985 feedback diff --git src/hg/hgUserSuggestion/hgUserSuggestion.c src/hg/hgUserSuggestion/hgUserSuggestion.c index 91ae3bc..b109842 100644 --- src/hg/hgUserSuggestion/hgUserSuggestion.c +++ src/hg/hgUserSuggestion/hgUserSuggestion.c @@ -78,44 +78,34 @@ else return cloneString(cfgOption(CFG_SUGGEST_BROWSER_NAME)); } static char *now() /* Return a mysql-formatted time like "2008-05-19 15:33:34". */ { char nowBuf[256]; time_t curtime; curtime = time (NULL); struct tm *theTime = localtime(&curtime); strftime(nowBuf, sizeof nowBuf, "%Y-%m-%d %H:%M:%S", theTime); return cloneString(nowBuf); } -void resetAllSuggFields() -/* clear all suggestion fields */ -{ -cartRemove(cart, "suggestCfmEmail"); -cartRemove(cart, "suggestDetails"); -cartRemove(cart, "suggestEmail"); -cartRemove(cart, "suggestName"); -cartRemove(cart, "suggestSubject"); -cartRemove(cart, "suggestSummary"); -} /* javascript functions */ void printMainForm() -/* javascript to print mainForm */ +/* Create the main suggestion form */ { hPrintf( " <FORM ACTION=\"../cgi-bin/hgUserSuggestion?do.suggestSendMail=1\" METHOD=\"POST\" ENCTYPE=\"multipart/form-data\" NAME=\"mainForm\" onLoad=\"document.forms.mainForm.name.focus()\">\n"); hPrintf( " <H2>User Suggestion Form</H2>\n" " <P> Please use this form to submit ... </P>\n" ); hPrintf( " <div id=\"suggest\"> \n" " <label for=\"name\">Your Name:</label><input type=\"text\" name=\"suggestName\" id=\"name\" size=\"50\" /><BR>\n" " <label for=\"email\">Your Email:</label><input type=\"text\" name=\"suggestEmail\" id=\"email\" size=\"50\" /><BR> \n" " <label for=\"confirmEmail\">Re-enter Your Email:</label><input type=\"text\" \n" " name=\"suggestCfmEmail\" id=\"cfmemail\" size=\"50\" /><BR> \n"); hPrintf( " <label for=\"category\">Category:</label><select name=\"suggestCategory\" id=\"category\">\n" @@ -356,36 +346,33 @@ char subject[256]; safef(subject, sizeof(subject),"%s %s", filter, suggestID); /* send back the suggestion */ sendSuggestionBack(sName, sEmail, sCategory, sSummary, sDetails, suggestID); /* send confirmation mail to user */ sendConfirmMail(sEmail,suggestID); /* display confirmation page */ printSuggestionConfirmed(); cartRemove(cart, "do.suggestSendMail"); } void doMiddle(struct cart *theCart) /* Write header and body of html page. */ { char *db, *organism; - cart = theCart; getDbAndGenome(cart, &db, &organism, oldVars); - cartWebStart(theCart, db, "User Suggestion"); - if (cartVarExists(cart, "do.suggestSendMail")) { submitSuggestion(); cartRemove(cart, "do.suggestSendMail"); return; } askForSuggest(organism,db); cartWebEnd(); } /* Null terminated list of CGI Variables we don't want to save * permanently. */ char *excludeVars[] = {"Submit", "submit", "Clear", NULL};