firebird-checkins Mailing List for Firebird (Page 2809)

A powerful, cross platform, SQL database system

Brought to you by: alexpeshkoff, asfernandes, awharrison, cincura_net, and 5 others

firebird-checkins — CVS checkins

You can subscribe to this list here.

2000	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (24)	Oct (37)	Nov (42)	Dec (29)
2001	Jan (24)	Feb (24)	Mar (15)	Apr (55)	May (99)	Jun (70)	Jul (197)	Aug (329)	Sep (81)	Oct (141)	Nov (100)	Dec (157)
2002	Jan (96)	Feb (216)	Mar (78)	Apr (103)	May (29)	Jun (193)	Jul (130)	Aug (215)	Sep (262)	Oct (655)	Nov (1009)	Dec (655)
2003	Jan (413)	Feb (939)	Mar (527)	Apr (538)	May (439)	Jun (295)	Jul (681)	Aug (810)	Sep (835)	Oct (730)	Nov (988)	Dec (787)
2004	Jan (559)	Feb (480)	Mar (749)	Apr (565)	May (748)	Jun (529)	Jul (454)	Aug (714)	Sep (628)	Oct (857)	Nov (1153)	Dec (617)
2005	Jan (603)	Feb (444)	Mar (377)	Apr (579)	May (664)	Jun (407)	Jul (363)	Aug (326)	Sep (527)	Oct (522)	Nov (387)	Dec (540)
2006	Jan (355)	Feb (242)	Mar (563)	Apr (768)	May (482)	Jun (427)	Jul (440)	Aug (314)	Sep (299)	Oct (403)	Nov (333)	Dec (389)
2007	Jan (247)	Feb (335)	Mar (391)	Apr (562)	May (345)	Jun (202)	Jul (239)	Aug (288)	Sep (510)	Oct (320)	Nov (487)	Dec (387)
2008	Jan (575)	Feb (539)	Mar (762)	Apr (648)	May (625)	Jun (522)	Jul (382)	Aug (191)	Sep (426)	Oct (231)	Nov (305)	Dec (670)
2009	Jan (582)	Feb (595)	Mar (294)	Apr (461)	May (445)	Jun (597)	Jul (408)	Aug (542)	Sep (476)	Oct (437)	Nov (587)	Dec (722)
2010	Jan (456)	Feb (319)	Mar (437)	Apr (303)	May (276)	Jun (233)	Jul (155)	Aug (208)	Sep (136)	Oct (274)	Nov (241)	Dec (106)
2011	Jan (160)	Feb (244)	Mar (138)	Apr (235)	May (208)	Jun (196)	Jul (107)	Aug (77)	Sep (109)	Oct (165)	Nov (86)	Dec (211)
2012	Jan (188)	Feb (136)	Mar (273)	Apr (185)	May (149)	Jun (146)	Jul (73)	Aug (127)	Sep (103)	Oct (87)	Nov (159)	Dec (149)
2013	Jan (74)	Feb (112)	Mar (176)	Apr (139)	May (116)	Jun (160)	Jul (161)	Aug (124)	Sep (124)	Oct (82)	Nov (137)	Dec (128)
2014	Jan (116)	Feb (121)	Mar (134)	Apr (177)	May (146)	Jun (158)	Jul (154)	Aug (79)	Sep (60)	Oct (90)	Nov (184)	Dec (201)
2015	Jan (163)	Feb (263)	Mar (406)	Apr (291)	May (213)	Jun (229)	Jul (229)	Aug (111)	Sep (120)	Oct (234)	Nov (155)	Dec (153)
2016	Jan (147)	Feb (188)	Mar (363)	Apr (304)	May (199)	Jun (218)	Jul (136)	Aug (128)	Sep (120)	Oct (123)	Nov (102)	Dec (156)
2017	Jan (123)	Feb (114)	Mar (132)	Apr (44)	May (143)	Jun (83)	Jul (98)	Aug (59)	Sep (58)	Oct (12)	Nov (14)	Dec (16)
2018	Jan (18)	Feb (24)	Mar (41)	Apr (16)	May (19)	Jun (31)	Jul (3)	Aug (33)	Sep (11)	Oct (11)	Nov	Dec
2019	Jan (21)	Feb (66)	Mar (72)	Apr (69)	May (63)	Jun (49)	Jul (55)	Aug (38)	Sep (66)	Oct (51)	Nov (66)	Dec (97)
2020	Jan (98)	Feb (95)	Mar (83)	Apr (121)	May (91)	Jun (137)	Jul (94)	Aug (91)	Sep (60)	Oct (81)	Nov (82)	Dec (64)
2021	Jan (66)	Feb (50)	Mar (52)	Apr (110)	May (160)	Jun (94)	Jul (97)	Aug (99)	Sep (160)	Oct (118)	Nov (117)	Dec (119)
2022	Jan (90)	Feb (93)	Mar (75)	Apr (70)	May (61)	Jun (153)	Jul (82)	Aug (118)	Sep (127)	Oct (121)	Nov (78)	Dec (84)
2023	Jan (80)	Feb (75)	Mar (92)	Apr (103)	May (89)	Jun (89)	Jul (106)	Aug (87)	Sep (183)	Oct (128)	Nov (173)	Dec (116)
2024	Jan (144)	Feb (120)	Mar (113)	Apr (107)	May (84)	Jun (95)	Jul (100)	Aug (135)	Sep (119)	Oct (93)	Nov (91)	Dec (93)
2025	Jan (104)	Feb (165)	Mar (120)	Apr (124)	May (90)	Jun (141)	Jul (239)	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 2807 2808 2809 2810 2811 .. 2820 > >> (Page 2809 of 2820)

[Firebird-checkins] CVS: interbase/builds_win32/original ib_udf.bind,1.1.1.1,1.2

From: Claudio V. C. <ro...@us...> - 2001-05-21 07:07:58

Update of /cvsroot/firebird/interbase/builds_win32/original
In directory usw-pr-cvs1:/tmp/cvs-serv28721

Modified Files:
	ib_udf.bind 
Log Message:
Add substrlen(str, start, length)

Index: ib_udf.bind
===================================================================
RCS file: /cvsroot/firebird/interbase/builds_win32/original/ib_udf.bind,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U3 -r1.1.1.1 -r1.2
--- ib_udf.bind	2000/08/03 20:42:52	1.1.1.1
+++ ib_udf.bind	2001/05/21 07:07:55	1.2
@@ -51,6 +51,7 @@
 	IB_UDF_sinh		@30
 	IB_UDF_sqrt		@31
 	IB_UDF_substr		@32
-	IB_UDF_strlen		@33
-	IB_UDF_tan		@34
-	IB_UDF_tanh		@35
+	IB_UDF_substrlen	@33
+	IB_UDF_strlen		@34
+	IB_UDF_tan		@35
+	IB_UDF_tanh		@36

[Firebird-checkins] CVS: interbase ChangeLog,1.28,1.29

From: Frank Schlottmann-G. <fs...@us...> - 2001-05-21 05:35:30

Update of /cvsroot/firebird/interbase
In directory usw-pr-cvs1:/tmp/cvs-serv15513/interbase

Modified Files:
	ChangeLog 
Log Message:
Updated ChangeLog


Index: ChangeLog
===================================================================
RCS file: /cvsroot/firebird/interbase/ChangeLog,v
retrieving revision 1.28
retrieving revision 1.29
diff -U3 -r1.28 -r1.29
--- ChangeLog	2001/05/20 12:16:43	1.28
+++ ChangeLog	2001/05/21 05:35:28	1.29
@@ -863,7 +863,7 @@
 	jrd/license.h, pyxis/debug.c, pyxis/edit.e, pyxis/fred.e:
 	
 	Changed all $Log$
-	Changed all Revision 1.28  2001/05/20 12:16:43  fsg
+	Changed all Revision 1.29  2001/05/21 05:35:28  fsg
 	Changed all Updated ChangeLog
 	Changed all tags to $Id$ BTW this will hopefully set
 	this_build to 2 :-)

[Firebird-checkins] CVS: interbase/isql isql.e,1.8,1.9

From: Neil M. <nm...@us...> - 2001-05-21 00:20:35

Update of /cvsroot/firebird/interbase/isql
In directory usw-pr-cvs1:/tmp/cvs-serv3062/isql

Modified Files:
	isql.e 
Log Message:
Add new option PLANONLY - if on and plan on isql will display query plan
but not execute query. 
Requires changes to messages file if it is to be displayed in help output. 


Index: isql.e
===================================================================
RCS file: /cvsroot/firebird/interbase/isql/isql.e,v
retrieving revision 1.8
retrieving revision 1.9
diff -U3 -r1.8 -r1.9
--- isql.e	2001/01/28 10:38:09	1.8
+++ isql.e	2001/05/21 00:20:31	1.9
@@ -28,6 +28,7 @@
   Apparently this has to be done in show.e also,
   but that is for another day :-)
 
+  2001/05/20  Neil McCalden  add planonly option
 */
 
 #include "../jrd/ib_stdio.h"
@@ -197,6 +198,7 @@
 static SSHORT	List = FALSE;	
 static SSHORT 	Docount = FALSE;
 static SSHORT	Plan = FALSE;
+static SSHORT	Planonly = FALSE;
 static int	Termlen = 0;
 static SCHAR	ISQL_charset[MAXCHARSET_LENGTH] = {0};
 static IB_FILE	*Diag;
@@ -1855,6 +1857,7 @@
 List 		= FALSE;
 Docount 	= FALSE;
 Plan 		= FALSE;
+Planonly 	= FALSE;
 Doblob		= 1;
 Time_display	= FALSE;
 Sqlda_display	= FALSE;
@@ -1932,6 +1935,7 @@
 Autofetch	= TRUE;
 Docount 	= FALSE;
 Plan 		= FALSE;
+Planonly 	= FALSE;
 Doblob		= 1;
 Time_display	= FALSE;
 Sqlda_display	= FALSE;
@@ -4173,6 +4177,13 @@
 	ret = do_set_command (parms[2], &List);
     else if (!strcmp (parms [1], "PLAN"))
 	ret = do_set_command (parms[2], &Plan);
+    else if (!strcmp (parms [1], "PLANONLY")) 
+	{
+		ret = do_set_command (parms[2], &Planonly);
+		if ( Planonly && (! Plan) ) 
+			/* turn on plan */
+			ret = do_set_command ("ON", &Plan);		
+	}
     else if ((!strcmp (parms [1], "BLOBDISPLAY")) ||
 	    (!strcmp (parms [1], "BLOB")))
 	{
@@ -5469,6 +5480,9 @@
 ISQL_printf (Out, "Access Plan:             ");
 ISQL_printf (Out, (Plan ? "ON" : "OFF"));
 ISQL_printf (Out, NEWLINE);
+ISQL_printf (Out, "Access Plan only:        ");
+ISQL_printf (Out, (Planonly ? "ON" : "OFF"));
+ISQL_printf (Out, NEWLINE);
 ISQL_printf (Out, "Display BLOB type:       ");
 if (Doblob == ALL_BLOBS)
     ISQL_printf (Out, "ALL");
@@ -7456,6 +7470,9 @@
 	ISQL_printf (Diag, Print_buffer);
 	}
     ISQL_FREE (plan_buffer);
+	
+	if (Planonly) return ret;	/* do not execute */
+	
     }
 	
 /* If the statement isn't a select, execute it and be done */

[Firebird-checkins] CVS: interbase/dsql pass1.c,1.3,1.4 parse.y,1.2,1.3 parse.c,1.2,1.3

From: Neil M. <nm...@us...> - 2001-05-20 18:09:57

Update of /cvsroot/firebird/interbase/dsql
In directory usw-pr-cvs1:/tmp/cvs-serv10905/dsql

Modified Files:
	pass1.c parse.y parse.c 
Log Message:
Allow a udf to be used in a 'group by' clause.


Index: pass1.c
===================================================================
RCS file: /cvsroot/firebird/interbase/dsql/pass1.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -U3 -r1.3 -r1.4
--- pass1.c	2001/04/05 17:05:43	1.3
+++ pass1.c	2001/05/20 18:09:54	1.4
@@ -1818,6 +1818,9 @@
 	    field == (FLD) reference->nod_arg[e_fld_field] &&
 	    context == (CTX) reference->nod_arg[e_fld_context])
 	    return FALSE;
+	else
+		if (reference->nod_type == nod_udf ) 
+			return FALSE;
 	}
     return TRUE; 
     }

Index: parse.y
===================================================================
RCS file: /cvsroot/firebird/interbase/dsql/parse.y,v
retrieving revision 1.2
retrieving revision 1.3
diff -U3 -r1.2 -r1.3
--- parse.y	2001/01/18 00:47:28	1.2
+++ parse.y	2001/05/20 18:09:54	1.3
@@ -2481,8 +2481,10 @@
 		;
 
 grp_column_elem : column_name
+		| udf
 		| column_name COLLATE symbol_collation_name
 			{ $$ = make_node (nod_collate, e_coll_count, (NOD) $3, $1); }
+		
 		;
 
 having_clause	: HAVING search_condition

Index: parse.c
===================================================================
RCS file: /cvsroot/firebird/interbase/dsql/parse.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -U3 -r1.2 -r1.3
--- parse.c	2001/01/18 00:47:28	1.2
+++ parse.c	2001/05/20 18:09:54	1.3
@@ -1,3 +1,13 @@
+#ifndef lint
+static char yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93";
+#endif
+#define YYBYACC 1
+#define YYMAJOR 1
+#define YYMINOR 9
+#define yyclearin (DSQL_yychar=(-1))
+#define yyerrok (DSQL_yyerrflag=0)
+#define YYRECOVERING (DSQL_yyerrflag!=0)
+#define YYPREFIX "yy"
 /* 
[...9528 lines suppressed...]
+#if YYDEBUG
+    if (yydebug)
+        printf("%sdebug: after reduction, shifting from state %d \
+to state %d\n", YYPREFIX, *yyssp, yystate);
+#endif
+    if (yyssp >= yyss + yystacksize - 1)
+    {
+        goto yyoverflow;
+    }
+    *++yyssp = yystate;
+    *++yyvsp = yyval;
+    goto yyloop;
+yyoverflow:
+    yyerror("yacc stack overflow");
+yyabort:
+    return (1);
+yyaccept:
+    return (0);
 }
-

[Firebird-checkins] CVS: interbase ChangeLog,1.27,1.28

From: Frank Schlottmann-G. <fs...@us...> - 2001-05-20 12:16:46

Update of /cvsroot/firebird/interbase
In directory usw-pr-cvs1:/tmp/cvs-serv23327/interbase

Modified Files:
	ChangeLog 
Log Message:
Updated ChangeLog


Index: ChangeLog
===================================================================
RCS file: /cvsroot/firebird/interbase/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -U3 -r1.27 -r1.28
--- ChangeLog	2001/05/12 06:12:50	1.27
+++ ChangeLog	2001/05/20 12:16:43	1.28
@@ -1,3 +1,25 @@
+2001-05-19 10:26  robocop
+
+	* interbase/isql/show.e:
+	
+	To be in sync with extract.e regarding BLOB params in UDFs
+
+2001-05-19 08:35  robocop
+
+	* interbase/jrd/: dyn_def.e, dyn_mod.e:
+	
+	no message
+
+2001-05-13 15:37  fsg
+
+	* interbase/jrd/: jrd.c, jrd.h, pwd.c, pwd.h, pwd_proto.h, scl.e,
+	scl_proto.h, shrinit.c, tra.c:
+	
+	Finally removed my "revolving backdoor" hack and replaced it with
+	Borland's (Stanialav Tsikin's?) solution to the problem.
+	
+	fsg
+
 2001-05-12 03:31  rfm
 
 	* interbase/: builds_win32/original/make.alice,
@@ -841,7 +863,7 @@
 	jrd/license.h, pyxis/debug.c, pyxis/edit.e, pyxis/fred.e:
 	
 	Changed all $Log$
-	Changed all Revision 1.27  2001/05/12 06:12:50  fsg
+	Changed all Revision 1.28  2001/05/20 12:16:43  fsg
 	Changed all Updated ChangeLog
 	Changed all tags to $Id$ BTW this will hopefully set
 	this_build to 2 :-)

[Firebird-checkins] CVS: interbase/isql show.e,1.4,1.5

From: Claudio V. C. <ro...@us...> - 2001-05-19 08:26:24

Update of /cvsroot/firebird/interbase/isql
In directory usw-pr-cvs1:/tmp/cvs-serv3376

Modified Files:
	show.e 
Log Message:
To be in sync with extract.e regarding BLOB params in UDFs

Index: show.e
===================================================================
RCS file: /cvsroot/firebird/interbase/isql/show.e,v
retrieving revision 1.4
retrieving revision 1.5
diff -U3 -r1.4 -r1.5
--- show.e	2001/01/08 16:07:18	1.4
+++ show.e	2001/05/19 08:26:22	1.5
@@ -23,6 +23,9 @@
  * Revision 1.2  2000/11/19 07:02:49  fsg
  * Change in show.e to use CHARACTER_LENGTH instead of FIELD_LENGTH in
  * SHOW PROCEDURE
+ * 19-May-2001 Claudio Valderrama.
+ * Change to be in sync with extract.e: BLOB is not returned
+ * by value but by descriptor.
  *
  */
 
@@ -2671,16 +2674,16 @@
 	    ISQL_printf (Out, Print_buffer);
 	    sprintf (Print_buffer, "Entry point is %s%s", 
 		     FUN.RDB$ENTRYPOINT,
-		     NEWLINE);
-	    ISQL_printf (Out, Print_buffer);
-	    }
+			  NEWLINE);
+		 ISQL_printf (Out, Print_buffer);
+		 }
 	first = FALSE;
 	if (FUN.RDB$RETURN_ARGUMENT == FNA.RDB$ARGUMENT_POSITION)
-	    {
-	    sprintf (Print_buffer, "Returns %s %s ", 
-                 ((SSHORT) abs(FNA.RDB$MECHANISM) == FUN_reference ? 
-                      "BY REFERENCE " : "BY VALUE "), 
-                 (FNA.RDB$MECHANISM < 0 ? "FREE_IT " : ""));
+		 {
+		 sprintf (Print_buffer, "Returns %s %s ",
+			  ((SSHORT) abs(FNA.RDB$MECHANISM) == FUN_reference ? "BY REFERENCE "
+					: (FNA.RDB$FIELD_TYPE == BLOB ? "BY DESCRIPTOR " : "BY VALUE ")),
+					(FNA.RDB$MECHANISM < 0 ? "FREE_IT " : ""));
 	    ISQL_printf (Out, Print_buffer);
 	    }
 	else

[Firebird-checkins] CVS: interbase/jrd dyn_def.e,1.1.1.1,1.2 dyn_mod.e,1.2,1.3

From: Claudio V. C. <ro...@us...> - 2001-05-19 06:35:42

Update of /cvsroot/firebird/interbase/jrd
In directory usw-pr-cvs1:/tmp/cvs-serv23596

Modified Files:
	dyn_def.e dyn_mod.e 
Log Message:
no message

Index: dyn_def.e
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/dyn_def.e,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U3 -r1.1.1.1 -r1.2
--- dyn_def.e	2000/08/03 20:49:59	1.1.1.1
+++ dyn_def.e	2001/05/19 06:35:39	1.2
@@ -19,6 +19,9 @@
  *
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
+ *    19-May-2001 Claudio Valderrama  - Fix oversight for ODS10, storing
+ *                                  char length in UDF param is possible.
+ *                                      
  */
 
 #include <stdio.h>
@@ -1011,10 +1014,14 @@
 VOLATILE BLK	  request = NULL;
 JMP_BUF		  env;
 JMP_BUF* VOLATILE old_env;
+USHORT            major_version, minor_original;
 
 tdbb = GET_THREAD_DATA;
 dbb = tdbb->tdbb_database;
 
+major_version  = (SSHORT) dbb->dbb_ods_version;
+minor_original = (SSHORT) dbb->dbb_minor_original;
+
 old_env = (JMP_BUF*) tdbb->tdbb_setjmp;
 tdbb->tdbb_setjmp = (UCHAR*) env;
 if (SETJMP (env))
@@ -1093,9 +1100,16 @@
 		break;
 
 	    /* Ignore the field character length as the system UDF parameter
-	       table has no place to store the information */
+	       table has no place to store the information
+               But IB6/FB has the place for this information. CVC 2001. */
 	    case gds__dyn_fld_char_length:
-		(void) DYN_get_number (ptr);
+                if (ENCODE_ODS(major_version, minor_original) < ODS_10_0)
+		    (void) DYN_get_number (ptr);
+		else
+		    {
+ 			X.RDB$CHARACTER_LENGTH = DYN_get_number (ptr);
+ 			X.RDB$CHARACTER_LENGTH.NULL = FALSE;
+		    }
 		break;
 
 	    default:

Index: dyn_mod.e
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/dyn_mod.e,v
retrieving revision 1.2
retrieving revision 1.3
diff -U3 -r1.2 -r1.3
--- dyn_mod.e	2001/04/13 15:33:31	1.2
+++ dyn_mod.e	2001/05/19 06:35:40	1.3
@@ -2041,7 +2041,7 @@
  ***********************************************************
  *
  *  Functional Description:
- *	Checks to see if the given field already exists in a relation
+ *	Checks to see if the given domain already exists
  ***********************************************************/
 BLK	request = NULL;
 BOOLEAN	retval = FALSE;

[Firebird-checkins] CVS: manual - Imported sources

From: David J. <d_j...@us...> - 2001-05-14 17:44:56

Update of /cvsroot/firebird/manual
In directory usw-pr-cvs1:/tmp/cvs-serv14935

Log Message:
initial import of docbook based manual authoring system, with mssql migration guide

Status:

Vendor Tag:	d_jencks
Release Tags:	start
		
N manual/lib/ant.jar
N manual/lib/bsf.jar
N manual/lib/fop.jar
N manual/lib/jaxp.jar
N manual/lib/optional.jar
N manual/lib/parser.jar
N manual/lib/w3c.jar
N manual/lib/xalan.jar
N manual/lib/xerces.jar
N manual/src/build/build.bat
N manual/src/build/build.sh
N manual/src/build/build.xml
N manual/src/docs/firebirddocs.xml
N manual/src/docs/firebirddocs.xsl
N manual/src/docs/firebirddocs.css
N manual/src/docs/docbook/ChangeLog
N manual/src/docs/docbook/BUGS
N manual/src/docs/docbook/LICENCE.txt
N manual/src/docs/docbook/README
N manual/src/docs/docbook/TODO
N manual/src/docs/docbook/VERSION
N manual/src/docs/docbook/WhatsNew
N manual/src/docs/docbook/common/ChangeLog
N manual/src/docs/docbook/common/LostLog
N manual/src/docs/docbook/common/ca.xml
N manual/src/docs/docbook/common/common.xsl
N manual/src/docs/docbook/common/cs.xml
N manual/src/docs/docbook/common/da.xml
N manual/src/docs/docbook/common/de.xml
N manual/src/docs/docbook/common/el.xml
N manual/src/docs/docbook/common/en.xml
N manual/src/docs/docbook/common/es.xml
N manual/src/docs/docbook/common/et.xml
N manual/src/docs/docbook/common/fi.xml
N manual/src/docs/docbook/common/fr.xml
N manual/src/docs/docbook/common/hu.xml
N manual/src/docs/docbook/common/id.xml
N manual/src/docs/docbook/common/it.xml
N manual/src/docs/docbook/common/ja.xml
N manual/src/docs/docbook/common/ko.xml
N manual/src/docs/docbook/common/l10n.dtd
N manual/src/docs/docbook/common/l10n.xml
N manual/src/docs/docbook/common/l10n.xsl
N manual/src/docs/docbook/common/nl.xml
N manual/src/docs/docbook/common/no.xml
N manual/src/docs/docbook/common/pl.xml
N manual/src/docs/docbook/common/pt.xml
N manual/src/docs/docbook/common/pt_br.xml
N manual/src/docs/docbook/common/ro.xml
N manual/src/docs/docbook/common/ru.xml
N manual/src/docs/docbook/common/sk.xml
N manual/src/docs/docbook/common/sl.xml
N manual/src/docs/docbook/common/sv.xml
N manual/src/docs/docbook/common/zh_cn.xml
N manual/src/docs/docbook/common/zh_tw.xml
N manual/src/docs/docbook/fo/ChangeLog
N manual/src/docs/docbook/fo/LostLog
N manual/src/docs/docbook/fo/admon.xsl
N manual/src/docs/docbook/fo/autotoc.xsl
N manual/src/docs/docbook/fo/biblio.xsl
N manual/src/docs/docbook/fo/block.xsl
N manual/src/docs/docbook/fo/callout.xsl
N manual/src/docs/docbook/fo/component.xsl
N manual/src/docs/docbook/fo/division.xsl
N manual/src/docs/docbook/fo/docbook.xsl
N manual/src/docs/docbook/fo/fo.xsl
N manual/src/docs/docbook/fo/footnote.xsl
N manual/src/docs/docbook/fo/formal.xsl
N manual/src/docs/docbook/fo/glossary.xsl
N manual/src/docs/docbook/fo/graphics.xsl
N manual/src/docs/docbook/fo/index.xsl
N manual/src/docs/docbook/fo/info.xsl
N manual/src/docs/docbook/fo/inline.xsl
N manual/src/docs/docbook/fo/keywords.xsl
N manual/src/docs/docbook/fo/lists.xsl
N manual/src/docs/docbook/fo/math.xsl
N manual/src/docs/docbook/fo/pagesetup.xsl
N manual/src/docs/docbook/fo/param.xsl
N manual/src/docs/docbook/fo/pi.xsl
N manual/src/docs/docbook/fo/qandaset.xsl
N manual/src/docs/docbook/fo/refentry.xsl
N manual/src/docs/docbook/fo/sections.xsl
N manual/src/docs/docbook/fo/synop.xsl
N manual/src/docs/docbook/fo/table.xsl
N manual/src/docs/docbook/fo/titlepage.templates.xml
N manual/src/docs/docbook/fo/titlepage.templates.xsl
N manual/src/docs/docbook/fo/titlepage.xsl
N manual/src/docs/docbook/fo/toc.xsl
N manual/src/docs/docbook/fo/verbatim.xsl
N manual/src/docs/docbook/fo/xref.xsl
N manual/src/docs/docbook/fo/xtdocbook.xsl
N manual/src/docs/docbook/fo/xtindex.xsl
N manual/src/docs/docbook/html/ChangeLog
N manual/src/docs/docbook/html/LostLog
N manual/src/docs/docbook/html/admon.xsl
N manual/src/docs/docbook/html/autotoc.xsl
N manual/src/docs/docbook/html/biblio.xsl
N manual/src/docs/docbook/html/block.xsl
N manual/src/docs/docbook/html/callout.xsl
N manual/src/docs/docbook/html/changebars.xsl
N manual/src/docs/docbook/html/chunk-common.xsl
N manual/src/docs/docbook/html/chunk.xsl
N manual/src/docs/docbook/html/component.xsl
N manual/src/docs/docbook/html/division.xsl
N manual/src/docs/docbook/html/docbook.xsl
N manual/src/docs/docbook/html/ebnf.xsl
N manual/src/docs/docbook/html/footnote.xsl
N manual/src/docs/docbook/html/formal.xsl
N manual/src/docs/docbook/html/glossary.xsl
N manual/src/docs/docbook/html/graphics.xsl
N manual/src/docs/docbook/html/html.xsl
N manual/src/docs/docbook/html/index.xsl
N manual/src/docs/docbook/html/info.xsl
N manual/src/docs/docbook/html/inline.xsl
N manual/src/docs/docbook/html/keywords.xsl
N manual/src/docs/docbook/html/lists.xsl
N manual/src/docs/docbook/html/math.xsl
N manual/src/docs/docbook/html/param.xsl
N manual/src/docs/docbook/html/pi.xsl
N manual/src/docs/docbook/html/qandaset.xsl
N manual/src/docs/docbook/html/refentry.xsl
N manual/src/docs/docbook/html/sections.xsl
N manual/src/docs/docbook/html/synop.xsl
N manual/src/docs/docbook/html/table.xsl
N manual/src/docs/docbook/html/titlepage.templates.xml
N manual/src/docs/docbook/html/titlepage.templates.xsl
N manual/src/docs/docbook/html/titlepage.xsl
N manual/src/docs/docbook/html/toc.xsl
N manual/src/docs/docbook/html/verbatim.xsl
N manual/src/docs/docbook/html/xref.xsl
N manual/src/docs/docbook/html/xtchunk.xsl
N manual/src/docs/docbook/html/xtdocbook.xsl
N manual/src/docs/docbook/html/xtindex.xsl
N manual/src/docs/docbook/lib/ChangeLog
N manual/src/docs/docbook/lib/LostLog
N manual/src/docs/docbook/lib/lib.xsl
N manual/src/docs/firebirddocs/firebirdintro.xml
N manual/src/docs/firebirddocs/migrationmssql.xml
N manual/src/docs/firebirddocs/preface.xml
N manual/src/docs/docbookx/40chg.txt
N manual/src/docs/docbookx/41chg.txt
N manual/src/docs/docbookx/ChangeLog
N manual/src/docs/docbookx/calstblx.dtd
N manual/src/docs/docbookx/dbcentx.mod
N manual/src/docs/docbookx/dbgenent.mod
N manual/src/docs/docbookx/dbhierx.mod
N manual/src/docs/docbookx/dbnotnx.mod
N manual/src/docs/docbookx/dbpoolx.mod
N manual/src/docs/docbookx/docbook.cat
N manual/src/docs/docbookx/docbookx.dtd
N manual/src/docs/docbookx/readme.txt
N manual/src/docs/docbookx/soextblx.dtd
N manual/src/docs/docbookx/ent/iso-amsa.ent
N manual/src/docs/docbookx/ent/iso-amsb.ent
N manual/src/docs/docbookx/ent/iso-amsc.ent
N manual/src/docs/docbookx/ent/iso-amsn.ent
N manual/src/docs/docbookx/ent/iso-amso.ent
N manual/src/docs/docbookx/ent/iso-amsr.ent
N manual/src/docs/docbookx/ent/iso-box.ent
N manual/src/docs/docbookx/ent/iso-cyr1.ent
N manual/src/docs/docbookx/ent/iso-cyr2.ent
N manual/src/docs/docbookx/ent/iso-dia.ent
N manual/src/docs/docbookx/ent/iso-grk1.ent
N manual/src/docs/docbookx/ent/iso-grk2.ent
N manual/src/docs/docbookx/ent/iso-grk3.ent
N manual/src/docs/docbookx/ent/iso-grk4.ent
N manual/src/docs/docbookx/ent/iso-lat1.ent
N manual/src/docs/docbookx/ent/iso-lat2.ent
N manual/src/docs/docbookx/ent/iso-num.ent
N manual/src/docs/docbookx/ent/iso-pub.ent
N manual/src/docs/docbookx/ent/iso-tech.ent
N manual/src/docs/images/next.gif
N manual/src/docs/images/titlegill.gif
N manual/src/docs/images/prev.gif
N manual/src/docs/images/toc.gif
N manual/src/docs/images/firebird_header2.png
N manual/src/docs/images/top.gif
N manual/src/docs/images/callouts/1.png
N manual/src/docs/images/callouts/10.png
N manual/src/docs/images/callouts/2.png
N manual/src/docs/images/callouts/3.png
N manual/src/docs/images/callouts/4.png
N manual/src/docs/images/callouts/5.png
N manual/src/docs/images/callouts/6.png
N manual/src/docs/images/callouts/7.png
N manual/src/docs/images/callouts/8.png
N manual/src/docs/images/callouts/9.png

No conflicts created by this import


***** Bogus filespec: -
***** Bogus filespec: Imported
***** Bogus filespec: sources

[Firebird-checkins] CVS: interbase/jrd jrd.c,1.4,1.5 jrd.h,1.1.1.1,1.2 pwd.c,1.6,1.7 pwd.h,1.5,1.6 pwd_proto.h,1.2,1.3 scl.e,1.2,1.3 scl_proto.h,1.1.1.1,1.2 shrinit.c,1.1.1.1,1.2 tra.c,1.1.1.1,1.2

From: Frank Schlottmann-G. <fs...@us...> - 2001-05-13 13:37:35

Update of /cvsroot/firebird/interbase/jrd
In directory usw-pr-cvs1:/tmp/cvs-serv27275/interbase/jrd

Modified Files:
	jrd.c jrd.h pwd.c pwd.h pwd_proto.h scl.e scl_proto.h 
	shrinit.c tra.c 
Log Message:
Finally removed my "revolving backdoor" hack 
and replaced it with Borland's (Stanialav Tsikin's?)
solution to the problem.

fsg
 

Index: jrd.c
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/jrd.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -U3 -r1.4 -r1.5
--- jrd.c	2001/05/07 07:23:23	1.4
+++ jrd.c	2001/05/13 13:37:33	1.5
@@ -478,6 +478,8 @@
 UCHAR		*p1, *p2;
 SSHORT		cnt, len;
 BOOLEAN		delimited_done = FALSE;
+BOOLEAN		internal;
+IHNDL		ihandle;
 
 API_ENTRY_POINT_INIT;
 
@@ -861,9 +863,19 @@
 
 options.dpb_sql_dialect = 0;
 
+/* Don't run internal handles thru the security gauntlet. */
+
+internal = FALSE;
+for (ihandle = internal_db_handles; ihandle; ihandle = ihandle->ihndl_next)
+    if (ihandle->ihndl_object == (isc_db_handle *) handle)
+	{
+	internal = TRUE;
+	break;
+	}
+
 SCL_init (FALSE, options.dpb_sys_user_name, options.dpb_user_name,
           options.dpb_password, options.dpb_password_enc,
-          options.dpb_role_name, tdbb);
+          options.dpb_role_name, tdbb, internal);
 #ifdef V4_THREADING
 initing_security = FALSE;
 V4_JRD_MUTEX_LOCK (dbb->dbb_mutexes + DBB_MUTX_init_fini);
@@ -1541,6 +1553,8 @@
 JMP_BUF		env1;
 #endif
 struct tdbb	thd_context, *tdbb = NULL;
+BOOLEAN		internal;
+IHNDL		ihandle;
 
 API_ENTRY_POINT_INIT;
 
@@ -1726,9 +1740,20 @@
 V4_JRD_MUTEX_UNLOCK (dbb->dbb_mutexes + DBB_MUTX_init_fini);
 initing_security = TRUE;
 #endif
+
+/* Don't run internal handles thru the security gauntlet. */
+
+internal = FALSE;
+for (ihandle = internal_db_handles; ihandle; ihandle = ihandle->ihndl_next)
+    if (ihandle->ihndl_object == (isc_db_handle *) handle)
+	{
+	internal = TRUE;
+	break;
+	}
+
 SCL_init (TRUE, options.dpb_sys_user_name, options.dpb_user_name,
           options.dpb_password, options.dpb_password_enc,
-          options.dpb_role_name, tdbb);
+          options.dpb_role_name, tdbb, internal);
 #ifdef V4_THREADING
 initing_security = FALSE;
 V4_JRD_MUTEX_LOCK (dbb->dbb_mutexes + DBB_MUTX_init_fini);

Index: jrd.h
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/jrd.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U3 -r1.1.1.1 -r1.2
--- jrd.h	2000/08/03 20:50:53	1.1.1.1
+++ jrd.h	2001/05/13 13:37:33	1.2
@@ -696,6 +696,13 @@
 #define TDBB_no_cache_unwind	2	/* Don't unwind page buffer cache */
 #define TDBB_prc_being_dropped	4       /* Dropping a procedure  */	
 
+/* List of internal database handles */
+
+typedef struct ihndl {
+    struct ihndl *ihndl_next;
+    void         *ihndl_object;
+} *IHNDL;
+
 /* Threading macros */
 
 #ifdef GET_THREAD_DATA
@@ -794,11 +801,14 @@
 #ifndef SHLIB_DEFS
 #ifdef JRD_MAIN
 int             debug;
+IHNDL		internal_db_handles = 0;
 #else
 extern int      debug;
+extern IHNDL	internal_db_handles;
 #endif
 #else
 extern int      debug;
+extern IHNDL	internal_db_handles;
 #endif
 #endif /* REQUESTER */
 

Index: pwd.c
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/pwd.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -U3 -r1.6 -r1.7
--- pwd.c	2000/12/23 10:59:47	1.6
+++ pwd.c	2001/05/13 13:37:33	1.7
@@ -102,9 +102,8 @@
 			   isc_tpb_wait };
 
 static BOOLEAN  lookup_user (TEXT *, int *, int *, TEXT *);
-static BOOLEAN  open_user_db (SLONG **, SLONG *);
+static BOOLEAN  open_user_db (isc_db_handle *, SLONG *);
 
-
 /* kludge to make sure pwd sits below why.c on the PC (Win16) platform */
 
 #ifdef  WINDOWS_ONLY
@@ -119,50 +118,7 @@
 #define isc_start_transaction           jrd8_start_transaction
 
 #endif
-
-
-static char ls_user[12]="Firebird   ";
-static char ls_pw[8]="Phoenix";
-
-
-void mk_pwd(TEXT *pw)
-{
-    unsigned char  i=0;
-    unsigned char  j=0;
-
-/* I hope that this will work on all platforms
-   FSG 22.Dez.2000
-*/
-    srand( (unsigned)time (NULL));
-    for (i=0; i < strlen(pw); i++)
-    {
-       j=1+(int) (255.0*rand()/(RAND_MAX+1.0));
-       pw[i]=j;
-    }
-}
-
-char *PWD_ls_user()
-{
- if (strcmp(ls_user,"Firebird   ")==0)
- {
-   mk_pwd(ls_user);
- }
- return ls_user;
-}
-
-
-char *PWD_ls_pw()
-
-{
- if (strcmp(ls_pw,"Phoenix")==0)
-  {
-     mk_pwd(ls_pw);
-  }
-  return ls_pw;
-}
-       
-
-
+
 void PWD_get_user_dbpath (
     TEXT        *path_buffer)
 {
@@ -262,7 +218,7 @@
  *
  **************************************/
 BOOLEAN         notfound;               /* user found flag */
-SLONG           *uinfo;                 /* database handle */
+isc_db_handle   uinfo;                  /* database handle */
 SLONG           *lookup_trans;          /* default transaction handle */
 STATUS          status [20];            /* status vector */
 SLONG           *lookup_req;            /* request handle */
@@ -347,7 +303,7 @@
 }
 
 static BOOLEAN open_user_db (
-    SLONG       **uihandle,
+    isc_db_handle *uihandle,
     SLONG	*status)
 {
 /**************************************
@@ -366,21 +322,31 @@
  **************************************/
 TEXT    user_info_name [MAX_PATH_LENGTH];
 BOOLEAN notopened;              /* open/not open flag */
-SLONG   *uinfo;                 /* database handle */
+isc_db_handle uinfo;            /* database handle */
+IHNDL	ihandle;
 SCHAR   *p, *dpb, dpb_buffer [256];
 SSHORT  dpb_len;
-TEXT    locksmith_password_enc [33];
 #ifdef  WINDOWS_ONLY
 SCHAR   *expanded_name;
 #endif
 
-/* Encrypt and copy locksmith's password under the global scheduler's
-   mutex since the implementation of the encryption isn't thread-safe
-   on most of our platforms. */
+/* Register as internal database handle */
 
+for (ihandle = internal_db_handles; ihandle; ihandle = ihandle->ihndl_next)
+    if (ihandle->ihndl_object == NULL)
+	{
+	ihandle->ihndl_object = &uinfo;
+	break;
+	}
 
+if (!ihandle)
+    {
+    ihandle = (IHNDL) gds__alloc ((SLONG) sizeof (struct ihndl));
+    ihandle->ihndl_object = &uinfo;
+    ihandle->ihndl_next = internal_db_handles;
+    internal_db_handles = ihandle;
+    }
 
-strcpy (locksmith_password_enc, ENC_crypt (LOCKSMITH_PASSWORD, PASSWORD_SALT));
 THREAD_EXIT;
 
 /* initialize the data base's name */
@@ -400,13 +366,13 @@
 
 *dpb++ = gds__dpb_version1;
 *dpb++ = gds__dpb_user_name;
-*dpb++ = strlen (LOCKSMITH_USER);
-p = LOCKSMITH_USER;
+p = "authenticator";
+*dpb++ = strlen (p);
 while (*p)
     *dpb++ = *p++;
 
-*dpb++ = gds__dpb_password_enc;
-p = locksmith_password_enc + 2;
+*dpb++ = gds__dpb_password;
+p = "none";
 *dpb++ = strlen (p);
 while (*p)
     *dpb++ = *p++;
@@ -421,7 +387,7 @@
 if (status [1] == gds__login)
     {
     /* we may be going against a V3 database which does not
-     * understand the "hello, god" combination.
+     * understand this combination.
      */
     
     isc_attach_database (status, 0, user_info_name, &uinfo, 0, 0);
@@ -430,6 +396,9 @@
 if (status [1])
     notopened = TRUE;
 *uihandle = uinfo;
+
+assert (ihandle->ihndl_object == &uinfo);
+ihandle->ihndl_object = NULL;
 
 #ifdef  WINDOWS_ONLY
 gds__free( (SLONG*)expanded_name);

Index: pwd.h
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/pwd.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -U3 -r1.5 -r1.6
--- pwd.h	2000/12/23 02:14:20	1.5
+++ pwd.h	2001/05/13 13:37:33	1.6
@@ -30,9 +30,6 @@
 #define PASSWORD_SALT		"9z"
 #define MAX_PASSWORD_ENC_LENGTH	12
 
-#define LOCKSMITH_USER  PWD_ls_user()
-#define LOCKSMITH_PASSWORD PWD_ls_pw()
-
 #ifdef APOLLO
 #define USER_INFO_NAME	"/interbase/isc4.gdb"      
 #endif
@@ -40,7 +37,7 @@
 #ifdef VMS
 #define USER_INFO_NAME	"[sysmgr]isc4.gdb"
 #endif
-
+    
 #if (defined WINDOWS_ONLY || defined WIN_NT)
 #define USER_INFO_NAME	"isc4.gdb"
 #endif

Index: pwd_proto.h
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/pwd_proto.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -U3 -r1.2 -r1.3
--- pwd_proto.h	2000/12/22 16:05:05	1.2
+++ pwd_proto.h	2001/05/13 13:37:33	1.3
@@ -28,7 +28,5 @@
 extern void	PWD_get_user_dbpath (TEXT *);
 extern void	PWD_verify_user (TEXT *, TEXT *, TEXT *, TEXT *, 
 				int *, int *, int *);
-extern char *PWD_ls_user(void);
-extern char *PWD_ls_pw(void);
 
 #endif /* _JRD_PWD_PROTO_H_ */

Index: scl.e
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/scl.e,v
retrieving revision 1.2
retrieving revision 1.3
diff -U3 -r1.2 -r1.3
--- scl.e	2001/04/11 17:16:19	1.2
+++ scl.e	2001/05/13 13:37:33	1.3
@@ -29,7 +29,6 @@
 #include "../jrd/jrd.h"
 #include "../jrd/ods.h"
 #include "../jrd/scl.h"
-#include "../jrd/pwd.h"
 #include "../jrd/acl.h"
 #include "../jrd/blb.h"
 #include "../jrd/irq.h"
@@ -40,7 +39,6 @@
 #include "../jrd/all_proto.h"
 #include "../jrd/blb_proto.h"
 #include "../jrd/cmp_proto.h"
-#include "../jrd/enc_proto.h"
 #include "../jrd/err_proto.h"
 #include "../jrd/exe_proto.h"
 #include "../jrd/gds_proto.h"
@@ -505,7 +503,8 @@
     TEXT	*password,
     TEXT	*password_enc,
     TEXT	*sql_role,
-    TDBB	tdbb)
+    TDBB	tdbb,
+    BOOLEAN	internal)
 {
 /**************************************
  *
@@ -529,9 +528,6 @@
 TEXT	name [129], project [33], organization [33], *p;
 USHORT	length;
 int	id, group, wheel, node_id;
-TEXT	locksmith_password[20];
-TEXT	locksmith_password_enc[33];
-TEXT	user_locksmith[20];
 TEXT	role_name[33], login_name [129], *q;
 USHORT  major_version, minor_original;
 
@@ -559,11 +555,7 @@
     if ((user_name == NULL) || ((password_enc == NULL) && (password == NULL)))
 	ERR_post (gds__login, 0);
 
-    strcpy (locksmith_password, LOCKSMITH_PASSWORD);
-    strcpy (user_locksmith, LOCKSMITH_USER);
-    strcpy (locksmith_password_enc, ENC_crypt (locksmith_password, PASSWORD_SALT));
-    if (strcmp (user_name, user_locksmith) || (password_enc == NULL) ||
-	strcmp (password_enc, locksmith_password_enc + 2))
+    if (!internal)
 	PWD_verify_user (name, user_name, password, password_enc, &id, 
 			 &group, &node_id);
 

Index: scl_proto.h
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/scl_proto.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U3 -r1.1.1.1 -r1.2
--- scl_proto.h	2000/08/03 20:51:17	1.1.1.1
+++ scl_proto.h	2001/05/13 13:37:33	1.2
@@ -30,7 +30,7 @@
 extern struct scl	*SCL_get_class (TEXT *);
 extern int		SCL_get_mask (TEXT *, TEXT *);
 extern void		SCL_init (BOOLEAN, TEXT *, TEXT *, TEXT *,
-                                 TEXT *, TEXT *, TDBB);
+                                 TEXT *, TEXT *, TDBB, BOOLEAN);
 extern void		SCL_move_priv (UCHAR **, USHORT, STR *, ULONG *);
 extern struct scl	*SCL_recompute_class	(TDBB, TEXT *);
 extern void		SCL_release (struct scl *);

Index: shrinit.c
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/shrinit.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U3 -r1.1.1.1 -r1.2
--- shrinit.c	2000/08/03 20:51:19	1.1.1.1
+++ shrinit.c	2001/05/13 13:37:33	1.2
@@ -287,6 +287,7 @@
 int	DSQL_yychar = 0;
 int	*DSQL_hash_table = 0;
 void	*gdbb = 0;
+int	*internal_db_handles = 0;
 
 #ifdef IMP
 /****    

Index: tra.c
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/tra.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U3 -r1.1.1.1 -r1.2
--- tra.c	2000/08/03 20:51:32	1.1.1.1
+++ tra.c	2001/05/13 13:37:33	1.2
@@ -3086,35 +3086,26 @@
  *	Sweep database.
  *
  **************************************/
-SLONG	db_handle;
+isc_db_handle	db_handle;
+IHNDL	ihandle;
 STATUS	status_vector [ISC_STATUS_LENGTH];
 UCHAR   *dpb;
 SSHORT  dpb_length;
 UCHAR   *q;
 UCHAR	sweep_dpb [100];
-TEXT    password_enc[100];
 
-/* The implementation of the encryption algorithm is not thread-safe
-   on most of our platforms. Wrap the encryption and copy operation
-   with the global scheduler's mutex. When we support SMP, we'll have
-   to do better than this. */
-
-THREAD_ENTER;
-strcpy (password_enc, (char *)ENC_crypt (LOCKSMITH_PASSWORD, PASSWORD_SALT));
-THREAD_EXIT;
-
 db_handle = NULL;
 
 dpb = sweep_dpb;
 *dpb++ = gds__dpb_version1;
 *dpb++ = gds__dpb_user_name;
-*dpb++ = strlen (LOCKSMITH_USER);
-q = LOCKSMITH_USER;
+q = "sweeper";
+*dpb++ = strlen (q);
 while (*q)
     *dpb++ = *q++;
 
-*dpb++ = gds__dpb_password_enc;
-q = password_enc + 2;
+*dpb++ = gds__dpb_password;
+q = "none";
 *dpb++ = strlen (q);
 while (*q)
     *dpb++ = *q++;
@@ -3124,12 +3115,34 @@
 *dpb++ = gds__dpb_records;
 dpb_length = dpb - sweep_dpb;
 
+/* Register as internal database handle */
+
+THREAD_ENTER;
+for (ihandle = internal_db_handles; ihandle; ihandle = ihandle->ihndl_next)
+    if (ihandle->ihndl_object == NULL)
+	{
+	ihandle->ihndl_object = &db_handle;
+	break;
+	}
+
+if (!ihandle)
+    {
+    ihandle = (IHNDL) gds__alloc ((SLONG) sizeof (struct ihndl));
+    ihandle->ihndl_object = &db_handle;
+    ihandle->ihndl_next = internal_db_handles;
+    internal_db_handles = ihandle;
+    }
+THREAD_EXIT;
+
 gds__attach_database (status_vector,
 	0,
 	GDS_VAL (database),
 	GDS_REF (db_handle),
 	dpb_length,
 	GDS_VAL (sweep_dpb));
+
+assert (ihandle->ihndl_object == &db_handle);
+ihandle->ihndl_object = NULL;
 
 if (db_handle)
     gds__detach_database (status_vector, GDS_REF (db_handle));

[Firebird-checkins] CVS: web/themes/Firebird header.php,1.5,1.6

From: Pavel C. <pc...@us...> - 2001-05-13 11:45:35

Update of /cvsroot/firebird/web/themes/Firebird
In directory usw-pr-cvs1:/tmp/cvs-serv13451/themes/Firebird

Modified Files:
	header.php 
Log Message:
no message

Index: header.php
===================================================================
RCS file: /cvsroot/firebird/web/themes/Firebird/header.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -U3 -r1.5 -r1.6
--- header.php	2001/05/08 18:12:47	1.5
+++ header.php	2001/05/13 11:45:32	1.6
@@ -45,7 +45,7 @@
 <TR>
 <TD align=right vAlign=top><A class=s_menu href=topics.php>&nbsp;News Archive&nbsp;</A></TD>
 <TD align=middle vAlign=center>| </TD>
-<TD align=right vAlign=top><A class=s_menu href=friend.php>&nbsp;Recomend us&nbsp;</A></TD>
+<TD align=right vAlign=top><A class=s_menu href=friend.php>&nbsp;Recommend us&nbsp;</A></TD>
 <TD align=middle vAlign=center>| </TD>
 </TR>
 <TR>

[Firebird-checkins] CVS: interbase ChangeLog,1.26,1.27

From: Frank Schlottmann-G. <fs...@us...> - 2001-05-12 06:12:52

Update of /cvsroot/firebird/interbase
In directory usw-pr-cvs1:/tmp/cvs-serv17932/interbase

Modified Files:
	ChangeLog 
Log Message:
Updated ChangeLog


Index: ChangeLog
===================================================================
RCS file: /cvsroot/firebird/interbase/ChangeLog,v
retrieving revision 1.26
retrieving revision 1.27
diff -U3 -r1.26 -r1.27
--- ChangeLog	2001/05/07 07:23:23	1.26
+++ ChangeLog	2001/05/12 06:12:50	1.27
@@ -1,3 +1,29 @@
+2001-05-12 03:31  rfm
+
+	* interbase/: builds_win32/original/make.alice,
+	builds_win32/original/make.burp, builds_win32/original/make.dsql,
+	builds_win32/original/make.intl,
+	builds_win32/original/make.ipserver,
+	builds_win32/original/make.jrd, builds_win32/original/make.lock,
+	builds_win32/original/make.register,
+	builds_win32/original/make.remote,
+	builds_win32/original/make.utilities,
+	builds_win32/original/make.wal, jrd/winnt.c:
+	
+	use macros for echo, fix comment in jrd/winnt.c
+
+2001-05-07 09:23  fsg
+
+	* interbase/: firebird/skywalker/install/classic/CSpostinstall.sh,
+	jrd/jrd.c, remote/inet.c:
+	
+	Added Brad Pepers fixes for select calls in inet.c and his fix for
+	an uninitialized data structure in jrd.c Changed install script for
+	classic to allow include and intl files to be read by general
+	public
+	
+	fsg
+
 2001-05-07 08:02  bellardo
 
 	* interbase/remote/interface.c:
@@ -815,13 +841,8 @@
 	jrd/license.h, pyxis/debug.c, pyxis/edit.e, pyxis/fred.e:
 	
 	Changed all $Log$
-	Changed all Revision 1.26  2001/05/07 07:23:23  fsg
-	Changed all Added Brad Pepers fixes for select calls in inet.c
-	Changed all and his fix for an uninitialized data structure in jrd.c
-	Changed all Changed install script for classic to allow
-	Changed all include and intl files to be read by general public
-	Changed all
-	Changed all fsg
+	Changed all Revision 1.27  2001/05/12 06:12:50  fsg
+	Changed all Updated ChangeLog
 	Changed all tags to $Id$ BTW this will hopefully set
 	this_build to 2 :-)

[Firebird-checkins] CVS: interbase/jrd winnt.c,1.2,1.3

From: Reed F. M. <rf...@us...> - 2001-05-12 01:32:01

Update of /cvsroot/firebird/interbase/jrd
In directory usw-pr-cvs1:/tmp/cvs-serv3101/interbase/jrd

Modified Files:
	winnt.c 
Log Message:
use macros for echo, fix comment in jrd/winnt.c


Index: winnt.c
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/winnt.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -U3 -r1.2 -r1.3
--- winnt.c	2001/04/05 17:05:43	1.2
+++ winnt.c	2001/05/12 01:31:59	1.3
@@ -843,7 +843,7 @@
  **************************************
  *
  * Functional description
- *	Read a data page.  Oh wow.
+ *	Write a data page.  Oh wow.
  *
  **************************************/
 DBB		dbb;

[Firebird-checkins] CVS: interbase/builds_win32/original make.alice,1.1.1.1,1.2 make.burp,1.1.1.1,1.2 make.dsql,1.1.1.1,1.2 make.intl,1.1.1.1,1.2 make.ipserver,1.1.1.1,1.2 make.jrd,1.3,1.4 make.lock,1.1.1.1,1.2 make.register,1.1.1.1,1.2 make.remote,1.1.1.1,1.2 make.utilities,1.1.1.1,1.2 make.wal,1.1.1.1,1.2

From: Reed F. M. <rf...@us...> - 2001-05-12 01:32:01

Update of /cvsroot/firebird/interbase/builds_win32/original
In directory usw-pr-cvs1:/tmp/cvs-serv3101/interbase/builds_win32/original

Modified Files:
	make.alice make.burp make.dsql make.intl make.ipserver 
	make.jrd make.lock make.register make.remote make.utilities 
	make.wal 
Log Message:
use macros for echo, fix comment in jrd/winnt.c


Index: make.alice
===================================================================
RCS file: /cvsroot/firebird/interbase/builds_win32/original/make.alice,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U3 -r1.1.1.1 -r1.2
--- make.alice	2000/08/03 20:42:52	1.1.1.1
+++ make.alice	2001/05/12 01:31:58	1.2
@@ -36,7 +36,7 @@
 
 alice.rsp:	$(GFIX_OBJS)
 	-$(RM) $(.path.obj)\alice.rsp
-	&echo $(ROOT)\alice\$** $(RSP_CONTINUE) >> $(.path.obj)\alice.rsp
+	&$(ECHO) $(ROOT)\alice\$** $(RSP_CONTINUE) >> $(.path.obj)\alice.rsp
 
 gfix.exe:	$(.path.obj)\gfix.exe
 

Index: make.burp
===================================================================
RCS file: /cvsroot/firebird/interbase/builds_win32/original/make.burp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U3 -r1.1.1.1 -r1.2
--- make.burp	2000/08/03 20:42:52	1.1.1.1
+++ make.burp	2001/05/12 01:31:58	1.2
@@ -41,7 +41,7 @@
 
 burp.rsp:	$(BURP_OBJS)
 	-$(RM) $(.path.obj)\burp.rsp
-	&echo $(ROOT)\burp\$** $(RSP_CONTINUE) >> $(.path.obj)\burp.rsp
+	&$(ECHO) $(ROOT)\burp\$** $(RSP_CONTINUE) >> $(.path.obj)\burp.rsp
 
 burp.exe:       $(BURP_OBJS) $(JRD_MISC) $(REMOTE_MISC)
 	-$(RM) burp.exe

Index: make.dsql
===================================================================
RCS file: /cvsroot/firebird/interbase/builds_win32/original/make.dsql,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U3 -r1.1.1.1 -r1.2
--- make.dsql	2000/08/03 20:42:52	1.1.1.1
+++ make.dsql	2001/05/12 01:31:58	1.2
@@ -49,7 +49,7 @@
 
 $(.path.obj)\dsql.rsp:      $(DSQL_OBJS)
 	$(RM) $(.path.obj)\dsql.rsp
-	&echo $(ROOT)\dsql\$** >> $(.path.obj)\dsql.rsp
+	&$(ECHO) $(ROOT)\dsql\$** >> $(.path.obj)\dsql.rsp
 
 !if $d(INCLUDE_DEPENDS_MAK)
 !include depends.mak

Index: make.intl
===================================================================
RCS file: /cvsroot/firebird/interbase/builds_win32/original/make.intl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U3 -r1.1.1.1 -r1.2
--- make.intl	2000/08/03 20:42:53	1.1.1.1
+++ make.intl	2001/05/12 01:31:58	1.2
@@ -47,7 +47,7 @@
 $(.path.obj)\intl.rsp:	$(INTL_OBJS1) $(INTL_OBJS2) 
 
 	$(RM) $(.path.obj)\intl.rsp
-	&echo $(ROOT)\intl\$** >> $(.path.obj)\intl.rsp
+	&$(ECHO) $(ROOT)\intl\$** >> $(.path.obj)\intl.rsp
 
 gdsintl.dll:	gdsintl_$(COMPILER).dll
 	$(TOUCH) gdsintl.dll

Index: make.ipserver
===================================================================
RCS file: /cvsroot/firebird/interbase/builds_win32/original/make.ipserver,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U3 -r1.1.1.1 -r1.2
--- make.ipserver	2000/08/03 20:42:53	1.1.1.1
+++ make.ipserver	2001/05/12 01:31:58	1.2
@@ -40,7 +40,7 @@
 
 $(.path.obj)\ipserver.rsp:      $(IPSERVER_OBJS)
 	$(RM) $(.path.obj)\ipserver.rsp
-	&echo $(ROOT)\ipserver\$** >> $(.path.obj)\ipserver.rsp
+	&$(ECHO) $(ROOT)\ipserver\$** >> $(.path.obj)\ipserver.rsp
 
 ipcevent.obj:	ipcevent.c
 	$(CC) $(VERSION_CFLAGS) -c $(O_OBJ_SWITCH)$(.path.obj)\ -DWIN32_LEAN_AND_MEAN ipcevent.c

Index: make.jrd
===================================================================
RCS file: /cvsroot/firebird/interbase/builds_win32/original/make.jrd,v
retrieving revision 1.3
retrieving revision 1.4
diff -U3 -r1.3 -r1.4
--- make.jrd	2000/12/30 05:10:10	1.3
+++ make.jrd	2001/05/12 01:31:58	1.4
@@ -127,7 +127,7 @@
 
 $(.path.obj)\gds.rsp:      $(GDS_OBJS)
 	$(RM) $(.path.obj)\gds.rsp
-	&echo $(ROOT)\jrd\$** $(RSP_CONTINUE) >> $(.path.obj)\gds.rsp
+	&$(ECHO) $(ROOT)\jrd\$** $(RSP_CONTINUE) >> $(.path.obj)\gds.rsp
 
 blf.c:          blf.e
 	$(CP) blf.e blf_tmp.e
@@ -149,7 +149,7 @@
 	$(RM) codes_tmp.e
 
 install_server:
-	echo "Installing InterBase Server DLLs"
+	$(ECHO) "Installing InterBase Server DLLs"
 #	$(CP) ..\jrd\$(.path.obj)\ibeng32.dll $(INSTALL_ROOT)\bin
 	$(CP) ..\intl\$(.path.obj)\gdsintl.dll $(INSTALL_ROOT)\intl
 	$(CP) ..\remote\$(.path.obj)\nt_server.exe $(INSTALL_ROOT)\bin\ibserver.exe
@@ -168,9 +168,9 @@
 
 
 install_client:
-	echo "Installing InterBase Client DLL"
+	$(ECHO) "Installing InterBase Client DLL"
 	$(CP) ..\jrd\$(.path.obj)\gds32.dll $(INSTALL_ROOT)\bin
-	echo "Installing InterBase EXEs"
+	$(ECHO) "Installing InterBase EXEs"
 	$(CP) ..\alice\$(.path.obj)\gfix.exe $(INSTALL_ROOT)\bin\gfix.exe
 	$(CP) ..\gpre\$(.path.obj)\gpre.exe $(INSTALL_ROOT)\bin\gpre.exe
 	$(CP) ..\dudley\$(.path.obj)\dudley.exe $(INSTALL_ROOT)\bin\gdef.exe
@@ -183,7 +183,7 @@
 	$(CP) ..\utilities\$(.path.obj)\dba.exe $(INSTALL_ROOT)\bin\gstat.exe
 	$(CP) ..\lock\$(.path.obj)\iblockpr.exe $(INSTALL_ROOT)\bin\iblockpr.exe
 	$(CP) ..\iscguard\$(.path.obj)\iscguard.exe $(INSTALL_ROOT)\bin\ibguard.exe
-	echo "Installing Link Libraries"
+	$(ECHO) "Installing Link Libraries"
 	$(CP) ..\jrd\$(.path.obj)\gds32.lib $(INSTALL_ROOT)\lib
 	$(CP) ..\jrd\$(.path.obj)\gds32_ms.lib $(INSTALL_ROOT)\lib
 !if "$(VERSION)"=="DEV"
@@ -205,7 +205,7 @@
 
 
 isc4.gdb:
-	echo "Making ISC4.GDB"
+	$(ECHO) "Making ISC4.GDB"
 	$(ISQL) -z -i ..\utilities\isc4.sql -user sysdba -pass $(LOCAL_DBA_PASSWORD)
 	$(GSEC) -user sysdba -password $(LOCAL_DBA_PASSWORD) -da isc4.gdb -add sysdba -pw masterkey
 	$(GBAK) -user sysdba -password $(LOCAL_DBA_PASSWORD) isc4.gdb isc4.gbk
@@ -230,7 +230,7 @@
 	$(CP) $(ROOT)\builds_win32\original\ibconfig $(INSTALL_ROOT)\ibconfig
 
 include:
-	echo "Getting InterBase header files"
+	$(ECHO) "Getting InterBase header files"
 	$(CP) ibase.h $(INSTALL_ROOT)\include\ibase.h
 	$(CP) perf.h $(INSTALL_ROOT)\include\perf.h
 	$(CP) ibase.h ..\ibase.h

Index: make.lock
===================================================================
RCS file: /cvsroot/firebird/interbase/builds_win32/original/make.lock,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U3 -r1.1.1.1 -r1.2
--- make.lock	2000/08/03 20:42:53	1.1.1.1
+++ make.lock	2001/05/12 01:31:58	1.2
@@ -56,7 +56,7 @@
 
 $(.path.obj)\lock.rsp:  $(LOCK_OBJS)
 	$(RM) $(.path.obj)\lock.rsp
-	&echo $(ROOT)\lock\$** >> $(.path.obj)\lock.rsp
+	&$(ECHO) $(ROOT)\lock\$** >> $(.path.obj)\lock.rsp
 
 !if $d(INCLUDE_DEPENDS_MAK)
 !include depends.mak

Index: make.register
===================================================================
RCS file: /cvsroot/firebird/interbase/builds_win32/original/make.register,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U3 -r1.1.1.1 -r1.2
--- make.register	2000/08/03 20:42:53	1.1.1.1
+++ make.register	2001/05/12 01:31:58	1.2
@@ -53,7 +53,7 @@
 
 $(.path.obj)\register.rsp:      $(IBLICEN_DLL_OBJS)
 	$(RM) $(.path.obj)\register.rsp
-		&echo $(ROOT)\register\$** >> $(.path.obj)\register.rsp
+		&$(ECHO) $(ROOT)\register\$** >> $(.path.obj)\register.rsp
 
 gen_license.exe:       $(GEN_LICS_OBJS) $(NODE_LINK)
 	-$(RM) $(.path.obj)\gen_license.exe

Index: make.remote
===================================================================
RCS file: /cvsroot/firebird/interbase/builds_win32/original/make.remote,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U3 -r1.1.1.1 -r1.2
--- make.remote	2000/08/03 20:42:53	1.1.1.1
+++ make.remote	2001/05/12 01:31:58	1.2
@@ -61,7 +61,7 @@
 
 $(.path.obj)\remote.rsp:      $(REMOTE_OBJS) interface.obj
 	$(RM) $(.path.obj)\remote.rsp
-	&echo $(ROOT)\remote\$** $(RSP_CONTINUE) >> $(.path.obj)\remote.rsp
+	&$(ECHO) $(ROOT)\remote\$** $(RSP_CONTINUE) >> $(.path.obj)\remote.rsp
 
 nt_server.exe: $(.path.obj)\nt_server.rsp window.res 
 	$(ECHO) $(VERSION_CFLAGS) $(O_EXE_SWITCH)$(.path.obj)\nt_server.exe > tmp.rsp

Index: make.utilities
===================================================================
RCS file: /cvsroot/firebird/interbase/builds_win32/original/make.utilities,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U3 -r1.1.1.1 -r1.2
--- make.utilities	2000/08/03 20:42:53	1.1.1.1
+++ make.utilities	2001/05/12 01:31:58	1.2
@@ -42,7 +42,7 @@
 
 $(.path.obj)\utilities.rsp:      $(UTILITY_OBJS) $(DBA_OBJS)
 	$(RM) $(.path.obj)\utilities.rsp
-	&echo $(ROOT)\utilities\$** >> $(.path.obj)\utilities.rsp
+	&$(ECHO) $(ROOT)\utilities\$** >> $(.path.obj)\utilities.rsp
 
 gsec.exe:       gsec.obj security.obj $(ENC_LINK) $(ISC_LINK)
 	-$(RM) gsec.exe

Index: make.wal
===================================================================
RCS file: /cvsroot/firebird/interbase/builds_win32/original/make.wal,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U3 -r1.1.1.1 -r1.2
--- make.wal	2000/08/03 20:42:53	1.1.1.1
+++ make.wal	2001/05/12 01:31:58	1.2
@@ -40,7 +40,7 @@
 
 $(.path.obj)\wal.rsp:	$(WAL_OBJS)
 	$(RM) $(.path.obj)\wal.rsp
-	&echo $(ROOT)\wal\$** >> $(.path.obj)\wal.rsp
+	&$(ECHO) $(ROOT)\wal\$** >> $(.path.obj)\wal.rsp
 
 !if $d(INCLUDE_DEPENDS_MAK)
 !include depends.mak

[Firebird-checkins] CVS: web/language lang-english.php,1.1.1.1,1.2

From: Pavel C. <pc...@us...> - 2001-05-11 09:41:55

Update of /cvsroot/firebird/web/language
In directory usw-pr-cvs1:/tmp/cvs-serv15055/language

Modified Files:
	lang-english.php 
Log Message:
Minor adjustment to main page

Index: lang-english.php
===================================================================
RCS file: /cvsroot/firebird/web/language/lang-english.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U3 -r1.1.1.1 -r1.2
--- lang-english.php	2001/05/03 09:30:56	1.1.1.1
+++ lang-english.php	2001/05/11 09:41:52	1.2
@@ -20,6 +20,7 @@
 	case "datestring":		$tmp = "%A, %B %d @ %T %Z"; break;
 	case "linksdatestring":		$tmp = "%d-%b-%Y"; break;
 	case "datestring2":		$tmp = "%A, %B %d"; break;
+	case "datestring3":		$tmp = "%B %d"; break;
 	default: 			$tmp = "$phrase"; break;
     
     }

[Firebird-checkins] CVS: web mainfile.php,1.3,1.4

From: Pavel C. <pc...@us...> - 2001-05-11 09:41:55

Update of /cvsroot/firebird/web
In directory usw-pr-cvs1:/tmp/cvs-serv15055

Modified Files:
	mainfile.php 
Log Message:
Minor adjustment to main page

Index: mainfile.php
===================================================================
RCS file: /cvsroot/firebird/web/mainfile.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -U3 -r1.3 -r1.4
--- mainfile.php	2001/05/08 18:12:47	1.3
+++ mainfile.php	2001/05/11 09:41:52	1.4
@@ -365,12 +365,12 @@
     } else {
 	$options .= "&thold=0";
     }
-    while(list($sid, $title, $time) = mysql_fetch_row($result)) {
+    while(list($sid, $title, $time, $comments) = mysql_fetch_row($result)) {
 	setlocale ("LC_TIME", "$locale");
 	ereg ("([0-9]{4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})", $time, $datetime2);
-	$datetime2 = strftime("".translate("datestring2")."", mktime($datetime2[4],$datetime2[5],$datetime2[6],$datetime2[2],$datetime2[3],$datetime2[1]));
+	$datetime2 = strftime("".translate("datestring3")."", mktime($datetime2[4],$datetime2[5],$datetime2[6],$datetime2[2],$datetime2[3],$datetime2[1]));
 	$datetime2 = ucfirst($datetime2);
-  $boxstuff .= "<li><a href=\"article.php?sid=$sid$options\">$title</a>\n";
+  $boxstuff .= "<li>$datetime2 <a href=\"article.php?sid=$sid$options\">$title</a> ($comments)\n";
 	$vari++;
 	if ($vari==$oldnum) {
 	    if (isset($cookie[3])) {

[Firebird-checkins] CVS: OdbcJdbc - Imported sources

From: Ann W. H. <awh...@us...> - 2001-05-10 21:51:43

Update of /cvsroot/firebird/OdbcJdbc
In directory usw-pr-cvs1:/tmp/cvs-serv3119

Log Message:
Finally the source of the Starkey ODBC/JDBC driver is released

Status:

Vendor Tag:	IBPhoenix
Release Tags:	start
		
N OdbcJdbc/.cvsignore
N OdbcJdbc/Attributes.cpp
N OdbcJdbc/Attributes.h
N OdbcJdbc/Date.h
N OdbcJdbc/DescRecord.cpp
N OdbcJdbc/DescRecord.h
N OdbcJdbc/InfoItems.h
N OdbcJdbc/Main.cpp
N OdbcJdbc/makefile
N OdbcJdbc/OdbcConnection.cpp
N OdbcJdbc/OdbcConnection.h
N OdbcJdbc/OdbcDateTime.cpp
N OdbcJdbc/OdbcDateTime.h
N OdbcJdbc/OdbcDesc.cpp
N OdbcJdbc/OdbcDesc.h
N OdbcJdbc/OdbcEnv.cpp
N OdbcJdbc/OdbcEnv.h
N OdbcJdbc/OdbcError.cpp
N OdbcJdbc/OdbcError.h
N OdbcJdbc/OdbcJdbc.dsw
N OdbcJdbc/OdbcJdbc.h
N OdbcJdbc/OdbcJdbc.mak
N OdbcJdbc/OdbcJdbcSetup.rc
N OdbcJdbc/OdbcObject.cpp
N OdbcJdbc/OdbcObject.h
N OdbcJdbc/OdbcStatement.cpp
N OdbcJdbc/OdbcStatement.h
N OdbcJdbc/SetupAttributes.h
N OdbcJdbc/Headers/SQL.H
N OdbcJdbc/Headers/SQLEXT.H
N OdbcJdbc/IscDbc/AsciiBlob.cpp
N OdbcJdbc/IscDbc/AsciiBlob.h
N OdbcJdbc/IscDbc/Attachment.cpp
N OdbcJdbc/IscDbc/Attachment.h
N OdbcJdbc/IscDbc/BinaryBlob.cpp
N OdbcJdbc/IscDbc/BinaryBlob.h
N OdbcJdbc/IscDbc/Blob.cpp
N OdbcJdbc/IscDbc/Blob.h
N OdbcJdbc/IscDbc/Connection.h
N OdbcJdbc/IscDbc/DateTime.cpp
N OdbcJdbc/IscDbc/DateTime.h
N OdbcJdbc/IscDbc/Engine.h
N OdbcJdbc/IscDbc/Error.cpp
N OdbcJdbc/IscDbc/Error.h
N OdbcJdbc/IscDbc/IscBlob.cpp
N OdbcJdbc/IscDbc/IscBlob.h
N OdbcJdbc/IscDbc/IscCallableStatement.cpp
N OdbcJdbc/IscDbc/IscCallableStatement.h
N OdbcJdbc/IscDbc/IscColumnsResultSet.cpp
N OdbcJdbc/IscDbc/IscColumnsResultSet.h
N OdbcJdbc/IscDbc/IscConnection.cpp
N OdbcJdbc/IscDbc/IscConnection.h
N OdbcJdbc/IscDbc/IscCrossReferenceResultSet.cpp
N OdbcJdbc/IscDbc/IscCrossReferenceResultSet.h
N OdbcJdbc/IscDbc/IscDatabaseMetaData.cpp
N OdbcJdbc/IscDbc/IscDatabaseMetaData.h
N OdbcJdbc/IscDbc/IscDbc.h
N OdbcJdbc/IscDbc/IscDbc.mak
N OdbcJdbc/IscDbc/IscIndexInfoResultSet.cpp
N OdbcJdbc/IscDbc/IscIndexInfoResultSet.h
N OdbcJdbc/IscDbc/IscMetaDataResultSet.cpp
N OdbcJdbc/IscDbc/IscMetaDataResultSet.h
N OdbcJdbc/IscDbc/IscPreparedStatement.cpp
N OdbcJdbc/IscDbc/IscPreparedStatement.h
N OdbcJdbc/IscDbc/IscPrimaryKeysResultSet.cpp
N OdbcJdbc/IscDbc/IscPrimaryKeysResultSet.h
N OdbcJdbc/IscDbc/IscProcedureColumnsResultSet.cpp
N OdbcJdbc/IscDbc/IscProcedureColumnsResultSet.h
N OdbcJdbc/IscDbc/IscProceduresResultSet.cpp
N OdbcJdbc/IscDbc/IscProceduresResultSet.h
N OdbcJdbc/IscDbc/IscResultSet.cpp
N OdbcJdbc/IscDbc/IscResultSet.h
N OdbcJdbc/IscDbc/IscResultSetMetaData.cpp
N OdbcJdbc/IscDbc/IscResultSetMetaData.h
N OdbcJdbc/IscDbc/IscSpecialColumnsResultSet.cpp
N OdbcJdbc/IscDbc/IscSpecialColumnsResultSet.h
N OdbcJdbc/IscDbc/IscSqlType.cpp
N OdbcJdbc/IscDbc/IscSqlType.h
N OdbcJdbc/IscDbc/IscStatement.cpp
N OdbcJdbc/IscDbc/IscStatement.h
N OdbcJdbc/IscDbc/IscStatementMetaData.cpp
N OdbcJdbc/IscDbc/IscStatementMetaData.h
N OdbcJdbc/IscDbc/IscTablesResultSet.cpp
N OdbcJdbc/IscDbc/IscTablesResultSet.h
N OdbcJdbc/IscDbc/JString.cpp
N OdbcJdbc/IscDbc/JString.h
N OdbcJdbc/IscDbc/LinkedList.cpp
N OdbcJdbc/IscDbc/LinkedList.h
N OdbcJdbc/IscDbc/Lock.cpp
N OdbcJdbc/IscDbc/Lock.h
N OdbcJdbc/IscDbc/makefile
N OdbcJdbc/IscDbc/makefile.in
N OdbcJdbc/IscDbc/Mutex.cpp
N OdbcJdbc/IscDbc/Mutex.h
N OdbcJdbc/IscDbc/Parameter.cpp
N OdbcJdbc/IscDbc/Parameter.h
N OdbcJdbc/IscDbc/Parameters.cpp
N OdbcJdbc/IscDbc/Parameters.h
N OdbcJdbc/IscDbc/Properties.h
N OdbcJdbc/IscDbc/Sqlda.cpp
N OdbcJdbc/IscDbc/Sqlda.h
N OdbcJdbc/IscDbc/SQLError.cpp
N OdbcJdbc/IscDbc/SQLError.h
N OdbcJdbc/IscDbc/SQLException.h
N OdbcJdbc/IscDbc/Stream.cpp
N OdbcJdbc/IscDbc/Stream.h
N OdbcJdbc/IscDbc/Time.cpp
N OdbcJdbc/IscDbc/Time.h
N OdbcJdbc/IscDbc/TimeStamp.cpp
N OdbcJdbc/IscDbc/TimeStamp.h
N OdbcJdbc/IscDbc/Types.h
N OdbcJdbc/IscDbc/TypesResultSet.cpp
N OdbcJdbc/IscDbc/TypesResultSet.h
N OdbcJdbc/IscDbc/Value.cpp
N OdbcJdbc/IscDbc/Value.h
N OdbcJdbc/IscDbc/Values.cpp
N OdbcJdbc/IscDbc/Values.h
N OdbcJdbc/JdbcTest/Test.cpp
N OdbcJdbc/OdbcJdbcSetup/DsnDialog.cpp
N OdbcJdbc/OdbcJdbcSetup/DsnDialog.h
N OdbcJdbc/OdbcJdbcSetup/OdbcJdbcSetup.cpp
N OdbcJdbc/OdbcJdbcSetup/OdbcJdbcSetup.h
N OdbcJdbc/OdbcJdbcSetup/OdbcJdbcSetup.mak
N OdbcJdbc/OdbcJdbcSetup/OdbcJdbcSetup.rc
N OdbcJdbc/OdbcJdbcSetup/ReadMe.txt
N OdbcJdbc/OdbcJdbcSetup/resource.h
N OdbcJdbc/OdbcJdbcSetup/Setup.cpp
N OdbcJdbc/OdbcJdbcSetup/Setup.h
N OdbcJdbc/OdbcJdbcSetup/StdAfx.cpp
N OdbcJdbc/OdbcJdbcSetup/StdAfx.h
N OdbcJdbc/Test/Constraint.cpp
N OdbcJdbc/Test/Constraint.h
N OdbcJdbc/Test/Database.cpp
N OdbcJdbc/Test/Database.h
N OdbcJdbc/Test/Field.cpp
N OdbcJdbc/Test/Field.h
N OdbcJdbc/Test/Gen.cpp
N OdbcJdbc/Test/Gen.h
N OdbcJdbc/Test/Hash.cpp
N OdbcJdbc/Test/Hash.h
N OdbcJdbc/Test/Index.cpp
N OdbcJdbc/Test/Index.h
N OdbcJdbc/Test/JString.cpp
N OdbcJdbc/Test/JString.h
N OdbcJdbc/Test/LinkedList.cpp
N OdbcJdbc/Test/LinkedList.h
N OdbcJdbc/Test/NetfraDatabase.cpp
N OdbcJdbc/Test/NetfraDatabase.h
N OdbcJdbc/Test/NetfraRemote.lib
N OdbcJdbc/Test/Odbc.cpp
N OdbcJdbc/Test/Odbc.h
N OdbcJdbc/Test/Print.cpp
N OdbcJdbc/Test/Print.h
N OdbcJdbc/Test/RString.cpp
N OdbcJdbc/Test/RString.h
N OdbcJdbc/Test/scrambledTest.cpp
N OdbcJdbc/Test/SimpleTest.cpp
N OdbcJdbc/Test/statistics.cpp
N OdbcJdbc/Test/StdAfx.h
N OdbcJdbc/Test/Table.cpp
N OdbcJdbc/Test/Table.h
N OdbcJdbc/Test/Test.001
N OdbcJdbc/Test/Test.cpp
N OdbcJdbc/Test/Test.dsp
N OdbcJdbc/Test/Test.dsw
N OdbcJdbc/Test/Test.ncb
N OdbcJdbc/Test/Test.opt
N OdbcJdbc/Test/Test.plg
N OdbcJdbc/Test/Type.cpp
N OdbcJdbc/Test/Type.h
N OdbcJdbc/TestInstall/TestInstall.cpp
N OdbcJdbc/TestInstall/TestInstall.dsp
N OdbcJdbc/TestInstall/TestInstall.plg

No conflicts created by this import


***** Bogus filespec: -
***** Bogus filespec: Imported
***** Bogus filespec: sources

[Firebird-checkins] CVS: client-java - Imported sources

From: David J. <d_j...@us...> - 2001-05-09 14:35:27

Update of /cvsroot/firebird/client-java
In directory usw-pr-cvs1:/tmp/cvs-serv4367

Log Message:
jdbc-jca driver initial checkin

Status:

Vendor Tag:	davidjencks
Release Tags:	start
		
N client-java/src/build/build.xml
N client-java/src/org/firebirdsql/jdbc/FBBlob.java
N client-java/src/org/firebirdsql/jdbc/FBClob.java
N client-java/src/org/firebirdsql/jdbc/FBRef.java
N client-java/src/org/firebirdsql/jdbc/FBConnection.java
N client-java/src/org/firebirdsql/jdbc/FBConnectionEventListener.java
N client-java/src/org/firebirdsql/jdbc/FBDriver.java
N client-java/src/org/firebirdsql/jdbc/FBXAResource.java
N client-java/src/org/firebirdsql/jdbc/FBRowSetInternal.java
N client-java/src/org/firebirdsql/jdbc/FBResultSetMetaData.java
N client-java/src/org/firebirdsql/jdbc/FBRowSetListener.java
N client-java/src/org/firebirdsql/jdbc/FBSQLOutput.java
N client-java/src/org/firebirdsql/jdbc/FBResultSet.java
N client-java/src/org/firebirdsql/jdbc/FBSQLInput.java
N client-java/src/org/firebirdsql/jdbc/FBRowSet.java
N client-java/src/org/firebirdsql/jdbc/FBRowSetMetaData.java
N client-java/src/org/firebirdsql/jdbc/FBXAConnection.java
N client-java/src/org/firebirdsql/jdbc/FBStatement.java
N client-java/src/org/firebirdsql/jdbc/FBRowSetReader.java
N client-java/src/org/firebirdsql/jdbc/FBStruct.java
N client-java/src/org/firebirdsql/jdbc/FBSQLData.java
N client-java/src/org/firebirdsql/jdbc/FBRowSetWriter.java
N client-java/src/org/firebirdsql/jdbc/FBArray.java
N client-java/src/org/firebirdsql/jdbc/FBConnectionPoolDataSource.java
N client-java/src/org/firebirdsql/jdbc/FBDataSource.java
N client-java/src/org/firebirdsql/jdbc/FBDatabaseMetaData.java
N client-java/src/org/firebirdsql/jdbc/FBPreparedStatement.java
N client-java/src/org/firebirdsql/jdbc/FBXADataSource.java
N client-java/src/org/firebirdsql/jdbc/FBDefaultConnectionManager.java
N client-java/src/org/firebirdsql/jdbc/FBCallableStatement.java
N client-java/src/org/firebirdsql/jca/FBManagedConnection.java
N client-java/src/org/firebirdsql/jca/FBLocalTransaction.java
N client-java/src/org/firebirdsql/jca/FBManagedConnectionMetaData.java
N client-java/src/org/firebirdsql/jca/FBConnectionRequestInfo.java
N client-java/src/org/firebirdsql/jca/FBManagedConnectionFactory.java
N client-java/src/org/firebirdsql/jca/FBStandAloneConnectionManager.java
N client-java/src/lib/connector.jar
N client-java/src/lib/jdbc-3_0-pfd2-classes.zip
N client-java/src/lib/jta-spec1_0_1.jar
N client-java/src/lib/jaas.jar
N client-java/lib/ant.jar
N client-java/lib/jaxp.jar
N client-java/lib/parser.jar

No conflicts created by this import


***** Bogus filespec: -
***** Bogus filespec: Imported
***** Bogus filespec: sources

[Firebird-checkins] CVS: web/themes/Firebird footer.php,1.5,1.6

From: Pavel C. <pc...@us...> - 2001-05-09 13:56:30

Update of /cvsroot/firebird/web/themes/Firebird
In directory usw-pr-cvs1:/tmp/cvs-serv30518/themes/Firebird

Modified Files:
	footer.php 
Log Message:
m

Index: footer.php
===================================================================
RCS file: /cvsroot/firebird/web/themes/Firebird/footer.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -U3 -r1.5 -r1.6
--- footer.php	2001/05/08 18:12:47	1.5
+++ footer.php	2001/05/09 13:56:28	1.6
@@ -1,17 +1,18 @@
 <?php
 global $admin;
 if ($index == 1) {
-    echo "<td>&nbsp;</td><td valign=\"top\" width=150>";
+//    echo "<td valign=\"top\" width=150>";
 //    bigstory();
 //    pollNewest();
 //    loginbox();
 //    online();
 //    oldNews($storynum);
 //    rightblocks();
-    ephemblock();
-    headlines();
+//    ephemblock();
+//    headlines();
+//echo "</td>";
 }
-echo "</td></tr></table></td></tr></table>";
+echo "</tr></table></td></tr></table>";
 
 if ($index == 1) {
 echo "

[Firebird-checkins] CVS: web/themes/Firebird footer.php,1.4,1.5 header.php,1.4,1.5 styles.css,1.1,1.2 theme.php,1.2,1.3

From: Pavel C. <pc...@us...> - 2001-05-08 18:12:51

Update of /cvsroot/firebird/web/themes/Firebird
In directory usw-pr-cvs1:/tmp/cvs-serv8550/themes/Firebird

Modified Files:
	footer.php header.php styles.css theme.php 
Log Message:
Main menu and left menu only

Index: footer.php
===================================================================
RCS file: /cvsroot/firebird/web/themes/Firebird/footer.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -U3 -r1.4 -r1.5
--- footer.php	2001/05/07 10:14:32	1.4
+++ footer.php	2001/05/08 18:12:47	1.5
@@ -3,11 +3,11 @@
 if ($index == 1) {
     echo "<td>&nbsp;</td><td valign=\"top\" width=150>";
 //    bigstory();
-    pollNewest();
-    loginbox();
-    online();
-    oldNews($storynum);
-    rightblocks();
+//    pollNewest();
+//    loginbox();
+//    online();
+//    oldNews($storynum);
+//    rightblocks();
     ephemblock();
     headlines();
 }

Index: header.php
===================================================================
RCS file: /cvsroot/firebird/web/themes/Firebird/header.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -U3 -r1.4 -r1.5
--- header.php	2001/05/07 12:57:34	1.4
+++ header.php	2001/05/08 18:12:47	1.5
@@ -3,7 +3,7 @@
 ?>
 <LINK href="themes/Firebird/styles.css" rel=STYLESHEET 
 type=text/css>
-<body onload=init() bgcolor="#FFFFFF" text="#000000" link="#000000" vlink="#000000" topmargin=5 leftmargin=0 rightmargin=0 marginheight=5>
+<body onload=init() bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#0000FF"" topmargin=5 leftmargin=0 rightmargin=0 marginheight=5>
 <?php
 if ($banners) {
     include("banners.php");
@@ -28,35 +28,39 @@
   <a href="<?php echo $nuke_url; ?>"><img src="themes/Firebird/firebird_header2.png" alt="<?php echo "".translate("Welcome to").""; ?> <?php echo $sitename; ?>" border=0></a>
 </td>
 <TD align=right>
-<TABLE border=0 cellPadding=0 cellSpacing=0 width="370">
+<TABLE border=0 cellPadding=0 cellSpacing=0 width="310">
 <TBODY>
 <TR>
 <TD align=right vAlign=top><A class=s_menu href=index.php>&nbsp;Home&nbsp;</A></TD>
 <TD align=middle vAlign=righ>| </TD>
 <TD align=right vAlign=top><A class=s_menu href=faq.php>&nbsp;FAQ&nbsp;</A></TD>
 <TD align=middle vAlign=center>| </TD>
-<TD align=right vAlign=top><A class=s_menu href=friend.php>&nbsp;Recomend us&nbsp;</A></TD>
-<TD align=middle vAlign=center>| </TD>
 </TR>
 <TR>
 <TD align=right vAlign=top><A class=s_menu href=http://sourceforge.net/projects/firebird>&nbsp;SourceForge Area&nbsp;</A></TD>
 <TD align=middle vAlign=center>| </TD>
 <TD align=right vAlign=top><A class=s_menu href=links.php>&nbsp;Web Links&nbsp;</A></TD>
 <TD align=middle vAlign=center>| </TD>
-<TD align=right vAlign=top><A class=s_menu href=memberslist.php>&nbsp;Members List&nbsp;</A></TD>
-<TD align=middle vAlign=center>| </TD>
 </TR>
 <TR>
 <TD align=right vAlign=top><A class=s_menu href=topics.php>&nbsp;News Archive&nbsp;</A></TD>
 <TD align=middle vAlign=center>| </TD>
+<TD align=right vAlign=top><A class=s_menu href=friend.php>&nbsp;Recomend us&nbsp;</A></TD>
+<TD align=middle vAlign=center>| </TD>
+</TR>
+<TR>
+<TD align=right vAlign=top><A class=s_menu href=sections.php>&nbsp;Featured articles&nbsp;</A></TD>
+<TD align=middle vAlign=center>| </TD>
+<TD align=right vAlign=top><A class=s_menu href=memberslist.php>&nbsp;Members List&nbsp;</A></TD>
+<TD align=middle vAlign=center>| </TD>
+</TR>
+<TR>
 <TD align=right vAlign=top><A class=s_menu href=http://sourceforge.net/project/showfiles.php?group_id=9028>&nbsp;Distributions&nbsp;</A></TD>
 <TD align=middle vAlign=center>| </TD>
 <TD align=right vAlign=top><A class=s_menu href=user.php>&nbsp;Your account&nbsp;</A></TD>
 <TD align=middle vAlign=center>| </TD>
 </TR>
 <TR>
-<TD align=right vAlign=top><A class=s_menu href=sections.php>&nbsp;Featured articles&nbsp;</A></TD>
-<TD align=middle vAlign=center>| </TD>
 <TD align=right vAlign=top><A class=s_menu href=download.php>&nbsp;Other download&nbsp;</A></TD>
 <TD align=middle vAlign=center>| </TD>
 <TD align=right vAlign=top><A class=s_menu href=submit.php>&nbsp;Submit News&nbsp;</A></TD>
@@ -83,6 +87,12 @@
   userblock();
   adminblock();
   leftblocks();
+
+  pollNewest();
+  loginbox();
+  online();
+  oldNews($storynum);
+  rightblocks();
 
 //echo "<img src=images/pix.gif border=0 width=150 height=1>";
 echo "</td><td width=100% valign=top>";

Index: styles.css
===================================================================
RCS file: /cvsroot/firebird/web/themes/Firebird/styles.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -U3 -r1.1 -r1.2
--- styles.css	2001/05/06 14:51:49	1.1
+++ styles.css	2001/05/08 18:12:47	1.2
@@ -53,5 +53,5 @@
 	FONT-WEIGHT: bold; TEXT-DECORATION: none; font-color: #FFFFFF
 }
 .s_menu {
-	FONT-WEIGHT: bold; TEXT-DECORATION: none; font-size: 12
+	FONT-WEIGHT: bold; TEXT-DECORATION: none; font-size: 12; COLOR: #000000
 }

Index: theme.php
===================================================================
RCS file: /cvsroot/firebird/web/themes/Firebird/theme.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -U3 -r1.2 -r1.3
--- theme.php	2001/05/07 12:57:34	1.2
+++ theme.php	2001/05/08 18:12:47	1.3
@@ -5,8 +5,8 @@
 //$bgcolor1 = "#CCCCCC";
 $bgcolor2 = "999999";
 $bgcolor3 = "FFFFFF";
-//$bgcolor4 = "CCCCCC";
-$bgcolor4 = "FFFFFF";
+$bgcolor4 = "CCCCCC";
+//$bgcolor4 = "FFFFFF";
 $textcolor1 = "#FFFFFF";
 $textcolor2 = "#000000";
 $hr = 1; # 1 to have horizonal rule in comments instead of table bgcolor
@@ -17,7 +17,7 @@
 }
 
 function themeindex ($aid, $informant, $time, $title, $counter, $topic, $thetext, $notes, $morelink, $topicname, $topicimage, $topictext) {
-	global $tipath, $anonymous;
+	global $tipath, $anonymous, $bgcolor4, $textcolor2;
 
 
 
@@ -27,8 +27,8 @@
 <tr><td>
 
 <table border=0 cellpadding=3 cellspacing=0 width=100%>
-<tr><td bgcolor=CE383D>
-<font size=4 color=FFFFFF>
+<tr><td bgcolor=<?php echo"$bgcolor4"; ?>>
+<font size=4 color=<?php echo"$textcolor2"; ?>>
 <b><?php echo"$title"; ?></b><br>
 </td></tr><tr><td bgcolor=FFFFFF>
 <a href="search.php?query=&topic=<?php echo"$topic"; ?>&author="><img src=<?php echo"$tipath$topicimage"; ?> border=0 Alt=<?php echo"\"$topictext\""; ?> align=right hspace=10 vspace=10></a>
@@ -55,8 +55,8 @@
 <tr><td>
 
 <table border=0 cellpadding=3 cellspacing=0 width=100%>
-<tr><td bgcolor=CE383D>
-<font size=4 color=FFFFFF>
+<tr><td bgcolor=<?php echo"$bgcolor4"; ?>>
+<font size=4 color=<?php echo"$textcolor2"; ?>>
 <b><?php echo"$title"; ?></b><br>
 <font size=2>
 </td></tr><tr><td bgcolor=FFFFFF>
@@ -79,7 +79,7 @@
 }
 
 function themearticle ($aid, $informant, $datetime, $title, $thetext, $topic, $topicname, $topicimage, $topictext) {
-	global $admin, $sid, $tipath;
+	global $admin, $sid, $tipath, $bgcolor4, $textcolor2;
 	if ("$aid" == "$informant") {
 echo"
 
@@ -87,7 +87,7 @@
 <tr><td>
 
 <table border=0 cellpadding=3 cellspacing=0 width=100%>
-<tr><td bgcolor=CE383D><font color=FFFFFF>
+<tr><td bgcolor=$bgcolor4><font color=$textcolor2>
 <font size=4>
 <b>$title</b><br><font size=2> $datetime
 ";
@@ -119,7 +119,7 @@
 <table border=0 cellpadding=0 cellspacing=0 align=center bgcolor=000000 width=100%>
 <tr><td>
 <table border=0 cellpadding=3 cellspacing=0 width=100%>
-<tr><td bgcolor=CE383D><font color=FFFFFF>
+<tr><td bgcolor=$bgcolor4><font color=$textcolor2>
 <font size=4>
 <b>$title</b><br><font size=2> ".translate("Contributed by")." $informant ".translate("on")." $datetime</font>
 ";

[Firebird-checkins] CVS: web mainfile.php,1.2,1.3

From: Pavel C. <pc...@us...> - 2001-05-08 18:12:50

Update of /cvsroot/firebird/web
In directory usw-pr-cvs1:/tmp/cvs-serv8550

Modified Files:
	mainfile.php 
Log Message:
Main menu and left menu only

Index: mainfile.php
===================================================================
RCS file: /cvsroot/firebird/web/mainfile.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -U3 -r1.2 -r1.3
--- mainfile.php	2001/05/07 12:57:34	1.2
+++ mainfile.php	2001/05/08 18:12:47	1.3
@@ -365,12 +365,12 @@
     } else {
 	$options .= "&thold=0";
     }
-    while(list($sid, $title, $time, $comments) = mysql_fetch_row($result)) {
+    while(list($sid, $title, $time) = mysql_fetch_row($result)) {
 	setlocale ("LC_TIME", "$locale");
 	ereg ("([0-9]{4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})", $time, $datetime2);
 	$datetime2 = strftime("".translate("datestring2")."", mktime($datetime2[4],$datetime2[5],$datetime2[6],$datetime2[2],$datetime2[3],$datetime2[1]));
 	$datetime2 = ucfirst($datetime2);
-  $boxstuff .= "<li><a href=\"article.php?sid=$sid$options\">$title</a> ($comments)\n";
+  $boxstuff .= "<li><a href=\"article.php?sid=$sid$options\">$title</a>\n";
 	$vari++;
 	if ($vari==$oldnum) {
 	    if (isset($cookie[3])) {

[Firebird-checkins] CVS: interclient/20/dev/firebird build.xml,1.1,1.2

From: David J. <d_j...@us...> - 2001-05-08 16:36:49

Update of /cvsroot/firebird/interclient/20/dev/firebird
In directory usw-pr-cvs1:/tmp/cvs-serv21025

Modified Files:
	build.xml 
Log Message:
Updated to ant 1.3 and put build directories in a better place

Index: build.xml
===================================================================
RCS file: /cvsroot/firebird/interclient/20/dev/firebird/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -U3 -r1.1 -r1.2
--- build.xml	2001/02/06 14:36:21	1.1
+++ build.xml	2001/05/08 16:36:47	1.2
@@ -1,17 +1,17 @@
 <!--ant build script for interclient 20/ interserver
 See ant project (jakarta-ant) at www.apache.org
-author: david jencks dav...@ea...
+author: david jencks dav...@ea...
 copyright 2001 david jencks
-This may be used under the LGPL (see gnu.org)-->
+This may be used under the MPL or  LGPL (see gnu.org)-->
 
-<project name="Interclient" default="dist.all" basedir="../../../../..">
+<project name="Interclient" default="dist.all" basedir="../..">
 
-  <property name="build.dir" value="${basedir}/build/interclient/dev"/>
+  <property name="build.dir" value="${basedir}/build"/>
   <property name="build.dir.java" value="${build.dir}/classes"/>
   <property name="build.dir.cpp" value="${build.dir}/interserver"/>
   <property name="build.dir.bin" value="${build.dir}/bin"/>
-  <property name="src.dir.java" value="${basedir}/CVS/interclient/20/dev/packages"/>
-  <property name="src.dir.cpp" value="${basedir}/CVS/interclient/20/dev/interserver"/>
+  <property name="src.dir.java" value="${basedir}/dev/packages"/>
+  <property name="src.dir.cpp" value="${basedir}/dev/interserver"/>
   <property name="jar.dir" value="${basedir}/build/interclient"/>
   <property name="dist.dir" value="${basedir}"/>
   <property name="dist.dir.jar" value="${dist.dir}"/>
@@ -45,7 +45,7 @@
 LINUX_CCFLAGS= 	 -w -fhandle-exceptions -DUSE_INETD -DUNIX -DARCH_32
 INCLUDES=	-I/usr/interbase/include -->
   <target name="compile.cpp" depends="setup.cpp">
-    <transform executable="gcc" dest="${build.dir.cpp}" parallel="false">
+    <apply executable="gcc" dest="${build.dir.cpp}" parallel="false">
        <arg value="-w"/>
        <!--arg value="-ggdb"/--><!--for debug-->
        <arg value="-fhandle-exceptions"/>
@@ -60,7 +60,7 @@
        <targetfile/>
        <fileset dir="${src.dir.cpp}" includes="*.cpp" excludes="Property.cpp, Window.cpp, interservice.cpp"/>
        <mapper type="glob" from="*.cpp" to="*.o"/>
-    </transform>  
+    </apply>  
   </target>
 
 <!--		$(CC) $(OBJS) interserver.o -o interserver $(LDLIBS)-->

[Firebird-checkins] CVS: web/themes/Firebird 1x1.gif,NONE,1.1 header.php,1.3,1.4 theme.php,1.1.1.1,1.2

From: Pavel C. <pc...@us...> - 2001-05-07 12:57:38

Update of /cvsroot/firebird/web/themes/Firebird
In directory usw-pr-cvs1:/tmp/cvs-serv18068/themes/Firebird

Modified Files:
	header.php theme.php 
Added Files:
	1x1.gif 
Log Message:
Change in layout

--- 1x1.gif ADDED ---

Index: header.php
===================================================================
RCS file: /cvsroot/firebird/web/themes/Firebird/header.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -U3 -r1.3 -r1.4
--- header.php	2001/05/07 10:14:32	1.3
+++ header.php	2001/05/07 12:57:34	1.4
@@ -3,7 +3,7 @@
 ?>
 <LINK href="themes/Firebird/styles.css" rel=STYLESHEET 
 type=text/css>
-<body onload=init() background="images/fine_line_bg.gif" bgcolor="#FFFFFF" text="#000000" link="#000000" vlink="#000000" topmargin=5 leftmargin=0 rightmargin=0 marginheight=5>
+<body onload=init() bgcolor="#FFFFFF" text="#000000" link="#000000" vlink="#000000" topmargin=5 leftmargin=0 rightmargin=0 marginheight=5>
 <?php
 if ($banners) {
     include("banners.php");
@@ -72,6 +72,7 @@
    <font color=FFFFFF><a class=osdn>&nbsp;&nbsp;&nbsp;<?php echo "$slogan"; ?></a></font></TD>
  </TR>
 </TABLE>
+<br>
 <table border=0 width=100% cellspacing=5><tr><td valign=top>
 
 <?php

Index: theme.php
===================================================================
RCS file: /cvsroot/firebird/web/themes/Firebird/theme.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U3 -r1.1.1.1 -r1.2
--- theme.php	2001/05/03 09:31:02	1.1.1.1
+++ theme.php	2001/05/07 12:57:34	1.2
@@ -2,9 +2,11 @@
 
 $thename = "Firebird";
 $bgcolor1 = "#CE383D";
+//$bgcolor1 = "#CCCCCC";
 $bgcolor2 = "999999";
 $bgcolor3 = "FFFFFF";
-$bgcolor4 = "CCCCCC";
+//$bgcolor4 = "CCCCCC";
+$bgcolor4 = "FFFFFF";
 $textcolor1 = "#FFFFFF";
 $textcolor2 = "#000000";
 $hr = 1; # 1 to have horizonal rule in comments instead of table bgcolor
@@ -24,7 +26,7 @@
 <table border=0 cellpadding=0 cellspacing=0 align=center bgcolor=000000 width=100%>
 <tr><td>
 
-<table border=0 cellpadding=3 cellspacing=1 width=100%>
+<table border=0 cellpadding=3 cellspacing=0 width=100%>
 <tr><td bgcolor=CE383D>
 <font size=4 color=FFFFFF>
 <b><?php echo"$title"; ?></b><br>
@@ -52,7 +54,7 @@
 <table border=0 cellpadding=0 cellspacing=0 align=center bgcolor=000000 width=100%>
 <tr><td>
 
-<table border=0 cellpadding=3 cellspacing=1 width=100%>
+<table border=0 cellpadding=3 cellspacing=0 width=100%>
 <tr><td bgcolor=CE383D>
 <font size=4 color=FFFFFF>
 <b><?php echo"$title"; ?></b><br>
@@ -84,7 +86,7 @@
 <table border=0 cellpadding=0 cellspacing=0 align=center bgcolor=000000 width=100%>
 <tr><td>
 
-<table border=0 cellpadding=3 cellspacing=1 width=100%>
+<table border=0 cellpadding=3 cellspacing=0 width=100%>
 <tr><td bgcolor=CE383D><font color=FFFFFF>
 <font size=4>
 <b>$title</b><br><font size=2> $datetime
@@ -116,7 +118,7 @@
 
 <table border=0 cellpadding=0 cellspacing=0 align=center bgcolor=000000 width=100%>
 <tr><td>
-<table border=0 cellpadding=3 cellspacing=1 width=100%>
+<table border=0 cellpadding=3 cellspacing=0 width=100%>
 <tr><td bgcolor=CE383D><font color=FFFFFF>
 <font size=4>
 <b>$title</b><br><font size=2> ".translate("Contributed by")." $informant ".translate("on")." $datetime</font>
@@ -147,16 +149,26 @@
 
 <?php
 function themesidebox($title, $content) {
+global $textcolor1, $textcolor2;
 ?>
-<table border=0 cellspacing=0 cellpadding=0 width=200 bgcolor=000000>
+<table border=0 cellspacing=0 cellpadding=0 width=200 bgcolor=CE383D>
 <tr>
 <td>
-<table width=100% border=0 cellspacing=2 cellpadding=3>
+<table width=100% border=0 cellspacing=0 cellpadding=3>
 <tr>
-<td colspan=1 bgcolor=CE383D align=center>
-<font size=3 color=FFFFFF><b><?php echo"$title"; ?></b>
+<td colspan=1 bgcolor=FFFFFF align=left>
+<font size=3 color=<?php echo"$textcolor2"; ?>><b><?php echo"$title"; ?></b>
 </td>
 </tr>
+</table>
+<table border="0" cellPadding="0" cellSpacing="0" width="100%">
+<TBODY>
+  <tr bgColor="#000000">
+    <td><img alt height="2" src="themes/Firebird/1x1.gif" width="1"></td>
+  </tr>
+</TBODY>
+</table>
+<table border=0 cellspacing=0 cellpadding=3 width=200 bgcolor=000000>
 <tr>
 <td bgcolor=FFFFFF>
 <font size=2>
@@ -164,6 +176,47 @@
 </td>
 </tr>
 </table>
+</td>
+</tr>
+</table><br>
+    
+<?php
+}
+
+function thememainbox($title, $content) {
+global $textcolor1, $textcolor2;
+
+if ("$title" != "") { ?>
+<table border=0 cellspacing=0 cellpadding=0 width=100% bgcolor=CE383D>
+<tr>
+<td>
+<table width=100% border=0 cellspacing=0 cellpadding=3>
+<tr>
+<td colspan=1 bgcolor=FFFFFF align=left>
+<font size=3 color=<?php echo"$textcolor2"; ?>><b><?php echo"$title"; ?></b>
+</td>
+</tr>
+</table>
+<table border="0" cellPadding="0" cellSpacing="0" width="100%">
+<TBODY>
+  <tr bgColor="#000000">
+    <td><img alt height="2" src="themes/Firebird/1x1.gif" width="1"></td>
+  </tr>
+</TBODY>
+</table>
+<?php
+  } ?>
+<table border=0 cellspacing=0 cellpadding=3 width=100% bgcolor=000000>
+<tr>
+<td bgcolor=FFFFFF>
+<font size=2>
+<?php echo"$content"; 
+if ("$title" != "") { ?>
+</td>
+</tr>
+</table>
+<?php
+  } ?>
 </td>
 </tr>
 </table><br>

[Firebird-checkins] CVS: web config.php,1.3,1.4 index.php,1.2,1.3 mainfile.php,1.1.1.1,1.2

From: Pavel C. <pc...@us...> - 2001-05-07 12:57:38

Update of /cvsroot/firebird/web
In directory usw-pr-cvs1:/tmp/cvs-serv18068

Modified Files:
	config.php index.php mainfile.php 
Log Message:
Change in layout

Index: config.php
===================================================================
RCS file: /cvsroot/firebird/web/config.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -U3 -r1.3 -r1.4
--- config.php	2001/05/07 10:14:31	1.3
+++ config.php	2001/05/07 12:57:34	1.4
@@ -86,30 +86,58 @@
 
 
 
+
+
+
+
 <a href=\"http://sourceforge.net/project/?group_id=9028\">
 
 
 
+
+
+
+
 <img src=\"http://sourceforge.net/sflogo.php?group_id=9028&type=1\" width=\"88\" height=\"31\"
 
 
 
+
+
+
+
 border=\"0\" alt=\"Firebird at SourceForge\"></a>
 
 
 
+
+
+
+
 </td><td align=\"left\" width=\"90%\"><FONT face=\"Lucida,Verdana,Helvetica,Arial\" color=\"black\" size=-2>
 
 
 
+
+
+
+
 This site and the pages contained within are Copyright © 2000, 2001, Firebird Project.<br>
 
 
 
+
+
+
+
 Firebird - Relational Database for the New Millennium.
 
 
 
+
+
+
+
 </font></td></tr></table>";
 $foot2 = "You can syndicate our news using the file <a href=backend.php>backend.php</a> or <a href=ultramode.txt>ultramode.txt</a>";
 $foot3 = "This web site was made with <a href=http://phpnuke.org>PHP-Nuke</a>, a web portal system written in PHP. PHP-Nuke is Free Software released under the <a href=http://www.gnu.org>GNU/GPL license</a>.";
@@ -130,7 +158,7 @@
 ######################################################################
 
 $top = 10;
-$storyhome = 5;
+$storyhome = 20;
 $oldnum = 30;
 $ultramode = 0;
 

Index: index.php
===================================================================
RCS file: /cvsroot/firebird/web/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -U3 -r1.2 -r1.3
--- index.php	2001/05/07 10:14:32	1.2
+++ index.php	2001/05/07 12:57:34	1.3
@@ -18,7 +18,6 @@
 
 function theindex() {
     global $storyhome, $httpref, $httprefmax, $topicname, $topicimage, $topictext, $datetime, $user, $cookie, $nuke_url;
-    include("header.php");
     if (isset($cookie[3])) {
 	$storynum = $cookie[3];
     } else {
@@ -121,8 +120,11 @@
 switch ($op) {
 
     default:
-	theindex();
-
+    include("header.php");
+  mainblock2();
+//	theindex();
+  NewsBlock(0);
+  include("footer.php");
 }
 
 ?>

Index: mainfile.php
===================================================================
RCS file: /cvsroot/firebird/web/mainfile.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U3 -r1.1.1.1 -r1.2
--- mainfile.php	2001/05/03 09:30:13	1.1.1.1
+++ mainfile.php	2001/05/07 12:57:34	1.2
@@ -279,7 +279,7 @@
     global $locale, $oldnum, $storyhome, $cookie, $categories, $cat;
     $storynum = $storyhome;
     $boxstuff = "";
-    $boxTitle = translate("Past Articles");
+    $boxTitle = translate("Past News");
     if ($categories == 1) {
 	$sel = "where catid='$cat'";
     } else {
@@ -333,6 +333,58 @@
     themesidebox($boxTitle, $boxstuff);
 }
 
+function NewsBlock($storynum) {
+    global $locale, $oldnum, $storyhome, $cookie, $categories, $cat;
+//    $storynum = $storyhome;
+    if (isset($cookie[3])) {
+	$storynum = $cookie[3];
+    } else {
+	$storynum = $storyhome;
+    }
+    $boxstuff = "";
+    $boxTitle = translate("Hot News");
+    if ($categories == 1) {
+	$sel = "where catid='$cat'";
+    } else {
+	$sel = "";
+    }
+    $result = mysql_query("select sid, title, time, comments from stories $sel order by time desc limit $storynum");
+    $vari = 0;
+    if (isset($cookie[4])) {
+	$options .= "&mode=$cookie[4]";
+    } else {
+	$options .= "&mode=thread";
+    }
+    if (isset($cookie[5])) {
+	$options .= "&order=$cookie[5]";
+    } else {
+	$options .= "&order=0";
+    }
+    if (isset($cookie[6])) {
+	$options .= "&thold=$cookie[6]";
+    } else {
+	$options .= "&thold=0";
+    }
+    while(list($sid, $title, $time, $comments) = mysql_fetch_row($result)) {
+	setlocale ("LC_TIME", "$locale");
+	ereg ("([0-9]{4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})", $time, $datetime2);
+	$datetime2 = strftime("".translate("datestring2")."", mktime($datetime2[4],$datetime2[5],$datetime2[6],$datetime2[2],$datetime2[3],$datetime2[1]));
+	$datetime2 = ucfirst($datetime2);
+  $boxstuff .= "<li><a href=\"article.php?sid=$sid$options\">$title</a> ($comments)\n";
+	$vari++;
+	if ($vari==$oldnum) {
+	    if (isset($cookie[3])) {
+		$storynum = $cookie[3];
+	    } else {
+		$storynum = $storyhome;
+	    }
+	    $min = $oldnum + $storynum;
+	    $boxstuff .= "<br><p align=right><font size=1><a href=\"search.php?min=$min&type=stories&category=$cat\"><b>".translate("Older Articles")."</b></a></font>\n";
+	}
+    }
+    thememainbox($boxTitle, $boxstuff);
+}
+
 function mainblock() {
 	$result = mysql_query("select title, content from mainblock");
 	while(list($title, $content) = mysql_fetch_array($result)) {
@@ -340,6 +392,15 @@
 		themesidebox($title, $content);
 	}
 }
+
+function mainblock2() {
+	$result = mysql_query("select title, content from mainblock");
+	while(list($title, $content) = mysql_fetch_array($result)) {
+		$content = nl2br($content);
+		thememainbox($title, $content);
+	}
+}
+
 
 function category() {
     global $cat, $language;

[Firebird-checkins] CVS: web/themes/Firebird firebird_header2.png,NONE,1.1 footer.php,1.3,1.4 header.php,1.2,1.3

From: Pavel C. <pc...@us...> - 2001-05-07 10:14:35

Update of /cvsroot/firebird/web/themes/Firebird
In directory usw-pr-cvs1:/tmp/cvs-serv21910/themes/Firebird

Modified Files:
	footer.php header.php 
Added Files:
	firebird_header2.png 
Log Message:
New header image + minor adjustments

--- firebird_header2.png ADDED ---

Index: footer.php
===================================================================
RCS file: /cvsroot/firebird/web/themes/Firebird/footer.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -U3 -r1.3 -r1.4
--- footer.php	2001/05/06 14:51:49	1.3
+++ footer.php	2001/05/07 10:14:32	1.4
@@ -5,6 +5,7 @@
 //    bigstory();
     pollNewest();
     loginbox();
+    online();
     oldNews($storynum);
     rightblocks();
     ephemblock();

Index: header.php
===================================================================
RCS file: /cvsroot/firebird/web/themes/Firebird/header.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -U3 -r1.2 -r1.3
--- header.php	2001/05/06 14:51:49	1.2
+++ header.php	2001/05/07 10:14:32	1.3
@@ -25,41 +25,41 @@
 <table border="0" cellspacing="0" cellpadding="3" width="100%" bgcolor="FFFFFF">
 <tr>
 <td>
-  <a href="<?php echo $nuke_url; ?>"><img src="themes/Firebird/firebird_header.png" alt="<?php echo "".translate("Welcome to").""; ?> <?php echo $sitename; ?>" border=0></a>
+  <a href="<?php echo $nuke_url; ?>"><img src="themes/Firebird/firebird_header2.png" alt="<?php echo "".translate("Welcome to").""; ?> <?php echo $sitename; ?>" border=0></a>
 </td>
 <TD align=right>
-<TABLE border=0 cellPadding=0 cellSpacing=0>
+<TABLE border=0 cellPadding=0 cellSpacing=0 width="370">
 <TBODY>
 <TR>
-<TD align=right vAlign=top><A class=s_menu href=index.php>Home</A></TD>
+<TD align=right vAlign=top><A class=s_menu href=index.php>&nbsp;Home&nbsp;</A></TD>
 <TD align=middle vAlign=righ>| </TD>
-<TD align=right vAlign=top><A class=s_menu href=faq.php>FAQ</A></TD>
+<TD align=right vAlign=top><A class=s_menu href=faq.php>&nbsp;FAQ&nbsp;</A></TD>
 <TD align=middle vAlign=center>| </TD>
-<TD align=right vAlign=top><A class=s_menu href=friend.php>Recomend us</A></TD>
+<TD align=right vAlign=top><A class=s_menu href=friend.php>&nbsp;Recomend us&nbsp;</A></TD>
 <TD align=middle vAlign=center>| </TD>
 </TR>
 <TR>
-<TD align=right vAlign=top><A class=s_menu href=http://sourceforge.net/projects/firebird>SourceForge Area</A></TD>
+<TD align=right vAlign=top><A class=s_menu href=http://sourceforge.net/projects/firebird>&nbsp;SourceForge Area&nbsp;</A></TD>
 <TD align=middle vAlign=center>| </TD>
-<TD align=right vAlign=top><A class=s_menu href=links.php>Web Links</A></TD>
+<TD align=right vAlign=top><A class=s_menu href=links.php>&nbsp;Web Links&nbsp;</A></TD>
 <TD align=middle vAlign=center>| </TD>
-<TD align=right vAlign=top><A class=s_menu href=memberslist.php>Members List</A></TD>
+<TD align=right vAlign=top><A class=s_menu href=memberslist.php>&nbsp;Members List&nbsp;</A></TD>
 <TD align=middle vAlign=center>| </TD>
 </TR>
 <TR>
-<TD align=right vAlign=top><A class=s_menu href=topics.php>News Archive</A></TD>
+<TD align=right vAlign=top><A class=s_menu href=topics.php>&nbsp;News Archive&nbsp;</A></TD>
 <TD align=middle vAlign=center>| </TD>
-<TD align=right vAlign=top><A class=s_menu href=http://sourceforge.net/project/showfiles.php?group_id=9028>Distributions</A></TD>
+<TD align=right vAlign=top><A class=s_menu href=http://sourceforge.net/project/showfiles.php?group_id=9028>&nbsp;Distributions&nbsp;</A></TD>
 <TD align=middle vAlign=center>| </TD>
-<TD align=right vAlign=top><A class=s_menu href=user.php>Your account</A></TD>
+<TD align=right vAlign=top><A class=s_menu href=user.php>&nbsp;Your account&nbsp;</A></TD>
 <TD align=middle vAlign=center>| </TD>
 </TR>
 <TR>
-<TD align=right vAlign=top><A class=s_menu href=sections.php>Featured articles</A></TD>
+<TD align=right vAlign=top><A class=s_menu href=sections.php>&nbsp;Featured articles&nbsp;</A></TD>
 <TD align=middle vAlign=center>| </TD>
-<TD align=right vAlign=top><A class=s_menu href=download.php>Other download</A></TD>
+<TD align=right vAlign=top><A class=s_menu href=download.php>&nbsp;Other download&nbsp;</A></TD>
 <TD align=middle vAlign=center>| </TD>
-<TD align=right vAlign=top><A class=s_menu href=submit.php>Submit News</A></TD>
+<TD align=right vAlign=top><A class=s_menu href=submit.php>&nbsp;Submit News&nbsp;</A></TD>
 <TD align=middle vAlign=center>| </TD>
 </TR>
 </TD></TBODY></TABLE>
@@ -82,7 +82,6 @@
   userblock();
   adminblock();
   leftblocks();
-  online();
 
 //echo "<img src=images/pix.gif border=0 width=150 height=1>";
 echo "</td><td width=100% valign=top>";

[Firebird-checkins] CVS: web config.php,1.2,1.3 index.php,1.1.1.1,1.2

From: Pavel C. <pc...@us...> - 2001-05-07 10:14:35

Update of /cvsroot/firebird/web
In directory usw-pr-cvs1:/tmp/cvs-serv21910

Modified Files:
	config.php index.php 
Log Message:
New header image + minor adjustments

Index: config.php
===================================================================
RCS file: /cvsroot/firebird/web/config.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -U3 -r1.2 -r1.3
--- config.php	2001/05/06 14:51:49	1.2
+++ config.php	2001/05/07 10:14:31	1.3
@@ -77,39 +77,39 @@
 $sitename = "Firebird Relational Database";
 $nuke_url = "http://localhost/firebird/";
 $site_logo = "firebird.gif";
-$slogan = "Database for the New Millennium";
+$slogan = "Relational Database for the New Millennium";
 $startdate = "February 2001";
 $adminmail = "pc...@at...";
 $anonpost = 1;
 $Default_Theme = "Firebird";
-$foot1 = "<table CELLSPACING=\"5\" border=\"0\" width=\"100%\"><tr><td align=\"left\" width=\"10%\">
-
-
-
-<a href=\"http://sourceforge.net/project/?group_id=9028\">
-
-
-
-<img src=\"http://sourceforge.net/sflogo.php?group_id=9028&type=1\" width=\"88\" height=\"31\"
-
-
-
-border=\"0\" alt=\"Firebird at SourceForge\"></a>
-
-
-
-</td><td align=\"left\" width=\"90%\"><FONT face=\"Lucida,Verdana,Helvetica,Arial\" color=\"black\" size=-2>
-
-
-
-This site and the pages contained within are Copyright © 2000, 2001, Firebird Project.<br>
-
-
-
-Firebird - Relational Database for the New Millennium.
-
-
-
+$foot1 = "<table CELLSPACING=\"5\" border=\"0\" width=\"100%\"><tr><td align=\"left\" width=\"10%\">
+
+
+
+<a href=\"http://sourceforge.net/project/?group_id=9028\">
+
+
+
+<img src=\"http://sourceforge.net/sflogo.php?group_id=9028&type=1\" width=\"88\" height=\"31\"
+
+
+
+border=\"0\" alt=\"Firebird at SourceForge\"></a>
+
+
+
+</td><td align=\"left\" width=\"90%\"><FONT face=\"Lucida,Verdana,Helvetica,Arial\" color=\"black\" size=-2>
+
+
+
+This site and the pages contained within are Copyright © 2000, 2001, Firebird Project.<br>
+
+
+
+Firebird - Relational Database for the New Millennium.
+
+
+
 </font></td></tr></table>";
 $foot2 = "You can syndicate our news using the file <a href=backend.php>backend.php</a> or <a href=ultramode.txt>ultramode.txt</a>";
 $foot3 = "This web site was made with <a href=http://phpnuke.org>PHP-Nuke</a>, a web portal system written in PHP. PHP-Nuke is Free Software released under the <a href=http://www.gnu.org>GNU/GPL license</a>.";
@@ -213,16 +213,16 @@
 ######################################################################
 
 $moderate = 2;
-$reasons = array("As Is",
-		    "Offtopic",
-		    "Flamebait",
-		    "Troll",
-		    "Redundant",
-		    "Insighful",
-		    "Interesting",
-		    "Informative",
-		    "Funny",
-		    "Overrated",
+$reasons = array("As Is",
+		    "Offtopic",
+		    "Flamebait",
+		    "Troll",
+		    "Redundant",
+		    "Insighful",
+		    "Interesting",
+		    "Informative",
+		    "Funny",
+		    "Overrated",
 		    "Underrated");
 $badreasons = 4;
 
@@ -271,17 +271,17 @@
 #                  =>1 means accept the tag only: <foo>
 ######################################################################
 
-$AllowableHTML = array("p"=>2,
-		    "b"=>1,
-		    "i"=>1,
-		    "a"=>2,
-		    "em"=>1,
-		    "br"=>1,
-		    "strong"=>1,
-		    "blockquote"=>1,
-                    "tt"=>1,
-                    "li"=>1,
-                    "ol"=>1,
+$AllowableHTML = array("p"=>2,
+		    "b"=>1,
+		    "i"=>1,
+		    "a"=>2,
+		    "em"=>1,
+		    "br"=>1,
+		    "strong"=>1,
+		    "blockquote"=>1,
+                    "tt"=>1,
+                    "li"=>1,
+                    "ol"=>1,
                     "ul"=>1);
 
 ######################################################################
@@ -300,19 +300,19 @@
 
 $MaxTextLength = 0;
 $MaxTotalLength = 0;
-$CensorList = array("fuck",
-		    "cunt",
-		    "fucker",
-		    "fucking",
-		    "pussy",
-		    "cock",
-		    "c0ck",
-		    "cum",
-		    "twat",
-		    "clit",
-		    "bitch",
-		    "fuk",
-		    "fuking",
+$CensorList = array("fuck",
+		    "cunt",
+		    "fucker",
+		    "fucking",
+		    "pussy",
+		    "cock",
+		    "c0ck",
+		    "cum",
+		    "twat",
+		    "clit",
+		    "bitch",
+		    "fuk",
+		    "fuking",
 		    "motherfucker");
 $CensorMode = 1;
 $CensorReplace = "*";

Index: index.php
===================================================================
RCS file: /cvsroot/firebird/web/index.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U3 -r1.1.1.1 -r1.2
--- index.php	2001/05/03 09:30:11	1.1.1.1
+++ index.php	2001/05/07 10:14:32	1.2
@@ -21,7 +21,6 @@
     include("header.php");
     if (isset($cookie[3])) {
 	$storynum = $cookie[3];
-    echo "Storynum = $storynum";
     } else {
 	$storynum = $storyhome;
     }

1363 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 2807 2808 2809 2810 2811 .. 2820 > >> (Page 2809 of 2820)