2012-07-09 18:49 UTC+0200 Viktor Szakats (harbour syenar.net)

* examples/guestbk/guestbk.htm * examples/guestbk/testcgi.prg * tests/function.cfm * minor updates * lowercased html tags ! deleted broken links
2012-07-09 16:51:03 +00:00
parent f2b6e5b308
commit ffdf730600
4 changed files with 129 additions and 130 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,14 @@
   The license applies to all entries newer than 2009-04-28.
 */

+2012-07-09 18:49 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * examples/guestbk/guestbk.htm
+  * examples/guestbk/testcgi.prg
+  * tests/function.cfm
+    * minor updates
+    * lowercased html tags
+    ! deleted broken links
+
 2012-07-09 18:37 UTC+0200 Viktor Szakats (harbour syenar.net)
  * contrib/hbcurl/tests/ftp_uldl.prg
    ! fixed broken link
--- a/harbour/examples/guestbk/guestbk.htm
+++ b/harbour/examples/guestbk/guestbk.htm
@@ -1,33 +1,31 @@
-<HTML>
-<HEAD>
-<TITLE>The Harbour Guestbook</TITLE>
-<META NAME="Generator" CONTENT="EditPlus 1.2">
-<META NAME="Author" CONTENT="">
-<META NAME="Keywords" CONTENT="">
-<META NAME="Description" CONTENT="">
-</HEAD>
+<html>
+<head>
+<title>The Harbour Guestbook</title>
+<meta name="Author" content="">
+<meta name="Keywords" content="">
+<meta name="Description" content="">
+</head>

 <!-- Harbour Guestbook Webpage             -->
 <!-- Copyright (C) 1999 by Felipe G. Coury -->
-<BODY BGCOLOR="#FFFFFF">
-<FONT FACE="Tahoma">
-<CENTER><B>Harbour GuestBook Script</B></CENTER>
-<HR>
-<CENTER>
-<FORM NAME="GuestBook" ACTION="/cgi-bin/guestbk.exe" METHOD="GET">
-<TABLE>
-  <TR><TD><FONT SIZE=2><B>Name:</B></TD><TD><INPUT NAME="Name" TYPE="text" SIZE="60"></TD></TR>
-  <TR><TD><FONT SIZE=2><B>City/State/Country:</TD><TD><INPUT NAME="City" TYPE="text" SIZE="20"><INPUT NAME="State" TYPE="text" SIZE="20"><INPUT NAME="Country" TYPE="text" SIZE="20"></TD></TR>
-  <TR><TD><FONT SIZE=2><B>E-Mail:</TD><TD><INPUT NAME="EMail" TYPE="text" SIZE="30"></TD></TR>
-  <TR><TD><FONT SIZE=2><B>Homepage:</TD><TD><INPUT NAME="Homepage" TYPE="text" SIZE="40"></TD></TR>
-  <TR><TD valign="TOP"><FONT SIZE=2><B>Comments:</TD><TD><TEXTAREA NAME="Comments" ROWS="5" COLS="60"></TEXTAREA></TD></TR>
-</TABLE>
-<INPUT TYPE="Submit" VALUE=" Submit Entry ">&nbsp;<INPUT TYPE="Reset" VALUE=" Reset Data "><BR>
-<INPUT TYPE="Hidden" NAME="Oper" VALUE="A">
-</CENTER>
-<IMG SRC="http://www.flexsys-ci.com/harbour-project/images/hscbtn.gif">
-</FORM>
-<HR>
+<body bgcolor="#FFFFFF">
+<font face="Tahoma">
+<center><b>Harbour GuestBook Script</b></center>
+<hr>
+<center>
+<form name="GuestBook" action="/cgi-bin/guestbk.exe" method="GET">
+<table>
+  <tr><td><font size=2><b>Name:</b></td><td><input name="Name" type="text" size="60"></td></tr>
+  <tr><td><font size=2><b>City/State/Country:</td><td><input name="City" TYPE="text" size="20"><input name="State" type="text" size="20"><input name="Country" type="text" size="20"></td></tr>
+  <tr><td><font size=2><b>E-Mail:</td><td><input name="EMail" type="text" size="30"></td></tr>
+  <tr><td><font size=2><b>Homepage:</td><td><input name="Homepage" type="text" size="40"></td></tr>
+  <tr><td valign="top"><font size=2><b>Comments:</td><td><textarea name="Comments" rows="5" cols="60"></textarea></td></tr>
+</table>
+<input type="Submit" value=" Submit Entry ">&nbsp;<input type="Reset" value=" Reset Data "><br />
+<input type="Hidden" name="Oper" value="A">
+</center>
+</form>
+<hr>
 <#Entries>
-</BODY>
-</HTML>
+</body>
+</html>
--- a/harbour/examples/guestbk/testcgi.prg
+++ b/harbour/examples/guestbk/testcgi.prg
@@ -17,10 +17,7 @@
 *  1999/06/02  Dynamic TAG matching routines (inspired on Delphi).
 *              First attempt to convert Delphi's ISAPI dll of WebSites'
 *              Function List
-*              (See http://www.flexsys-ci.com/harbour-project/functions.htm)
-*  1999/06/11  List can be viewed online at
-*              http://www.flexsys-ci.com/cgi-bin/testcgi.exe
-*  1999/07/29  Changed qOut() calls to OutStd() calls.
+*  1999/07/29  Changed QOut() calls to OutStd() calls.
 *
 **/

@@ -32,57 +29,58 @@ FUNCTION ParseString( cString, cDelim, nRet )

   LOCAL cBuf, aElem, nPosFim, nSize, i

-   nSize := len( cString ) - len( StrTran( cString, cDelim, "" ) ) + 1
-   aElem := array( nSize )
+   nSize := Len( cString ) - Len( StrTran( cString, cDelim, "" ) ) + 1
+   aElem := Array( nSize )

   cBuf := cString
-   i := 1
+
   FOR i := 1 TO nSize
-      nPosFim := at( cDelim, cBuf )
+      nPosFim := At( cDelim, cBuf )

      IF nPosFim > 0
-         aElem[i] := substr( cBuf, 1, nPosFim - 1 )
+         aElem[ i ] := SubStr( cBuf, 1, nPosFim - 1 )
      ELSE
-         aElem[i] := cBuf
+         aElem[ i ] := cBuf
      ENDIF

-      cBuf := substr( cBuf, nPosFim + 1, len( cBuf ) )
+      cBuf := SubStr( cBuf, nPosFim + 1, Len( cBuf ) )

-   NEXT i
+   NEXT

   RETURN aElem[ nRet ]

 FUNCTION Hex2Dec( cHex )

-   LOCAL aHex := { { "0", 00 }, ;
-                   { "1", 01 }, ;
-                   { "2", 02 }, ;
-                   { "3", 03 }, ;
-                   { "4", 04 }, ;
-                   { "5", 05 }, ;
-                   { "6", 06 }, ;
-                   { "7", 07 }, ;
-                   { "8", 08 }, ;
-                   { "9", 09 }, ;
-                   { "A", 10 }, ;
-                   { "B", 11 }, ;
-                   { "C", 12 }, ;
-                   { "D", 13 }, ;
-                   { "E", 14 }, ;
-                   { "F", 15 } }
+   LOCAL aHex := {;
+      { "0", 00 }, ;
+      { "1", 01 }, ;
+      { "2", 02 }, ;
+      { "3", 03 }, ;
+      { "4", 04 }, ;
+      { "5", 05 }, ;
+      { "6", 06 }, ;
+      { "7", 07 }, ;
+      { "8", 08 }, ;
+      { "9", 09 }, ;
+      { "A", 10 }, ;
+      { "B", 11 }, ;
+      { "C", 12 }, ;
+      { "D", 13 }, ;
+      { "E", 14 }, ;
+      { "F", 15 } }
   LOCAL nRet
   LOCAL nRes

-   nRet := ascan( aHex, { |x| upper( x[1] ) == upper( left( cHex, 1 ) ) } )
-   nRes := aHex[nRet, 2] * 16
-   nRet := ascan( aHex, { |x| upper( x[1] ) == upper( right( cHex, 1 ) ) } )
-   nRes += aHex[nRet, 2]
+   nRet := AScan( aHex, {| x | Upper( x[ 1 ] ) == Upper( Left( cHex, 1 ) ) } )
+   nRes := aHex[ nRet, 2 ] * 16
+   nRet := AScan( aHex, {| x | Upper( x[ 1 ] ) == Upper( Right( cHex, 1 ) ) } )
+   nRes += aHex[ nRet, 2 ]

   RETURN nRes

-/*-------------------------------------------------------------------------*/
+   /*-------------------------------------------------------------------------*/

-FUNCTION THTML
+FUNCTION THTML()

   STATIC oClass

@@ -109,7 +107,7 @@ FUNCTION THTML
      oClass:AddMethod( "SaveToFile", @SaveToFile() )  // Saves Content to File
      oClass:AddMethod( "ShowResult", @ShowResult() )  // Show Result - SEE Fcn
      oClass:AddMethod( "Generate",   @Generate() )    // Generate HTML
-      oClass:AddMethod( "SetHTMLFile",@SetHTMLFile() ) // Sets source HTML file
+      oClass:AddMethod( "SetHTMLFile", @SetHTMLFile() ) // Sets source HTML file

      oClass:AddMethod( "ProcessCGI",    @ProcessCGI() )
      oClass:AddMethod( "GetCGIParam",   @GetCGIParam() )
@@ -152,7 +150,7 @@ STATIC FUNCTION AddLink( cLinkTo, cLinkName )
   LOCAL Self := QSelf()

   ::cBody := ::cBody + ;
-      "<A HREF='" + cLinkTo + "'>" + cLinkName + "</A>"
+      "<a href='" + cLinkTo + "'>" + cLinkName + "</a>"

   RETURN Self

@@ -160,12 +158,7 @@ STATIC FUNCTION AddHead( cDescr )

   LOCAL Self := QSelf()

-   // Why this doesn't work?
-   // ::cBody += ...
-   // ???
-
-   ::cBody := ::cBody + ;
-      "<H1>" + cDescr + "</H1>"
+   ::cBody += "<h1>" + cDescr + "</h1>"

   RETURN NIL

@@ -174,9 +167,9 @@ STATIC FUNCTION AddPara( cPara, cAlign )
   LOCAL Self := QSelf()

   ::cBody := ::cBody + ;
-      "<P ALIGN='" + cAlign + "'>" + hb_eol() + ;
+      "<p align='" + cAlign + "'>" + hb_eol() + ;
      cPara + hb_eol() + ;
-      "</P>"
+      "</p>"

   RETURN Self

@@ -184,45 +177,45 @@ STATIC FUNCTION Generate()

   LOCAL Self := QSelf()
   LOCAL cFile, i, hFile, nPos, cRes := ""
-   LOCAL lFlag := .f.
+   LOCAL lFlag := .F.

   // Is this a meta file or hand generated script?
-   IF empty( ::cHTMLFile )
+   IF Empty( ::cHTMLFile )
      ::cContent :=                                                        ;
-         "<HTML><HEAD>"                                        + hb_eol() + ;
-         "<TITLE>" + ::cTitle + "</TITLE>"                     + hb_eol() + ;
-         "<BODY link='" + ::cLinkColor + "' " +                            ;
+         "<html><head>"                                        + hb_eol() + ;
+         "<title>" + ::cTitle + "</title>"                     + hb_eol() + ;
+         "<body link='" + ::cLinkColor + "' " +                            ;
         "vlink='" + ::cvLinkColor + "'>" +                    + hb_eol() + ;
         ::cBody                                               + hb_eol() + ;
-         "</BODY></HTML>"
+         "</body></html>"
   ELSE
      ::cContent := ""

      // Does cHTMLFile exists?
-      IF !File( ::cHTMLFile )
-         ::cContent := "<H1>Server Error</H1><P><I>No such file: " + ;
-           ::cHTMLFile
+      IF ! hb_FileExists( ::cHTMLFile )
+         ::cContent := "<h1>Server Error</h1><p><i>No such file: " + ;
+            ::cHTMLFile
      ELSE
         // Read from file
-         hFile := fOpen( ::cHTMLFile, 0 )
-         cFile := space( IF_BUFFER )
-         DO WHILE (nPos := fRead( hFile, @cFile, IF_BUFFER )) > 0
+         hFile := FOpen( ::cHTMLFile, 0 )
+         cFile := Space( IF_BUFFER )
+         DO WHILE ( nPos := FRead( hFile, @cFile, IF_BUFFER ) ) > 0

-            cFile := left( cFile, nPos )
+            cFile := Left( cFile, nPos )
            cRes += cFile
-            cFile := space( IF_BUFFER )
+            cFile := Space( IF_BUFFER )

         ENDDO

-         fClose( hFile )
+         FClose( hFile )

         // Replace matched tags
         i := 1
         ::cContent := cRes
         /* TODO: Replace this DO WHILE with FOR..NEXT */
-         DO WHILE i <= len( ::aReplaceTags )
-            ::cContent := strtran( ::cContent, ;
-               "<#" + ::aReplaceTags[i, 1] + ">", ::aReplaceTags[i, 2] )
+         DO WHILE i <= Len( ::aReplaceTags )
+            ::cContent := StrTran( ::cContent, ;
+               "<#" + ::aReplaceTags[ i, 1 ] + ">", ::aReplaceTags[ i, 2 ] )
            i++
         ENDDO

@@ -230,15 +223,15 @@ STATIC FUNCTION Generate()
         /*
         cRes := ""
         FOR i := 1 TO len( ::cContent )
-            IF substr( ::cContent, i, 1 ) == "<" .AND. ;
-               substr( ::cContent, i + 1, 1 ) == "#"
+            IF SubStr( ::cContent, i, 1 ) == "<" .AND. ;
+               SubStr( ::cContent, i + 1, 1 ) == "#"
               lFlag := .t.
-            ELSEIF substr( ::cContent, i, 1 ) == ">" .AND. lFlag
+            ELSEIF SubStr( ::cContent, i, 1 ) == ">" .AND. lFlag
               lFlag := .f.
-            ELSEIF !lFlag
-               cRes += substr( ::cContent, i, 1 )
+            ELSEIF ! lFlag
+               cRes += SubStr( ::cContent, i, 1 )
            ENDIF
-         NEXT i
+         NEXT

         ::cContent := cRes
         */
@@ -262,10 +255,10 @@ STATIC FUNCTION ShowResult()
 STATIC FUNCTION SaveToFile( cFile )

   LOCAL Self  := QSelf()
-   LOCAL hFile := fCreate( cFile )
+   LOCAL hFile := FCreate( cFile )

-   fWrite( hFile, ::cContent )
-   fClose( hFile )
+   FWrite( hFile, ::cContent )
+   FClose( hFile )

   RETURN Self

@@ -277,7 +270,7 @@ STATIC FUNCTION ProcessCGI()
   LOCAL nBuff  := 0
   LOCAL i

-   IF empty( ::aCGIContents )
+   IF Empty( ::aCGIContents )
      ::aCGIContents := {               ;
         GetEnv( "SERVER_SOFTWARE"   ), ;
         GetEnv( "SERVER_NAME"       ), ;
@@ -299,37 +292,37 @@ STATIC FUNCTION ProcessCGI()
         GetEnv( "CONTENT_TYPE"      ), ;
         GetEnv( "CONTENT_LENGTH"    ), ;
         GetEnv( "ANNOTATION_SERVER" )  ;
-          }
+         }

      cQuery := ::GetCGIParam( CGI_QUERY_STRING )

-      IF !empty( cQuery )
+      IF !Empty( cQuery )

-        ::aQueryFields := {}
+         ::aQueryFields := {}

-        FOR i := 1 TO len( cQuery ) + 1
+         FOR i := 1 TO Len( cQuery ) + 1

-          IF i > len( cQuery ) .OR. substr( cQuery, i, 1 ) == "&"
+            IF i > Len( cQuery ) .OR. SubStr( cQuery, i, 1 ) == "&"

-             aadd( ::aQueryFields,                          ;
-                { substr( cBuff, 1, at( "=", cBuff ) - 1 ), ;
-                  strtran( substr( cBuff, at( "=", cBuff ) + 1,      ;
-                     len( cBuff ) - at( "=", cBuff ) + 1 ), "+", " " ) } )
-             cBuff := ""
-          ELSE
-             IF substr( cQuery, i, 1 ) == "%"
-                cBuff += chr( Hex2Dec( substr( cQuery, i + 1, 2 ) ) )
-                nBuff := 3
-             ENDIF
+               AAdd( ::aQueryFields,                          ;
+                  { SubStr( cBuff, 1, At( "=", cBuff ) - 1 ), ;
+                  StrTran( SubStr( cBuff, At( "=", cBuff ) + 1,      ;
+                  Len( cBuff ) - At( "=", cBuff ) + 1 ), "+", " " ) } )
+               cBuff := ""
+            ELSE
+               IF SubStr( cQuery, i, 1 ) == "%"
+                  cBuff += Chr( Hex2Dec( SubStr( cQuery, i + 1, 2 ) ) )
+                  nBuff := 3
+               ENDIF

-             IF nBuff == 0
-                cBuff += substr( cQuery, i, 1 )
-             ELSE
-                nBuff--
-             ENDIF
-          ENDIF
+               IF nBuff == 0
+                  cBuff += SubStr( cQuery, i, 1 )
+               ELSE
+                  nBuff--
+               ENDIF
+            ENDIF

-        NEXT
+         NEXT

      ENDIF

@@ -344,7 +337,7 @@ STATIC FUNCTION GetCGIParam( nParam )
   ::ProcessCGI()

   IF nParam > 20 .OR. nParam < 1
-      outerr( "Invalid CGI parameter" )
+      OutErr( "Invalid CGI parameter" )
      RETURN NIL
   ENDIF

@@ -358,11 +351,11 @@ STATIC FUNCTION QueryFields( cQueryName )

   ::ProcessCGI()

-   nRet := aScan( ::aQueryFields, ;
-      { |x| upper( x[1] ) == upper( cQueryName ) } )
+   nRet := AScan( ::aQueryFields, ;
+      {| x | Upper( x[ 1 ] ) == Upper( cQueryName ) } )

   IF nRet > 0
-      cRet := ::aQueryFields[nRet, 2]
+      cRet := ::aQueryFields[ nRet, 2 ]
   ENDIF

   RETURN cRet
@@ -379,6 +372,6 @@ STATIC FUNCTION AddReplaceTag( cTag, cReplaceText )

   LOCAL Self := QSelf()

-   aAdd( ::aReplaceTags, { cTag, cReplaceText } )
+   AAdd( ::aReplaceTags, { cTag, cReplaceText } )

   RETURN Self
--- a/harbour/tests/function.cfm
+++ b/harbour/tests/function.cfm
@@ -8,11 +8,11 @@ content="text/html; charset=iso-8859-1">

 <body bgcolor="#FFFFFF">

-<p align="center"><img src="/harbour-project/images/clouds.jpg" alt="clouds.jpg (2615 bytes)" WIDTH="550" HEIGHT="36"></p>
+<p align="center"><img src="clouds.jpg" alt="clouds.jpg" width="550" height="36"></p>

 <font SIZE="2">

-<p align="center"></font><font face="Tahoma" size="4"><strong>Function Task List</strong></font><font SIZE="2">
+<p align="center"></font><font face="Tahoma" size="4"><strong>Function Task List</strong></font><font size="2">
 <br><small><a href="funcs.dll?Lang=BR">In Portuguese</A></p>

 <p><font size="2" face="Tahoma">Below is a list of all Harbour