From fd9171e0df775da9c4a3ea22e8f95ec75d3b3897 Mon Sep 17 00:00:00 2001
From: Christian Schneider
Date: Tue, 12 Dec 2006 13:38:57 +0000
Subject: Merged revisions 13944-15067 via svnmerge from
 svn+ssh://rdc.rim.ch/rdc/svn/itools/devel-redesign

........
  r13945 | weber | 2006-10-26 16:13:44 +0200 (Thu, 26 Oct 2006) | 2 lines
  
  omit null attributes, true means add name only. select() supports optgroups
........
  r13946 | weber | 2006-10-26 16:22:42 +0200 (Thu, 26 Oct 2006) | 2 lines
  
  Removed cruft
........
  r13989 | cschneid | 2006-10-27 18:32:11 +0200 (Fri, 27 Oct 2006) | 1 line
  
  Removed more cruft
........
  r13991 | cschneid | 2006-10-28 19:36:35 +0200 (Sat, 28 Oct 2006) | 1 line
  
  Make adserver output xhtml compliant tags
........
  r14093 | weber | 2006-11-06 17:13:23 +0100 (Mon, 06 Nov 2006) | 2 lines
  
  title tag can be omitted completely
........
  r14096 | weber | 2006-11-06 18:00:43 +0100 (Mon, 06 Nov 2006) | 2 lines
  
  Q() doesn't encode newlines, tag() encodes newlines within attributes
........
  r14135 | weber | 2006-11-09 02:30:03 +0100 (Thu, 09 Nov 2006) | 2 lines
  
  Migrate DB to texts.php on the fly (this functionality will be removed later), use only statictext, not DB
........
  r14164 | mueller | 2006-11-09 19:23:40 +0100 (Thu, 09 Nov 2006) | 1 line
  
  disable empty options in select
........
  r14194 | mueller | 2006-11-13 14:34:25 +0100 (Mon, 13 Nov 2006) | 1 line
  
  imply choose() in show()
........
  r14212 | weber | 2006-11-13 18:14:33 +0100 (Mon, 13 Nov 2006) | 2 lines
  
  Debug output is left-aligned
........
  r14231 | cschneid | 2006-11-14 17:09:32 +0100 (Tue, 14 Nov 2006) | 1 line
  
  Load js files before dom is ready and prevent loops on static=
........
  r14288 | cschneid | 2006-11-15 13:16:54 +0100 (Wed, 15 Nov 2006) | 1 line
  
  More compact serialization of arrays
........
  r14388 | weber | 2006-11-22 18:19:34 +0100 (Wed, 22 Nov 2006) | 2 lines
  
  Add optional IE PNG fix to it_html::img()
........
  r14442 | mueller | 2006-11-27 23:22:23 +0100 (Mon, 27 Nov 2006) | 1 line
  
  correctly handle <option value="">
........
  r14444 | cschneid | 2006-11-28 12:35:43 +0100 (Tue, 28 Nov 2006) | 1 line
  
  Handle null separately to preserve 0 == '0'
........
  r14450 | cschneid | 2006-11-28 15:36:45 +0100 (Tue, 28 Nov 2006) | 1 line
  
  Style commit (mainly done to test commit-email)
........
  r14451 | cschneid | 2006-11-28 15:44:49 +0100 (Tue, 28 Nov 2006) | 1 line
  
  Test commit for commit-email
........
  r14638 | cschneid | 2006-12-01 14:20:45 +0100 (Fri, 01 Dec 2006) | 1 line
  
  Suppress warning in case src file was removed by race
........
  r14970 | weber | 2006-12-09 03:07:22 +0100 (Sat, 09 Dec 2006) | 2 lines
  
  Added the highly useful timerlog() method from searchlib to justify the supporting code in auto_append.php ;)
........
  r14971 | weber | 2006-12-09 03:08:49 +0100 (Sat, 09 Dec 2006) | 2 lines
  
  Added set(), made dump_php's return value more convincing
........
  r14993 | cschneid | 2006-12-11 14:05:29 +0100 (Mon, 11 Dec 2006) | 1 line
  
  Added itjs::send_headers() to send HTTP headers suitable for JSON data
........
  r14997 | cschneid | 2006-12-11 14:28:52 +0100 (Mon, 11 Dec 2006) | 1 line
  
  Set JSON expiration date for IE
........
  r15057 | weber | 2006-12-12 14:02:43 +0100 (Tue, 12 Dec 2006) | 2 lines
  
  documentation update
........
---
 .gitignore              |   6 --
 .notice                 |   0
 Makefile                |  68 ---------------
 banner/.cvsignore       |   2 -
 banner/Makefile         |  48 ----------
 banner/banner.class     |  14 +--
 config.class            |  36 --------
 darwin/.cvsignore       |   2 -
 darwin/Makefile         |  43 ---------
 darwin/query.class      |  95 --------------------
 debug.class             |   2 +-
 html.class              |  72 +++++++++++----
 it.class                |  17 +++-
 itjs.class              |  15 +++-
 itjs/boot.js            |  29 +++++--
 license/.cvsignore      |   1 -
 license/Makefile        |  47 ----------
 license/license.class   |   8 --
 sms.lib                 |   3 -
 sms/Makefile            |  47 ----------
 sms/sms.class           | 122 --------------------------
 text.class              | 226 ++++++++++++++++++++++++++----------------------
 url.class               |   2 +-
 urlcache/.cvsignore     |   2 -
 urlcache/Makefile       |  43 ---------
 urlcache/urlcache.class | 217 ----------------------------------------------
 urlcache/urlcache.php   |  28 ------
 urlcache/urlcache.sql   |  14 ---
 user.class              |   1 +
 29 files changed, 241 insertions(+), 969 deletions(-)
 delete mode 100644 .notice
 delete mode 100644 Makefile
 delete mode 100644 banner/.cvsignore
 delete mode 100644 banner/Makefile
 delete mode 100644 config.class
 delete mode 100644 darwin/.cvsignore
 delete mode 100644 darwin/Makefile
 delete mode 100644 darwin/query.class
 delete mode 100644 license/.cvsignore
 delete mode 100644 license/Makefile
 delete mode 100644 sms.lib
 delete mode 100644 sms/Makefile
 delete mode 100644 sms/sms.class
 delete mode 100644 urlcache/.cvsignore
 delete mode 100644 urlcache/Makefile
 delete mode 100644 urlcache/urlcache.class
 delete mode 100644 urlcache/urlcache.php
 delete mode 100644 urlcache/urlcache.sql

diff --git a/.gitignore b/.gitignore
index 25c5961..2b52b61 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,10 +2,4 @@
 /*.slib
 banner/*.lib
 banner/*.slib
-darwin/*.lib
-darwin/*.slib
 license/license.slib
-sms/*.lib
-sms/*.slib
-urlcache/*.lib
-urlcache/*.slib
diff --git a/.notice b/.notice
deleted file mode 100644
index e69de29..0000000
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 1bdb140..0000000
--- a/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-##
-##	$Id$
-##
-##	Makefile for itools.lib
-##
-##	Copyright (C) 1995-2003 by the ITools Authors.
-##	This program is free software; you can redistribute it and/or
-##	modify it under the terms of either the GNU General Public License
-##	or the GNU Lesser General Public License as published by the Free
-##	Software Foundation.
-##
-
-CPP=		cpp -traditional
-QUIETMAKE=	$(MAKE) -s
-PHPCOMPILE=	/usr/local/bin/phpcompile
-
-MODULE=		itools
-SUBDIRS=	banner darwin license sms urlcache
-CLASSES=	support.pinc it.class browser.class db.class db_record.class db_table.class dbi.class debug.class html.class html_form.class html_page.class itjs.class mail.class fax.class session.class text.class url.class user.class xml.class
-
-#
-# Library creation rules, do not change stuff below...
-#
-SLIB=		$(MODULE).slib
-LIB=		$(MODULE)-compiled.lib
-DEVEL=		$(MODULE)-devel.lib
-
-all:
-		@echo Nothing to do. You may want to make $(MODULE)-compiled.lib
-
-all2:		$(LIB) $(DEVEL) $(SUBDIRS)
-
-$(LIB):		$(SLIB) Makefile
-		@if [ -x $(PHPCOMPILE) ]; then (echo Compiling $(SLIB) to $(LIB) ...) 1>&2; cat $(SLIB) license/license.slib | $(PHPCOMPILE) >$(LIB); else (echo $(PHPCOMPILE) not found, copying $(SLIB) to $(LIB) ...) 1>&2; cp $(SLIB) $(LIB); fi
-
-$(SLIB):	$(CLASSES) DUMMY
-		@(echo Creating $(SLIB) from $(SUBDIRS) $(CLASSES) ...) 1>&2
-		@echo -e "<?php\nrequire_once('itools/config.class');" >$(SLIB)
-		@(for class in DUMMY $(CLASSES); do test -f $$class && cat $$class; done) | $(CPP) -P -undef | perl -ne 's/^\s+//g; print unless /^\s*$$/' | grep -v "^<?php" | grep -v "^?>" >>$(SLIB)
-		@echo "?>" >>$(SLIB)
-
-$(DEVEL):	$(CLASSES) Makefile
-		@echo "<?php" >$(DEVEL)
-		@(for class in $(CLASSES); do test -f $$class && echo "require_once('itools/$$class');"; done) >>$(DEVEL)
-		@echo "?>" >>$(DEVEL)
-
-## Rule to merge all of SLIB and SUBDIRS/SLIBS into one big SLIB
-#$(SLIB):	$(CLASSES) DUMMY
-#		@(echo Creating $(SLIB) from $(SUBDIRS) $(CLASSES) ...) 1>&2
-#		@echo "<?php" >$(SLIB)
-#		@(for dir in DUMMY $(SUBDIRS); do (test -d $$dir && cd $$dir && $(QUIETMAKE) cat); done; for class in DUMMY $(CLASSES); do test -f $$class && cat $$class; done) | $(CPP) -P -undef | perl -ne 's/^\s+//g; print unless /^\s*$$/' | grep -v "^<?php" | grep -v "^?>" >>$(SLIB)
-#		@echo "?>" >>$(SLIB)
-
-$(SUBDIRS)::
-		@(cd $@; $(QUIETMAKE))
-
-DUMMY:	
-
-cat:		$(SLIB)
-		@cat $(SLIB)
-
-clean:		
-		@(echo Cleaning $(SLIB) $(LIB) ...) 1>&2
-		@rm -f $(SLIB) $(LIB) $(DEVEL)
-		@for dir in DUMMY $(SUBDIRS); do (test -d $$dir && cd $$dir && $(QUIETMAKE) $@) || :; done
-
-delsource:
-		@rm -rf *.slib license.lib $(DEVEL) $(CLASSES) $(SUBDIRS)
diff --git a/banner/.cvsignore b/banner/.cvsignore
deleted file mode 100644
index b8e8856..0000000
--- a/banner/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.slib
-*.lib
diff --git a/banner/Makefile b/banner/Makefile
deleted file mode 100644
index 8e607aa..0000000
--- a/banner/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-##
-##	$Id$
-##
-##	Makefile for itools/banner.lib
-##
-##	$Log$
-##	Revision 1.1  2000/02/25 18:49:46  weber
-##	Hello, world!
-##
-##	
-
-CPP=		cpp
-QUIETMAKE=	$(MAKE) -s
-PHPCOMPILE=	/usr/local/bin/phpcompile
-
-MODULE=		banner
-SUBDIRS=	
-CLASSES=	banner.class
-
-#
-# Library creation rules, do not change stuff below...
-#
-SLIB=		$(MODULE).slib
-LIB=		../$(MODULE).lib
-
-all:		$(LIB)
-
-$(LIB):		$(SLIB)
-		@if [ -x $(PHPCOMPILE) ]; then (echo Compiling $(SLIB) to $(LIB) ...) 1>&2; $(PHPCOMPILE) <$(SLIB) >$(LIB); else (echo $(PHPCOMPILE) not found, copying $(SLIB) to $(LIB) ...) 1>&2; cp $(SLIB) $(LIB); fi
-
-$(SLIB):	$(CLASSES) DUMMY
-		@(echo Creating $(SLIB) from $(SUBDIRS) $(CLASSES) ...) 1>&2
-		@echo "<?php" >$(SLIB)
-		@(for dir in DUMMY $(SUBDIRS); do (test -d $$dir && cd $$dir && $(QUIETMAKE) cat); done; for class in DUMMY $(CLASSES); do test -f $$class && cat $$class; done) | $(CPP) -P -undef | perl -ne 's/^\s+//g; print unless /^\s*$$/' | grep -v "^<?php" | grep -v "^?>" >>$(SLIB)
-		@echo "?>" >>$(SLIB)
-
-$(SUBDIRS)::
-		@(cd $@; $(QUIETMAKE))
-
-DUMMY:	
-
-cat:		$(SLIB)
-		@cat $(SLIB)
-
-clean:		
-		@(echo Cleaning $(SLIB) $(LIB) ...) 1>&2
-		@rm -f $(SLIB) $(LIB)
-		@for dir in DUMMY $(SUBDIRS); do (test -d $$dir && cd $$dir && $(QUIETMAKE) $@) || :; done
diff --git a/banner/banner.class b/banner/banner.class
index 7c6d32a..37ae213 100644
--- a/banner/banner.class
+++ b/banner/banner.class
@@ -129,8 +129,9 @@ function choose()
 			ED($this->banners);
 	}
 
-        srand((double)microtime()*1000000);
+	srand((double)microtime()*1000000);
 	$this->rand = rand();
+	$this->chosen = true;
 }
 
 /**
@@ -141,6 +142,9 @@ function choose()
  */
 function show($nocount = false, $noecho = false)
 {
+	if (!$this->chosen)
+		$this->choose();
+
 	if (!is_array($this->banners))
 		return; // none found or choose() not called yet
 
@@ -190,7 +194,7 @@ function showcombined($position = "banner", $nocount = false)
 function render($banner, $count, $number, $nocount = false)
 {
 	if ($number > 0)
-		echo "<br><br>";
+		echo "<br /><br />";
 
 	$this->render_banner($banner, $nocount);
 }
@@ -267,13 +271,13 @@ function render_banner($banner, $nocount = false)
 				$linkend   = "</a>";
 			}
 
-			echo "$linkstart<img src=\"$viewurl\" alt=\"" . $banner['alttext'] . "\" width=" . $banner['width'] . " height=" . $banner['height'] . " border=0>$linkend";
+			echo "$linkstart<img src=\"$viewurl\" alt=\"" . $banner['alttext'] . "\" width=\"" . $banner['width'] . "\" height=\"" . $banner['height'] . "\" border=\"0\" />$linkend";
 
 			if (strlen($banner['extraline']) > 0)
-				echo "<br>$linkstart" . $banner['extraline'] . $linkend;
+				echo "<br />$linkstart" . $banner['extraline'] . $linkend;
 
 			if (strlen($banner['extraline']) == 0 && $this->p['addextraline'])
-				echo "<br>&nbsp;";
+				echo "<br />&nbsp;";
 		break;
 		case 1:
 			echo $banner['data'];
diff --git a/config.class b/config.class
deleted file mode 100644
index 0998c28..0000000
--- a/config.class
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/*
-**      $Id$
-**
-**	ITools - the Internet Tools Library
-**
-**	Copyright (C) 1995-2003 by the ITools Authors.
-**	This program is free software; you can redistribute it and/or
-**	modify it under the terms of either the GNU General Public License
-**	or the GNU Lesser General Public License, as published by the Free
-**	Software Foundation. See http://www.gnu.org/licenses/ for details.
-**
-**	Class it_config: Server-wide ITools Configuration
-**	Can be overloaded as needed by applications
-*/
-
-/**
- * Class it_config: Server-wide ITools Configuration
- * Can be overloaded as needed by applications
- */
-class it_config
-{
-	/* Generic Paraphernalia (readable) */
-	var $project_root;		/* string: usually /www/gna.ch */
-
-/**
- * Constructor: Initializes public fields
- */
-function it_config()
-{
-	$this->project_root = dirname($_SERVER['DOCUMENT_ROOT']);
-}
-
-} /* End Class it_config */
-
-?>
diff --git a/darwin/.cvsignore b/darwin/.cvsignore
deleted file mode 100644
index b8e8856..0000000
--- a/darwin/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.slib
-*.lib
diff --git a/darwin/Makefile b/darwin/Makefile
deleted file mode 100644
index bd59596..0000000
--- a/darwin/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-##
-##	$Id$
-##
-##	Makefile for itools/darwin.lib
-##	
-
-CPP=		cpp
-QUIETMAKE=	$(MAKE) -s
-PHPCOMPILE=	/usr/local/bin/phpcompile
-
-MODULE=		darwin
-SUBDIRS=	
-CLASSES=	query.class
-
-#
-# Library creation rules, do not change stuff below...
-#
-SLIB=		$(MODULE).slib
-LIB=		../$(MODULE).lib
-
-all:		$(LIB)
-
-$(LIB):		$(SLIB)
-		@if [ -x $(PHPCOMPILE) ]; then (echo Compiling $(SLIB) to $(LIB) ...) 1>&2; $(PHPCOMPILE) <$(SLIB) >$(LIB); else (echo $(PHPCOMPILE) not found, copying $(SLIB) to $(LIB) ...) 1>&2; cp $(SLIB) $(LIB); fi
-
-$(SLIB):	$(CLASSES) DUMMY
-		@(echo Creating $(SLIB) from $(SUBDIRS) $(CLASSES) ...) 1>&2
-		@echo "<?php" >$(SLIB)
-		@(for dir in DUMMY $(SUBDIRS); do (test -d $$dir && cd $$dir && $(QUIETMAKE) cat); done; for class in DUMMY $(CLASSES); do test -f $$class && cat $$class; done) | $(CPP) -P -undef | perl -ne 's/^\s+//g; print unless /^\s*$$/' | grep -v "^<?php" | grep -v "^?>" >>$(SLIB)
-		@echo "?>" >>$(SLIB)
-
-$(SUBDIRS)::
-		@(cd $@; $(QUIETMAKE))
-
-DUMMY:	
-
-cat:		$(SLIB)
-		@cat $(SLIB)
-
-clean:		
-		@(echo Cleaning $(SLIB) $(LIB) ...) 1>&2
-		@rm -f $(SLIB) $(LIB)
-		@for dir in DUMMY $(SUBDIRS); do (test -d $$dir && cd $$dir && $(QUIETMAKE) $@) || :; done
diff --git a/darwin/query.class b/darwin/query.class
deleted file mode 100644
index f0a5b7e..0000000
--- a/darwin/query.class
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/*
-**  $Id$
-**
-**  itools/darwin/query.class - Query the UltraDarwin 3000 Search Engine
-**
-**  Requires: global $it_text object to determine result language
-**
-**  $Log$
-**  Revision 1.4  2000/05/08 16:01:21  cschneid
-**  Removed need to global $it_text object
-**
-**  Revision 1.3  2000/05/08 15:44:18  cschneid
-**  Allow absolute http:// url to search binary
-**
-**  Revision 1.2  2000/01/16 22:46:02  weber
-**  Renamed query to result to avoid confusion
-**
-**  Revision 1.1  2000/01/12 02:26:21  weber
-**  Added darwin query class
-**
-**
-*/
-
-class it_darwin_query
-{
-	/* Public Result information (read only) */
-	var $totalresults;	/* Total number of results found */
-	var $firstresult;	/* first fetched result */
-	var $lastresult;	/* last fetched result */
-
-	/* Parameters (read only) */
-	var $service;		/* Service identifier for query URL */
-	var $resultsperpage;	/* Number of results to show per page */
-
-	/* Private */
-	var $result;		/* Raw query result array */
-	var $resptr;		/* Result array pointer */
-
-	/* Constructor */
-	function it_darwin_query($service, $resultsperpage=10)
-	{
- 		if (!ereg('^http://', $service))
-			$service = "http://ultrasearch.relog.ch/$service/Search";
-
-		$this->service = $service;
-		$this->resultsperpage = $resultsperpage;
-		$this->totalresults = $this->firstresult = $this->lastresult = 0;
-	}
-
-
-	/*
-	** Perform a query for $q starting at $rank. Return true on success,
-	** false on error (no results is not an error)
-	*/
-	function query($q, $rank=0)
-	{
-		global $it_text;
-
-		if (is_object($it_text))
-			$lang = "&lang=" . $it_text->get_language();
-
-		$url = $this->service . "?q=" . urlencode($q) . "$lang&rank=$rank&n=" . $this->resultsperpage;
-
-		/* debug("it_darwin::query(\"$url\",$rank)"); */
-
-		if ($this->result = file($url))
-		{
-			$this->totalresults = trim($this->result[2]);
-			$this->firstresult = trim($this->result[3]);
-			$this->lastresult = trim($this->result[4]);
-			$this->resptr = $this->firstresult;
-			return 1;
-		}
-		return 0;
-	}
-
-	/* Fetch a result as an array "url", "title", "description", "size", "date" */
-	function fetch_array($number="XX")
-	{
-		/* debug("fetch_array($number), resptr==$this->resptr"); */
-		if ($number != "XX")
-			$this->resptr = $number;
-
-		if (($this->resptr >= $this->firstresult) && ($this->resptr <= $this->lastresult))
-		{
-			$n = 5+($this->resptr-$this->firstresult)*5; /* start of result record */
-			$this->resptr+=1;	/* Spinn ich?? ++ geht nicht !! */
-			return array("url" => trim($this->result[$n]), "title" => trim($this->result[$n+1]), "description" => trim($this->result[$n+2]), "size" => trim($this->result[$n+3])*1024, "date" => trim($this->result[$n+4]));
-		}
-		else return 0;	/* Out of bounds */
-
-	}
-} /* End class it_darwin_query */
-?>
diff --git a/debug.class b/debug.class
index b4cb764..e33a339 100644
--- a/debug.class
+++ b/debug.class
@@ -164,7 +164,7 @@ function dump()
 		$r = str_repeat("  ", count(debug_backtrace())-3) . $r;
 
 	if (isset($_SERVER['REMOTE_ADDR']) && !$plain)
-		 return "<pre style='color:#c00; background-color:white; margin:0px'>$r</pre>\n";
+		 return "<pre style='color:#c00; text-align:left; background-color:white; margin:0'>$r</pre>\n";
 	else
 		 return "$r\n";
 }
diff --git a/html.class b/html.class
index f23274b..a4657f2 100644
--- a/html.class
+++ b/html.class
@@ -24,11 +24,12 @@ class it_html
 		'name' => 'it_html',	# Name of global variable to use
 		'oldhtml' => false,
 		'prettyprint' => false,
-		'tags' => 'a,br,form,h1,h2,h3,h4,img,input,li,meta,table,td,th,tr,ul',
+		'tags' => 'a,br,form,h1,h2,h3,h4,input,li,meta,table,td,th,tr,ul',
 		'moretags' => '',
 		'nonewlinetags' => 'a,img,span',
 		'preprocess_attr' => array(),
 		'charset' => "iso-8859-1",
+		'ie_png_fix' => false,	# To enable, supply URL of a transparent gif (like /images/0.gif)
 		'show_content_type' => true,
 		'show_favicon' => true,
 		'show_boot_dom' => true,
@@ -137,17 +138,15 @@ function tag(/* $name, ... */)
 
 	$result = "<$name";
 
-	# add attributes. If $value === null, use key only (<td nowrap> instead of <td nowrap=""> for old html, <td nowrap="nowrap"> for xhtml style)
+	# add attributes. If $value === true, use key only (<td nowrap> instead of <td nowrap=""> for old html, <td nowrap="nowrap"> for xhtml style)
 	foreach($attr as $key => $value)
 	{
-		if ($value === false) # omit whole tag
+		if (($value === null) || ($value === false))	# null or false: omit whole tag
 			;
-		else if (isset($value) && $value !== true)
-			$result .= " $key=\"" . it_html::Q($value) . '"';
-		else if ($this->_oldhtml)
-			$result .= " $key";
-		else
-			$result .= " $key=\"$key\"";
+		else if (isset($value) && $value !== true)	# normal case: value
+			$result .= " $key=\"" . str_replace("\n", "&#10;", it_html::Q($value)) . '"';
+		else						# true: tag without value
+			$result .= $this->_oldhtml ? " $key" : " $key=\"$key\"";
 	}
 
 	# Apply a kind of magic... this needs further investigation
@@ -189,6 +188,30 @@ function div(/* $class, ... */)
 }
 
 
+/**
+ * Special img() function patches png transparency for IE 5.5-6 if ie_png_fix is set
+ * @param ... any number optional data or array of key => value arguments
+ * @return <img ... />
+ */
+function img(/* ... */)
+{
+	$args = func_get_args();
+
+	if ($this->_ie_png_fix && preg_match('/MSIE [56]/', $_SERVER['HTTP_USER_AGENT']))
+	{
+		foreach($args as $id => $arg)
+			if (preg_match('/\.png(\?.*)?$/', $arg['src']))
+			{
+				$args[$id]['style'] = "filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='{$arg['src']}',sizingMethod='scale');" . $arg['style'];
+				$args[$id]['src'] = $this->_ie_png_fix;
+			}
+	}
+
+	array_unshift($args, 'img');
+	return call_user_func_array(array(&$this, 'tag'), $args);
+}
+
+
 /**
  * Shortcut: return a span of a specific class
  * @param $class class name or null for no class= tag
@@ -217,7 +240,7 @@ function Q($string)
 	if ($GLOBALS['it_html']->_charset == "iso-8859-1")
 		$string = preg_replace('/[\x80-\x9f]/', ' ', strtr($string, array("\x80"=>"EUR", "\x82"=>"'", "\x84"=>"\"", "\x85"=>"...", "\x8a"=>"S", "\x8c"=>"OE", "\x8e"=>"Z", "\x91"=>"'", "\x92"=>"'", "\x93"=>"\"", "\x94"=>"\"", "\x96"=>"-", "\x97"=>"-", "\x9a"=>"s", "\x9e"=>"z")));
 
-	return str_replace("\n", "&#10;", htmlspecialchars($string));
+	return htmlspecialchars($string);
 }
 
 
@@ -274,13 +297,14 @@ function U(/* ... */)
 
 
 /**
- * Create a dropdown menu object
+ * Create a dropdown menu object. Warning: encodes html code within options!
  * @param $tags key => value pairs of <select> tag
  * @param $options array (value => text) of available options or
  *		 string key:val{,key:val} where key will be rawurldecoded so it may contain %2C as comma
+ *        supports optgroups as array (value => optgroup => array(value => text))
  * @param $selected optional currently selected value
  */
-function select($tags, $options, $selected = '')
+function select($tags, $options, $selected = null)
 {
 	# Transmogrify key:val{,key:val} to array(key => val)
 	if (!is_array($options))
@@ -295,9 +319,19 @@ function select($tags, $options, $selected = '')
 		}
 	}
 
-	$html = '';
-	foreach($options as $value => $text)
-		$html .= '<option value="'.it_html::Q($value).'"'.(($value == $selected) ? ($this->_oldhtml ? ' selected' : ' selected="selected"') : '').'>'.(trim($text) === "" ? "&nbsp;" : it_html::Q($text))."</option>\n";
+	$html = "";
+	foreach($options as $value => $option)
+	{
+		if (is_array($option))
+		{
+			$grouphtml = "";
+			foreach($option as $optval => $opt)
+				$grouphtml .= $this->tag('option', 'value' => $optval, 'selected' => isset($selected) ? $optval == $selected : false, it_html::Q($opt));
+			$html .= $this->tag('optgroup', 'label' => $value, $grouphtml); 
+		}
+		else
+			$html .= $this->tag('option', 'value' => $value, 'selected' => isset($selected) ? $value == $selected : false, 'disabled' => $option === "", (trim($option) === "") ? "&nbsp;" : it_html::Q($option));
+	}
 
 	return $this->tag('select', $tags, $html);
 }
@@ -386,7 +420,7 @@ function itjs(/* ... */)
  * Return HTML header with correct doctype.
  *
  * @param any number of text args or array of key => value:
- *    'title'         HTML title tag
+ *    'title'         optional HTML title tag
  *    'content-type'  optional content type (default: "text/html; charset=iso-8859-1")
  *    'description'   optional data for <meta name="description"> tag
  *    'doctype'       optional <!DOCTYPE HTML PUBLIC...> tag
@@ -434,7 +468,9 @@ function head(/* ... */)
 		);
 
 		$header = $p['show_content_type'] ? meta(array('http-equiv' => "Content-Type", 'content' => $p['content-type'])) : "";
-		$header .= tag('title', it_html::Q($p['title']));
+
+		if (isset($p['title']))
+			$header .= tag('title', it_html::Q($p['title']));
 
 		foreach(array('description', 'keywords') as $name)
 			if (!empty($p[$name]))
@@ -466,7 +502,7 @@ function head(/* ... */)
 		if ($p['js'])
 		{
 			$js .= $this->itjs("boot.js", array('mode' => "inline"));
-			$js .= "function it_boot_init(){ window.clearTimeout(window.it_panictimer); " . trim($p['jsboot']) . " }\n";
+			$js .= "function it_boot_start(){ " . trim($p['jsboot']) . " }\n";
 			$js .= "it_boot('/itjs/" . $p['js'] . "');\n";
 		}
 
diff --git a/it.class b/it.class
index 2dad792..4f561c6 100644
--- a/it.class
+++ b/it.class
@@ -4,7 +4,7 @@
 **
 **	ITools - the Internet Tools Library
 **
-**	Copyright (C) 1995-2004 by the ITools Authors.
+**	Copyright (C) 1995-2006 by the ITools Authors.
 **	This program is free software; you can redistribute it and/or
 **	modify it under the terms of either the GNU General Public License
 **	or the GNU Lesser General Public License, as published by the Free
@@ -44,6 +44,21 @@ function log($name /* ... */)
 }
 
 
+/**
+ * Store timings for appending to log/timer_log-* in auto_append.php
+ */
+function timerlog($label = '')
+{
+	if ($GLOBALS['debug_timerlog'])
+	{
+		$s = $GLOBALS['ULTRATIME'];
+		$e = gettimeofday();
+		$msec= ($e['sec'] - $s['sec']) * 1000 + ($e['usec'] - $s['usec']) / 1000;
+		$GLOBALS['ULTRATIMERLOG'] .= sprintf(" %s:%d", $label, $msec);
+	}
+}
+
+
 /**
  * Send error report either to browser (on devel/twin machines) or by email to .diffnotice guys
  * @parma $title (optional) error title, one line
diff --git a/itjs.class b/itjs.class
index ac56032..e5c0b25 100644
--- a/itjs.class
+++ b/itjs.class
@@ -16,6 +16,17 @@
 class itjs
 {
 
+/**
+ * Send HTTP headers (content-type) to transmit javascript code
+ */
+function send_headers()
+{
+	if (!preg_match('/Opera/', $_SERVER['HTTP_USER_AGENT']))	# text/plain breaks Opera 8.51/Linux
+		header('Content-Type: text/plain; charset=iso-8859-1');	# Berni reported some Firewalls to require this
+
+	header('Expires: ' . gmdate('D, d M Y H:i:s', time()+10) . ' GMT');	# prevent broken data on IE reloads
+}
+
 /**
  * Serialize the result into a javascript script
  * @param $values Array with values to be serialized
@@ -38,7 +49,7 @@ function serialize($values)
  */
 function encode($values)
 {
-	$texts = ($values === array_values($values)) ? "[]0" : "{}1";	# Numerical or associative array
+	$texts = ($values === array_values($values)) ? "[]0 " : "{}1\n";	# Numerical or associative array
 
 	$result = $texts{0};
 
@@ -62,7 +73,7 @@ function encode($values)
 		else
 			$result .= itjs::encode($value);
 
-		$separator = ",\n";
+		$separator = "," . $texts{3};
 	}
 
 	$result .= $texts{1};
diff --git a/itjs/boot.js b/itjs/boot.js
index 78d1fd1..a0ec24f 100644
--- a/itjs/boot.js
+++ b/itjs/boot.js
@@ -1,6 +1,6 @@
 // $Id$
 
-var it_boot_status = "";
+var it_boot_status = "boot";
 var it_panictimer = window.setTimeout("it_panic(it_boot_status)", 31337);
 var it_catcherrstart = new Date().getTime();
 
@@ -34,7 +34,9 @@ function it_boot_addparam(url, param)
 
 function it_panic(msg)
 {
-	window.setTimeout("document.location.href = it_boot_addparam(document.location.href, 'static=" + msg + "')", 500);
+	if (!document.location.href.match(/[?&]static=/))	// Avoid loop
+		window.setTimeout("document.location.href = it_boot_addparam(document.location.href, 'static=" + msg + "')", 500);
+
 	return it_catcherr('panic ' + msg, '-', -1);
 }
 
@@ -47,7 +49,12 @@ function it_boot_report(msg, file, line, error)
 	new Image().src = "/itjs/error.gif/" + escape(msg) + "|" + escape(file) + "|" + line + "|" + (new Date().getTime() - it_catcherrstart) + "|" + escape(error);
 }
 
-function it_boot(file, isretry)
+function it_boot_checkcss(style, key, value)
+{
+	return navigator.userAgent.match(/konqueror/i) || (style && style.getPropertyValue && (style.getPropertyValue(key) == value));
+}
+
+function it_boot_init()
 {
 	window.it_domtimer = null;
 	var konqueror = navigator.userAgent.match(/konqueror/i);
@@ -55,12 +62,12 @@ function it_boot(file, isretry)
 	var dom = doc && (dom = document.getElementById('it_boot_dom'));	// HTML has been rendered
 	var view = dom && doc.defaultView;	// We can check if stylesheet is active
 	var style = view && view.getComputedStyle && view.getComputedStyle(dom, '');
-	var css = style && style.getPropertyValue && ((style.getPropertyValue("visibility") == "hidden") || konqueror);	// CSS active (inline style on tag)
-	var stylesheet = style && style.getPropertyValue && ((style.getPropertyValue("display") == "none") || konqueror);	// External stylesheet loaded
+	var css = window.it_boot_checkcss(style, "visibility", "hidden"); // CSS active (inline style on tag)
+	var stylesheet = window.it_boot_checkcss(style, "display", "none");	// External stylesheet loaded
 
-	if (!(doc || !(it_boot_status = "doc")) || !(dom || !(it_boot_status = "dom")) || (style && (style.length > 0) && !(stylesheet || !(it_boot_status = "stylesheet"))))
+	if (!(doc || !(it_boot_status = "doc")) || !(dom || !(it_boot_status = "dom")) || (style && !(stylesheet || !(it_boot_status = "stylesheet"))))
 	{
-		window.it_domtimer = window.setTimeout("it_boot('" + file + "')" , 42);
+		window.it_domtimer = window.setTimeout("it_boot_init()" , 42);
 
 		if (style && !css)
 			it_panic("css");
@@ -68,6 +75,12 @@ function it_boot(file, isretry)
 		return;
 	}
 
+	window.clearTimeout(window.it_panictimer); 
+	window.it_boot_start();
+}
+
+function it_boot(file, isretry)
+{
 	try
 	{
 		var loader = new XMLHttpRequest();
@@ -97,7 +110,7 @@ function it_boot(file, isretry)
 
 						if (data.code.length == data.len)
 						{
-							var code = "try {" + data.code + ";window.it_boot_init()} catch (e) { it_boot_report('Load error', '-', -1, e); }";	// Wrapped in try/catch as Konqueror does not support window.onerror
+							var code = "try {" + data.code + "} catch (e) { it_boot_report('Load error', '-', -1, e); };window.it_boot_init()";	// Wrapped in try/catch as Konqueror does not support window.onerror
 							isretry = true;	// No further retry after this point
 
 							if (window.execScript)
diff --git a/license/.cvsignore b/license/.cvsignore
deleted file mode 100644
index a5abf2f..0000000
--- a/license/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-license.slib
diff --git a/license/Makefile b/license/Makefile
deleted file mode 100644
index 0aa63bd..0000000
--- a/license/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-##	$Id$
-##
-##	Makefile for itools/license.lib
-##
-##	$Log$
-##	Revision 1.1  2000/07/13 19:10:19  weber
-##	Added licensing suite
-##
-
-CPP=		cpp
-QUIETMAKE=	$(MAKE) -s
-PHPCOMPILE=	/usr/local/bin/phpcompile
-
-MODULE=		license
-SUBDIRS=	
-CLASSES=	license.class
-
-#
-# Library creation rules, do not change stuff below...
-#
-SLIB=		$(MODULE).slib
-LIB=		../$(MODULE).lib
-
-all:		$(LIB)
-
-$(LIB):		$(SLIB)
-		@if [ -x $(PHPCOMPILE) ]; then (echo Compiling $(SLIB) to $(LIB) ...) 1>&2; $(PHPCOMPILE) <$(SLIB) >$(LIB); else (echo $(PHPCOMPILE) not found, copying $(SLIB) to $(LIB) ...) 1>&2; cp $(SLIB) $(LIB); fi
-
-$(SLIB):	$(CLASSES) DUMMY
-		@(echo Creating $(SLIB) from $(SUBDIRS) $(CLASSES) ...) 1>&2
-		@echo "<?php" >$(SLIB)
-		@(for dir in DUMMY $(SUBDIRS); do (test -d $$dir && cd $$dir && $(QUIETMAKE) cat); done; for class in DUMMY $(CLASSES); do test -f $$class && cat $$class; done) | $(CPP) -P -undef | perl -ne 's/^\s+//g; print unless /^\s*$$/' | grep -v "^<?php" | grep -v "^?>" >>$(SLIB)
-		@echo "?>" >>$(SLIB)
-
-$(SUBDIRS)::
-		@(cd $@; $(QUIETMAKE))
-
-DUMMY:	
-
-cat:		$(SLIB)
-		@cat $(SLIB)
-
-clean:		
-		@(echo Cleaning $(SLIB) $(LIB) ...) 1>&2
-		@rm -f $(SLIB) $(LIB)
-		@for dir in DUMMY $(SUBDIRS); do (test -d $$dir && cd $$dir && $(QUIETMAKE) $@) || :; done
diff --git a/license/license.class b/license/license.class
index 83a71a5..c915c3a 100644
--- a/license/license.class
+++ b/license/license.class
@@ -5,14 +5,6 @@
 **	Relog Internet Tools 3 Library ("ITOOLS3")
 **
 **	it_license.class - Handle software licensing
-**
-**	$Log$
-**	Revision 1.2  2000/07/13 19:16:29  daenzer
-**	cosmetic changes
-**
-**	Revision 1.1  2000/07/13 19:10:19  weber
-**	Added licensing suite
-**	
 */
 
 /**
diff --git a/sms.lib b/sms.lib
deleted file mode 100644
index 98e2b62..0000000
--- a/sms.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-require('sms/sms.class');
-?>
diff --git a/sms/Makefile b/sms/Makefile
deleted file mode 100644
index 33cd428..0000000
--- a/sms/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-##	$Id$
-##
-##	Makefile for itools/sms.lib
-##
-##	$Log$
-##	Revision 1.1  2000/01/10 23:04:09  weber
-##	SMS functions added
-##
-
-CPP=		cpp
-QUIETMAKE=	$(MAKE) -s
-PHPCOMPILE=	/usr/local/bin/phpcompile
-
-MODULE=		sms
-SUBDIRS=	
-CLASSES=	sms.class
-
-#
-# Library creation rules, do not change stuff below...
-#
-SLIB=		$(MODULE).slib
-LIB=		../$(MODULE).lib
-
-all:		$(LIB)
-
-$(LIB):		$(SLIB)
-		@if [ -x $(PHPCOMPILE) ]; then (echo Compiling $(SLIB) to $(LIB) ...) 1>&2; $(PHPCOMPILE) <$(SLIB) >$(LIB); else (echo $(PHPCOMPILE) not found, copying $(SLIB) to $(LIB) ...) 1>&2; cp $(SLIB) $(LIB); fi
-
-$(SLIB):	$(CLASSES) DUMMY
-		@(echo Creating $(SLIB) from $(SUBDIRS) $(CLASSES) ...) 1>&2
-		@echo "<?php" >$(SLIB)
-		@(for dir in DUMMY $(SUBDIRS); do (test -d $$dir && cd $$dir && $(QUIETMAKE) cat); done; for class in DUMMY $(CLASSES); do test -f $$class && cat $$class; done) | $(CPP) -P -undef | perl -ne 's/^\s+//g; print unless /^\s*$$/' | grep -v "^<?php" | grep -v "^?>" >>$(SLIB)
-		@echo "?>" >>$(SLIB)
-
-$(SUBDIRS)::
-		@(cd $@; $(QUIETMAKE))
-
-DUMMY:	
-
-cat:		$(SLIB)
-		@cat $(SLIB)
-
-clean:		
-		@(echo Cleaning $(SLIB) $(LIB) ...) 1>&2
-		@rm -f $(SLIB) $(LIB)
-		@for dir in DUMMY $(SUBDIRS); do (test -d $$dir && cd $$dir && $(QUIETMAKE) $@) || :; done
diff --git a/sms/sms.class b/sms/sms.class
deleted file mode 100644
index 6483035..0000000
--- a/sms/sms.class
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/*
-**	$Id$
-**
-**	ITools - the Internet Tools Library
-**
-**	Copyright (C) 1995-2003 by the ITools Authors.
-**	This program is free software; you can redistribute it and/or
-**	modify it under the terms of either the GNU General Public License
-**	or the GNU Lesser General Public License, as published by the Free
-**	Software Foundation. See http://www.gnu.org/licenses/ for details.
-**
-**	sms.class - SMS gateway interface (both ways) using the Minick SMS gateway
-*/
-
-class it_sms
-{
-	/* Public readonly */
-	var $service;	/* Service name ("soltime", "superweb", etc.) */
-	var $keyword;	/* Short number service keyword ("SOLTIME", "SW", etc.) */
-
-	var $direction;	/* "IN": Handy -> it_sms; "OUT": it_sms -> Handy */
-	var $date;	/* Date of message sent / received */
-
-	var $number;	/* FQPhone number of other party z. B. 0041763901391 */
-	var $message;	/* Message text */
-
-	var $result;	/* Result of transaction or empty */
-
-	/* Private */
-	var $logfile;	/* Log file name or empty for no log */
-
-
-	/* Constructor */
-	function it_sms($service, $keyword, $logfile="XX")
-	{
-		$this->service = $service;
-		$this->keyword = $keyword;
-		$this->logfile = $logfile;
-
-		if ($logfile == "XX")
-			$this->logfile = $_SERVER['DOCUMENT_ROOT']."/../log/sms.log";
-	}
-
-
-	/* Write a log file entry */
-	function log()
-	{
-		if ($this->logfile == "")
-			return;
-
-		$log = date("Y-m-d H:i:s") . " DIR=$this->direction NUMBER=$this->number RESULT=$this->result TEXT=\"$this->message\"";
-		if ($_COOKIE['UID'])
-			$log .= " UID=\"" . $_COOKIE['UID'] . "\"";
-
-		if ($file = fopen($this->logfile, "a"))
-		{
-			fwrite($file, $log . "\n");
-			fclose($file);
-		}
-	}
-
-
-	/* Send an SMS. Returns 1 on success, 0 otherwise. */
-	function send($number, $message)
-	{
-		$this->direction = "OUT";
-		$this->date = date("Y-m-d H:i:s");
-
-		/* Remove all non-digits */
-		$number = ereg_replace('[^+0-9]', '', $number);
-
-		/* Change 076 to 004176 etc. */
-		$this->number = ereg_replace('^0([1-9])', '0041\\1', $number);
-
-		$this->message = $message;
-
-		$url = "http://panther.minick.ch/cgi-bin/$this->service/send?number=$this->number&message=" . urlencode($this->keyword." ".$this->message);
-
-		/* debug("Sending SMS: $url<br>\n"); */
-
-		$result = file($url);
-		$this->result = trim($result[5]); /* "OKAY" or "NOTOK" w/o newline */
-		$this->log();
-
-		if ($this->result == "OKAY")
-			return 1;	/* Success */
-
-		return 0;	/* Failure */
-	}
-
-
-	/*
-	**  Receive an SMS from HTTP GET request
-	**  Format: number=Absendertelefonnummer, message=SMS-Text, id=xxxxx
-	**  Returns: 1=got a valid message, 0=got invalid garbage, ignore.
-	*/
-	function receive($secret="")
-	{
-		$this->direction = "IN";
-		$this->date = date("Y-m-d H:i:s");
-
-		$this->number = $_GET['number'];
-		$this->message = $_GET['message'];
-
-		if ($_GET['id'] == $secret)
-		{
-			$this->result = "OKAY";
-			$this->log();
-			return 1;
-		}
-		else
-		{
-			$this->result = "NOTOK: Bad authentication \"".$_GET['id']."\"";
-			$this->log();
-			$this->number = $this->message = "";
-			return 0;
-		}
-	}
-
-} /* End class it_sms */
-?>
diff --git a/text.class b/text.class
index 2011a0b..2f042e1 100644
--- a/text.class
+++ b/text.class
@@ -4,7 +4,7 @@
 **
 **	ITools - the Internet Tools Library
 **
-**	Copyright (C) 1995-2003 by the ITools Authors.
+**	Copyright (C) 1995-2006 by the ITools Authors.
 **	This program is free software; you can redistribute it and/or
 **	modify it under the terms of either the GNU General Public License
 **	or the GNU Lesser General Public License, as published by the Free
@@ -12,18 +12,18 @@
 **
 */
 
-class it_text extends it_db_record
+class it_text
 {
-	var $defaultlanguage;		/* Preferred language (without cookie) */
-	var $actlanguage;		/* Selected language */
-	var $actlanguagename;		/* Name of selected language */
-	var $languages = array();	/* Active languages */
-	var $languages_available = array(); /* Available languages */
-	var $language_failsafe;         /* First available language */
-	var $debug;			/* Non-empty if debug mode is desired */
-	var $cookiename;                /* Name of the language cookie, default is "LANGUAGE" */
-	var $unknown_labels = array();  /* array for spooling unknown labels in
-                                           debug mode */
+	var $defaultlanguage;			# Preferred language (without cookie)
+	var $actlanguage;			# Selected language
+	var $actlanguagename;			# Name of selected language
+	var $languages = array();		# Active languages
+	var $languages_available = array();	# Available languages
+	var $language_failsafe;			# First available language
+	var $statictext = array();		# Text array, read from php file on init
+	var $debug;				# Non-empty if debug mode is desired
+	var $cookiename;			# Name of the language cookie, default is "LANGUAGE"
+	var $unknown_labels = array();		# array for spooling unknown labels in debug mode
 
 /**
  * Constructor
@@ -33,47 +33,52 @@ class it_text extends it_db_record
  * @param $db Optional database object, defaults to global $it_db
  * @param $cookiename Optional cookie name (default: 'LANGUAGE')
  */
-function it_text($defaultlanguage='de', $tablename='it_texts', $debug='', $db=0, $cookiename='LANGUAGE')
+function it_text($defaultlanguage = 'de', $tablename = 'it_texts', $debug = '', $db = 0, $cookiename = 'LANGUAGE')
 {
+	$this->phpfile = isset($phpfile) ? $phpfile : ($GLOBALS['ULTRAHOME'] . '/phpinclude/texts.php');
 	$this->debug = $debug;
 	$this->cookiename = $cookiename;
 
-	/* Create database objects */
-	if (is_object($db))
+	# Read $this->statictext from php file if it's not defined yet
+	if (!$this->statictext)
+		include($this->phpfile);
+
+	# $$$ MIGRATION: Try to create texts.php from database if it doesn't exist
+	if (!$this->statictext)
+	{
+		$db = is_object($db) ? $db : $GLOBALS['it_db'];
 		$table = new it_db_table($db, $tablename);
-	else
-		$table = new it_db_table($GLOBALS['it_db'], $tablename);
-	$this->it_db_record($table, 'Label');
-
-	/* Get array of supported languages and their names */
-	if (!$this->read('_'))
-		internal_error("Can't read language names");
-	$languages = explode(',', $table->field_names());
-	while (list($index, $code) = each($languages))
+		$record = new it_db_record($table, 'Label');
+		for ($record->select(); $record->fetch_next();)
+		{
+			$data = $record->data;
+			unset($data['Label']);
+			$this->statictext[$record->data['Label']] = $data;
+		}
+		$this->dump_php();
+	}
+
+	# Get array of supported languages and their names
+	foreach(array_keys($this->statictext['_']) as $code)
 	{
-		if ($code != 'Label')
+		# If a language's name in '_' is unset, ignore it
+		if ($languagename = $this->statictext['_'][$code])
 		{
-			/* If a language's "_" field is unset, ignore it */
-			if ($languagename = $this->data[$code])
+			$this->languages_available[$code] = $languagename;
+			# Only use a language in browser/cookie detection below if it's not diasbled by a leading '-'
+			if (substr($languagename, 0, 1) != '-')
 			{
-				$this->languages_available[$code] = $languagename;
-				/* Only use a language in browser/cookie detection below if it's not diasbled by a leading '-' */
-				if (substr($languagename, 0, 1) != '-')
-				{
-					$this->languages[$code] = $languagename;
-					if (!isset($this->language_failsafe))
-						$this->language_failsafe = $code;
-				}
+				$this->languages[$code] = $languagename;
+				if (!isset($this->language_failsafe))
+					$this->language_failsafe = $code;
 			}
 		}
 	}
 
-	/* Set our default language according to browser preference */
+	# Set our default language according to browser preference
 	if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
 	{
-		/* SQL field names can't contain "-" so we change these to "_" */
-		$languages = explode(',', strtr($_SERVER['HTTP_ACCEPT_LANGUAGE'], '-', '_'));
-		while (list($key, $lang) = each($languages))
+		foreach(explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $lang)
 		{
 			if (isset($this->languages[$lang]))
 			{
@@ -93,35 +98,35 @@ function it_text($defaultlanguage='de', $tablename='it_texts', $debug='', $db=0,
 			}
 		}
 		if (count($this->languages) == 0)
-		        debug("No active languages found!", 5);
+			debug("No active languages found!", 5);
 	}
 
-	/* If no language matched, use the one that was supplied by our caller */
+	# If no language matched, use the one that was supplied by our caller
 	if (!isset($this->defaultlanguage))
 		$this->defaultlanguage = $defaultlanguage;
 
-	/* If language is still invalid, use the first one from our database */
+	# If language is still invalid, use failsafe language
 	if (!$this->languages[$this->defaultlanguage])
 	{
 		debug("Bad language \"{$this->defaultlanguage}\", using first entry \"{$this->languages[$this->language_failsafe]}\"", 5);
 		$this->defaultlanguage = $this->language_failsafe;
 	}
 
-	/* If a cookie is set, we use its value as our active language */
+	# If a cookie is set, we use its value as our active language
 	if (isset($_COOKIE[$this->cookiename]) && ($cookie = $_COOKIE[$this->cookiename]))
 	{
-		if ($this->languages[$cookie])	/* Is this language available? */
+		if ($this->languages[$cookie])	# Is this language available?
 		{
 			$this->actlanguage = $cookie;
 			debug("Got language from cookie: {$this->actlanguage}", 6);
 		}
 	}
 
-	/* If the cookie supplied no valid language, we use our calculated default language */
+	# If the cookie supplied no valid language, we use our calculated default language
 	if (!isset($this->actlanguage))
 		$this->actlanguage = $this->defaultlanguage;
 
-	/* And finally, record the name of our active language. */
+	# And finally, record the name of our active language.
 	$this->actlanguagename = $this->languages[$this->actlanguage];
 
 	debug("Used language is {$this->actlanguagename}, default language is {$this->defaultlanguage}.", 6);
@@ -135,31 +140,19 @@ function it_text($defaultlanguage='de', $tablename='it_texts', $debug='', $db=0,
  * @param $language Optional language to return text in.
  * @return Localized text string
  */
-function text($label, $raw=0, $language='')
+function text($label, $raw = null, $language = null)
 {
 	if ($this->debug === 'label')
 		return $label;
 	
-	if ($this->read($label))
-	{
-		if ($language == '')
-			$language = $this->actlanguage;
-
-		/*
-		** If field is NULL, consider it undefined (and return label if in
-		** debug mode). That's why we can't call safe_get_field() here.
-		*/
-		if (isset($this->data[$language]))
-			return $this->data[$language];
-	}
+	if (!isset($language))
+		$language = $this->actlanguage;
 
-	if ($this->debug)
-	{
-	        $this->unknown_labels[] = $label;
-		return "<blink>$label</blink>";
-	}
-	else
-	        return $this->label_unknown($label);
+	if (isset($this->statictext[$label][$language]))
+		return $this->statictext[$label][$language];
+
+	$this->unknown_labels[] = $label;
+	return $this->debug ? "<blink>$label ($language)</blink>" : $this->label_unknown($label);
 }
 
 
@@ -170,7 +163,7 @@ function text($label, $raw=0, $language='')
  */
 function label_unknown($label)
 {
-        internal_error("No text found for label \"$label\"");
+	internal_error("No text found for label \"$label\"");
 }
 
 
@@ -183,9 +176,9 @@ function label_unknown($label)
  * @param $language Optional language to return text in.
  * @return Localized text string with variables replaced by their values
  */
-function etext($label, $values=null, $language='')
+function etext($label, $values = null, $language = null)
 {
-	return it_text_transmogrify($this->text($label, false, $language), is_array($values) ? $values : null);
+	return it_text_transmogrify($this->text($label, null, $language), $values);
 }
 
 
@@ -194,22 +187,22 @@ function etext($label, $values=null, $language='')
  * @param $language New language to set
  * @param $setcookie Optional flag if a cookie is to be set (default: true)
  */
-function set_language($language, $setcookie=true)
+function set_language($language, $setcookie = true)
 {
 	/* If set to an invalid language (via forged GET?) we delete the cookie */
-        if ($this->languages_available[$language])
-        {
-	        if (!$this->languages[$language])
-		        debug('Selected an existing but currently disabled language!', 6);
-	        $this->actlanguage = $language;
+	if ($this->languages_available[$language])
+	{
+		if (!$this->languages[$language])
+			debug('Selected an existing but currently disabled language!', 6);
+		$this->actlanguage = $language;
 		if ($setcookie)
-		        SetCookie($this->cookiename, $this->actlanguage, time() + 31536000, '/');	/* 1 Year */
+			SetCookie($this->cookiename, $this->actlanguage, time() + 31536000, '/');	# 1 year
 	}
-        else
+	else
 	{
 		$this->actlanguage = $this->defaultlanguage;
 		if ($setcookie)
-		  SetCookie($this->cookiename, '', time() + 31536000, '/');
+			SetCookie($this->cookiename, '', time() + 31536000, '/');
 	}
 }
 
@@ -237,12 +230,26 @@ function get_default_language()
 /**
  * Check if a text entry for a specific label exists
  * @param $label Label to check
+ * @return true if text exists in actual (or supplied) language, false otherwise.
+ */
+function text_exists($label, $language = null)
+{
+	return isset($this->statictext[$label][isset($language) ? $language : $this->actlanguage]);
+}
+
+
+/**
+ * Create / overwrite a text in the selected language. Call dump_php() to make the change permanent.
+ * @param $label Label of text to change
+ * @param $text New text to set
+ * @param $language Optional language that is to be manipulated
  */
-function text_exists($label)
+function set($label, $text = null, $language = null)
 {
-	if ($this->read($label))
-		return 1;
-	return 0;
+	if (!isset($language))
+		$language = $this->actlanguage;
+
+	$this->statictext[$label][$language] = $text;
 }
 
 
@@ -252,17 +259,8 @@ function text_exists($label)
  */
 function checkout_unknown_labels()
 {
-	if (count($this->unknown_labels) > 0)
-	{
-		$debug_text = 'No text found for labels:<br>';
-		reset ($this->unknown_labels);
-		while($a = each($this->unknown_labels))
-			$debug_text .= $a[1]."<br>";
-
-		internal_error($debug_text);
-	}
-	else
-		return 0;
+	if ($this->unknown_labels)
+		internal_error('No text found for labels: ' . implode(',', $this->unknown_labels));
 }
 	
 
@@ -342,6 +340,32 @@ function texify($text, $convertlinebreaks = true)
 	return strtr($text, $translation);
 }
 
+/**
+ * Re-create php text file from $this->statictext
+ * @return true if successful, false if not (usually if file is not writeable by user www)
+ */
+function dump_php()
+{
+	$result = false;
+
+	# Special sorting: natural, but _ is the first entry
+	$keys = array_keys($this->statictext);
+	natsort($keys);
+	foreach($keys as $key)
+		$text[$key] = $this->statictext[$key];
+	$this->statictext = array_merge('_' => $text['_'], $text);
+
+	$oldmask = umask(002);
+	if ($f = fopen($this->phpfile, 'w'))
+	{
+		$result = (fputs($f, '<?php $this->statictext = ' . strtr(var_export($this->statictext, TRUE), array("=> \n  array (" => "=> array(", "array (\n  '_'" => "array(\n'_'", "\n  ),\n  " => "\n),\n", "\n  ),\n" => "\n)\n")) . ";\n?>\n") !== false);
+		fclose($f);
+	}
+
+	umask($oldmask);
+	return $result;
+}
+
 } /* End class it_text */
 
 
@@ -349,15 +373,15 @@ function texify($text, $convertlinebreaks = true)
  * Globally available functions without need for object
  */
 
-/*
+/**
  * Replaces variables of the form {obj.var} with value, e.g. {user.name}
  * NOTE: Invalid object names or non-existing variables are simply deleted.
  */
-function it_text_transmogrify($text, $values=array())
+function it_text_transmogrify($text, $values = null)
 {
 	while (preg_match('/{([\w.]+)}/', $text, $regs))
 	{
-		$path =  explode('.', $regs[1]);
+		$path = explode('.', $regs[1]);
 		if ($values)
 			$value =& $values;
 		else
@@ -382,7 +406,7 @@ function it_text_transmogrify($text, $values=array())
 /*
  * Shortcut to $it_text->Text()
  */
-function T($label, $raw=0, $language='')
+function T($label, $raw = null, $language = null)
 {
 	return $GLOBALS['it_text']->text($label, $raw, $language);
 }
@@ -391,7 +415,7 @@ function T($label, $raw=0, $language='')
 /*
  * Shortcut to $it_text->etext()
  */
-function ET($label, $values=null, $language='')
+function ET($label, $values = null, $language = null)
 {
 	return $GLOBALS['it_text']->etext($label, $values, $language);
 }
@@ -407,7 +431,7 @@ function T_lang()
 /**
  * Shortcut to $it_text->get_language()
  */
-function T_set_language($language, $setcookie=true)
+function T_set_language($language, $setcookie = true)
 {
 	return $GLOBALS['it_text']->set_language($language, $setcookie);
 }
@@ -415,8 +439,8 @@ function T_set_language($language, $setcookie=true)
 /**
  * Shortcut to $it_text->text_exists()
  */
-function T_exists($label)
+function T_exists($label, $language = null)
 {
-	return $GLOBALS['it_text']->text_exists($label);
+	return $GLOBALS['it_text']->text_exists($label, $language);
 }
 ?>
diff --git a/url.class b/url.class
index 98a3967..71a1114 100644
--- a/url.class
+++ b/url.class
@@ -393,7 +393,7 @@ function get_cache($p = array())
 		if ($result)
 		{
 			EDC('getcache', "processold", $p['url'], $path);
-			touch($result, filemtime($srcpath));	# Ensure processed is never newer than src
+			touch($result, @filemtime($srcpath));	# Ensure processed is never newer than src
 		}
 	}
 
diff --git a/urlcache/.cvsignore b/urlcache/.cvsignore
deleted file mode 100644
index b8e8856..0000000
--- a/urlcache/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.slib
-*.lib
diff --git a/urlcache/Makefile b/urlcache/Makefile
deleted file mode 100644
index 0cccffd..0000000
--- a/urlcache/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-##
-##	$Id$
-##
-##	Makefile for itools/urlcache.lib
-##
-
-CPP=		cpp
-QUIETMAKE=	$(MAKE) -s
-PHPCOMPILE=	/usr/local/bin/phpcompile
-
-MODULE=		urlcache
-SUBDIRS=	
-CLASSES=	urlcache.class
-
-#
-# Library creation rules, do not change stuff below...
-#
-SLIB=		$(MODULE).slib
-LIB=		../$(MODULE).lib
-
-all:		$(LIB)
-
-$(LIB):		$(SLIB)
-		@if [ -x $(PHPCOMPILE) ]; then (echo Compiling $(SLIB) to $(LIB) ...) 1>&2; $(PHPCOMPILE) <$(SLIB) >$(LIB); else (echo $(PHPCOMPILE) not found, copying $(SLIB) to $(LIB) ...) 1>&2; cp $(SLIB) $(LIB); fi
-
-$(SLIB):	$(CLASSES) DUMMY
-		@(echo Creating $(SLIB) from $(SUBDIRS) $(CLASSES) ...) 1>&2
-		@echo "<?php" >$(SLIB)
-		@(for dir in DUMMY $(SUBDIRS); do (test -d $$dir && cd $$dir && $(QUIETMAKE) cat); done; for class in DUMMY $(CLASSES); do test -f $$class && cat $$class; done) | $(CPP) -P -undef | perl -ne 's/^\s+//g; print unless /^\s*$$/' | grep -v "^<?php" | grep -v "^?>" >>$(SLIB)
-		@echo "?>" >>$(SLIB)
-
-$(SUBDIRS)::
-		@(cd $@; $(QUIETMAKE))
-
-DUMMY:	
-
-cat:		$(SLIB)
-		@cat $(SLIB)
-
-clean:		
-		@(echo Cleaning $(SLIB) $(LIB) ...) 1>&2
-		@rm -f $(SLIB) $(LIB)
-		@for dir in DUMMY $(SUBDIRS); do (test -d $$dir && cd $$dir && $(QUIETMAKE) $@) || :; done
diff --git a/urlcache/urlcache.class b/urlcache/urlcache.class
deleted file mode 100644
index b058a1c..0000000
--- a/urlcache/urlcache.class
+++ /dev/null
@@ -1,217 +0,0 @@
-<?php
-/*
-**	$Id$
-**
-**	Relog Internet Tools 3 Library ("ITOOLS3")     
-**
-**	it_urlcache.class - Interface to URL content cache in DB
-**
-**	This class relies on a DB table with the following scheme:
-**	url		CHAR(255)	NOT NULL,
-**	updateinterval	INT		NOT NULL,
-**	lastupdate	INT		NOT NULL,
-**	nextupdate	INT		NOT NULL,
-**	contentmd5	CHAR(32)	NOT NULL,
-**	content		TEXT		NOT NULL,
-**	PRIMARY KEY	(url),
-**	KEY		(nextupdate)
-*/
-
-/* PRIVATE */
-define("_IT_URLCACHE_DEFAULT_INTERVAL", 300);
-define("_IT_URLCACHE_MAX_CONNECTIONS", 30);
-
-class it_urlcache extends it_db_record
-{
-	/* PRIVATE */
-	var $default_interval = _IT_URLCACHE_DEFAULT_INTERVAL;
-	var $max_connections = _IT_URLCACHE_MAX_CONNECTIONS;
-
-function set_default_interval($default_interval)
-{
-	$this->default_interval = $default_interval;
-}
-
-
-function set_max_connections($max_connections)
-{
-	$this->max_connections = $max_connections;
-}
-
-
-/*
- * Register an URL to be fetched by background process.
- * Note: get() will return an empty string until the url is fetched for the
- * first time
- */
-function register($url)
-{
-	if (!$this->read($url))
-	{
-		$tags = array("url" => $url, "updateinterval" => $this->default_interval);
-		$this->create($tags);
-	}
-}
-
-
-/*
- * Removes the url from the cache. It won't be fetched again until register()
- * is called again.
- */
-function unregister($url)
-{
-	if ($this->read($url))
-		$this->delete();
-}
-
-
-/*
- * Get content of url. Returns empty string if it was never successfully
- * fetched.
- */
-function get_content($url)
-{
-	$this->read($url);
-	return $this->data['content'];
-}
-
-
-/*
- * Try to refetch all URLs in the database.
- * Note: This is intented for background process use only as it may take
- * a while to finish...
- */
-function update_cache()
-{
-	$now = time();
-	$pages = array();
-
-	$result = $this->table->safe_sql_select("WHERE nextupdate < $now", "url");
-
-	while (list($url) = $this->table->db->fetch_array($result))
-		$pages[] = $url;
-
-	$this->table->db->free($result);
-
-	$this->_fetch_urls($pages, $now);
-}
-
-
-/* PRIVATE */
-function _update_cache($url, $content, $now)
-{
-	$contentmd5 = md5($content);
-
-	if ($this->read($url))
-	{
-		$interval = $this->data['updateinterval'];
-		$age = $now - $this->data['lastupdate'];
-
-		if ($this->data['contentmd5'] == $contentmd5)
-		{
-			if ($age > ($interval * 2))
-				$interval = $interval * 1.5;
-
-			$tags = array("updateinterval" => $interval, "nextupdate" => $now + $interval);
-		}
-		else
-		{
-			if ($age < ($interval / 2))
-				$interval = $interval / 1.5;
-
-			if ($interval < $this->default_interval)
-				$interval = $this->default_interval;
-
-			$tags = array("updateinterval" => $interval, "lastupdate" => $now, "nextupdate" => $now + $interval, "contentmd5" => $contentmd5, "content" => $content);
-		}
-
-		$this->update($tags);
-	}
-	else
-	{
-		$tags = array("url" => $url, "updateinterval" => $this->default_interval, "lastupdate" => $now, "nextupdate" => $now + $this->default_interval, "contentmd5" => $contentmd5, "content" => $content);
-		$this->create($tags);
-	}
-}
-
-
-/*
- * PRIVATE
- * Fetch URL in array $urls and store update cache database accordingly
- */
-function _fetch_urls($pages, $now)
-{
-	$pos = 0;
-	$fds = array();
-	$urls = array();
-	$content = array();
-	$count = 0;
-
-	for ($pos = 0; ($pos < count($pages)) && ($pos < $this->max_connections); $pos++)
-	{
-		debug("Opening $pages[$pos]", 10);
-
-		if ($fd = fopen($pages[$pos], "r"))
-		{
-			socket_set_blocking($fd, false);
-			$fds[] = $fd;
-			$urls[] = $pages[$pos];
-			$content[] = "";
-			$count++;
-			debug("Opened $pages[$pos]", 10);
-		}
-	}
-
-	while ($count > 0)
-	{
-		$read = 0;
-
-		for ($i = 0; $i < count($fds); $i++)
-		{
-			if ($fds[$i])
-			{
-				if (!feof($fds[$i]))
-				{
-					$data = fread($fds[$i], 4096);
-					$content[$i] .= $data;
-					$read += strlen($data);
-					debug("Read " . strlen($data) . " from $urls[$i]", 10);
-				}
-
-				if (feof($fds[$i]))
-				{
-					fclose($fds[$i]);
-					$fds[$i] = 0;
-					$count--;
-					$this->_update_cache($urls[$i], $content[$i], $now);
-					debug("Finished $urls[$i]: " . strlen($content[$i]) . " bytes", 10);
-
-					/* Schedule next url for retrieval */
-					if ($pos < count($pages))
-					{
-						if ($fd = fopen($pages[$pos], "r"))
-						{
-							socket_set_blocking($fd, false);
-							$fds[$i] = $fd;
-							$urls[$i] = $pages[$pos];
-							$content[$i] = "";
-							$count++;
-							debug("Opened $pages[$pos]", 10);
-						}
-
-						$pos++;
-					}
-				}
-			}
-		}
-
-		/* We are in non-blocking mode, be nice */
-		if (($count > 0) && ($read == 0))
-		{
-			sleep(1);
-			debug("Sleeping...", 10);
-		}
-	}
-}
-
-} /* End class it_urlcache */
diff --git a/urlcache/urlcache.php b/urlcache/urlcache.php
deleted file mode 100644
index fb6fd33..0000000
--- a/urlcache/urlcache.php
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/www/server/bin/php -q
-<?php
-/*
-**	$Id$
-**
-**      ITools - the Internet Tools Library
-**
-**      Copyright (C) 1995-2003 by the ITools Authors.
-**      This program is free software; you can redistribute it and/or
-**      modify it under the terms of either the GNU General Public License
-**      or the GNU Lesser General Public License, as published by the Free
-**      Software Foundation. See http://www.gnu.org/licenses/ for details.
-**
-**	cacher.php - Script to be called from crontab to keep url cache up-to-date
-*/
-
-set_time_limit(4 * 60);
-
-require("itools/itools.lib");
-require("itools/urlcache.lib");
-
-$it_debug = new it_debug(10, "weber@search.ch");
-$it_db = new it_db("urlcache", "urlcache", "JKhsad34H");
-$table = new it_db_table($it_db, "urlcache");
-$it_urlcache = new it_urlcache($table, "url");
-$it_urlcache->update_cache();
-
-?>
diff --git a/urlcache/urlcache.sql b/urlcache/urlcache.sql
deleted file mode 100644
index fcf8659..0000000
--- a/urlcache/urlcache.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-DROP TABLE IF EXISTS urlcache;
-
-CREATE TABLE urlcache
-(
-	url		CHAR(255)	NOT NULL,
-	updateinterval	INT		NOT NULL,
-	lastupdate	INT		NOT NULL,
-	nextupdate	INT		NOT NULL,
-	contentmd5	CHAR(32)	NOT NULL,
-	content		TEXT		NOT NULL,
-
-	PRIMARY KEY	(url),
-	KEY		(nextupdate)
-);
diff --git a/user.class b/user.class
index c0da429..e66fc78 100644
--- a/user.class
+++ b/user.class
@@ -225,6 +225,7 @@ function is_logged_in()
  * @param $username User ID to login
  * @param $password Password to authenticate login
  * @param $ignorepassword True if you want to login anyway (e.g. 'su')
+ * @return non-false if successful, false on error
  */
 function login($username, $password, $ignorepassword = false, $withsession = true)
 {
-- 
cgit v1.2.3