]> granicus.if.org Git - php/commitdiff
Some existing files modified and a couple of files removed for NetWare.
authorAnantha Kesari H Y <hyanantha@php.net>
Fri, 3 Jan 2003 15:21:33 +0000 (15:21 +0000)
committerAnantha Kesari H Y <hyanantha@php.net>
Fri, 3 Jan 2003 15:21:33 +0000 (15:21 +0000)
netware/phplib.imp
netware/phplib.mak
netware/sendmail.c [deleted file]
netware/sendmail.h [deleted file]

index fdee6f1efe9b21c876b02a8e036f3d479221bbfa..d2236f2beb158083c45f6ac5ae3319e89179b091 100644 (file)
@@ -9,7 +9,6 @@ _estrndup,
 _object_and_properties_init,
 _object_init,
 _object_init_ex,
-_persist_alloc,
 _zend_get_parameters_array,
 _zend_list_addref,
 _zend_list_delete,
@@ -55,10 +54,7 @@ php_addslashes,
 php_check_open_basedir,
 php_checkuid,
 php_execute_script,
-php_file_le_fopen,
 php_fopen_primary_script,
-php_fopen_wrapper,
-php_fread_all,
 php_handle_aborted_connection,
 php_handle_special_queries,
 php_body_write,
index d6ec83f18758b04395eb7e7d30cd3eef93a43b53..4403ce44bc6fc822df2ca9b69973bddd38270dc6 100644 (file)
@@ -336,6 +336,7 @@ endif
        @echo $(wordlist 126, 130, $(OBJECTS)) >> $(basename $@).link
        @echo $(wordlist 131, 135, $(OBJECTS)) >> $(basename $@).link
        @echo $(wordlist 136, 140, $(OBJECTS)) >> $(basename $@).link
+       @echo $(wordlist 141, 141, $(OBJECTS)) >> $(basename $@).link
 
        @echo $(wordlist 1, 2, $(WIN32_OBJECTS)) >> $(basename $@).link
 
diff --git a/netware/sendmail.c b/netware/sendmail.c
deleted file mode 100644 (file)
index a9fea3b..0000000
+++ /dev/null
@@ -1,564 +0,0 @@
-
-/* 
- *  PHP Sendmail for NetWare.
- *
- *  This code is based on the sendmail.c file under Win32 folder
- *
- *  This file is rewriten specificly for PHPFI.  Some functionality
- *  has been removed (MIME and file attachments).  This code was 
- *  modified from code based on code writen by Jarle Aase.
- *
- *  This class is based on the original code by Jarle Aase, see bellow:
- *  wSendmail.cpp  It has been striped of some functionality to match
- *  the requirements of phpfi.
- *
- *  Very simple SMTP Send-mail program for sending command-line level
- *  emails and CGI-BIN form response for the Windows platform.
- *
- *  The complete wSendmail package with source code can be located
- *  from http://www.jgaa.com
- *
- */
-
-#include "php.h"                               /*php specific */
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef USE_WINSOCK
-/*#include <ws2nlm.h>*/
-#include <novsock2.h>
-#else
-//#include <sys/socket.h>
-#include <netinet\in.h>
-#include <ws2name.h>
-#endif
-
-#include "time.h"
-#include <string.h>
-//#include <malloc.h>
-//#include <memory.h>
-//#include <winbase.h>
-#include "sendmail.h"
-#include "php_ini.h"
-
-
-static char *days[] =
-{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
-static char *months[] =
-{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
-
-
-#ifndef THREAD_SAFE
-char Buffer[MAIL_BUFFER_SIZE];
-
-/* socket related data */
-typedef int       SOCKET;
-typedef struct sockaddr_in SOCKADDR_IN;
-typedef struct sockaddr * LPSOCKADDR;
-typedef struct hostent * LPHOSTENT;
-
-#define INVALID_SOCKET  (SOCKET)(~0)
-
-SOCKET sc;
-//WSADATA Data;
-//struct hostent *adr;
-SOCKADDR_IN sock_in;
-//int WinsockStarted;
-/* values set by the constructor */
-//char *AppName;
-char MailHost[HOST_NAME_LEN];
-char LocalHost[HOST_NAME_LEN];
-#endif
-
-
-char seps[] = " ,\t\n";
-char *php_mailer = "PHP 4.0 NetWare";
-
-char *get_header(char *h, char *headers);
-
-/* Error messages */
-static char *ErrorMessages[] =
-{
-       {"Success"},
-       {"Bad arguments from form"},
-       {"Unable to open temporary mailfile for read"},
-       {"Failed to Start Sockets"},
-       {"Failed to Resolve Host"},
-       {"Failed to obtain socket handle"},
-       {"Failed to Connect"},
-       {"Failed to Send"},
-       {"Failed to Receive"},
-       {"Server Error"},
-       {"Failed to resolve the host IP name"},
-       {"Out of memory"},
-       {"Unknown error"},
-       {"Bad Message Contents"},
-       {"Bad Message Subject"},
-       {"Bad Message destination"},
-       {"Bad Message Return Path"},
-       {"Bad Mail Host"},
-       {"Bad Message File"},
-       {"PHP Internal error: php.ini sendmail from variable not set!"}
-};
-
-
-/*********************************************************************
-// Name:  TSendMail
-// Input:   1) host:    Name of the mail host where the SMTP server resides
-//                      max accepted length of name = 256
-//          2) appname: Name of the application to use in the X-mailer
-//                      field of the message. if NULL is given the application
-//                      name is used as given by the GetCommandLine() function
-//                      max accespted length of name = 100
-// Output:  1) error:   Returns the error code if something went wrong or
-//                      SUCCESS otherwise.
-//
-//  See SendText() for additional args!
-//********************************************************************/
-int TSendMail(char *host, int *error,
-                         char *headers, char *Subject, char *mailTo, char *data)
-{
-       int ret;
-       char *RPath = NULL;
-
-       if (host == NULL) {
-               *error = BAD_MAIL_HOST;
-               return BAD_MAIL_HOST;
-       } else if (strlen(host) >= HOST_NAME_LEN) {
-               *error = BAD_MAIL_HOST;
-               return BAD_MAIL_HOST;
-       } else {
-               strcpy(MailHost, host);
-       }
-
-       if (INI_STR("sendmail_from")){
-               RPath = estrdup(INI_STR("sendmail_from"));
-               } else {
-                       return 19;
-       }
-
-       /* attempt to connect with mail host */
-       *error = MailConnect();
-       if (*error != 0) {
-               if(RPath)efree(RPath);
-               return *error;
-       } else {
-               ret = SendText(RPath, Subject, mailTo, data, headers);
-               TSMClose();
-               if (ret != SUCCESS) {
-                       *error = ret;
-               }
-               if(RPath)efree(RPath);
-               return ret;
-       }
-}
-
-
-//********************************************************************
-// Name:  TSMClose
-// Input:
-// Output:
-// Description: DESTRUCTOR
-// Author/Date:  jcar 20/9/96
-// History:
-//********************************************************************/
-void TSMClose()
-{
-       Post("QUIT\r\n");
-       Ack();
-       /* to guarantee that the cleanup is not made twice and 
-          compomise the rest of the application if sockets are used
-          elesewhere 
-       */
-
-       shutdown(sc, 0);
-
-       /* closesocket commented out since it was giving undefined symbol linker error
-          close added in its place */
-//     closesocket(sc);
-       close(sc);
-}
-
-
-/*********************************************************************
-// Name:  char *GetSMErrorText
-// Input:   Error index returned by the menber functions
-// Output:  pointer to a string containing the error description
-// Description:
-// Author/Date:  jcar 20/9/96
-// History:
-//*******************************************************************/
-char *GetSMErrorText(int index)
-{
-
-       if ((index > MAX_ERROR_INDEX) || (index < MIN_ERROR_INDEX))
-               return (ErrorMessages[UNKNOWN_ERROR]);
-       else
-               return (ErrorMessages[index]);
-}
-
-
-/*********************************************************************
-// Name:  TSendText
-// Input:       1) RPath:   return path of the message
-//                                  Is used to fill the "Return-Path" and the
-//                                  "X-Sender" fields of the message.
-//                  2) Subject: Subject field of the message. If NULL is given
-//                                  the subject is set to "No Subject"
-//                  3) mailTo:  Destination address
-//                  4) data:        Null terminated string containing the data to be send.
-// Output:      Error code or SUCCESS
-// Description:
-// Author/Date:  jcar 20/9/96
-// History:
-//*******************************************************************/
-int SendText(char *RPath, char *Subject, char *mailTo, char *data, char *headers)
-{
-       int res, i;
-       char *p;
-       char *tempMailTo, *token, *pos1, *pos2;
-
-       /* check for NULL parameters */
-       if (data == NULL)
-               return (BAD_MSG_CONTENTS);
-       if (mailTo == NULL)
-               return (BAD_MSG_DESTINATION);
-       if (RPath == NULL)
-               return (BAD_MSG_RPATH);
-
-       /* simple checks for the mailto address */
-       /* have ampersand ? */
-       if (strchr(mailTo, '@') == NULL)
-               return (BAD_MSG_DESTINATION);
-
-       sprintf(Buffer, "HELO %s\r\n", LocalHost);
-
-       /* in the beggining of the dialog */
-       /* attempt reconnect if the first Post fail */
-       if ((res = Post(Buffer)) != SUCCESS) {
-               MailConnect();
-               if ((res = Post(Buffer)) != SUCCESS)
-                       return (res);
-       }
-       if ((res = Ack()) != SUCCESS)
-               return (res);
-
-       sprintf(Buffer, "MAIL FROM:<%s>\r\n", RPath);
-       if ((res = Post(Buffer)) != SUCCESS)
-               return (res);
-       if ((res = Ack()) != SUCCESS)
-               return (res);
-
-
-       tempMailTo = estrdup(mailTo);
-       
-       /* Send mail to all rcpt's */
-       token = strtok(tempMailTo, ",");
-       while(token != NULL)
-       {
-               sprintf(Buffer, "RCPT TO:<%s>\r\n", token);
-               if ((res = Post(Buffer)) != SUCCESS)
-                       return (res);
-               if ((res = Ack()) != SUCCESS)
-                       return (res);
-               token = strtok(NULL, ",");
-       }
-
-       /* Send mail to all Cc rcpt's */
-       efree(tempMailTo);
-       if (headers && (pos1 = strstr(headers, "Cc:"))) {
-               pos2 = strstr(pos1, "\r\n");
-               tempMailTo = estrndup(pos1, pos2-pos1);
-
-               token = strtok(tempMailTo, ",");
-               while(token != NULL)
-               {
-                       sprintf(Buffer, "RCPT TO:<%s>\r\n", token);
-                       if ((res = Post(Buffer)) != SUCCESS)
-                               return (res);
-                       if ((res = Ack()) != SUCCESS)
-                               return (res);
-                       token = strtok(NULL, ",");
-               }
-               efree(tempMailTo);
-       }
-
-       if ((res = Post("DATA\r\n")) != SUCCESS)
-               return (res);
-       if ((res = Ack()) != SUCCESS)
-               return (res);
-
-       /* send message header */
-       if (Subject == NULL)
-               res = PostHeader(RPath, "No Subject", mailTo, headers);
-       else
-               res = PostHeader(RPath, Subject, mailTo, headers);
-       if (res != SUCCESS)
-               return (res);
-
-       /* send message contents in 1024 chunks */
-       if (strlen(data) <= 1024) {
-               if ((res = Post(data)) != SUCCESS)
-                       return (res);
-       } else {
-               p = data;
-               while (1) {
-                       if (*p == '\0')
-                               break;
-                       if (strlen(p) >= 1024)
-                               i = 1024;
-                       else
-                               i = strlen(p);
-
-                       /* put next chunk in buffer */
-                       strncpy(Buffer, p, i);
-                       Buffer[i] = '\0';
-                       p += i;
-
-                       /* send chunk */
-                       if ((res = Post(Buffer)) != SUCCESS)
-                               return (res);
-               }
-       }
-
-       /*send termination dot */
-       if ((res = Post("\r\n.\r\n")) != SUCCESS)
-               return (res);
-       if ((res = Ack()) != SUCCESS)
-               return (res);
-
-       return (SUCCESS);
-}
-
-
-/*********************************************************************
-// Name:  PostHeader
-// Input:       1) return path
-//                  2) Subject
-//                  3) destination address
-//                  4) DoMime flag
-// Output:      Error code or Success
-// Description:
-// Author/Date:  jcar 20/9/96
-// History:
-//********************************************************************/
-int PostHeader(char *RPath, char *Subject, char *mailTo, char *xheaders)
-{
-
-       /* Print message header according to RFC 822 */
-       /* Return-path, Received, Date, From, Subject, Sender, To, cc */
-
-       time_t tNow = time(NULL);
-       struct tm *tm = localtime(&tNow);
-       int zoneh = abs(_timezone);
-       int zonem, res;
-       char *p;
-
-       p = Buffer;
-       zoneh /= (60 * 60);
-       zonem = (abs(_timezone) / 60) - (zoneh * 60);
-
-       if(!xheaders || !strstr(xheaders, "Date:")){
-               p += sprintf(p, "Date: %s, %02d %s %04d %02d:%02d:%02d %s%02d%02d\r\n",
-                                        days[tm->tm_wday],
-                                        tm->tm_mday,
-                                        months[tm->tm_mon],
-                                        tm->tm_year + 1900,
-                                        tm->tm_hour,
-                                        tm->tm_min,
-                                        tm->tm_sec,
-                                        (_timezone > 0) ? "+" : (_timezone < 0) ? "-" : "",
-                                        zoneh,
-                                        zonem);
-       }
-
-       if(!xheaders || !strstr(xheaders, "From:")){
-               p += sprintf(p, "From: %s\r\n", RPath);
-       }
-       p += sprintf(p, "Subject: %s\r\n", Subject);
-       if(!xheaders || !strstr(xheaders, "To:")){
-               p += sprintf(p, "To: %s\r\n", mailTo);
-       }
-       if(xheaders){
-               p += sprintf(p, "%s\r\n", xheaders);
-       }
-
-       if ((res = Post(Buffer)) != SUCCESS)
-               return (res);
-
-       if ((res = Post("\r\n")) != SUCCESS)
-               return (res);
-
-       return (SUCCESS);
-}
-
-
-/*********************************************************************
-// Name:  MailConnect
-// Input:   None
-// Output:  None
-// Description: Connect to the mail host and receive the welcome message.
-// Author/Date:  jcar 20/9/96
-// History:
-//********************************************************************/
-int MailConnect()
-{
-       int res;
-       short portnum;
-
-       /* Create Socket */
-       if ((sc = socket(PF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
-               return (FAILED_TO_OBTAIN_SOCKET_HANDLE);
-
-       /* Get our own host name */
-       if (gethostname(LocalHost, HOST_NAME_LEN))
-               return (FAILED_TO_GET_HOSTNAME);
-
-       /* Resolve the servers IP */
-       /*
-       if (!isdigit(MailHost[0])||!gethostbyname(MailHost))
-       {
-               return (FAILED_TO_RESOLVE_HOST);
-       }
-        */
-
-       portnum = (short) INI_INT("sendmail_port");
-       if (!portnum) {
-               portnum = 25;
-       }
-
-       /* Connect to server */
-       sock_in.sin_family = AF_INET;
-       sock_in.sin_port = htons(portnum);
-       sock_in.sin_addr.S_un.S_addr = GetAddr(MailHost);
-
-       if (connect(sc, (LPSOCKADDR) & sock_in, sizeof(sock_in)))
-               return (FAILED_TO_CONNECT);
-
-       /* receive Server welcome message */
-       res = Ack();
-       return (res);
-}
-
-
-/*********************************************************************
-// Name:  Post
-// Input:
-// Output:
-// Description:
-// Author/Date:  jcar 20/9/96
-// History:
-//********************************************************************/
-int Post(char * msg)
-{
-       int len = strlen(msg);
-       int slen;
-       int index = 0;
-
-       while (len > 0) {
-               if ((slen = send(sc, msg + index, len, 0)) < 1)
-                       return (FAILED_TO_SEND);
-               len -= slen;
-               index += slen;
-       }
-       return (SUCCESS);
-}
-
-
-/*********************************************************************
-// Name:  Ack
-// Input:
-// Output:
-// Description:
-// Get the response from the server. We only want to know if the
-// last command was successful.
-// Author/Date:  jcar 20/9/96
-// History:
-//********************************************************************/
-int Ack()
-{
-       static char *buf;
-       int rlen;
-       int Index = 0;
-       int Received = 0;
-
-       if (!buf)
-               if ((buf = (char *) malloc(1024 * 4)) == NULL)
-                       return (OUT_OF_MEMORY);
-
-  again:
-
-       if ((rlen = recv(sc, buf + Index, ((1024 * 4) - 1) - Received, 0)) < 1)
-               return (FAILED_TO_RECEIVE);
-
-       Received += rlen;
-       buf[Received] = 0;
-       /*err_msg   fprintf(stderr,"Received: (%d bytes) %s", rlen, buf + Index); */
-
-       /* Check for newline */
-       Index += rlen;
-       
-       if ((buf[Received - 4] == ' ' && buf[Received - 3] == '-') ||
-           (buf[Received - 2] != '\r') || (buf[Received - 1] != '\n'))
-               /* err_msg          fprintf(stderr,"Incomplete server message. Awaiting CRLF\n"); */
-               goto again;                             /* Incomplete data. Line must be terminated by CRLF
-                                          And not contain a space followed by a '-' */
-
-       if (buf[0] > '3')
-               return (SMTP_SERVER_ERROR);
-
-       return (SUCCESS);
-}
-
-
-/*********************************************************************
-// Name:  unsigned long GetAddr (LPSTR szHost)
-// Input:
-// Output:
-// Description: Given a string, it will return an IP address.
-//   - first it tries to convert the string directly
-//   - if that fails, it tries o resolve it as a hostname
-//
-// WARNING: gethostbyname() is a blocking function
-// Author/Date:  jcar 20/9/96
-// History:
-//********************************************************************/
-unsigned long GetAddr(char * szHost)
-{
-       LPHOSTENT lpstHost;
-       u_long lAddr = INADDR_ANY;
-
-       /* check that we have a string */
-       if (*szHost) {
-
-               /* check for a dotted-IP address string */
-               lAddr = inet_addr(szHost);
-
-               /* If not an address, then try to resolve it as a hostname */
-               if ((lAddr == INADDR_NONE) && (strcmp(szHost, "255.255.255.255"))) {
-
-                       /*
-                          Added the (LPHOSTENT) typecasting since the CodeWarrior compiler
-                          was cribbing without that:
-                          " illegal implicit conversion from 'int' to 'struct hostent *' "
-                        */
-                       lpstHost = (LPHOSTENT) gethostbyname(szHost);
-
-                       if (lpstHost) {         /* success */
-                               /*
-                                  The below line commented since it is giving compiler error.
-                                  The next line is done in its place. But it is WRONG and
-                                  we need to get the below line to work.
-                                  Due to this work-around, the mail functionality will not work
-                                  if the "server name" of the mail server is given.
-                                  It only works when the IP address is given.
-                               */
-//                             lAddr = *((u_long FAR *) (lpstHost->h_addr));
-                               lAddr = (u_long) 0xf;
-
-                       } else {
-                               lAddr = INADDR_ANY;             /* failure */
-                       }
-               }
-       }
-       return (lAddr);
-}                                                              /* end GetAddr() */
diff --git a/netware/sendmail.h b/netware/sendmail.h
deleted file mode 100644 (file)
index 2a1a2b7..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-
-#if !defined(SENDMAIL_H)               /* Sentry, use file only if it's not already included. */
-#define SENDMAIL_H
-
-
-#define HOST_NAME_LEN  256
-#define MAX_APPNAME_LENGHT 100
-#define  MAX_ERROR_INDEX               17
-#define  MIN_ERROR_INDEX               0
-#define  MAIL_BUFFER_SIZE              (1024*4)        /* 4k buffer */
-
-/* Return values */
-#define        SUCCESS 0
-#define        FAILED_TO_PARSE_ARGUMENTS 1
-#define        FAILED_TO_OPEN_MAILFILE 2
-#define        FAILED_TO_START_SOCKETS 3
-#define        FAILED_TO_RESOLVE_HOST 4
-#define        FAILED_TO_OBTAIN_SOCKET_HANDLE 5
-#define        FAILED_TO_CONNECT 6
-#define        FAILED_TO_SEND 7
-#define        FAILED_TO_RECEIVE 8
-#define        SMTP_SERVER_ERROR 9
-#define        FAILED_TO_GET_HOSTNAME 10
-#define        OUT_OF_MEMORY 11
-#define        UNKNOWN_ERROR 12
-#define        BAD_MSG_CONTENTS 13
-#define        BAD_MSG_SUBJECT 14
-#define        BAD_MSG_DESTINATION 15
-#define        BAD_MSG_RPATH 16
-#define        BAD_MAIL_HOST 17
-#define BAD_MSG_FILE 18
-
-
-int TSendMail(char *smtpaddr, int *returnerror,
-                         char *RPath, char *Subject, char *mailTo, char *data);
-void TSMClose(void);
-int SendText(char *RPath, char *Subject, char *mailTo, char *data, char *headers);
-char *GetSMErrorText(int index);
-
-int MailConnect();
-int PostHeader(char *, char *, char *, char *);
-int Post(char *);
-int Ack();
-unsigned long GetAddr(char * szHost);
-
-
-#endif         /* SENDMAIL_H */