From e8afcfb007e9453bb48c21f5fea761ef79f1ac2f Mon Sep 17 00:00:00 2001
From: Luiz Rafael Culik <culik@sl.conex.net>
Date: Wed, 17 Apr 2002 16:13:17 +0000
Subject: [PATCH] See changelog 2002-04-17 13:15 UTC-0300

---
 harbour/ChangeLog                 |  6 ++++++
 harbour/contrib/htmllib/forms.ch  |  5 ++++-
 harbour/contrib/htmllib/oedit.prg | 20 +++++++++++++-------
 harbour/contrib/htmllib/ohtm.prg  |  2 +-
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index dbbca9ac24..fc18220d76 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -7,6 +7,12 @@
    For example:
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
+    + Add new parameter. FT_TEMPFIL( cPath, [lHidden], [@nHandle] )
+      if [@]nHandle is used, the function not close the temp file and
+      return the handle by nHandle.
+      This parameter should be passed by reference.
+      If this parameter is not used or not passed by reference, the temp
+      file is closed.
 
   * contrib/libnf/dispc.c
     + ported to Harbour of FT_DISPFILE().
diff --git a/harbour/contrib/htmllib/forms.ch b/harbour/contrib/htmllib/forms.ch
index a048138db9..26d545d863 100644
--- a/harbour/contrib/htmllib/forms.ch
+++ b/harbour/contrib/htmllib/forms.ch
@@ -117,6 +117,7 @@
           [CAPTION <cap>]                     ;
           [STYLE <style>]                     ;
           [ID <id>]                           ;
+          [<l:LABEL>]                         ;
           IN <oForm>                          ;
           =>                                  ;
           <oForm>:addControl( ;
@@ -131,7 +132,7 @@
                   __ALIGN__ [<aln>], ;
                   __WRAP__ [<wrap>], ;
                   __TYPE__ [<typ>],;
-                  <style>, <id> ) )
+                  <style>, <id> ,<.l.>) )
 
 
 #xCommand DEFINE <typ:EDIT,TEXT,TEXTAREA,PASSWORD,BUTTON,IMAGE,CHECKBOX,CHECK,HIDDEN,RADIO,FILE,RESET,SUBMIT,SELECT,LISTBOX> <oCtr>;
@@ -162,6 +163,7 @@
           [CAPTION <cap>]                          ;
           [STYLE <style>]                          ;
           [ID <id>]                                ;
+          [<l:LABEL>]                         ;
           IN <oForm>                               ;
           =>                                       ;
           <oCtr> := HControl()                    ;;
@@ -192,6 +194,7 @@
           [<oCtr>:SetMultiple(<.mult.>);]          ;
           [<oCtr>:SetDisabled(<.dis.>);]           ;
           [<oCtr>:SetReadonly(<.ro.>);]            ;
+          [<oCtr>:SetLabel(<.l.>);]            ;
           <oCtr>:Type := __TYPE__ <typ>           ;;
           <oForm>:AddControl( <oCtr> )
 
diff --git a/harbour/contrib/htmllib/oedit.prg b/harbour/contrib/htmllib/oedit.prg
index 75dea5e9da..661e460cbd 100644
--- a/harbour/contrib/htmllib/oedit.prg
+++ b/harbour/contrib/htmllib/oedit.prg
@@ -98,6 +98,7 @@ DATA MaxLength                // length in chars
 DATA MaxChars                 // length on screen
 
 DATA Checked    INIT .F.      // checkboxes...
+DATA lLabel     init .f.
 
 DATA Source, Align            // images...
 DATA Wrap                     // textarea
@@ -146,7 +147,7 @@ METHOD SetOnKPress(c)    INLINE ::onKeyPress  := c
 METHOD SetOnKDown(c)     INLINE ::onKeyDown   := c
 METHOD SetOnKUp(c)       INLINE ::onKeyUp     := c
 METHOD SetOnSelect(c)    INLINE ::onSelect    := c
-      
+METHOD SetLabel(l)       INLINE ::lLabel      := l  
 //METHOD Debug()         INLINE __clsDebug( self )
 
 METHOD Put(lPut)
@@ -155,7 +156,7 @@ METHOD SetControl( name,rows,cols,size,maxchars,value,onfocus,;
                            onblur,onchange,onselect,onclick,onmsover,onmsout,;
                            onmsdown,onmsup,onkdown,onkup,onkprs, ;
                            pic,cap,dis,ro,lMulti,checked,;
-                           align,wrap,type, Style, Id ) 
+                           align,wrap,type, Style, Id ,lLabel) 
 
 ENDCLASS
 
@@ -175,7 +176,9 @@ LOCAL i, cStr := ""
 ::form := currentForm()
 
 ::cOutput += IF( ::lBreak, CRLF()+"<BR>", CRLF() )
-
+IF  ::lLabel
+   ::cOutPut+=CRLF()+"<LABEL>"+CRLF()
+ENDIF
 IF ::Caption != NIL
    ::cOutput += ::Caption + HTMLSPACE(2) +" <!-- "+::Type+" Control Caption -->"+CRLF()
 ENDIF
@@ -300,9 +303,12 @@ IF ::onKeyPress != NIL
 ::cOutput += space(1)+'onKeyPress="'+::onKeyPress+'"'+CRLF()
 ENDIF
 
-
 ::cOutput += " >"+CRLF()
 
+if ::lLabel
+    ::cOutPut+=CRLF()+"</LABEL>"+CRLF()
+Endif
+
 FWrite( ::nH, ::cOutput )
 
 IF ::Type == "SELECT"
@@ -352,7 +358,7 @@ method setControl( name,rows,cols,size,maxchars,value,onfocus,;
                            onblur,onchange,onselect,onclick,onmsover,onmsout,;
                            onmsdown,onmsup,onkdown,onkup,onkprs, ;
                            pic,cap,dis,ro,lMulti,checked,;
-                           align,wrap,type, Style, Id ) CLASS HControl 
+                           align,wrap,type, Style, Id,lLabel ) CLASS HControl 
 ::name        := name
 ::rows        := rows
 ::cols        := cols
@@ -382,7 +388,7 @@ method setControl( name,rows,cols,size,maxchars,value,onfocus,;
 ::type        := type
 ::Style       := Style
 ::Id          := Id
-
+::lLabel      := lLabel
 RETURN Self
 
   
@@ -600,7 +606,7 @@ IF ::onReset != NIL
     FWrite( ::nH, ::cOutput )
 ENDIF
 
-//::cOutPut := ">"+CRLF()
+::cOutPut := ">"+CRLF()
 
 FWrite( ::nH, ::cOutput )
 
diff --git a/harbour/contrib/htmllib/ohtm.prg b/harbour/contrib/htmllib/ohtm.prg
index 010c640dd5..31c8f789c5 100644
--- a/harbour/contrib/htmllib/ohtm.prg
+++ b/harbour/contrib/htmllib/ohtm.prg
@@ -457,7 +457,7 @@ DEFAULT cTitle        := "CGI HTML page"
 DEFAULT cLinkTitle    := cTitle
 DEFAULT cRefreshURL:= ""
 DEFAULT cCharset   := "windows-1253"
-
+default lNocache := .f.
 ::nH     := STD_OUT       //FCreate( cFile )
 ::Title  := cTitle
 ::FName  := "CGIOUT.HTM"