From 73d2b794f7a9311ebf0568e32d39804de2ff9b61 Mon Sep 17 00:00:00 2001
From: Fred Gleason <fredg@paravelsystems.com>
Date: Tue, 1 Jun 2021 17:03:57 -0400
Subject: [PATCH] 2021-06-01 Fred Gleason <fredg@paravelsystems.com> 	*
 Removed ' RDReadPost()', 'RDPutPostString()', 'GetPostString()', 
 'GetPostInt()', 'GetPostLongInt()', 'RDPurgePostString', 
 'RDEncodeString()', 'RDEncodeSQLString()', 'RDDecodeString()', 
 'RDPutPlaintext()', 'RDPurgePlaintext()', 'RDCgiError()', 
 'RDBufferDiff()', 'RDPruneAmp()', 'RDEscapeQuotes()', 
 'RDAuthenticateLogin()', ' RDAuthenticateSession()', 	'RDLogoutSession()'
 and 'RDParsePost()' functions from 	'lib/rdweb.[cpp|h]'.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
---
 ChangeLog     |   9 +
 lib/rdweb.cpp | 814 --------------------------------------------------
 lib/rdweb.h   |  39 +--
 3 files changed, 12 insertions(+), 850 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a47b0887..09b7c107 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21801,3 +21801,12 @@
 2021-06-01 Fred Gleason <fredg@paravelsystems.com>
 	* Cleaned up 'No relevant classes found' warnings in
 	'lib/Makefile.am'.
+2021-06-01 Fred Gleason <fredg@paravelsystems.com>
+	* Removed ' RDReadPost()', 'RDPutPostString()', 'GetPostString()',
+	'GetPostInt()', 'GetPostLongInt()', 'RDPurgePostString',
+	'RDEncodeString()', 'RDEncodeSQLString()', 'RDDecodeString()',
+	'RDPutPlaintext()', 'RDPurgePlaintext()', 'RDCgiError()',
+	'RDBufferDiff()', 'RDPruneAmp()', 'RDEscapeQuotes()',
+	'RDAuthenticateLogin()', ' RDAuthenticateSession()',
+	'RDLogoutSession()' and 'RDParsePost()' functions from
+	'lib/rdweb.[cpp|h]'.
diff --git a/lib/rdweb.cpp b/lib/rdweb.cpp
index aa44f7da..42f9062d 100644
--- a/lib/rdweb.cpp
+++ b/lib/rdweb.cpp
@@ -37,521 +37,6 @@
 
 #include "rdweb.h"
 
-/* RDReadPost(char *cBuffer,int dSize) */
-
-/* This function reads POST data (such as that submitted by an HTML form) into
-the buffer pointed to by cBuffer.  The size of the buffer is indicated by 
-dSize.
-
-RETURNS: Number of bytes read if the function is successful
-         -1 if an error is encountered. */
-
-int RDReadPost(char *cBuffer,int dSize)
-
-{
-  int dPostSize=0;
-
-  if(strcasecmp(getenv("REQUEST_METHOD"),"POST")!=0) {   /* No post data to receive! */
-    return -1;
-  }
-  sscanf(getenv("CONTENT_LENGTH"),"%d",&dPostSize);
-  if(dPostSize>=dSize) {  /* Data block too large! */
-    return -1;
-  }
-  dPostSize++;
-  fgets(cBuffer,dPostSize,stdin);
-  return dPostSize;  
-}
-
-
-
-/*
- * int RDPutPostString(char *sPost,char *sArg,char *sValue,int dMaxSize)
- *
- * This function changes the contents of the POST buffer pointed to by
- * 'sPost'.  If the entry pointed to by 'sArg' exists, it's value is
- * replaced by the string pointed to by 'sValue'.  If the entry doesn't
- * exist, it is created.  'dMaxSize' is the maximum allowable size of 'sPost'.
- *
- * RETURNS:  If successful, a pointer to the start of the updated value
- *           If unsuccessful, -1
- */
-int RDPutPostString(char *sPost,char *sArg,char *sValue,int dMaxSize)
-{
-  int dOrigin;         /* Start of insert point */
-  int dValue;          /* Length of sValue */
-  int i;               /* General purpose counter */
-  char sAccum[CGI_ACCUM_SIZE];
-
-  /*
-   * Does the argument already exist?
-   */
-  dOrigin=RDFindPostString(sPost,sArg,sAccum,CGI_ACCUM_SIZE);
-  if(dOrigin<0) {
-    /* 
-     * Create a new entry
-     * Will it fit?
-     */
-    dOrigin=strlen(sPost);
-    if((dOrigin+strlen(sArg)+strlen(sValue)+2)>=(unsigned)dMaxSize) {
-      return -1;
-    }
-    /*
-     * Append to the end
-     */
-    strcat(sPost,"&");
-    strcat(sPost,sArg);
-    strcat(sPost,"=");
-    dOrigin=strlen(sPost);
-    strcat(sPost,sValue);
-  }
-  else {
-    /*
-     * The argument exists, so update it
-     */
-    dValue=strlen(sValue);
-    if(RDBufferDiff(sPost,dOrigin,dValue-strlen(sAccum),dMaxSize)<0) {
-      return -1;
-    }
-    for(i=0;i<dValue;i++) {
-      sPost[dOrigin+i]=sValue[i];
-    }
-    sPost[dOrigin+dValue]='&';
-  }
-  return dOrigin;
-} 
-
-
-/*
- * int RDFindPostString(char *cBuffer,char *sSearch,char *sReturn,
- * int dReturnSize)
- *
- * This function returns the argument value associated with field name 
- * pointed to by sSearch in the POST buffer cBuffer.  The argument value 
- * is returned in the buffer pointed to by sReturn, of maximum size 
- * dReturnSize.
- *
- * RETURNS:  Pointer to the start of the value, if successful
- *          -1 if the search is unsuccessful
- */
-
-int RDFindPostString(const char *cBuffer,const char *sSearch,char *sReturn,int dReturnSize)
-
-{
-  int i=0,j=0;
-  int dMatch,dOrigin;
-
-  while(cBuffer[i]!=0) {
-    j=0;
-    dMatch=0;
-    while(cBuffer[i]!='=' && cBuffer[i]!=0) {
-      if(cBuffer[i++]!=sSearch[j++]) dMatch=1;
-    }
-    if(dMatch==0 && cBuffer[i]=='=' && sSearch[j]==0) {   /* Found it! */
-      j=0;
-      i++;
-      dOrigin=i;
-      while(cBuffer[i]!='&' && cBuffer[i]!=0 && j<dReturnSize-1) {
-	sReturn[j++]=cBuffer[i++];
-      }
-      sReturn[j]=0;
-      return dOrigin;
-    }
-    else {
-      while(cBuffer[i]!='&' && cBuffer[i]!=0) i++;
-    }
-    if(cBuffer[i]==0) {
-      sReturn[0]=0;
-      return -1;   /* No match found! */
-    }
-    else {  /* advance to next field */
-      i++;
-    }
-  }
-  sReturn[0]=0;
-  return -1;
-}
-
-
-
-
-/*
- * int GetPostString(char *cBuffer,char *sSearch,char *sReturn,
- * int dReturnSize)
- *
- * This function returns the argument value associated with field name 
- * pointed to by sSearch in the POST buffer cBuffer.  The argument value 
- * is returned in the buffer pointed to by sReturn, of maximum size 
- * dReturnSize.  The argument value is also processed to convert any
- * CGI escape sequences back into normal characters.
- *
- * RETURNS:  0 if successful
- *          -1 if the search is unsuccessful
- */
-
-int RDGetPostString(const char *cBuffer,const char *sSearch,
-		    char *sReturn,int dReturnSize)
-{
-  if(RDFindPostString(cBuffer,sSearch,sReturn,dReturnSize)<0) {
-    return -1;
-  }
-  RDDecodeString(sReturn);
-  return 0;
-}
-
-
-
-/*
- * int GetPostInt(char *cBuffer,char *sSearch,int *dReturn)
- *
- * This function returns the integer argument value associated with field name 
- * pointed to by sSearch in the POST buffer cBuffer.  The argument value 
- * is returned in the integer variable pointed to by dReturn.
- *
- * RETURNS:  0 if successful
- *          -1 if the search is unsuccessful
- */
-
-int RDGetPostInt(const char *cBuffer,const char *sSearch,int *dReturn)
-{
-  char sAccum[256];
-
-  if(RDGetPostString(cBuffer,sSearch,sAccum,255)<0) {
-    return -1;
-  }
-  if(sscanf(sAccum,"%d",dReturn)!=1) {
-    return -1;
-  }
-  return 0;
-}
-
-
-
-
-int RDGetPostLongInt(const char *cBuffer,const char *sSearch,long int *dReturn)
-{
-  char sAccum[256];
-
-  if(RDGetPostString(cBuffer,sSearch,sAccum,255)<0) {
-    return -1;
-  }
-  if(sscanf(sAccum,"%ld",dReturn)!=1) {
-    return -1;
-  }
-  return 0;
-}
-
-
-
-
-/*
- * int PurgePostString(char *sPost,char *sArg)
- *
- * This function removes the argument/value pair pointed to by 'sArg'.
- *
- * RETURNS:  If successful, the new size of 'sPost'
- *           If unsuccessful, -1
- */ 
-int RDPurgePostString(char *sPost,char *sArg,int dMaxSize)
-{
-  char sAccum[CGI_ACCUM_SIZE];
-  int dPointer;
-
-  dPointer=RDFindPostString(sPost,sArg,sAccum,CGI_ACCUM_SIZE);
-  if(dPointer<0) {
-    return -1;
-  }
-  dPointer-=(strlen(sArg)+1);
-  RDBufferDiff(sPost,dPointer,-(strlen(sArg)+strlen(sAccum)+2),dMaxSize);
-  return strlen(sPost);
-}
-
-
-
-/*
- * int RDEncodeString(char *sString,int dMaxSize)
- *
- * This function processes the string pointed to by 'sString', replacing
- * any spaces with + and escaping most punctuation characters in accordance
- * with the Common Gateway Interface (CGI) standard
- *
- * RETURNS: If successful, the new size of 'sString'
- *          If unsuccessful, -1
- */
-int RDEncodeString(char *sString,int dMaxSize)
-{
-  int i;                  /* General Purpose Counter */
-  char sAccum[4];          /* General String Buffer */
-
-  i=0;
-  while(sString[i]!=0) {
-    if(((sString[i]!=' ') && (sString[i]!='*') && (sString[i]!='-') &&
-	(sString[i]!='_') && (sString[i]!='.')) && 
-       ((sString[i]<'0') ||
-       ((sString[i]>'9') && (sString[i]<'A')) ||
-       ((sString[i]>'Z') && (sString[i]<'a')) ||
-       (sString[i]>'z'))) {
-      if(RDBufferDiff(sString,i,2,dMaxSize)<0) {
-	return -1;
-      }
-      sprintf(sAccum,"%%%2x",sString[i]);
-      sString[i++]=sAccum[0];
-      sString[i++]=sAccum[1];
-      sString[i]=sAccum[2];
-    }
-    if(sString[i]==' ') {
-      sString[i]='+';
-    }
-    i++;
-  }
-  return strlen(sString);
-}
-
-
-/*
- * int RDEncodeSQLString(char *sString,int dMaxSize)
- *
- * This function processes the string pointed to by 'sString', 
- * escaping the ' \ and " characters.
- *
- * RETURNS: If successful, the new size of 'sString'
- *          If unsuccessful, -1
- */
-int RDEncodeSQLString(char *sString,int dMaxSize)
-{
-  int i;                  /* General Purpose Counter */
-  char sAccum[4];          /* General String Buffer */
-
-  i=0;
-  while(sString[i]!=0) {
-    if((sString[i]=='%')||(sString[i]==34)||(sString[i]==39)) {
-      if(RDBufferDiff(sString,i,2,dMaxSize)<0) {
-	return -1;
-      }
-      sprintf(sAccum,"%%%2x",sString[i]);
-      sString[i++]=sAccum[0];
-      sString[i++]=sAccum[1];
-      sString[i]=sAccum[2];
-    }
-    i++;
-  }
-  return strlen(sString);
-}
-
-
-
-
-int RDDecodeString(char *sString)
-
-{
-  int i=0,j=0,k;
-  char sAccum[4];
-
-  while(sString[i]!=0) {
-    switch(sString[i]) {
-      
-      case '+':
-      sString[j]=' ';
-      break;
-
-      case '%':   /* escape sequence */
-      sAccum[0]=sString[++i];
-      sAccum[1]=sString[++i];
-      sAccum[2]=0;
-      sscanf(sAccum,"%x",&k);
-      sString[j]=(char)k;
-      break;
-
-      default:
-      sString[j]=sString[i];
-      break;
-    }
-    i++;
-    j++;
-  }
-  sString[j]=0;
-  return --j;
-}
-
-
-
-/*
- * RDPutPlaintext(char *sPost,int dMaxSize)
- *
- * This function appends a block of text consisting of the *decoded* values
- * of all the POST values found in the buffer pointed to by 'sPost' into
- * the buffer pointed to by 'sPost'.  The block is enclosed by the HTML
- * start and end comment sequence (<! ... -->).  'sPost' is of maximum size
- * 'dMaxSize'.
- *
- * RETURNS: If successful, the new size of 'sPost'.
- *          If unsuccessful, -1.  
- */
-int RDPutPlaintext(char *sPost,int dMaxSize)
-{
-  int dOriginalsize=0,dPostsize=0;   /* Current post buffer length */
-  int i,j=0;                           /* General purpose counter */
-  int iState=0;                      /* State Counter */
-  char sAccum[CGI_ACCUM_SIZE];       /* General String Buffer */
-  int dAccum;                        /* Length of sAccum */
-
-  /*
-   * Initialize some data structures
-   */
-  dOriginalsize=strlen(sPost);
-  dPostsize=dOriginalsize;
-
-  /*
-   * Append the start of comment sequence
-   */
-  if((dPostsize+3)>=dMaxSize) {
-    return -1;
-  }
-  strcat(sPost,"&< ");
-  dPostsize+=3;
-
-  /* 
-   * Scan for value strings
-   */
-  for(i=0;i<dOriginalsize+1;i++) {
-    switch(iState) {
-
-    case 0:    /* Looking for a start of value or comment */
-      switch(sPost[i]) {
-
-      case '=':   /* Start of value */
-	j=0;
-	sAccum[j]=0;
-	iState=1;
-	break;
-
-      case '<':   /* Start of comment sequence */
-	iState=10;
-	break;
-      }
-      break;
-
-    case 1:
-      switch(sPost[i]) {
-
-      case '&':   /* End of value string */
-	sAccum[j++]=' ';
-	sAccum[j]=0;
-	RDDecodeString(sAccum);
-	dAccum=strlen(sAccum);
-	if(dAccum>=dMaxSize) {
-	  return -1;
-	}
-	strcat(sPost,sAccum);
-	dPostsize+=dAccum;
-	iState=0;
-	break;
-
-      default:    /* Another character in value string */
-	if((sPost[i]!='<') && (sPost[i]!='>')) {
-	  sAccum[j++]=sPost[i];
-	}
-	break;
-      }
-    case 10:    /* Middle of a comment */
-      switch(sPost[i]) {
-      case '>':   /* End of comment */
-	iState=0;
-	break;
-      }
-      break;
-    default:    /* Parser error! */
-      return -1;
-      break;
-    }
-  }
-
-  /*
-   * Append the end of comment sequence
-   */
-  if((dPostsize+1)>=dMaxSize) {
-    return -1;
-  }
-  strcat(sPost,">");
-  dPostsize+=1;
-
-  return dPostsize;
-}
-
-
-
-
-/*
- * int RDPurgePlaintext(char *sPost,int dMaxSize)
- *
- * This function removes one or more plaintext blocks enclosed by HTML comment
- * sequences (<! ... -->) from the buffer pointed to by 'sPost', of
- * maximum size 'dMaxSize'.  
- *
- * RETURNS: If successful, the new size of 'sPost'. 
- *          If unsuccessful, -1
- */
-int RDPurgePlaintext(char *sPost,int dMaxSize)
-{
-  int i=0;                    /* General Purpose Counters */
-  int dComments=0;            /* Comment State Switch */
-  int dStart=0;               /* Comment Startpoint Pointer */
-
-  /*
-   * Scan for comment sequences
-   */
-  while(sPost[i]!=0) {
-    if((sPost[i]=='<') && (dComments==0)) {   /* Start of comment */
-      dStart=i;
-      dComments=1;
-    }
-    if((sPost[i]=='>') && (dComments==1)) {   /* End of comment */
-      if(RDBufferDiff(sPost,dStart,dStart-i-1,dMaxSize)<0) {
-	return -1;
-      }
-      if(sPost[i]==0) {   /* Ensure a proper exit if at end of string */
-	i--;
-      }
-    }
-    i++;
-  }
-
-  /*
-   * Clean up and exit nicely
-   */
-  RDPruneAmp(sPost);
-  return strlen(sPost);
-}
-
-
-
-
-void RDCgiError(const char *str,int resp_code)
-{
-  /* The cgi header */
-  printf("Content-type: text/html\n");
-  printf("Status: %d\n",resp_code);
-  printf("\n");
-
-  /* The html header */
-  printf("<html>\n");
-  printf("<head>\n");
-  printf("<title>");
-  printf("CGI Internal Error %d",resp_code);
-  printf("</title>\n");
-  printf("</head>\n");
-
-  /* The body of the message */
-  printf("<h1>Oops!</h1><br>\n");
-  printf("We seem to have encountered a problem!  The system says: <br>\n");
-  printf("<pre>%d<br>%s</pre><br>\n",resp_code,str);
-
-  /* The html footer */
-  printf("</body>\n");
-  exit(0);
-}
-
-
 extern void RDXMLResult(const char *str,int resp_code,
 			RDAudioConvert::ErrorCode err)
 {
@@ -567,305 +52,6 @@ extern void RDXMLResult(const char *str,int resp_code,
 }
 
 
-/*
- * int BufferDiff(char sString,int dOrigin,int dDiff,int dMaxSize)
- *
- * This function adds (+ value) or deletes (- value) 'dDiff' characters 
- * from the string pointed to by 'sString' at the offset location pointed 
- * to by 'dOrigin'.  'dMaxSize' is the maximum allowable size of 'sString'.
- *
- * RETURNS:  If successful, the new size of 'sString'
- *           If unsuccessful, -1
- */
-int RDBufferDiff(char *sString,int dOrigin,int dDiff,int dMaxSize)
-{
-  int dOldSize,dNewSize;
-  int i;
-
-  /*
-   * Will it fit?
-   */
-  dOldSize=strlen(sString);
-  if((dOldSize+dDiff)>=dMaxSize) {
-    return -1;
-  }
-  dNewSize=dOldSize+dDiff;
-
-  /* 
-   * Adding characters 
-   */
-  if(dDiff>0) {
-    for(i=dOldSize;i>dOrigin;i--) {
-      sString[i+dDiff]=sString[i];
-    }
-    return dNewSize;
-  }
-
-  /* 
-   * No Change
-   */
-  if(dDiff==0) {
-    return dNewSize;
-  }
-
-  /*
-   * Deleting Characters
-   */
-  if(dDiff<0) {
-    for(i=dOrigin;i<dOldSize;i++) {
-      sString[i]=sString[i-dDiff];
-    }
-    return dNewSize;
-  }
-  return -1; 
-}
-
-
-
-
-void RDPruneAmp(char *sPost)
-{
-  if(sPost[strlen(sPost)-1]=='&') {
-    sPost[strlen(sPost)-1]=0;
-  }
-}
-
-
-int RDEscapeQuotes(const char *src,char *dest,int maxlen)
-{
-  int i=0;
-  int j=0;
-  while(src[i]!=0) {
-    if(src[i]==34) {  // Double Quotes
-      if((j+7)>maxlen) {
-	dest[j]=0;
-	return j;
-      }
-      dest[j]=0;
-      strcat(dest,"&quot;");
-      i++;
-      j+=6;
-    }      
-    else {
-      if((j+2)>maxlen) {
-	dest[j]=0;
-	return j;
-      }
-      dest[j++]=src[i++];
-    }
-  }
-  dest[j]=0;
-  return j;
-}
-
-
-long int RDAuthenticateLogin(const QString &username,const QString &passwd,
-			     const QHostAddress &addr)
-{
-  //
-  // Authenticate User
-  //
-  RDUser *user=new RDUser(username);
-  if(!user->exists()) {
-    delete user;
-    return -1;
-  }
-  if(!user->checkPassword(passwd,true)) {
-    delete user;
-    return -1;
-  }
-  delete user;
-
-  //
-  // Create Session
-  //
-  time_t timeval;
-  timeval=time(&timeval);
-  srandom(timeval);
-  long int session=random();
-  QString sql=QString("insert into `WEB_CONNECTIONS` set ")+
-    QString().sprintf("`SESSION_ID`=%ld,",session)+
-    "`LOGIN_NAME`='"+RDEscapeString(username)+"',"+
-    "`IP_ADDRESS`='"+addr.toString()+"',"+
-    "`TIME_STAMP`=now()";
-  RDSqlQuery::apply(sql);
-
-  return session;
-}
-
-
-QString RDAuthenticateSession(long int session_id,const QHostAddress &addr)
-{
-  QString sql;
-  RDSqlQuery *q;
-
-  //
-  // Expire Stale Sessions
-  //
-  QDateTime current_datetime=
-    QDateTime(QDate::currentDate(),QTime::currentTime());
-  sql=QString("delete from `WEB_CONNECTIONS` where ")+
-    "`TIME_STAMP`<'"+current_datetime.addSecs(-RD_WEB_SESSION_TIMEOUT).
-    toString("yyyy-MM-dd hh:mm:ss")+"'";
-  RDSqlQuery::apply(sql);
-
-  //
-  // Check for Session
-  //
-  sql=QString("select ")+
-    "`LOGIN_NAME`,"+  // 00
-    "`IP_ADDRESS` "+  // 01
-    "from `WEB_CONNECTIONS` where "+
-    QString().sprintf("`SESSION_ID`=%ld",session_id);
-  q=new RDSqlQuery(sql);
-  if(!q->first()) {
-    delete q;
-    return QString();
-  }
-  if(q->value(1).toString()!=addr.toString()) {
-    delete q;
-    return QString();
-  }
-  QString name=q->value(0).toString();
-  delete q;
-
-  //
-  // Update Session
-  //
-  sql=QString("update `WEB_CONNECTIONS` set ")+
-    "`TIME_STAMP`='"+current_datetime.toString("yyyy-MM-dd hh:mm:dd")+"' "+
-    QString().sprintf("where `SESSION_ID`=%ld",session_id);
-  RDSqlQuery::apply(sql);
-
-  return name;
-}
-
-
-void RDLogoutSession(long int session_id,const QHostAddress &addr)
-{
-  QString sql=QString("select `IP_ADDRESS` from `WEB_CONNECTIONS` ")+
-    QString().sprintf("where `SESSION_ID`=%ld",session_id);
-  RDSqlQuery *q=new RDSqlQuery(sql);
-  if(!q->first()) {
-    delete q;
-    return;
-  }
-  if(q->value(0).toString()!=addr.toString()) {
-    delete q;
-    return;
-  }
-  delete q;
-  sql=QString("delete from `WEB_CONNECTIONS` ")+
-    QString().sprintf("where `SESSION_ID`=%ld",session_id);
-  RDSqlQuery::apply(sql);
-}
-
-
-bool RDParsePost(std::map<QString,QString> *vars)
-{
-  std::map<QString,QString> headers;
-  bool header=true;
-  FILE *f=NULL;
-  char *data=NULL;
-  ssize_t n=0;
-  QString sep;
-  QString name;
-  QString filename;
-  QString tempdir;
-  int fd=-1;
-
-  //
-  // Initialize Temp Directory Path
-  //
-  tempdir=RDTempDirectory::basePath()+"/rivendellXXXXXX";
-
-  //
-  // Get message part separator
-  //
-  if(getenv("REQUEST_METHOD")==NULL) {
-    return false;
-  }
-  if(QString(getenv("REQUEST_METHOD")).toLower()!="post") {
-    return false;
-  }
-  if((f=fdopen(0,"r"))==NULL) {
-    return false;
-  }
-  if((n=getline(&data,(size_t *)&n,f))<=0) {
-    return false;
-  }
-  sep=QString(data).trimmed();
-
-  //
-  // Get message parts
-  //
-  while((n=getline(&data,(size_t *)&n,f))>0) {
-    if(QString(data).trimmed().contains(sep)>0) {  // End of part
-      if(fd>=0) {
-	ftruncate(fd,lseek(fd,0,SEEK_CUR)-2);  // Remove extraneous final CR/LF
-	::close(fd);
-	fd=-1;
-      }
-      name="";
-      filename="";
-      headers.clear();
-      header=true;
-      continue;
-    }
-    if(header) {  // Read header
-      if(QString(data).trimmed().isEmpty()) {
-	if(!headers["content-disposition"].isNull()) {
-	  QStringList fields;
-	  fields=headers["content-disposition"].split(";");
-	  if(fields.size()>0) {
-	    if(fields[0].toLower().trimmed()=="form-data") {
-	      for(int i=1;i<fields.size();i++) {
-		QStringList pairs;
-		pairs=fields.at(i).split("=",QString::KeepEmptyParts);
-		if(pairs[0].toLower().trimmed()=="name") {
-		  name=pairs[1].trimmed();
-		  name.replace("\"","");
-		}
-		if(pairs[0].toLower().trimmed()=="filename") {
-		  if(tempdir.right(6)=="XXXXXX") {
-		    char dir[PATH_MAX];
-		    strcpy(dir,tempdir.toUtf8());
-		    mkdtemp(dir);
-		    tempdir=dir;
-		  }
-		  filename=tempdir+"/"+pairs[1].trimmed();
-		  filename.replace("\"","");
-		  fd=open(filename.toUtf8(),O_WRONLY|O_CREAT,S_IRUSR|S_IWUSR);
-		}
-	      }
-	    }
-	  }
-	}
-	header=false;
-      }
-      else {
-	QStringList hdr;
-	hdr=QString(data).trimmed().split(":");
-	headers[hdr[0].toLower()]=hdr[1];
-      }
-    }
-    else {  // Read data
-      if(filename.isEmpty()) {
-	(*vars)[name]+=QString(data);
-      }
-      else {
-	(*vars)[name]=filename;
-	write(fd,data,n);
-      }
-    }
-  }
-
-  free(data);
-
-  return true;
-}
-
-
 QString RDXmlField(const QString &tag,const QString &value,const QString &attrs)
 {
   QString str="";
diff --git a/lib/rdweb.h b/lib/rdweb.h
index f0377315..f12c2d2f 100644
--- a/lib/rdweb.h
+++ b/lib/rdweb.h
@@ -3,7 +3,7 @@
 // Functions for interfacing with web components using the
 // Common Gateway Interface (CGI) Standard 
 //
-//   (C) Copyright 1996-2007 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 1996-2021 Fred Gleason <fredg@paravelsystems.com>
 //
 //   This program is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License version 2 as
@@ -22,49 +22,16 @@
 #ifndef RDWEB_H
 #define RDWEB_H
 
-#include <map>
-
-#include <qstring.h>
-#include <qdatetime.h>
-#include <qhostaddress.h>
-#include <qstringlist.h>
+#include <QDateTime>
+#include <QString>
 
 #include <rdaudioconvert.h>
 
-//
-// Data Structure Sizes
-//
-#define CGI_ACCUM_SIZE 1024
-#define RD_WEB_SESSION_TIMEOUT 900
-
 //
 // Function Prototypes
 //
-extern int RDReadPost(char *,int);
-extern int RDPutPostString(char *,char *,char *,int);
-extern int RDFindPostString(const char *,const char *,char *,int);
-extern int RDGetPostString(const char *,const char *,char *,int);
-extern int RDGetPostInt(const char *,const char *,int *);
-extern int RDGetPostLongInt(const char *,const char *,long int *);
-extern int RDPurgePostString(const char *,const char *,int);
-extern int RDEncodeString(char *,int);
-extern int RDEncodeSQLString(char *,int);
-extern int RDDecodeString(char *);
-extern int RDPutPlaintext(char *,int);
-extern int RDPurgePlaintext(char *,int);
-extern void RDCgiError(const char *str,int resp_code=200);
 extern void RDXMLResult(const char *str,int resp_code,
 			RDAudioConvert::ErrorCode err=RDAudioConvert::ErrorOk);
-extern int RDBufferDiff(char *,int,int,int);
-extern void RDPruneAmp(char *);
-extern int RDEscapeQuotes(const char *src,char *dest,int maxlen);
-extern long int RDAuthenticateLogin(const QString &username,
-				    const QString &passwd,
-				    const QHostAddress &addr);
-extern QString RDAuthenticateSession(long int session_id,
-				     const QHostAddress &addr);
-extern void RDLogoutSession(long int session_id,const QHostAddress &addr);
-extern bool RDParsePost(std::map<QString,QString> *vars);
 extern QString RDXmlField(const QString &tag,const QString &value,
 			  const QString &attrs="");
 extern QString RDXmlField(const QString &tag,const char *value,