From fb8c18576e4a6c775c8a2829f12c7b057d1cefce Mon Sep 17 00:00:00 2001 From: Stefan Ritt Date: Mon, 7 Jun 2004 10:36:48 +0000 Subject: [PATCH] Version 2.5.3 SVN revision: 891 --- doc/ChangeLog | 78 ++++--- doc/index.html | 9 +- elog.nsi | 92 ++++---- src/elogd.c | 570 +++++++++---------------------------------------- 4 files changed, 194 insertions(+), 555 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 3160c18e..8b30c056 100755 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,39 +1,51 @@ +Version 2.5.3, released June 7th, 2004 +====================================== + +- Implemented favicon (little icon displayed next to bookmarks in Mozilla browser) +- Several problems and bugs with quick filters fixed +- Implemented "protect selection page" +- Implemented text body CSV import +- Changed redirection to absolute path (as defined in HTTP standard) +- Allow ',', '.' and '-' in numeric format +- Added
and
to be recognized as HTML in attributes +- Fixed stack overflow under Windows on resubmit of entry +- Added NT/XP service functionality + Version 2.5.2, released March 26th, 2004 ======================================== -- Improved synchronization speed -- Implemented 'display ' -- Implemented XML encoding -- Implemented CSV import and XML export -- Implemented 'guest list display' -- Implemented 'extendable options' for MOptions -- Conditional attributes get evaluated correctly during editing of existing entries -- Fixed crashing elogd in threaded display -- Implemented option 'guest display' -- Implemented OR's and AND's of several conditions -- Change POST action to './' for OS-X IE -- Strip HTML from title bar and summary display -- Fixed bug with MOptions and conditional attributes -- Implemented 'ID display' -- Fixed bug with supressed email notification box and conditional attributes -- Substitutions now also work with 'preset text' -- Added Prepend/Append on Edit/Reply -- Substitution of $message id and $entry time now works on all possible places -- Allocate heap memory in display_line -- Fixed bug with date attribute email notification -- Fixed bug with top text -- Added 'edit' and 'delete' to 'list display' -- Added CSV import page -- Show attribute values as HTML if the contain or in listing -- Fixed bug with 'start page = 0?cmd=Last -- Fixed bug in el_decode, added or in listing +- Fixed bug with 'start page = 0?cmd=Last +- Fixed bug in el_decode, added Links]  * 

Home of the Electronic Logbook package by Stefan Ritt

-
  Current version is : 2.5.2  
+
  Current version is : 2.5.3  
  What is ELOG ?  
@@ -164,12 +164,7 @@ width="88" height="31" border="0" alt="SourceForge"> and Freshmeat - - - -Visits to this page since 23 May 2001:   - - -

+

  diff --git a/elog.nsi b/elog.nsi index d4927492..8585bc75 100755 --- a/elog.nsi +++ b/elog.nsi @@ -4,6 +4,14 @@ ; ; The name of the installer +;-------------------------------- +;Include Modern UI + +!include "MUI.nsh" + +;-------------------------------- +;General + Name "ELOG" ; The file to write @@ -23,17 +31,31 @@ ComponentText "This will install the ELOG electronic logbook server on your comp ; The text to prompt the user to enter a directory DirText "Choose a directory to install in to:" -; Pages -Page components -Page directory -Page instfiles +;-------------------------------- +;Pages -UninstPage uninstConfirm -UninstPage instfiles +!insertmacro MUI_PAGE_WELCOME +!insertmacro MUI_PAGE_LICENSE "COPYING" +!insertmacro MUI_PAGE_COMPONENTS +!insertmacro MUI_PAGE_DIRECTORY +!insertmacro MUI_PAGE_INSTFILES + +!insertmacro MUI_UNPAGE_CONFIRM +!insertmacro MUI_UNPAGE_INSTFILES + +;-------------------------------- +;Languages + +!insertmacro MUI_LANGUAGE "English" + +;-------------------------------- +;Installer Sections + +!define MUI_ABORTWARNING ;---------------------------------------------- ; Main system -Section "ELOG system (required)" +Section "ELOG system (required)" SecSystem ; root directory SetOutPath $INSTDIR @@ -70,6 +92,8 @@ Section "ELOG system (required)" themesNotExist: File themes\default\*.css File themes\default\*.gif + File themes\default\*.ico + File themes\default\*.png SetOutPath $INSTDIR\themes\default\icons File themes\default\icons\*.* themesNotOverwrite: @@ -95,30 +119,19 @@ Section "ELOG system (required)" SectionEnd ; optional section -Section "Multi-language support" +Section "Multi-language support" SecLang SetOutPath $INSTDIR - File eloghelp_ge.html - File eloghelp_fr.html - File eloghelp_sp.html - File eloghelp_du.html - File eloghelp_br.html - File eloghelp_ja.html - File eloghelp_it.html - File eloghelp_en.html - File eloglang.german - File eloglang.french - File eloglang.spanish - File eloglang.dutch - File eloglang.brazilian - File eloglang.japanese - File eloglang.italian - File eloglang.danish + File eloghelp_*.html + File eloglang.* SectionEnd ; optional section -Section "Start Menu Shortcuts" +Section "Start Menu Shortcuts" SecStart CreateDirectory "$SMPROGRAMS\ELOG" - CreateShortCut "$SMPROGRAMS\ELOG\ELOG server.lnk" "$INSTDIR\elogd.exe" "" "$INSTDIR\elogd.exe" 0 + CreateDirectory "$SMPROGRAMS\ELOG\ELOG Server" + CreateShortCut "$SMPROGRAMS\ELOG\ELOG Server\Start ELOG server manually.lnk" "$INSTDIR\elogd.exe" "$INSTDIR\elogd.exe" "$INSTDIR\themes\default\favicon.ico" + CreateShortCut "$SMPROGRAMS\ELOG\ELOG Server\Register ELOG server service.lnk" "$INSTDIR\elogd.exe" "$INSTDIR\elogd.exe -install" "$INSTDIR\themes\default\favicon.ico" + CreateShortCut "$SMPROGRAMS\ELOG\ELOG Server\Unregister ELOG server service.lnk" "$INSTDIR\elogd.exe" "$INSTDIR\elogd.exe -remove" "$INSTDIR\themes\default\favicon.ico" Delete "$SMPROGRAMS\ELOG\Demo Logbook (start server first!).lnk" WriteINIStr "$SMPROGRAMS\ELOG\Demo Logbook (start server first!).url" \ "InternetShortcut" "URL" "http://localhost:8080/demo/" @@ -155,22 +168,8 @@ Section "Uninstall" Delete $INSTDIR\elconv.exe Delete $INSTDIR\elogd.cfg - Delete $INSTDIR\eloghelp_en.html - Delete $INSTDIR\eloghelp_fr.html - Delete $INSTDIR\eloghelp_ge.html - Delete $INSTDIR\eloghelp_sp.html - Delete $INSTDIR\eloghelp_du.html - Delete $INSTDIR\eloghelp_it.html - Delete $INSTDIR\eloghelp_ja.html - Delete $INSTDIR\eloghelp_br.html - Delete $INSTDIR\eloglang.french - Delete $INSTDIR\eloglang.german - Delete $INSTDIR\eloglang.spanish - Delete $INSTDIR\eloglang.dutch - Delete $INSTDIR\eloglang.brazilian - Delete $INSTDIR\eloglang.italian - Delete $INSTDIR\eloglang.japanese - Delete $INSTDIR\eloglang.danish + Delete $INSTDIR\eloghelp_*.html + Delete $INSTDIR\eloglang.* Delete $INSTDIR\doc\* RMDir $INSTDIR\doc @@ -212,4 +211,13 @@ Section "Uninstall" SectionEnd +;-------------------------------- +;Descriptions + +!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN + !insertmacro MUI_DESCRIPTION_TEXT ${SecSystem} "Installs ELOG system, documentation, source code and an example logbook" + !insertmacro MUI_DESCRIPTION_TEXT ${SecLang} "Installs support for different languages which can be switched during runtime" + !insertmacro MUI_DESCRIPTION_TEXT ${SecStart} "Installs start menu shortcuts for ELOG" +!insertmacro MUI_FUNCTION_DESCRIPTION_END + ; eof diff --git a/src/elogd.c b/src/elogd.c index 5ad16dc4..c871309d 100755 --- a/src/elogd.c +++ b/src/elogd.c @@ -6,6 +6,9 @@ Contents: Web server program for Electronic Logbook ELOG $Log$ + Revision 1.336 2004/06/07 10:36:48 midas + Version 2.5.3 + Revision 1.335 2004/06/05 21:45:55 midas Added NT service functionality @@ -114,405 +117,12 @@ Revision 1.300 2004/03/17 21:11:04 midas Removed debug print - Revision 1.299 2004/03/17 20:57:07 midas - Fixed config sync problem due to CRLF-LF - - Revision 1.298 2004/03/16 15:39:53 midas - Fixed endless loop in strip_html - - Revision 1.297 2004/03/16 08:48:30 midas - Fixed format compiler warnings - - Revision 1.296 2004/03/15 20:07:34 midas - Conditional attributes get evaluated correctly during editing of existing entries - - Revision 1.295 2004/03/15 08:02:46 midas - Fixed crashing elogd in threaded display - - Revision 1.294 2004/03/14 16:43:29 midas - Implemented option 'guest display' - - Revision 1.293 2004/03/13 21:07:58 midas - Implemented and between conditions - - Revision 1.292 2004/03/13 15:00:05 midas - Implemented OR's of several conditions - - Revision 1.291 2004/03/11 11:42:09 midas - Change POST action to './' for OS-X IE - - Revision 1.290 2004/03/10 15:54:03 midas - Strip HTML from title bar and summary display - - Revision 1.289 2004/03/10 14:53:40 midas - Fixed bug with MOptions and conditional attributes - - Revision 1.288 2004/03/09 09:56:04 midas - Implemented 'ID display' - - Revision 1.287 2004/03/08 21:24:43 midas - Tried to reduce required stack size in threaded display - - Revision 1.286 2004/03/08 20:49:18 midas - Fixed bug with supressed email notification box and conditional attributes - - Revision 1.285 2004/03/08 13:00:12 midas - Filter entries with invalid date - - Revision 1.284 2004/03/08 12:52:51 midas - Filter entries with invalid date - - Revision 1.283 2004/03/08 09:41:23 midas - Substitutions now also work with 'preset test' - - Revision 1.282 2004/03/08 08:59:06 midas - Evaluage 'pre/append on edit/reply' even for empty entries - - Revision 1.281 2004/03/08 08:13:09 midas - Replaces __TIMESTAMP__ with __DATE__ and __TIME__ - - Revision 1.280 2004/03/06 11:41:58 midas - Made preset $date for date attributes working - - Revision 1.279 2004/03/05 22:35:15 midas - Added Prepend/Append on Edit/Reply - - Revision 1.278 2004/03/05 21:40:01 midas - Substitution of $message id and $entry time now works on all possible places - - Revision 1.277 2004/03/05 20:39:09 midas - Allocate heap memory in display_line - - Revision 1.276 2004/03/03 10:29:56 midas - Fixed bug with date attribute email notification - - Revision 1.275 2004/03/01 15:56:47 midas - Fixed bug with top text - - Revision 1.274 2004/03/01 07:32:29 midas - Added label for 'search across all logbooks' - - Revision 1.273 2004/02/27 08:20:02 midas - Do not sort 'edit' and 'delete' in 'list display' - - Revision 1.272 2004/02/27 08:10:40 midas - Added 'edit' and 'delete' to 'list display' - - Revision 1.271 2004/02/26 21:06:32 midas - Added CSV import page - - Revision 1.270 2004/02/26 13:41:17 midas - Changed strupr() to toupper() - - Revision 1.269 2004/02/26 13:16:34 midas - Show attribute values as HTML if the contain or in listing - - Revision 1.268 2004/02/26 13:09:14 midas - Show attribute values as HTML if the contain or - - Revision 1.267 2004/02/26 13:00:27 midas - Fixed bug with 'start page = 0?cmd=Last - - Revision 1.266 2004/02/26 12:41:42 midas - Fixed bug in el_decode, added