ac7676c711cd10029f6c39cb2029c5f663d86e0d
Merge parents 663f939 845d51f
chinhli
  Thu May 17 15:04:05 2012 -0700
Merge branch 'master' into chinhli-hgLogin-final
diff --cc src/hg/hgLogin/hgLogin.c
index 9475344,8b9e616..f0662ab
--- src/hg/hgLogin/hgLogin.c
+++ src/hg/hgLogin/hgLogin.c
@@@ -277,109 -276,106 +277,108 @@@
      "\n"
      "<h2>UCSC Genome Browser</h2>"
      "<p id=\"confirmationMsg\" class=\"confirmationTxt\">An email has been sent to "
      " <span id=\"emailaddress\">%s</span> containing %s...</p>"
      "\n"
      "<p><a href=\"hgLogin?hgLogin.do.displayLoginPage=1\">Return to Login</a></p>", email, obj);
  }
  
  void sendMailOut(char *email, char *subject, char *msg)
  /* send mail to email address */
  {
  char *hgLoginHost = wikiLinkHost();
  char *obj = cartUsualString(cart, "hgLogin_helpWith", "");
  char cmd[4096];
  safef(cmd,sizeof(cmd),
- "echo '%s' | mail -s \"%s\" %s" , msg, subject, email);
+     "echo '%s' | mail -s \"%s\" %s" , msg, subject, email);
  int result = system(cmd);
  if (result == -1)
      {
      hPrintf( 
-     "<h2>UCSC Genome Browser</h2>"
-     "<p align=\"left\">"
-     "</p>"
-     "<h3>Error emailing %s to: %s</h3>"
-     "Click <a href=hgLogin?hgLogin.do.displayAccHelpPage=1>here</a> to return.<br>", obj, email );
+         "<h2>UCSC Genome Browser</h2>"
+         "<p align=\"left\">"
+         "</p>"
+         "<h3>Error emailing %s to: %s</h3>"
+         "Click <a href=hgLogin?hgLogin.do.displayAccHelpPage=1>here</a> to return.<br>", 
+         obj, email );
      }
  else
      {
- hPrintf("<script  language=\"JavaScript\">\n"
-     "<!-- \n"
-     "window.location =\"http://%s/cgi-bin/hgLogin?hgLogin.do.displayMailSuccess=1\""
-     "//-->"
-     "\n"
-     "</script>", hgLoginHost);
+     hPrintf("<script  language=\"JavaScript\">\n"
+         "<!-- \n"
+         "window.location =\"http://%s/cgi-bin/hgLogin?hgLogin.do.displayMailSuccess=1\""
+         "//-->"
+         "\n"
+         "</script>", hgLoginHost);
      }
  }
  
  void mailUsername(char *email, char *users)
  /* send user name list to the email address */
  {
  char subject[256];
  char msg[256];
 -char signature[256]="\nUCSC Genome Browser \nhttp://www.genome.ucsc.edu ";
 -safef(subject, sizeof(subject),"Greeting form UCSC Genome Browser");
 -safef(msg, sizeof(msg), "User name(s) associated with this email address at UCSC Genome Browser: \n\n  %s \n", users);
 +char *remoteAddr=getenv("REMOTE_ADDR");
 +
 +safef(subject, sizeof(subject),"Your user name at the UCSC Genome Browser");
 +safef(msg, sizeof(msg), 
 +    "Someone (probably you, from IP address %s) has requested user name associated with this email address at UCSC Genome Browser. Your user name is: \n\n  %s\n\n", 
 +   remoteAddr, users);
  safecat (msg, sizeof(msg), signature);
  sendMailOut(email, subject, msg);
  }
  
  
  void sendUsername(struct sqlConnection *conn, char *email)
  /* email user username(s)  */
  {
  struct sqlResult *sr;
  char **row;
  char query[256];
  
  /* find all the user names assocaited with this email address */
  char user[256];
  safef(query,sizeof(query),"select * from gbMembers where email='%s'", email);
  sr = sqlGetResult(conn, query);
  while ((row = sqlNextRow(sr)) != NULL)
      {
      struct gbMembers *m = gbMembersLoad(row);
      safecpy(user, sizeof(user), m->userName);
      mailUsername(email, user);   
      }
  sqlFreeResult(&sr);
  }
  
  void sendNewPwdMail(char *username, char *email, char *password)
  /* send user new password */
  {
  char subject[256];
  char msg[4096];
 -char signature[256]="\nUCSC Genome Browser \nhttp://www.genome.ucsc.edu ";
  char *remoteAddr=getenv("REMOTE_ADDR");
  safef(subject, sizeof(subject),"New temporary password for UCSC Genome Browse");
  safef(msg, sizeof(msg),
      "Someone (probably you, from IP address %s) requested a new password for UCSC Genome Browser (http://genome.ucsc.edu). A temporary password for user \"%s\" has been created and was set to \"%s\". If this was your intent, you will need to log in and choose a new password now. Your temporary password will expire in 7 days.\nIf someone else made this request, or if you have remembered your password, and you no longer wish to change it, you may ignore this message and continue using your old password.\n",
      remoteAddr, username, password);
  safecat (msg, sizeof(msg), signature);
  sendMailOut(email, subject, msg);
  }
  
  void displayAccHelpPage(struct sqlConnection *conn)
  /* draw the account help page */
  {
  char *email = cartUsualString(cart, "hgLogin_email", "");
  char *username = cartUsualString(cart, "hgLogin_userName", "");
- //cartRemove(cart, "hgLogin_helpWith");
- //cartRemove(cart, "hgLogin_email");
  hPrintf("<script  language=\"JavaScript\">\n"
      "<!-- "
      "\n"
      "function toggle(value){\n"
      "if(value=='showE')\n"
      "{\n"
      " document.getElementById('usernameBox').style.display='none';\n"
      " document.getElementById('emailAddrBox').style.display='inline';\n"
      " } else {\n"
      " document.getElementById('usernameBox').style.display='inline';\n"
      " document.getElementById('emailAddrBox').style.display='none';\n"
      "}\n"
      "}\n"
      "//-->"
      "\n"