Menu
▾
▴
popfile-commit — CVS commit list messages
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
(160) |
Mar
(119) |
Apr
(111) |
May
(118) |
Jun
(101) |
Jul
(304) |
Aug
(113) |
Sep
(140) |
Oct
(137) |
Nov
(87) |
Dec
(122) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(78) |
Feb
(125) |
Mar
(131) |
Apr
(59) |
May
(121) |
Jun
(166) |
Jul
(150) |
Aug
(137) |
Sep
(73) |
Oct
(58) |
Nov
(27) |
Dec
(60) |
| 2005 |
Jan
(131) |
Feb
(84) |
Mar
(36) |
Apr
(8) |
May
(28) |
Jun
(20) |
Jul
(10) |
Aug
(72) |
Sep
(76) |
Oct
(34) |
Nov
(3) |
Dec
(29) |
| 2006 |
Jan
(13) |
Feb
(92) |
Mar
(7) |
Apr
(1) |
May
(1) |
Jun
(2) |
Jul
(4) |
Aug
(17) |
Sep
(5) |
Oct
(2) |
Nov
(8) |
Dec
(12) |
| 2007 |
Jan
(28) |
Feb
(15) |
Mar
|
Apr
|
May
(8) |
Jun
(4) |
Jul
(5) |
Aug
(8) |
Sep
(20) |
Oct
(38) |
Nov
(65) |
Dec
(92) |
| 2008 |
Jan
(21) |
Feb
(56) |
Mar
(27) |
Apr
(174) |
May
(25) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: naoki i. <am...@us...> - 2008-05-26 17:38:33
|
Update of /cvsroot/popfile/macosx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17368 Modified Files: Makefile Log Message: * Add --perl_only option to build version module to work on Mac OS X 10.3.9 * Apply recommended permission for StartupItems to avoid warning message Index: Makefile =================================================================== RCS file: /cvsroot/popfile/macosx/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 25 May 2008 08:04:55 -0000 1.3 --- Makefile 26 May 2008 17:38:40 -0000 1.4 *************** *** 96,99 **** --- 96,102 ---- @echo "Applying recommended permissions..." + chmod 744 $(PACKAGE_ROOT)/Library/StartupItems/POPFile/POPFile + chmod 644 $(PACKAGE_ROOT)/Library/StartupItems/POPFile/StartupParameters.plist + sudo chown -R root:wheel $(PACKAGE_ROOT)/Library/StartupItems sudo chown -R root:admin $(PACKAGE_ROOT)/Library/POPFile |
|
From: naoki i. <am...@us...> - 2008-05-26 17:38:33
|
Update of /cvsroot/popfile/macosx/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17368/modules Modified Files: Makefile Log Message: * Add --perl_only option to build version module to work on Mac OS X 10.3.9 * Apply recommended permission for StartupItems to avoid warning message Index: Makefile =================================================================== RCS file: /cvsroot/popfile/macosx/modules/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 25 May 2008 08:04:55 -0000 1.3 --- Makefile 26 May 2008 17:38:40 -0000 1.4 *************** *** 195,199 **** if test ! -d $(VERSION_MODULE); then tar xzf $(VERSION_ARCHIVE); fi cd $(VERSION_MODULE) ; \ ! if test ! -e Makefile; then perl -I.. -MConfig_ub Makefile.PL ; fi ;\ make --- 195,199 ---- if test ! -d $(VERSION_MODULE); then tar xzf $(VERSION_ARCHIVE); fi cd $(VERSION_MODULE) ; \ ! if test ! -e Makefile; then perl -I.. -MConfig_ub Makefile.PL --perl_only ; fi ;\ make |
|
From: naoki i. <am...@us...> - 2008-05-25 08:04:49
|
Update of /cvsroot/popfile/macosx/addssl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19367/addssl Modified Files: Makefile Log Message: Filter CVS folders in building the installer Index: Makefile =================================================================== RCS file: /cvsroot/popfile/macosx/addssl/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 25 May 2008 07:38:05 -0000 1.2 --- Makefile 25 May 2008 08:04:55 -0000 1.3 *************** *** 69,73 **** @echo "Building installer packages ..." ! $(PACKAGE_MAKER) --root $(PACKAGE_ROOT) --id $(PACKAGE_ID) --out $(PACKAGE) --root-volume-only --discard-forks --target 10.3 --resources $(RESOURCES) --scripts $(RESOURCES) --title $(PACKAGE_TITLE) --version $(PACKAGE_VERSION) @echo "...done" --- 69,84 ---- @echo "Building installer packages ..." ! $(PACKAGE_MAKER) \ ! --root $(PACKAGE_ROOT) \ ! --id $(PACKAGE_ID) \ ! --out $(PACKAGE) \ ! --root-volume-only \ ! --discard-forks \ ! --target 10.3 \ ! --resources $(RESOURCES) \ ! --scripts $(RESOURCES) \ ! --title $(PACKAGE_TITLE) \ ! --version $(PACKAGE_VERSION) \ ! --filter CVS @echo "...done" |
|
From: naoki i. <am...@us...> - 2008-05-25 08:04:49
|
Update of /cvsroot/popfile/macosx/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19367/modules Modified Files: Makefile Log Message: Filter CVS folders in building the installer Index: Makefile =================================================================== RCS file: /cvsroot/popfile/macosx/modules/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 25 May 2008 07:38:05 -0000 1.2 --- Makefile 25 May 2008 08:04:55 -0000 1.3 *************** *** 313,316 **** --- 313,317 ---- esac + if test ! -d $(KAKASI_DIC_ROOT); then mkdir $(KAKASI_DIC_ROOT); fi cp -f $(KAKASI)/kanwadict-body $(KAKASI_DIC_ROOT) cp -f $(KAKASI)/kanwadict-head_i386 $(KAKASI_DIC_ROOT) |
|
From: naoki i. <am...@us...> - 2008-05-25 08:04:49
|
Update of /cvsroot/popfile/macosx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19367 Modified Files: Makefile Log Message: Filter CVS folders in building the installer Index: Makefile =================================================================== RCS file: /cvsroot/popfile/macosx/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 25 May 2008 07:38:04 -0000 1.2 --- Makefile 25 May 2008 08:04:55 -0000 1.3 *************** *** 103,107 **** @echo "Building installer packages ..." ! $(PACKAGE_MAKER) --root $(PACKAGE_ROOT) --id $(PACKAGE_ID) --out $(PACKAGE) --root-volume-only --discard-forks --target 10.3 --resources $(RESOURCES) --scripts $(RESOURCES) --title $(PACKAGE_TITLE) --version $(PACKAGE_VERSION) @echo "...done" --- 103,118 ---- @echo "Building installer packages ..." ! $(PACKAGE_MAKER) \ ! --root $(PACKAGE_ROOT) \ ! --id $(PACKAGE_ID) \ ! --out $(PACKAGE) \ ! --root-volume-only \ ! --discard-forks \ ! --target 10.3 \ ! --resources $(RESOURCES) \ ! --scripts $(RESOURCES) \ ! --title $(PACKAGE_TITLE) \ ! --version $(PACKAGE_VERSION) \ ! --filter CVS @echo "...done" *************** *** 126,131 **** cp $(ENGINE)/license $(RESOURCES)/License.txt if test ! -d $(RESOURCES)/English.lproj; then mkdir $(RESOURCES)/English.lproj ; fi - cp $(ENGINE)/v$(POPFILE_VERSION).change $(RESOURCES)/English.lproj/ReadMe.txt if test ! -d $(RESOURCES)/Japanese.lproj; then mkdir $(RESOURCES)/Japanese.lproj ; fi cp $(ENGINE)/v$(POPFILE_VERSION).change.nihongo $(RESOURCES)/Japanese.lproj/ReadMe.txt --- 137,142 ---- cp $(ENGINE)/license $(RESOURCES)/License.txt if test ! -d $(RESOURCES)/English.lproj; then mkdir $(RESOURCES)/English.lproj ; fi if test ! -d $(RESOURCES)/Japanese.lproj; then mkdir $(RESOURCES)/Japanese.lproj ; fi + cp $(ENGINE)/v$(POPFILE_VERSION).change $(RESOURCES)/English.lproj/ReadMe.txt cp $(ENGINE)/v$(POPFILE_VERSION).change.nihongo $(RESOURCES)/Japanese.lproj/ReadMe.txt |
|
From: naoki i. <am...@us...> - 2008-05-25 07:37:59
|
Update of /cvsroot/popfile/macosx/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9408/modules Modified Files: Makefile Log Message: Update Makefiles to create necessary folders Index: Makefile =================================================================== RCS file: /cvsroot/popfile/macosx/modules/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Makefile 25 May 2008 07:03:23 -0000 1.1.1.1 --- Makefile 25 May 2008 07:38:05 -0000 1.2 *************** *** 23,29 **** POPFILE_ROOT=$(PACKAGE_ROOT)/Library/POPFile LIB_ROOT = $(POPFILE_ROOT)/lib ! SSLLIB_ROOT = ../addssl/Package_Root/Library/POPFile/lib KAKASI_DIC_ROOT = $(POPFILE_ROOT)/kakasi FAKECONFIG = ExtUtils-FakeConfig-0.11 FAKECONFIG_ARCHIVE = $(FAKECONFIG).zip --- 23,34 ---- POPFILE_ROOT=$(PACKAGE_ROOT)/Library/POPFile LIB_ROOT = $(POPFILE_ROOT)/lib ! KAKASI_DIC_ROOT = $(POPFILE_ROOT)/kakasi + SSLPACKAGE_ROOT = ../addssl/Package_Root + SSLPACKAGE_LIBRARY_ROOT = $(SSLPACKAGE_ROOT)/Library + SSLPOPFILE_ROOT = $(SSLPACKAGE_LIBRARY_ROOT)/POPFile + SSLLIB_ROOT = $(SSLPOPFILE_ROOT)/lib + FAKECONFIG = ExtUtils-FakeConfig-0.11 FAKECONFIG_ARCHIVE = $(FAKECONFIG).zip *************** *** 108,111 **** --- 113,118 ---- core_modules:core_modules_build $(CORE_MODULES) + if test ! -d $(LIB_ROOT); then mkdir $(LIB_ROOT) ; fi + cp -rf $(DBI)/blib/arch/auto $(LIB_ROOT) cp -rf $(DBI)/blib/lib/* $(LIB_ROOT) *************** *** 127,130 **** --- 134,139 ---- xmlrpc_modules: xmlrpc_modules_build + if test ! -d $(LIB_ROOT); then mkdir $(LIB_ROOT) ; fi + cp -rf $(SOAPLITE)/lib/* $(LIB_ROOT) *************** *** 133,140 **** --- 142,156 ---- japanese_modules: japanese_modules_build + if test ! -d $(LIB_ROOT); then mkdir $(LIB_ROOT) ; fi + cp -rf $(TEXTKAKASI)/blib/arch/auto $(LIB_ROOT) cp -rf $(TEXTKAKASI)/blib/lib/* $(LIB_ROOT) ssl_modules: ssl_modules_build + if test ! -d $(SSLPACKAGE_ROOT); then mkdir $(SSLPACKAGE_ROOT) ; fi + if test ! -d $(SSLPACKAGE_LIBRARY_ROOT); then mkdir $(SSLPACKAGE_LIBRARY_ROOT) ; fi + if test ! -d $(SSLPOPFILE_ROOT); then mkdir $(SSLPOPFILE_ROOT) ; fi + if test ! -d $(SSLLIB_ROOT); then mkdir $(SSLLIB_ROOT) ; fi + cp -rf $(NETSSLEAY)/blib/arch/auto $(SSLLIB_ROOT) cp -rf $(NETSSLEAY)/blib/lib/* $(SSLLIB_ROOT) |
|
From: naoki i. <am...@us...> - 2008-05-25 07:37:58
|
Update of /cvsroot/popfile/macosx/addssl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9408/addssl Modified Files: Makefile Log Message: Update Makefiles to create necessary folders Index: Makefile =================================================================== RCS file: /cvsroot/popfile/macosx/addssl/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Makefile 25 May 2008 07:03:23 -0000 1.1.1.1 --- Makefile 25 May 2008 07:38:05 -0000 1.2 *************** *** 82,85 **** --- 82,87 ---- documents: $(ENGINE)/license $(ENGINE)/v$(POPFILE_VERSION).change $(ENGINE)/v$(POPFILE_VERSION).change.nihongo cp $(ENGINE)/license $(RESOURCES)/License.txt + if test ! -d $(RESOURCES)/English.lproj; then mkdir $(RESOURCES)/English.lproj ; fi + if test ! -d $(RESOURCES)/Japanese.lproj; then mkdir $(RESOURCES)/Japanese.lproj ; fi cp $(ENGINE)/v$(POPFILE_VERSION).change $(RESOURCES)/English.lproj/ReadMe.txt cp $(ENGINE)/v$(POPFILE_VERSION).change.nihongo $(RESOURCES)/Japanese.lproj/ReadMe.txt |
|
From: naoki i. <am...@us...> - 2008-05-25 07:37:58
|
Update of /cvsroot/popfile/macosx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9408 Modified Files: Makefile Log Message: Update Makefiles to create necessary folders Index: Makefile =================================================================== RCS file: /cvsroot/popfile/macosx/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Makefile 25 May 2008 07:03:23 -0000 1.1.1.1 --- Makefile 25 May 2008 07:38:04 -0000 1.2 *************** *** 125,133 **** --- 125,136 ---- documents: $(ENGINE)/license $(ENGINE)/v$(POPFILE_VERSION).change $(ENGINE)/v$(POPFILE_VERSION).change.nihongo cp $(ENGINE)/license $(RESOURCES)/License.txt + if test ! -d $(RESOURCES)/English.lproj; then mkdir $(RESOURCES)/English.lproj ; fi cp $(ENGINE)/v$(POPFILE_VERSION).change $(RESOURCES)/English.lproj/ReadMe.txt + if test ! -d $(RESOURCES)/Japanese.lproj; then mkdir $(RESOURCES)/Japanese.lproj ; fi cp $(ENGINE)/v$(POPFILE_VERSION).change.nihongo $(RESOURCES)/Japanese.lproj/ReadMe.txt engine: $(engine) rm -rf $(POPFILE_ROOT)/*.pl $(POPFILE_ROOT)/*.png $(POPFILE_ROOT)/*.gif $(POPFILE_ROOT)/*.pck $(POPFILE_ROOT)/POPFile $(POPFILE_ROOT)/Classifier $(POPFILE_ROOT)/Proxy $(POPFILE_ROOT)/Services $(POPFILE_ROOT)/UI $(POPFILE_ROOT)/languages $(POPFILE_ROOT)/skins $(POPFILE_ROOT)/stopwords $(POPFILE_ROOT)/license $(POPFILE_ROOT)/v*.change* + if test ! -d $(POPFILE_ROOT); then mkdir $(POPFILE_ROOT) ; fi cp $(ENGINE)/popfile.pl $(POPFILE_ROOT) |
|
From: Manni H. <man...@us...> - 2008-05-17 13:35:40
|
Update of /cvsroot/popfile/engine/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31012/tests Modified Files: Tag: b0_22_2 TestIMAP.tst IMAP_test_server.pl Log Message: Add a test for unsolicited IMAP server responses Index: TestIMAP.tst =================================================================== RCS file: /cvsroot/popfile/engine/tests/TestIMAP.tst,v retrieving revision 1.3.4.17 retrieving revision 1.3.4.18 diff -C2 -d -r1.3.4.17 -r1.3.4.18 *** TestIMAP.tst 18 Apr 2008 14:33:54 -0000 1.3.4.17 --- TestIMAP.tst 17 May 2008 13:35:43 -0000 1.3.4.18 *************** *** 256,259 **** --- 256,268 ---- test_assert_equal( $im->config_('uidvalidities'), $uidvalis ); + # What happens when we get unsolicited responses from the server? + $im->disconnect_folders__(); + $im->log_( 0, "---- Testing unsolicited BYE response" ); + $im->config_( 'login', 'unsolicitedBYE' ); + $im->{last_update__} = 0; + $im->service(); + test_assert( ! %{$im->{folders__}}, 'Folder hash is empty' ); + + # Check what happens when we time out $im->log_( 0, "---- Testing time-out behaviour for the module." ); Index: IMAP_test_server.pl =================================================================== RCS file: /cvsroot/popfile/engine/tests/IMAP_test_server.pl,v retrieving revision 1.2.4.5 retrieving revision 1.2.4.6 diff -C2 -d -r1.2.4.5 -r1.2.4.6 *** IMAP_test_server.pl 18 Apr 2008 14:33:54 -0000 1.2.4.5 --- IMAP_test_server.pl 17 May 2008 13:35:43 -0000 1.2.4.6 *************** *** 77,80 **** --- 77,81 ---- my $uidvalidity = 1; my $time_out_at = -1; + my $unsolicited = ''; *************** *** 252,260 **** } elsif ( $user =~ /^duplicateMessage/ ) { ! } elsif ( $user =~ /^timeOut(\d+)$/ ) { $time_out_at = $1; } } --- 253,264 ---- } elsif ( $user =~ /^duplicateMessage/ ) { ! # TODO: something seems to be missing here } elsif ( $user =~ /^timeOut(\d+)$/ ) { $time_out_at = $1; } + elsif ( $user =~ /unsolicited(.+)$/ ) { + $unsolicited = $1; + } } *************** *** 310,315 **** # NOOP if ( $command =~ /^NOOP/ ) { ! print $client "$tag OK NOOP complete.$eol"; ! return; } --- 314,326 ---- # NOOP if ( $command =~ /^NOOP/ ) { ! if ( $unsolicited ) { ! print $client "* $unsolicited$eol"; ! $client->shutdown( 2 ); ! return; ! } ! else { ! print $client "$tag OK NOOP complete.$eol"; ! return; ! } } |
|
From: Brian S. <xue...@us...> - 2008-05-15 19:08:36
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23556 Modified Files: Tag: b0_22_2 installer.nsi Log Message: A bug in the NSIS compiler corrupts the default text shown next to the "Show ReadMe" checkbox on the FINISH page when the Japanese language is selected. Setting the text for this checkbox to the default MUI string is a simple way to work around this bug. The main installer (setup.exe) only shows its FINISH page when the "/SSL" command-line option is used. Index: installer.nsi =================================================================== RCS file: /cvsroot/popfile/windows/installer.nsi,v retrieving revision 1.242.4.30 retrieving revision 1.242.4.31 diff -C2 -d -r1.242.4.30 -r1.242.4.31 *** installer.nsi 10 May 2008 12:52:25 -0000 1.242.4.30 --- installer.nsi 15 May 2008 19:08:20 -0000 1.242.4.31 *************** *** 697,702 **** --- 697,705 ---- ; Provide a checkbox to let user display the Release Notes for this version of POPFile + ; (MUI_FINISHPAGE_SHOWREADME_TEXT is set to the MUI default string here in order to + ; work around a NSIS compiler bug which corrupts the Japanese version of the string) !define MUI_FINISHPAGE_SHOWREADME + !define MUI_FINISHPAGE_SHOWREADME_TEXT "$(MUI_TEXT_FINISH_SHOWREADME)" !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED !define MUI_FINISHPAGE_SHOWREADME_FUNCTION "ShowReadMe" |
|
From: Brian S. <xue...@us...> - 2008-05-13 14:12:11
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24656 Modified Files: Tag: b0_22_2 adduser-Version.nsh adduser.nsi Log Message: A bug in the NSIS compiler corrupts the default text shown next to the "Show ReadMe" checkbox on the FINISH page when the Japanese language is selected. Setting the text for this checkbox to the default MUI string is a simple way to work around this bug. To do: check for other default strings which need to be explicitly set like this in order to avoid problems when an MBCS language is selected. Index: adduser-Version.nsh =================================================================== RCS file: /cvsroot/popfile/windows/adduser-Version.nsh,v retrieving revision 1.6.2.23 retrieving revision 1.6.2.24 diff -C2 -d -r1.6.2.23 -r1.6.2.24 *** adduser-Version.nsh 10 May 2008 12:52:25 -0000 1.6.2.23 --- adduser-Version.nsh 13 May 2008 14:12:15 -0000 1.6.2.24 *************** *** 7,11 **** #-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.4.2" #-------------------------------------------------------------------------- --- 7,11 ---- #-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.4.3" #-------------------------------------------------------------------------- Index: adduser.nsi =================================================================== RCS file: /cvsroot/popfile/windows/adduser.nsi,v retrieving revision 1.59.4.25 retrieving revision 1.59.4.26 diff -C2 -d -r1.59.4.25 -r1.59.4.26 *** adduser.nsi 10 May 2008 12:52:25 -0000 1.59.4.25 --- adduser.nsi 13 May 2008 14:12:15 -0000 1.59.4.26 *************** *** 632,637 **** --- 632,640 ---- ; Provide a checkbox to let user display the Release Notes for this version of POPFile + ; (MUI_FINISHPAGE_SHOWREADME_TEXT is set to the MUI default string here in order to + ; work around a NSIS compiler bug which corrupts the Japanese version of the string) !define MUI_FINISHPAGE_SHOWREADME + !define MUI_FINISHPAGE_SHOWREADME_TEXT "$(MUI_TEXT_FINISH_SHOWREADME)" !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED !define MUI_FINISHPAGE_SHOWREADME_FUNCTION "ShowReadMe" |
|
From: Brian S. <xue...@us...> - 2008-05-10 12:52:21
|
Update of /cvsroot/popfile/windows/toolkit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31106/toolkit Modified Files: Tag: b0_22_2 ap-vcheck.nsi Log Message: Updated to use latest compiler (2.37) which fixes the fuzzy icons seen for the NSIS-based executables on Win9x and Win2K systems. Index: ap-vcheck.nsi =================================================================== RCS file: /cvsroot/popfile/windows/toolkit/Attic/ap-vcheck.nsi,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** ap-vcheck.nsi 2 Apr 2008 20:17:33 -0000 1.1.2.2 --- ap-vcheck.nsi 10 May 2008 12:52:26 -0000 1.1.2.3 *************** *** 36,44 **** #------------------------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.36" compiler, ! ; released 29 March 2008. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.36-setup.exe?download ! !define C_EXPECTED_VERSION "v2.36" !define ${NSIS_VERSION}_found --- 36,44 ---- #------------------------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.37" compiler, ! ; released 3 May 2008. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.37-setup.exe?download ! !define C_EXPECTED_VERSION "v2.37" !define ${NSIS_VERSION}_found *************** *** 73,77 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.2" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "ap-vcheck.exe" --- 73,77 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.3" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "ap-vcheck.exe" |
|
From: Brian S. <xue...@us...> - 2008-05-10 12:52:20
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31106 Modified Files: Tag: b0_22_2 adduser-Version.nsh adduser.nsi dbicapture.nsi installer.nsi MonitorCC.nsi msgcapture.nsi runpopfile.nsi runsqlite.nsi stop_popfile.nsi Log Message: Updated to use latest compiler (2.37) which fixes the fuzzy icons seen for the NSIS-based executables on Win9x and Win2K systems. Index: installer.nsi =================================================================== RCS file: /cvsroot/popfile/windows/installer.nsi,v retrieving revision 1.242.4.29 retrieving revision 1.242.4.30 diff -C2 -d -r1.242.4.29 -r1.242.4.30 *** installer.nsi 26 Apr 2008 13:33:19 -0000 1.242.4.29 --- installer.nsi 10 May 2008 12:52:25 -0000 1.242.4.30 *************** *** 50,58 **** #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.36" compiler, ! ; released 29 March 2008. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.36-setup.exe?download ! !define C_EXPECTED_VERSION "v2.36" !define ${NSIS_VERSION}_found --- 50,58 ---- #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.37" compiler, ! ; released 3 May 2008. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.37-setup.exe?download ! !define C_EXPECTED_VERSION "v2.37" !define ${NSIS_VERSION}_found Index: stop_popfile.nsi =================================================================== RCS file: /cvsroot/popfile/windows/stop_popfile.nsi,v retrieving revision 1.14.4.9 retrieving revision 1.14.4.10 diff -C2 -d -r1.14.4.9 -r1.14.4.10 *** stop_popfile.nsi 2 Apr 2008 20:17:33 -0000 1.14.4.9 --- stop_popfile.nsi 10 May 2008 12:52:26 -0000 1.14.4.10 *************** *** 82,90 **** #------------------------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.36" compiler, ! ; released 29 March 2008. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.36-setup.exe?download ! !define C_EXPECTED_VERSION "v2.36" !define ${NSIS_VERSION}_found --- 82,90 ---- #------------------------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.37" compiler, ! ; released 3 May 2008. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.37-setup.exe?download ! !define C_EXPECTED_VERSION "v2.37" !define ${NSIS_VERSION}_found *************** *** 126,130 **** Caption "POPFile Silent Shutdown Utility" ! !define C_VERSION "0.6.7" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "stop_pf.exe" --- 126,130 ---- Caption "POPFile Silent Shutdown Utility" ! !define C_VERSION "0.6.8" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "stop_pf.exe" Index: MonitorCC.nsi =================================================================== RCS file: /cvsroot/popfile/windows/MonitorCC.nsi,v retrieving revision 1.19.4.9 retrieving revision 1.19.4.10 diff -C2 -d -r1.19.4.9 -r1.19.4.10 *** MonitorCC.nsi 2 Apr 2008 20:17:33 -0000 1.19.4.9 --- MonitorCC.nsi 10 May 2008 12:52:26 -0000 1.19.4.10 *************** *** 24,32 **** #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.36" compiler, ! ; released 29 March 2008. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.36-setup.exe?download ! !define C_EXPECTED_VERSION "v2.36" !define ${NSIS_VERSION}_found --- 24,32 ---- #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.37" compiler, ! ; released 3 May 2008. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.37-setup.exe?download ! !define C_EXPECTED_VERSION "v2.37" !define ${NSIS_VERSION}_found *************** *** 114,118 **** Name "${C_PFI_PRODUCT}" ! !define C_PFI_VERSION "0.2.8" !define C_OUTFILE "monitorcc.exe" --- 114,118 ---- Name "${C_PFI_PRODUCT}" ! !define C_PFI_VERSION "0.2.9" !define C_OUTFILE "monitorcc.exe" Index: dbicapture.nsi =================================================================== RCS file: /cvsroot/popfile/windows/Attic/dbicapture.nsi,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -C2 -d -r1.1.2.6 -r1.1.2.7 *** dbicapture.nsi 2 Apr 2008 20:12:36 -0000 1.1.2.6 --- dbicapture.nsi 10 May 2008 12:52:25 -0000 1.1.2.7 *************** *** 25,33 **** #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.36" compiler, ! ; released 29 March 2008. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.36-setup.exe?download ! !define C_EXPECTED_VERSION "v2.36" !define ${NSIS_VERSION}_found --- 25,33 ---- #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.37" compiler, ! ; released 3 May 2008. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.37-setup.exe?download ! !define C_EXPECTED_VERSION "v2.37" !define ${NSIS_VERSION}_found *************** *** 89,93 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.6" !define C_OUTFILE "dbicapture.exe" --- 89,93 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.7" !define C_OUTFILE "dbicapture.exe" Index: runpopfile.nsi =================================================================== RCS file: /cvsroot/popfile/windows/runpopfile.nsi,v retrieving revision 1.11.4.9 retrieving revision 1.11.4.10 diff -C2 -d -r1.11.4.9 -r1.11.4.10 *** runpopfile.nsi 2 Apr 2008 20:17:33 -0000 1.11.4.9 --- runpopfile.nsi 10 May 2008 12:52:26 -0000 1.11.4.10 *************** *** 29,37 **** #------------------------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.36" compiler, ! ; released 29 March 2008. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.36-setup.exe?download ! !define C_EXPECTED_VERSION "v2.36" !define ${NSIS_VERSION}_found --- 29,37 ---- #------------------------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.37" compiler, ! ; released 3 May 2008. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.37-setup.exe?download ! !define C_EXPECTED_VERSION "v2.37" !define ${NSIS_VERSION}_found *************** *** 120,124 **** ;-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.2.8" !define C_OUTFILE "runpopfile.exe" --- 120,124 ---- ;-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.2.9" !define C_OUTFILE "runpopfile.exe" Index: msgcapture.nsi =================================================================== RCS file: /cvsroot/popfile/windows/msgcapture.nsi,v retrieving revision 1.7.4.8 retrieving revision 1.7.4.9 diff -C2 -d -r1.7.4.8 -r1.7.4.9 *** msgcapture.nsi 2 Apr 2008 20:12:36 -0000 1.7.4.8 --- msgcapture.nsi 10 May 2008 12:52:26 -0000 1.7.4.9 *************** *** 26,34 **** #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.36" compiler, ! ; released 29 March 2008. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.36-setup.exe?download ! !define C_EXPECTED_VERSION "v2.36" !define ${NSIS_VERSION}_found --- 26,34 ---- #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.37" compiler, ! ; released 3 May 2008. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.37-setup.exe?download ! !define C_EXPECTED_VERSION "v2.37" !define ${NSIS_VERSION}_found *************** *** 118,122 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.7" !define C_OUTFILE "msgcapture.exe" --- 118,122 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.8" !define C_OUTFILE "msgcapture.exe" Index: adduser-Version.nsh =================================================================== RCS file: /cvsroot/popfile/windows/adduser-Version.nsh,v retrieving revision 1.6.2.22 retrieving revision 1.6.2.23 diff -C2 -d -r1.6.2.22 -r1.6.2.23 *** adduser-Version.nsh 2 Apr 2008 20:10:41 -0000 1.6.2.22 --- adduser-Version.nsh 10 May 2008 12:52:25 -0000 1.6.2.23 *************** *** 7,11 **** #-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.4.1" #-------------------------------------------------------------------------- --- 7,11 ---- #-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.4.2" #-------------------------------------------------------------------------- Index: runsqlite.nsi =================================================================== RCS file: /cvsroot/popfile/windows/runsqlite.nsi,v retrieving revision 1.1.4.8 retrieving revision 1.1.4.9 diff -C2 -d -r1.1.4.8 -r1.1.4.9 *** runsqlite.nsi 2 Apr 2008 20:17:33 -0000 1.1.4.8 --- runsqlite.nsi 10 May 2008 12:52:26 -0000 1.1.4.9 *************** *** 39,47 **** #------------------------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.36" compiler, ! ; released 29 March 2008. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.36-setup.exe?download ! !define C_EXPECTED_VERSION "v2.36" !define ${NSIS_VERSION}_found --- 39,47 ---- #------------------------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.37" compiler, ! ; released 3 May 2008. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.37-setup.exe?download ! !define C_EXPECTED_VERSION "v2.37" !define ${NSIS_VERSION}_found *************** *** 78,82 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.6" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "runsqlite.exe" --- 78,82 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.7" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "runsqlite.exe" Index: adduser.nsi =================================================================== RCS file: /cvsroot/popfile/windows/adduser.nsi,v retrieving revision 1.59.4.24 retrieving revision 1.59.4.25 diff -C2 -d -r1.59.4.24 -r1.59.4.25 *** adduser.nsi 2 Apr 2008 20:10:41 -0000 1.59.4.24 --- adduser.nsi 10 May 2008 12:52:25 -0000 1.59.4.25 *************** *** 34,42 **** #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.36" compiler, ! ; released 29 March 2008. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.36-setup.exe?download ! !define C_EXPECTED_VERSION "v2.36" !define ${NSIS_VERSION}_found --- 34,42 ---- #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.37" compiler, ! ; released 3 May 2008. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.37-setup.exe?download ! !define C_EXPECTED_VERSION "v2.37" !define ${NSIS_VERSION}_found |
|
From: Brian S. <xue...@us...> - 2008-05-10 12:52:20
|
Update of /cvsroot/popfile/windows/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31106/test Modified Files: Tag: b0_22_2 pfidbstatus.nsi pfidiag.nsi Log Message: Updated to use latest compiler (2.37) which fixes the fuzzy icons seen for the NSIS-based executables on Win9x and Win2K systems. Index: pfidbstatus.nsi =================================================================== RCS file: /cvsroot/popfile/windows/test/pfidbstatus.nsi,v retrieving revision 1.3.2.9 retrieving revision 1.3.2.10 diff -C2 -d -r1.3.2.9 -r1.3.2.10 *** pfidbstatus.nsi 2 Apr 2008 20:12:36 -0000 1.3.2.9 --- pfidbstatus.nsi 10 May 2008 12:52:26 -0000 1.3.2.10 *************** *** 30,38 **** #------------------------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.36" compiler, ! ; released 29 March 2008. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.36-setup.exe?download ! !define C_EXPECTED_VERSION "v2.36" !define ${NSIS_VERSION}_found --- 30,38 ---- #------------------------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.37" compiler, ! ; released 3 May 2008. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.37-setup.exe?download ! !define C_EXPECTED_VERSION "v2.37" !define ${NSIS_VERSION}_found *************** *** 160,164 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.7" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "pfidbstatus.exe" --- 160,164 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.8" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "pfidbstatus.exe" Index: pfidiag.nsi =================================================================== RCS file: /cvsroot/popfile/windows/test/pfidiag.nsi,v retrieving revision 1.8.4.12 retrieving revision 1.8.4.13 diff -C2 -d -r1.8.4.12 -r1.8.4.13 *** pfidiag.nsi 2 Apr 2008 20:17:34 -0000 1.8.4.12 --- pfidiag.nsi 10 May 2008 12:52:26 -0000 1.8.4.13 *************** *** 24,32 **** #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.36" compiler, ! ; released 29 March 2008. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.36-setup.exe?download ! !define C_EXPECTED_VERSION "v2.36" !define ${NSIS_VERSION}_found --- 24,32 ---- #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.37" compiler, ! ; released 3 May 2008. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.37-setup.exe?download ! !define C_EXPECTED_VERSION "v2.37" !define ${NSIS_VERSION}_found *************** *** 106,110 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.10" !define C_OUTFILE "pfidiag.exe" --- 106,110 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.11" !define C_OUTFILE "pfidiag.exe" |
|
From: Brian S. <xue...@us...> - 2008-05-10 12:52:20
|
Update of /cvsroot/popfile/windows/add-ons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31106/add-ons Modified Files: Tag: b0_22_2 OnDemand.nsi Log Message: Updated to use latest compiler (2.37) which fixes the fuzzy icons seen for the NSIS-based executables on Win9x and Win2K systems. Index: OnDemand.nsi =================================================================== RCS file: /cvsroot/popfile/windows/add-ons/Attic/OnDemand.nsi,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -C2 -d -r1.1.2.7 -r1.1.2.8 *** OnDemand.nsi 2 Apr 2008 20:17:33 -0000 1.1.2.7 --- OnDemand.nsi 10 May 2008 12:52:26 -0000 1.1.2.8 *************** *** 28,36 **** #------------------------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.36" compiler, ! ; released 29 March 2008. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.36-setup.exe?download ! !define C_EXPECTED_VERSION "v2.36" !define ${NSIS_VERSION}_found --- 28,36 ---- #------------------------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.37" compiler, ! ; released 3 May 2008. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.37-setup.exe?download ! !define C_EXPECTED_VERSION "v2.37" !define ${NSIS_VERSION}_found *************** *** 140,144 **** OutFile ${C_OUTFILE} ! !define C_VERSION "0.1.1" ; Specify the icon file for the utility --- 140,144 ---- OutFile ${C_OUTFILE} ! !define C_VERSION "0.1.2" ; Specify the icon file for the utility |
|
From: Brian S. <xue...@us...> - 2008-05-10 12:46:51
|
Update of /cvsroot/popfile/windows/add-ons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30729/add-ons Modified Files: Tag: b0_22_2 addssl.nsi Log Message: Updated to use latest compiler (2.37) which fixes the fuzzy icons seen on Win9x and Win2K systems and the latest bug-fix version of the Inetc plugin. Index: addssl.nsi =================================================================== RCS file: /cvsroot/popfile/windows/add-ons/addssl.nsi,v retrieving revision 1.3.4.14 retrieving revision 1.3.4.15 diff -C2 -d -r1.3.4.14 -r1.3.4.15 *** addssl.nsi 2 Apr 2008 20:17:33 -0000 1.3.4.14 --- addssl.nsi 10 May 2008 12:46:55 -0000 1.3.4.15 *************** *** 54,62 **** #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.36" compiler, ! ; released 29 March 2008. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.36-setup.exe?download ! !define C_EXPECTED_VERSION "v2.36" !define ${NSIS_VERSION}_found --- 54,62 ---- #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.37" compiler, ! ; released 3 May 2008. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.37-setup.exe?download ! !define C_EXPECTED_VERSION "v2.37" !define ${NSIS_VERSION}_found *************** *** 108,112 **** ; appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional. ; ! ; Tested with the inetc.dll plugin timestamped 11 August 2007 19:06:24 ;------------------------------------------------ --- 108,112 ---- ; appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional. ; ! ; Tested with the inetc.dll plugin timestamped 4 May 2008 10:27:40 ;------------------------------------------------ *************** *** 271,275 **** Name "POPFile SSL Setup" ! !define C_PFI_VERSION "0.3.2" ; Mention the wizard's version number in the window title --- 271,275 ---- Name "POPFile SSL Setup" ! !define C_PFI_VERSION "0.3.3" ; Mention the wizard's version number in the window title |
|
From: Brian S. <xue...@us...> - 2008-05-10 12:44:47
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29970 Modified Files: Tag: b0_22_2 getparser.nsh getssl.nsh Log Message: Use the latest bug-fix version of the Inetc plugin. Index: getssl.nsh =================================================================== RCS file: /cvsroot/popfile/windows/getssl.nsh,v retrieving revision 1.6.2.24 retrieving revision 1.6.2.25 diff -C2 -d -r1.6.2.24 -r1.6.2.25 *** getssl.nsh 2 Apr 2008 20:19:42 -0000 1.6.2.24 --- getssl.nsh 10 May 2008 12:44:52 -0000 1.6.2.25 *************** *** 50,54 **** ; to the appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional. ; ! ; Tested with the inetc.dll plugin timestamped 1 April 2008 10:33:06 ;------------------------------------------------ --- 50,54 ---- ; to the appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional. ; ! ; Tested with the inetc.dll plugin timestamped 4 May 2008 10:27:40 ;------------------------------------------------ Index: getparser.nsh =================================================================== RCS file: /cvsroot/popfile/windows/Attic/getparser.nsh,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -C2 -d -r1.1.2.7 -r1.1.2.8 *** getparser.nsh 26 Apr 2008 13:35:13 -0000 1.1.2.7 --- getparser.nsh 10 May 2008 12:44:52 -0000 1.1.2.8 *************** *** 53,57 **** ; to the appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional. ; ! ; Tested with the inetc.dll plugin timestamped 1 April 2008 10:33:06 ;------------------------------------------------ --- 53,57 ---- ; to the appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional. ; ! ; Tested with the inetc.dll plugin timestamped 4 May 2008 10:27:40 ;------------------------------------------------ |
|
From: naoki i. <am...@us...> - 2008-05-02 12:50:45
|
Update of /cvsroot/popfile/engine/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10802/languages Modified Files: English.msg Nihongo.msg Log Message: Change Log 1. Add an interface to change the session timeout on the Administration tab UI/HTML.pm skins/default/administration-page.thtml languages/English.pm languages/Nihongo.pm tests/TestHTML.script Current state of the test suite: TestBayesScript PASS TestBayes PASS TestConfiguration PASS TestHistory PASS TestHTML PASS TestHTTP PASS TestIMAP PASS TestInsertScript PASS * TestLogger PASS TestMailParse PASS TestModule PASS TestMQ PASS TestMutex PASS TestPipeScript PASS TestPOP3 PASS TestProxy PASS TestWordMangle PASS TestXMLRPC PASS * : TODO : needs to add tests for multi user support Index: Nihongo.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/Nihongo.msg,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** Nihongo.msg 28 Apr 2008 11:17:43 -0000 1.30 --- Nihongo.msg 2 May 2008 12:50:50 -0000 1.31 *************** *** 129,132 **** --- 129,133 ---- Configuration_Error7 XML RPC ¥Ý¡¼¥ÈÈÖ¹æ¤Ï 1 ¤«¤é 65535 ¤Þ¤Ç¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ Configuration_Error8 SOCKS V ¥×¥í¥¥·¤Î¥Ý¡¼¥ÈÈÖ¹æ¤Ï 1 ¤«¤é 65535 ¤Þ¤Ç¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ + Configuration_Error9 ¥»¥Ã¥·¥ç¥ó¥³¥Í¥¯¥·¥ç¥ó¥¿¥¤¥à¥¢¥¦¥È¤ÎÉÿô¤Ï 300 ¤«¤é 86400 ¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ Configuration_POP3Port POP3 ¥Ý¡¼¥ÈÈÖ¹æ Configuration_POP3Update POP3 ¥Ý¡¼¥ÈÈÖ¹æ¤ò ¡Ö%s¡×¤ËÊѹ¹¤·¤Þ¤·¤¿¡£¤³¤ÎÊѹ¹¤Ï POPFile ¤òºÆµ¯Æ°¤¹¤ë¤Þ¤Ç͸ú¤Ë¤Ê¤ê¤Þ¤»¤ó¡£ *************** *** 177,180 **** --- 178,184 ---- Configuration_TCPTimeoutSecs TCP ¥³¥Í¥¯¥·¥ç¥ó¥¿¥¤¥à¥¢¥¦¥È¤ÎÉÿô Configuration_TCPTimeoutUpdate TCP ¥³¥Í¥¯¥·¥ç¥ó¥¿¥¤¥à¥¢¥¦¥È¤ÎÉÿô¤ò ¡Ö%s¡×¤ËÊѹ¹¤·¤Þ¤·¤¿¡£ + Configuration_SessionTimeout ¥»¥Ã¥·¥ç¥ó¥¿¥¤¥à¥¢¥¦¥È + Configuration_SessionTimeoutSecs ¥»¥Ã¥·¥ç¥ó¥¿¥¤¥à¥¢¥¦¥È¤ÎÉÿô + Configuration_SessionTimeoutUpdate ¥»¥Ã¥·¥ç¥ó¥¿¥¤¥à¥¢¥¦¥È¤ÎÉÿô¤ò ¡Ö%s¡×¤ËÊѹ¹¤·¤Þ¤·¤¿¡£ Configuration_ClassificationInsertion ÅŻҥ᡼¥ë¤Ø¤Î¥Æ¥¥¹¥ÈÁÞÆþµ¡Ç½ Configuration_SubjectLine ·ï̾¤ÎÊѹ¹ Index: English.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/English.msg,v retrieving revision 1.117 retrieving revision 1.118 diff -C2 -d -r1.117 -r1.118 *** English.msg 28 Apr 2008 11:17:43 -0000 1.117 --- English.msg 2 May 2008 12:50:50 -0000 1.118 *************** *** 128,131 **** --- 128,132 ---- Configuration_Error7 The XML RPC listen port must be a number between 1 and 65535 Configuration_Error8 The SOCKS V proxy port must be a number between 1 and 65535 + Configuration_Error9 The session timeout must be a number between 300 and 86400 Configuration_POP3Port POP3 listen port Configuration_POP3Update Updated POP3 port to %s; this change will not take affect until you restart POPFile *************** *** 175,178 **** --- 176,182 ---- Configuration_TCPTimeoutSecs Connection timeout in seconds Configuration_TCPTimeoutUpdate Updated connection timeout to %s + Configuration_SessionTimeout Session Timeout + Configuration_SessionTimeoutSecs Session timeout in seconds + Configuration_SessionTimeoutUpdate Updated session timeout to %s Configuration_ClassificationInsertion Message Text Insertion Configuration_SubjectLine Subject line<br>modification |
|
From: naoki i. <am...@us...> - 2008-05-02 12:50:45
|
Update of /cvsroot/popfile/engine/UI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10802/UI Modified Files: HTML.pm Log Message: Change Log 1. Add an interface to change the session timeout on the Administration tab UI/HTML.pm skins/default/administration-page.thtml languages/English.pm languages/Nihongo.pm tests/TestHTML.script Current state of the test suite: TestBayesScript PASS TestBayes PASS TestConfiguration PASS TestHistory PASS TestHTML PASS TestHTTP PASS TestIMAP PASS TestInsertScript PASS * TestLogger PASS TestMailParse PASS TestModule PASS TestMQ PASS TestMutex PASS TestPipeScript PASS TestPOP3 PASS TestProxy PASS TestWordMangle PASS TestXMLRPC PASS * : TODO : needs to add tests for multi user support Index: HTML.pm =================================================================== RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v retrieving revision 1.395 retrieving revision 1.396 diff -C2 -d -r1.395 -r1.396 *** HTML.pm 1 May 2008 15:21:43 -0000 1.395 --- HTML.pm 2 May 2008 12:50:50 -0000 1.396 *************** *** 1432,1435 **** --- 1432,1454 ---- } } + + if ( defined($self->{form_}{session_timeout}) ) { + if ( ( $self->{form_}{session_timeout} =~ /^\d+$/ ) && # PROFILE BLOCK START + ( $self->{form_}{session_timeout} >= 300 ) && + ( $self->{form_}{session_timeout} <= 86400 ) ) { # PROFILE BLOCK STOP + if ( $self->global_config_( 'session_timeout' ) ne $self->{form_}{session_timeout} ) { + $self->global_config_( 'session_timeout', $self->{form_}{session_timeout} ); + $self->status_message__( # PROFILE BLOCK START + $templ, + sprintf( $self->language($session)->{Configuration_SessionTimeoutUpdate}, + $self->global_config_( 'session_timeout' ) ) ); # PROFILE BLOCK STOP + + } + } + else { + $self->error_message__( $templ, $self->language($session)->{Configuration_Error9} ); + delete $self->{form_}{session_timeout}; + } + } } *************** *** 1441,1444 **** --- 1460,1464 ---- $templ->param( 'Configuration_UI_HTTPS_Port' => $self->config_( 'https_port' ) ); $templ->param( 'Configuration_TCP_Timeout' => $self->global_config_( 'timeout' ) ); + $templ->param( 'Configuration_Session_Timeout' => $self->global_config_( 'session_timeout' ) ); $templ->param( 'If_Single_User' => $self->global_config_( 'single_user' ) ); |
|
From: naoki i. <am...@us...> - 2008-05-02 12:50:45
|
Update of /cvsroot/popfile/engine/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10802/tests Modified Files: TestHTML.script Log Message: Change Log 1. Add an interface to change the session timeout on the Administration tab UI/HTML.pm skins/default/administration-page.thtml languages/English.pm languages/Nihongo.pm tests/TestHTML.script Current state of the test suite: TestBayesScript PASS TestBayes PASS TestConfiguration PASS TestHistory PASS TestHTML PASS TestHTTP PASS TestIMAP PASS TestInsertScript PASS * TestLogger PASS TestMailParse PASS TestModule PASS TestMQ PASS TestMutex PASS TestPipeScript PASS TestPOP3 PASS TestProxy PASS TestWordMangle PASS TestXMLRPC PASS * : TODO : needs to add tests for multi user support Index: TestHTML.script =================================================================== RCS file: /cvsroot/popfile/engine/tests/TestHTML.script,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** TestHTML.script 1 May 2008 15:21:43 -0000 1.42 --- TestHTML.script 2 May 2008 12:50:50 -0000 1.43 *************** *** 1583,1586 **** --- 1583,1598 ---- INPUTIS timeout 61 + # Check change session timeout + + INPUTIS session_timeout 1800 + CONFIGIS GLOBAL_session_timeout 1800 + SETSUBMIT session_timeout 1801 + INPUTIS session_timeout 1801 + CONFIGIS GLOBAL_session_timeout 1801 + MATCH Updated session timeout to 1801 + SETSUBMIT session_timeout 0 + MATCH The session timeout must be a number between 300 and 86400 + INPUTIS session_timeout 1801 + # Check change POP3 port |
|
From: naoki i. <am...@us...> - 2008-05-02 12:50:45
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10802/skins/default Modified Files: administration-page.thtml Log Message: Change Log 1. Add an interface to change the session timeout on the Administration tab UI/HTML.pm skins/default/administration-page.thtml languages/English.pm languages/Nihongo.pm tests/TestHTML.script Current state of the test suite: TestBayesScript PASS TestBayes PASS TestConfiguration PASS TestHistory PASS TestHTML PASS TestHTTP PASS TestIMAP PASS TestInsertScript PASS * TestLogger PASS TestMailParse PASS TestModule PASS TestMQ PASS TestMutex PASS TestPipeScript PASS TestPOP3 PASS TestProxy PASS TestWordMangle PASS TestXMLRPC PASS * : TODO : needs to add tests for multi user support Index: administration-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/administration-page.thtml,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** administration-page.thtml 25 Apr 2008 16:26:37 -0000 1.18 --- administration-page.thtml 2 May 2008 12:50:50 -0000 1.19 *************** *** 191,194 **** --- 191,201 ---- <input name="timeout" type="text" id="configTCPTimeout" value="<TMPL_VAR NAME="Configuration_TCP_Timeout">" /> + <br /> + <label class="configurationLabel" for="configSessionTimeout"> + <TMPL_VAR NAME="Localize_Configuration_SessionTimeoutSecs">: + </label> + <br /> + <input name="session_timeout" type="text" id="configSessionTimeout" value="<TMPL_VAR NAME="Configuration_Session_Timeout">" /> + <br /><br /> <input type="submit" class="submit" name="update_modules" value="<TMPL_VAR NAME="Localize_Apply">" /> |
|
From: naoki i. <am...@us...> - 2008-05-01 15:21:40
|
Update of /cvsroot/popfile/engine/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8666/tests Modified Files: TestHTML.script TestHTML.tst TestHTTP.tst TestPOP3.tst TestXMLRPC.tst Added Files: TestRandom.tst Log Message: Change Log 1. New HTML module option 'cookie_cipher' UI/HTML.pm UI/HTTP.pm Users can choose Crypt::DES instead of Crypt::Blowfish. 2. Update POPFile::Random module POPFile/Random.pm POPFile/Module.pm Classifier/Bayes.pm UI/HTML.pm UI/HTTP.pm 3. New test script for POPFile::Random tests/TestRandom.tst 4. Fixed a bug that users couldn't login to the UI on some environment UI/HTTP.pm 5. Add some tests for UI::HTML 6. Update TestHTML.tst to pass tests/TestHTML.script Config bar History tab View log file View text message Session timeout Change language in the multiuser mode 7. Minor fix of the test scripts tests/TestXMLRPC.tst tests/TestPOP3.tst tests/TestHTTP.tst Current state of the test suite: TestBayesScript PASS TestBayes PASS TestConfiguration PASS TestHistory PASS TestHTML PASS TestHTTP PASS TestIMAP PASS TestInsertScript PASS * TestLogger PASS TestMailParse PASS TestModule PASS TestMQ PASS TestMutex PASS TestPipeScript PASS TestPOP3 PASS TestProxy PASS TestWordMangle PASS TestXMLRPC PASS * : TODO : needs to add tests for multi user support --- NEW FILE: TestRandom.tst --- # ---------------------------------------------------------------------------- # # Tests for Random.pm # # Copyright (c) 2003-2008 John Graham-Cumming # # This file is part of POPFile # # POPFile is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. # # POPFile is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with POPFile; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # Modified by Sam Schinke (ssc...@us...) # # ---------------------------------------------------------------------------- use POPFile::Random; use POSIX ":sys_wait_h"; my @random_modules = ( POPFile::Random->new( 'Crypt::Random' ), POPFile::Random->new( 'Crypt::OpenSSL::Random' ), POPFile::Random->new( 'Crypt::CBC' ), ); foreach my $random_module ( @random_modules ) { my $has_module = 0; $has_module = eval "require $random_module->{module__}; 1;"; if ( $has_module ) { my $rand_string = $random_module->generate_random_string( 128 ); test_assert( defined( $rand_string ) ); test_assert_equal( length( $rand_string ), 128 ); if ( $random_module->{module__} eq 'Crypt::Random' ) { $rand_string = $random_module->generate_random_string( 128, 1, '' ); test_assert( defined( $rand_string ) ); test_assert_equal( length( $rand_string ), 128 ); }; if ( $random_module->{module__} eq 'Crypt::OpenSSL::Random' ) { $random_module->rand_seed( time ); my $rand_string = $random_module->generate_random_string( 128 ); test_assert( defined( $rand_string ) ); test_assert_equal( length( $rand_string ), 128 ); } } else { print "Warning: skipping $$random_module->{module__} test since the module is not installed\n"; } } Index: TestXMLRPC.tst =================================================================== RCS file: /cvsroot/popfile/engine/tests/TestXMLRPC.tst,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** TestXMLRPC.tst 16 Apr 2008 13:08:05 -0000 1.12 --- TestXMLRPC.tst 1 May 2008 15:21:44 -0000 1.13 *************** *** 34,37 **** --- 34,39 ---- test_assert( copy ( 'stopwords.base', 'stopwords' ) ); + use POSIX ":sys_wait_h"; + use POPFile::Loader; my $POPFile = POPFile::Loader->new(); *************** *** 67,71 **** if ( $x->start() == 1 ) { ! my $count = 100; while ( $x->service() && $POPFile->CORE_service( 1 ) ) { select( undef, undef, undef, 0.1 ); --- 69,73 ---- if ( $x->start() == 1 ) { ! my $count = 50; while ( $x->service() && $POPFile->CORE_service( 1 ) ) { select( undef, undef, undef, 0.1 ); *************** *** 129,136 **** -> call('POPFile/API.release_session_key', $session ); ! wait(); ! } ! # TODO : terminate child process 1; --- 131,140 ---- -> call('POPFile/API.release_session_key', $session ); ! sleep(3); ! while ( waitpid( $pid, WNOHANG ) > 0 ) { ! select( undef, undef, undef, 0.1 ); ! } ! } 1; Index: TestHTML.tst =================================================================== RCS file: /cvsroot/popfile/engine/tests/TestHTML.tst,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** TestHTML.tst 30 Apr 2008 14:41:49 -0000 1.42 --- TestHTML.tst 1 May 2008 15:21:44 -0000 1.43 *************** *** 144,148 **** $hi->service(); ! my $session = $b->get_session_key( 'admin', '' ); # CHILD THAT WILL RUN THE HTML INTERFACE --- 144,148 ---- $hi->service(); ! my $session = $b->get_administrator_session_key(); # CHILD THAT WILL RUN THE HTML INTERFACE *************** *** 170,173 **** --- 170,175 ---- while ( 1 ) { $h->service(); + $b->service(); + $mq->service(); if ( pipeready( $dreader ) ) { *************** *** 192,203 **** } ! if ( $command =~ /^__GETUSERCONFIG ([^_]+)_(.+)/ ) { ! my $value = $h->user_module_config_( 1, $1, $2 ); print $uwriter "OK $value\n"; next; } ! if ( $command =~ /^__SETUSERCONFIG ([^_]+)_(.+) (.+)?/ ) { ! my $value = $h->user_module_config_( 1, $1, $2, $3 ); print $uwriter "OK\n"; next; --- 194,207 ---- } ! if ( $command =~ /^__GETUSERCONFIG ([^ ]+) ([^_]+)_(.+)/ ) { ! my $userid = $b->get_user_id( $session, $1 ); ! my $value = $h->user_module_config_( $userid, $2, $3 ); print $uwriter "OK $value\n"; next; } ! if ( $command =~ /^__SETUSERCONFIG ([^ ]+) ([^_]+)_(.+) (.+)?/ ) { ! my $userid = $b->get_user_id( $session, $1 ); ! my $value = $h->user_module_config_( $userid, $2, $3, $4 ); print $uwriter "OK\n"; next; *************** *** 280,283 **** --- 284,288 ---- } } + select( undef, undef, undef, 0.05 ); } *************** *** 409,416 **** } ! if ( $line =~ /^USERCONFIGIS +([^ ]+) ?(.+)?$/ ) { ! my ( $option, $expected ) = ( $1, $2 ); $expected = '' if ( !defined( $expected ) ); ! print $dwriter "__GETUSERCONFIG $option\n"; my $reply = <$ureader>; if ( $reply =~ /^OK ([^\r\n]+)/ ) { --- 414,421 ---- } ! if ( $line =~ /^USERCONFIGIS +([^ ]+) +([^ ]+) ?(.+)?$/ ) { ! my ( $user, $option, $expected ) = ( $1, $2, $3 ); $expected = '' if ( !defined( $expected ) ); ! print $dwriter "__GETUSERCONFIG $user $option\n"; my $reply = <$ureader>; if ( $reply =~ /^OK ([^\r\n]+)/ ) { *************** *** 435,442 **** } ! if ( $line =~ /^SETUSERCONFIG +([^ ]+) ?(.+)?$/ ) { ! my ( $option, $value ) = ( $1, $2 ); $value = '' if ( !defined( $value ) ); ! print $dwriter "__SETUSERCONFIG $option $value\n"; my $reply = <$ureader>; --- 440,447 ---- } ! if ( $line =~ /^SETUSERCONFIG +([^ ]+) ([^ ]+) ?(.+)?$/ ) { ! my ( $user, $option, $value ) = ( $1, $2, $3 ); $value = '' if ( !defined( $value ) ); ! print $dwriter "__SETUSERCONFIG $user $option $value\n"; my $reply = <$ureader>; Index: TestHTML.script =================================================================== RCS file: /cvsroot/popfile/engine/tests/TestHTML.script,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** TestHTML.script 30 Apr 2008 14:41:49 -0000 1.41 --- TestHTML.script 1 May 2008 15:21:43 -0000 1.42 *************** *** 40,46 **** # SETSUBMIT a b Just like doing SETINPUT a b followed by SUBMIT a # CONFIGIS a b Verify that config item a has value b ! # SETCONFIG a b Set config item a to b ! # USERCONFIGIS a b Verify that current user's config item a has value b ! # SETUSERCONFIG a b Set current user's config item a to b # MAGNETIS a b c Checks that magnet c exists in bucket a with type b # PARAMETERIS a b c Check that parameter b in bucket a has value c --- 40,46 ---- # SETSUBMIT a b Just like doing SETINPUT a b followed by SUBMIT a # CONFIGIS a b Verify that config item a has value b ! # SETCONFIG u a b Set config item a for user u to b ! # USERCONFIGIS u a b Verify that config item a for user u has value b ! # SETUSERCONFIG u a b Set config item a for user u to b # MAGNETIS a b c Checks that magnet c exists in bucket a with type b # PARAMETERIS a b c Check that parameter b in bucket a has value c *************** *** 160,163 **** --- 160,173 ---- MATCH Recent Messages + # Does not redirect to login page + + GET /logout + GET /administration + MATCH <input type="hidden" id="next" name="next" value="%2Fadministration" /> + GET /logout + MATCH <input type="hidden" id="next" name="next" value="%2F" /> + SETINPUT username admin + SETSUBMIT password + # Administration page (Current Active User sessions) *************** *** 329,332 **** --- 339,343 ---- </td> ENDMATCH + SETINPUT newaccount fooz:bar CLICK addaccount *************** *** 336,343 **** --- 347,359 ---- </td> ENDMATCH + SETINPUT newaccount foo:bar CLICK addaccount MATCH Failed to add the account because it is assigned to another user + SETINPUT newaccount badaccount + CLICK addaccount + MATCH The new account name must be in the form host:user + # Remove account *************** *** 349,363 **** INPUTIS parameter_history_history_days 2 ! USERCONFIGIS history_history_days 2 SETSUBMIT parameter_history_history_days 10 INPUTIS parameter_history_history_days 10 ! USERCONFIGIS history_history_days 10 SETSUBMIT parameter_history_history_days 2 INPUTIS parameter_GLOBAL_can_admin 1 ! USERCONFIGIS GLOBAL_can_admin 1 SETSUBMIT parameter_GLOBAL_can_admin 0 INPUTIS parameter_GLOBAL_can_admin 1 ! USERCONFIGIS GLOBAL_can_admin 1 GET /logout --- 365,403 ---- INPUTIS parameter_history_history_days 2 ! USERCONFIGIS admin history_history_days 2 SETSUBMIT parameter_history_history_days 10 INPUTIS parameter_history_history_days 10 ! USERCONFIGIS admin history_history_days 10 SETSUBMIT parameter_history_history_days 2 INPUTIS parameter_GLOBAL_can_admin 1 ! USERCONFIGIS admin GLOBAL_can_admin 1 SETSUBMIT parameter_GLOBAL_can_admin 0 INPUTIS parameter_GLOBAL_can_admin 1 ! USERCONFIGIS admin GLOBAL_can_admin 1 ! ! # Timeout test ! ! GET /advanced ! CONFIGIS GLOBAL_session_timeout 1800 ! INPUTIS parameter_GLOBAL_session_timeout 1800 ! SETSUBMIT parameter_GLOBAL_session_timeout 1 ! CONFIGIS GLOBAL_session_timeout 1 ! INPUTIS parameter_GLOBAL_session_timeout 1 ! ! CODE ! select( undef, undef, undef, 5 ); # wait for timeout ! ENDCODE ! ! GET /advanced ! MATCH Login ! MATCH POPFile session has been expired because a timeout period passed ! SETINPUT username admin ! SETSUBMIT password ! ! GET /advanced ! SETSUBMIT parameter_GLOBAL_session_timeout 1800 ! CONFIGIS GLOBAL_session_timeout 1800 ! INPUTIS parameter_GLOBAL_session_timeout 1800 GET /logout *************** *** 389,392 **** --- 429,437 ---- NOTMATCH <a class="shutdownLink" href="/shutdown">Shutdown POPFile</a> + # Standard user can't access the log file + + GET /popfile_current_log.log + MATCH POPFile Web Server Error 404 + # No History *************** *** 432,445 **** # Non admin users can't access these pages ! GET /administration MATCH POPFile Web Server Error 404 ! GET /users MATCH POPFile Web Server Error 404 ! GET /advanced MATCH POPFile Web Server Error 404 ! GET /shutdown MATCH POPFile Web Server Error 404 GET /logout --- 477,503 ---- # Non admin users can't access these pages ! GET /administration MATCH POPFile Web Server Error 404 ! GET /users MATCH POPFile Web Server Error 404 ! GET /advanced MATCH POPFile Web Server Error 404 ! GET /shutdown MATCH POPFile Web Server Error 404 + # Language test + + GET / + MATCH <html lang="en"> + USERCONFIGIS renameduser html_language English + SETSUBMIT language Francais + MATCH <html lang="fr"> + USERCONFIGIS renameduser html_language Francais + USERCONFIGIS admin html_language English + SETSUBMIT language English + MATCH <html lang="en"> + USERCONFIGIS renameduser html_language English + GET /logout *************** *** 624,636 **** SETSUBMIT password ! #INPUTIS usermode CONFIGIS GLOBAL_single_user 0 SETINPUT usermode on CLICK apply_stealth ! #INPUTIS usermode on CONFIGIS GLOBAL_single_user 1 NOTMATCH <a class="logoutLink" href="/logout">Logout (admin)</a> MATCH POPFile is now in the Single User Mode (POPFile classic). You are recommended to restart POPFile. # History Page --- 682,904 ---- SETSUBMIT password ! INPUTIS usermode CONFIGIS GLOBAL_single_user 0 SETINPUT usermode on CLICK apply_stealth ! INPUTIS usermode on CONFIGIS GLOBAL_single_user 1 NOTMATCH <a class="logoutLink" href="/logout">Logout (admin)</a> MATCH POPFile is now in the Single User Mode (POPFile classic). You are recommended to restart POPFile. + # Config Bar + + GET /history + + # Show/Hide Config Bar + + MATCH <a name="configBar" title="Hide configuration bar" href="/history?hide_configbar=1">Config Bar</a> + MATCH <table class="configBarBody" cellspacing="0" width="100%" summary=""> + GET /history?hide_configbar=1 + MATCH <a title="Show configuration bar" href="/history?show_configbar=1#configBar">Config Bar</a> + NOTMATCH <table class="configBarBody" cellspacing="0" width="100%" summary=""> + GET /history?show_configbar=1 + MATCH <a name="configBar" title="Hide configuration bar" href="/history?hide_configbar=1">Config Bar</a> + + # Check skin change + + MATCH <link rel="stylesheet" type="text/css" href="skins/default/style.css" media="all" title="POPFile"> + USERCONFIGIS admin html_skin default + SETSUBMIT skin oceanblue + MATCH <link rel="stylesheet" type="text/css" href="skins/oceanblue/style.css" title="POPFile-Style"> + USERCONFIGIS admin html_skin oceanblue + SETSUBMIT skin default + USERCONFIGIS admin html_skin default + + # Check language change + + MATCH <html lang="en"> + USERCONFIGIS admin html_language English + SETSUBMIT language Francais + MATCH <html lang="fr"> + USERCONFIGIS admin html_language Francais + SETSUBMIT language English + MATCH <html lang="en"> + USERCONFIGIS admin html_language English + + # Check history lines change + + INPUTIS page_size 20 + USERCONFIGIS admin html_page_size 20 + SETSUBMIT page_size 30 + INPUTIS page_size 30 + USERCONFIGIS admin html_page_size 30 + #MATCH Updated number of messages per page to 30 + SETSUBMIT page_size 0 + MATCH The page size must be a number between 1 and 1000 + INPUTIS page_size 30 + SETSUBMIT page_size 20 + USERCONFIGIS admin html_page_size 20 + + # Check history days change + + INPUTIS history_days 2 + USERCONFIGIS admin history_history_days 2 + SETSUBMIT history_days 3 + INPUTIS history_days 3 + USERCONFIGIS admin history_history_days 3 + #MATCH Updated number of days of history to 3 + SETSUBMIT history_days 0 + #MATCH The number of days in the history must be a number between 1 and 366 + INPUTIS history_days 3 + + # Add/Remove columns + + MATCH + <a href="/history?setsort=inserted" title="Sort by this column"> + <em class="historyLabelSort"> + < Arrived + </em> + </a> + ENDMATCH + MATCH + <a href="/history?setsort=from" title="Sort by this column"> + From + </a> + ENDMATCH + MATCH + <a href="/history?setsort=to" title="Sort by this column"> + To + </a> + ENDMATCH + MATCH + <a href="/history?setsort=subject" title="Sort by this column"> + Subject + </a> + ENDMATCH + MATCH + <a href="/history?setsort=bucket" title="Sort by this column"> + Bucket + </a> + ENDMATCH + MATCH + <input type="hidden" id="inserted" name="inserted"> + <input type="hidden" id="from" name="from"> + <input type="hidden" id="to" name="to"> + <span class="checkLabel"><input type="checkbox" id="cc" class="checkbox" name="cc"> <label for="cc">Cc</label> </span> + <input type="hidden" id="subject" name="subject"> + <span class="checkLabel"><input type="checkbox" id="date" class="checkbox" name="date"> <label for="date">Date</label> </span> + <span class="checkLabel"><input type="checkbox" id="size" class="checkbox" name="size"> <label for="size">Size</label> </span> + <input type="hidden" id="bucket" name="bucket"> + ENDMATCH + USERCONFIGIS admin html_columns +inserted,+from,+to,-cc,+subject,-date,-size,+bucket, + + SETINPUT date on + CLICK update_fields + MATCH + <a href="/history?setsort=date" title="Sort by this column"> + Date + </a> + ENDMATCH + MATCH + <input type="hidden" id="inserted" name="inserted"> + <input type="hidden" id="from" name="from"> + <input type="hidden" id="to" name="to"> + <span class="checkLabel"><input type="checkbox" id="cc" class="checkbox" name="cc"> <label for="cc">Cc</label> </span> + <input type="hidden" id="subject" name="subject"> + <input type="hidden" id="date" name="date"> + <span class="checkLabel"><input type="checkbox" id="size" class="checkbox" name="size"> <label for="size">Size</label> </span> + <input type="hidden" id="bucket" name="bucket"> + ENDMATCH + USERCONFIGIS admin html_columns +inserted,+from,+to,-cc,+subject,+date,-size,+bucket, + + SETINPUT size on + CLICK update_fields + MATCH + <a href="/history?setsort=size" title="Sort by this column"> + Size + </a> + ENDMATCH + MATCH + <input type="hidden" id="inserted" name="inserted"> + <input type="hidden" id="from" name="from"> + <input type="hidden" id="to" name="to"> + <span class="checkLabel"><input type="checkbox" id="cc" class="checkbox" name="cc"> <label for="cc">Cc</label> </span> + <input type="hidden" id="subject" name="subject"> + <input type="hidden" id="date" name="date"> + <input type="hidden" id="size" name="size"> + <input type="hidden" id="bucket" name="bucket"> + ENDMATCH + USERCONFIGIS admin html_columns +inserted,+from,+to,-cc,+subject,+date,+size,+bucket, + + MATCH <a class="columnRemove" href="/history?removecolumn=date"><img title="Remove column" src="skins/x.gif" border="0" alt="x"></a> + MATCH <a class="columnRemove" href="/history?removecolumn=size"><img title="Remove column" src="skins/x.gif" border="0" alt="x"></a> + + GET /history?removecolumn=date + NOTMATCH <a class="columnRemove" href="/history?removecolumn=date"><img title="Remove column" src="skins/x.gif" border="0" alt="x"></a> + MATCH <a class="columnRemove" href="/history?removecolumn=size"><img title="Remove column" src="skins/x.gif" border="0" alt="x"></a> + MATCH + <input type="hidden" id="inserted" name="inserted"> + <input type="hidden" id="from" name="from"> + <input type="hidden" id="to" name="to"> + <span class="checkLabel"><input type="checkbox" id="cc" class="checkbox" name="cc"> <label for="cc">Cc</label> </span> + <input type="hidden" id="subject" name="subject"> + <span class="checkLabel"><input type="checkbox" id="date" class="checkbox" name="date"> <label for="date">Date</label> </span> + <input type="hidden" id="size" name="size"> + <input type="hidden" id="bucket" name="bucket"> + ENDMATCH + USERCONFIGIS admin html_columns +inserted,+from,+to,-cc,+subject,-date,+size,+bucket, + + GET /history?removecolumn=size + NOTMATCH <a class="columnRemove" href="/history?removecolumn=size"><img title="Remove column" src="skins/x.gif" border="0" alt="x"></a> + MATCH + <input type="hidden" id="inserted" name="inserted"> + <input type="hidden" id="from" name="from"> + <input type="hidden" id="to" name="to"> + <span class="checkLabel"><input type="checkbox" id="cc" class="checkbox" name="cc"> <label for="cc">Cc</label> </span> + <input type="hidden" id="subject" name="subject"> + <span class="checkLabel"><input type="checkbox" id="date" class="checkbox" name="date"> <label for="date">Date</label> </span> + <span class="checkLabel"><input type="checkbox" id="size" class="checkbox" name="size"> <label for="size">Size</label> </span> + <input type="hidden" id="bucket" name="bucket"> + ENDMATCH + USERCONFIGIS admin html_columns +inserted,+from,+to,-cc,+subject,-date,-size,+bucket, + + # Move column left/right + + MATCH <a class="columnMove" href="/history?moveright=inserted"><img title="Move right" src="skins/rightarrow.gif" border="0" alt=">"></a> + MATCH <a class="columnMove" href="/history?moveleft=from"><img title="Move left" src="skins/leftarrow.gif" border="0" alt="<"></a> + GET /history?moveright=inserted + MATCH <a class="columnMove" href="/history?moveleft=inserted"><img title="Move left" src="skins/leftarrow.gif" border="0" alt="<"></a> + MATCH <a class="columnMove" href="/history?moveright=inserted"><img title="Move right" src="skins/rightarrow.gif" border="0" alt=">"></a> + NOTMATCH <a class="columnMove" href="/history?moveleft=from"><img title="Move left" src="skins/leftarrow.gif" border="0" alt="<"></a> + USERCONFIGIS admin html_columns +from,+inserted,+to,-cc,+subject,-date,-size,+bucket + + GET /history?moveleft=inserted + MATCH <a class="columnMove" href="/history?moveright=inserted"><img title="Move right" src="skins/rightarrow.gif" border="0" alt=">"></a> + MATCH <a class="columnMove" href="/history?moveleft=from"><img title="Move left" src="skins/leftarrow.gif" border="0" alt="<"></a> + NOTMATCH <a class="columnMove" href="/history?moveleft=inserted"><img title="Move left" src="skins/leftarrow.gif" border="0" alt="<"></a> + USERCONFIGIS admin html_columns +inserted,+from,+to,-cc,+subject,-date,-size,+bucket + + # Column size + + MATCH Think you've seen porn? How about a dog... + USERCONFIGIS admin html_column_characters 39 + CLICK increase + MATCH Think you've seen porn? How about a dog ... + USERCONFIGIS admin html_column_characters 40 + + CLICK decrease + MATCH Think you've seen porn? How about a dog... + USERCONFIGIS admin html_column_characters 39 + SETUSERCONFIG admin html_column_characters 6 + USERCONFIGIS admin html_column_characters 6 + CLICK decrease + CLICK decrease + MATCH Think... + USERCONFIGIS admin html_column_characters 5 + + CLICK automatic + MATCH Think you've seen porn? How about a dog ... + USERCONFIGIS admin html_column_characters 0 + # History Page *************** *** 679,682 **** --- 947,983 ---- NOTMATCH Douglas Arnold <0noy8\@worldnet.att.net> + SETSUBMIT jumptopage 1 + MATCH + Jump to page: + <b>1</b> + [<a href="/history?start_message=20&sort=-inserted">2</a>] + [<a href="/history?start_message=20&sort=-inserted">Next ></a>] + ENDMATCH + MATCH Douglas Arnold <0noy8\@worldnet.att.net> + MATCH XoSeXyGoDdEsSm\@hotmail.com + MATCH from: Leandro + + SETSUBMIT jumptopage 3 + MATCH + Jump to page: + <b>1</b> + [<a href="/history?start_message=20&sort=-inserted">2</a>] + [<a href="/history?start_message=20&sort=-inserted">Next ></a>] + ENDMATCH + MATCH Douglas Arnold <0noy8\@worldnet.att.net> + MATCH XoSeXyGoDdEsSm\@hotmail.com + MATCH from: Leandro + + SETSUBMIT jumptopage 0 + MATCH + Jump to page: + <b>1</b> + [<a href="/history?start_message=20&sort=-inserted">2</a>] + [<a href="/history?start_message=20&sort=-inserted">Next ></a>] + ENDMATCH + MATCH Douglas Arnold <0noy8\@worldnet.att.net> + MATCH XoSeXyGoDdEsSm\@hotmail.com + MATCH from: Leandro + GET /history *************** *** 740,744 **** SETSUBMIT search Doctor NOTMATCH test\@test.com ! MATCH Enlarge your package Doctor Approv... NOTMATCH Jump to page CLICK reset_filter_search --- 1041,1045 ---- SETSUBMIT search Doctor NOTMATCH test\@test.com ! MATCH Enlarge your package Doctor ApprovedNHOB... NOTMATCH Jump to page CLICK reset_filter_search *************** *** 942,945 **** --- 1243,1251 ---- MATCH 2.6727 + GET /view?view=31&text=1 + MATCH From: John + MATCH Subject: Testing Refresh + MATCH Body would go here + # Jump to message *************** *** 1216,1279 **** SETINPUT remove1 on SETINPUT remove3 on ! CLICK delete NOTMATCH "foo" NOTMATCH "bar" ! INPUTIS text1 oldstyle ! INPUTIS bucket1 personal ! INPUTIS type1 from ! INPUTIS text2 baz\@baz.com ! INPUTIS bucket2 personal ! INPUTIS type2 to NOTMATCH type3 - # Config Bar - - GET /history - - # Check skin change - - MATCH <link rel="stylesheet" type="text/css" href="skins/default/style.css" media="all" title="POPFile"> - USERCONFIGIS html_skin default - SETSUBMIT skin oceanblue - MATCH <link rel="stylesheet" type="text/css" href="skins/oceanblue/style.css" title="POPFile-Style"> - USERCONFIGIS html_skin oceanblue - SETSUBMIT skin default - USERCONFIGIS html_skin default - - # Check language change - - MATCH <html lang="en"> - USERCONFIGIS html_language English - SETSUBMIT language Francais - MATCH <html lang="fr"> - USERCONFIGIS html_language Francais - SETSUBMIT language English - MATCH <html lang="en"> - USERCONFIGIS html_language English - - # Check history lines change - - INPUTIS page_size 20 - USERCONFIGIS html_page_size 20 - SETSUBMIT page_size 30 - INPUTIS page_size 30 - USERCONFIGIS html_page_size 30 - #MATCH Updated number of messages per page to 30 - SETSUBMIT page_size 0 - MATCH The page size must be a number between 1 and 1000 - INPUTIS page_size 30 - - # Check history days change - - INPUTIS history_days 2 - USERCONFIGIS history_history_days 2 - SETSUBMIT history_days 3 - INPUTIS history_days 3 - USERCONFIGIS history_history_days 3 - #MATCH Updated number of days of history to 3 - SETSUBMIT history_days 0 - #MATCH The number of days in the history must be a number between 1 and 366 - INPUTIS history_days 3 - # Administration Page --- 1522,1536 ---- SETINPUT remove1 on SETINPUT remove3 on ! CLICK delete NOTMATCH "foo" NOTMATCH "bar" ! INPUTIS text1 oldstyle ! INPUTIS bucket1 personal ! INPUTIS type1 from ! INPUTIS text2 baz\@baz.com ! INPUTIS bucket2 personal ! INPUTIS type2 to NOTMATCH type3 # Administration Page *************** *** 1411,1422 **** INPUTIS update_check ! USERCONFIGIS html_update_check 0 SETSUBMIT update_check on INPUTIS update_check on ! USERCONFIGIS html_update_check 1 MATCH POPFile checks for updates daily SETSUBMIT update_check off INPUTIS update_check ! USERCONFIGIS html_update_check 0 MATCH POPFile does not check for updates automatically --- 1668,1679 ---- INPUTIS update_check ! USERCONFIGIS admin html_update_check 0 SETSUBMIT update_check on INPUTIS update_check on ! USERCONFIGIS admin html_update_check 1 MATCH POPFile checks for updates daily SETSUBMIT update_check off INPUTIS update_check ! USERCONFIGIS admin html_update_check 0 MATCH POPFile does not check for updates automatically *************** *** 1424,1435 **** INPUTIS send_stats ! USERCONFIGIS html_send_stats 0 SETSUBMIT send_stats on INPUTIS send_stats on MATCH POPFile sends classification statistics daily ! USERCONFIGIS html_send_stats 1 SETSUBMIT send_stats off INPUTIS send_stats ! USERCONFIGIS html_send_stats 0 MATCH POPFile does not send classification statistics --- 1681,1692 ---- INPUTIS send_stats ! USERCONFIGIS admin html_send_stats 0 SETSUBMIT send_stats on INPUTIS send_stats on MATCH POPFile sends classification statistics daily ! USERCONFIGIS admin html_send_stats 1 SETSUBMIT send_stats off INPUTIS send_stats ! USERCONFIGIS admin html_send_stats 0 MATCH POPFile does not send classification statistics *************** *** 1508,1511 **** --- 1765,1772 ---- MATCH Single User Mode Parameters + SETSUBMIT parameter_bayes_unclassified_weight 1000 + USERCONFIGIS admin bayes_unclassified_weight 1000 + INPUTIS parameter_bayes_unclassified_weight 1000 + # Buckets Page *************** *** 1796,1800 **** SETSUBMIT password secret - SETSUBMIT password secret MATCH Recent Messages --- 2057,2060 ---- *************** *** 1851,1854 **** --- 2111,2117 ---- MATCH 10 GOTO 10 + GET /popfile_current_log.log + MATCH Attempting to connect to dbi:SQLite2:dbname=../tests/popfile.db + CODE mkdir '../manual'; *************** *** 1871,1878 **** # Check update checking ! SETUSERCONFIG html_update_check 1 ! SETUSERCONFIG html_send_stats 1 ! SETUSERCONFIG html_last_update_check 0 ! SETCONFIG GLOBAL_ecount 1 GET / MATCH popfile_update.pl --- 2134,2140 ---- # Check update checking ! SETUSERCONFIG admin html_update_check 1 ! SETUSERCONFIG admin html_send_stats 1 ! SETUSERCONFIG admin html_last_update_check 0 GET / MATCH popfile_update.pl Index: TestPOP3.tst =================================================================== RCS file: /cvsroot/popfile/engine/tests/TestPOP3.tst,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** TestPOP3.tst 28 Apr 2008 11:48:59 -0000 1.39 --- TestPOP3.tst 1 May 2008 15:21:44 -0000 1.40 *************** *** 46,49 **** --- 46,51 ---- rmtree( 'messages' ); + use POSIX ":sys_wait_h"; + use POPFile::Loader; my $POPFile = POPFile::Loader->new(); *************** *** 478,483 **** close $server; ! exit(0) if ( $^O ne 'MSWin32' ); ! select ( undef, undef, undef, 3 ); } else { --- 480,485 ---- close $server; ! sleep(1); ! exit(0); } else { *************** *** 576,581 **** $POPFile->CORE_stop(); ! exit(0) if ( $^O ne 'MSWin32' ); ! select ( undef, undef, undef, 3 ); } else { --- 578,583 ---- $POPFile->CORE_stop(); ! sleep(1); ! exit(0); } else { *************** *** 790,794 **** $cam =~ s/msg$/cam/; ! test_assert( open RESULT, ">$messages[27]_testpop3_-got.cam" ); test_assert( open FILE, "<$cam" ); binmode FILE; --- 792,796 ---- $cam =~ s/msg$/cam/; ! test_assert( open RESULT, ">$messages[27]_testpop3-got.cam" ); test_assert( open FILE, "<$cam" ); binmode FILE; *************** *** 2162,2169 **** close $ureader; ! # while ( waitpid( $pid, &WNOHANG ) != $pid ) { ! # } ! # while ( waitpid( $pid2, &WNOHANG ) != $pid2 ) { ! # } } --- 2164,2170 ---- close $ureader; ! while ( waitpid( -1, WNOHANG ) > 0 ) { ! select( undef, undef, undef, 0.1 ); ! } } Index: TestHTTP.tst =================================================================== RCS file: /cvsroot/popfile/engine/tests/TestHTTP.tst,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** TestHTTP.tst 9 Apr 2008 17:20:48 -0000 1.14 --- TestHTTP.tst 1 May 2008 15:21:44 -0000 1.15 *************** *** 65,68 **** --- 65,69 ---- $h->config_( 'port', $port ); $h->config_( 'local', 1 ); + $h->config_( 'cookie_cipher', 'Blowfish' ); test_assert_equal( $h->config_( 'port' ), $port ); test_assert_equal( $h->config_( 'local' ), 1 ); |
|
From: naoki i. <am...@us...> - 2008-05-01 15:21:38
|
Update of /cvsroot/popfile/engine/Classifier In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8666/Classifier Modified Files: Bayes.pm Log Message: Change Log 1. New HTML module option 'cookie_cipher' UI/HTML.pm UI/HTTP.pm Users can choose Crypt::DES instead of Crypt::Blowfish. 2. Update POPFile::Random module POPFile/Random.pm POPFile/Module.pm Classifier/Bayes.pm UI/HTML.pm UI/HTTP.pm 3. New test script for POPFile::Random tests/TestRandom.tst 4. Fixed a bug that users couldn't login to the UI on some environment UI/HTTP.pm 5. Add some tests for UI::HTML 6. Update TestHTML.tst to pass tests/TestHTML.script Config bar History tab View log file View text message Session timeout Change language in the multiuser mode 7. Minor fix of the test scripts tests/TestXMLRPC.tst tests/TestPOP3.tst tests/TestHTTP.tst Current state of the test suite: TestBayesScript PASS TestBayes PASS TestConfiguration PASS TestHistory PASS TestHTML PASS TestHTTP PASS TestIMAP PASS TestInsertScript PASS * TestLogger PASS TestMailParse PASS TestModule PASS TestMQ PASS TestMutex PASS TestPipeScript PASS TestPOP3 PASS TestProxy PASS TestWordMangle PASS TestXMLRPC PASS * : TODO : needs to add tests for multi user support Index: Bayes.pm =================================================================== RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v retrieving revision 1.371 retrieving revision 1.372 diff -C2 -d -r1.371 -r1.372 *** Bayes.pm 30 Apr 2008 14:41:49 -0000 1.371 --- Bayes.pm 1 May 2008 15:21:43 -0000 1.372 *************** *** 1567,1575 **** # get a random session key in hex - my $module = $self->global_config_( 'random_module' ); - $self->log_( 1, "Generating random octet using $module" ); - my $random = $self->random_()->generate_random_string( # PROFILE BLOCK START - $module, 128, $self->global_config_( 'crypt_strength' ), --- 1567,1571 ---- |
|
From: naoki i. <am...@us...> - 2008-05-01 15:21:38
|
Update of /cvsroot/popfile/engine/UI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8666/UI Modified Files: HTML.pm HTTP.pm Log Message: Change Log 1. New HTML module option 'cookie_cipher' UI/HTML.pm UI/HTTP.pm Users can choose Crypt::DES instead of Crypt::Blowfish. 2. Update POPFile::Random module POPFile/Random.pm POPFile/Module.pm Classifier/Bayes.pm UI/HTML.pm UI/HTTP.pm 3. New test script for POPFile::Random tests/TestRandom.tst 4. Fixed a bug that users couldn't login to the UI on some environment UI/HTTP.pm 5. Add some tests for UI::HTML 6. Update TestHTML.tst to pass tests/TestHTML.script Config bar History tab View log file View text message Session timeout Change language in the multiuser mode 7. Minor fix of the test scripts tests/TestXMLRPC.tst tests/TestPOP3.tst tests/TestHTTP.tst Current state of the test suite: TestBayesScript PASS TestBayes PASS TestConfiguration PASS TestHistory PASS TestHTML PASS TestHTTP PASS TestIMAP PASS TestInsertScript PASS * TestLogger PASS TestMailParse PASS TestModule PASS TestMQ PASS TestMutex PASS TestPipeScript PASS TestPOP3 PASS TestProxy PASS TestWordMangle PASS TestXMLRPC PASS * : TODO : needs to add tests for multi user support Index: HTML.pm =================================================================== RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v retrieving revision 1.394 retrieving revision 1.395 diff -C2 -d -r1.394 -r1.395 *** HTML.pm 30 Apr 2008 14:41:49 -0000 1.394 --- HTML.pm 1 May 2008 15:21:43 -0000 1.395 *************** *** 176,179 **** --- 176,183 ---- $self->config_( 'https_port', 8443 ); + # Encryption module for cookies + + $self->config_( 'cookie_cipher', 'Blowfish' ); + # Load skins *************** *** 424,433 **** # MD5 checksum of the data (hex encoded) - my $module = $self->global_config_( 'random_module' ); - $self->log_( 1, "Generating random octet using $module" ); - $cookie_string = encode_base64( # PROFILE BLOCK START $self->random_()->generate_random_string( - $module, 16, $self->global_config_( 'crypt_strength' ), --- 428,433 ---- *************** *** 490,494 **** my $timeout = 0; ! if ( $cookie ne '' ) { $session = $self->handle_cookie__( $cookie, $client ); if ( defined($session) && ( $session eq 'TIMEOUT' ) ) { --- 490,494 ---- my $timeout = 0; ! if ( defined($cookie) && ( $cookie ne '' ) ) { $session = $self->handle_cookie__( $cookie, $client ); if ( defined($session) && ( $session eq 'TIMEOUT' ) ) { *************** *** 644,649 **** if ( $url =~ /^\/(.+\.ico)/ ) { ! $self->http_file_( $client, $self->get_root_path_( $1 ), ! 'image/x-icon' ); return 1; } --- 644,649 ---- if ( $url =~ /^\/(.+\.ico)/ ) { ! $self->http_file_( $client, $self->get_root_path_( $1 ), # PROFILE BLOCK START ! 'image/x-icon' ); # PROFILE BLOCK STOP return 1; } *************** *** 1725,1730 **** # Handle user creation ! if ( exists( $self->{form_}{create} ) && ! ( $self->{form_}{newuser} ne '' ) ) { my ( $result, $password ) = $self->classifier_()->create_user( # PROFILE BLOCK START $session, --- 1725,1730 ---- # Handle user creation ! if ( exists( $self->{form_}{create} ) && # PROFILE BLOCK START ! ( $self->{form_}{newuser} ne '' ) ) { # PROFILE BLOCK STOP my ( $result, $password ) = $self->classifier_()->create_user( # PROFILE BLOCK START $session, *************** *** 1951,1956 **** $templ->param( 'Users_Loop_ChangePassword' => \@user_loop ); ! if ( exists( $self->{form_}{edituser} ) && ! ( $self->{form_}{editname} ne '' ) ) { my $id = $self->classifier_()->get_user_id( $session, $self->{form_}{editname} ); my @parameters = $self->classifier_()->get_user_parameter_list( $session ); --- 1951,1956 ---- $templ->param( 'Users_Loop_ChangePassword' => \@user_loop ); ! if ( exists( $self->{form_}{edituser} ) && # PROFILE BLOCK START ! ( $self->{form_}{editname} ne '' ) ) { # PROFILE BLOCK STOP my $id = $self->classifier_()->get_user_id( $session, $self->{form_}{editname} ); my @parameters = $self->classifier_()->get_user_parameter_list( $session ); *************** *** 2057,2062 **** if ( defined($self->{form_}{word}) ) { ! my $result = $self->classifier_()->remove_stopword( $session, ! $self->{form_}{word} ); if ( $result == 0 ) { $self->error_message__( $templ, $self->language($session)->{Advanced_Error2} ); --- 2057,2062 ---- if ( defined($self->{form_}{word}) ) { ! my $result = $self->classifier_()->remove_stopword( $session, # PROFILE BLOCK START ! $self->{form_}{word} ); # PROFILE BLOCK STOP if ( $result == 0 ) { $self->error_message__( $templ, $self->language($session)->{Advanced_Error2} ); *************** *** 2136,2141 **** $templ->param( 'Advanced_Loop_Word' => \@word_loop ); ! $templ->param( 'Advanced_POPFILE_CFG' => ! $self->get_user_path_( 'popfile.cfg' ) ); my $last_module = ''; --- 2136,2141 ---- $templ->param( 'Advanced_Loop_Word' => \@word_loop ); ! $templ->param( 'Advanced_POPFILE_CFG' => # PROFILE BLOCK START ! $self->get_user_path_( 'popfile.cfg' ) ); # PROFILE BLOCK STOP my $last_module = ''; *************** *** 2226,2231 **** if ( defined( $self->{form_}{delete} ) ) { for my $i ( 1 .. $self->{form_}{count} ) { ! if ( defined( $self->{form_}{"remove$i"} ) && ! ( $self->{form_}{"remove$i"} ) ) { my $mtype = $self->{form_}{"type$i"}; my $mtext = $self->{form_}{"text$i"}; --- 2226,2231 ---- if ( defined( $self->{form_}{delete} ) ) { for my $i ( 1 .. $self->{form_}{count} ) { ! if ( defined( $self->{form_}{"remove$i"} ) && # PROFILE BLOCK START ! ( $self->{form_}{"remove$i"} ) ) { # PROFILE BLOCK STOP my $mtype = $self->{form_}{"type$i"}; my $mtext = $self->{form_}{"text$i"}; *************** *** 2260,2266 **** } ! if ( ( defined($mbucket) ) && ( $mbucket ne '' ) && ! ( $mtext ne '' ) ) { # Support for feature request 77646 - import function. --- 2260,2266 ---- } ! if ( ( defined($mbucket) ) && # PROFILE BLOCK START ( $mbucket ne '' ) && ! ( $mtext ne '' ) ) { # PROFILE BLOCK STOP # Support for feature request 77646 - import function. *************** *** 2630,2635 **** } ! if ( ( $s == 2 ) && ! ( $self->classifier_()->is_pseudo_bucket( $session, $bucket ) ) ) { $count = ''; $percent = ''; --- 2630,2635 ---- } ! if ( ( $s == 2 ) && # PROFILE BLOCK START ! ( $self->classifier_()->is_pseudo_bucket( $session, $bucket ) ) ) { # PROFILE BLOCK STOP $count = ''; $percent = ''; *************** *** 2725,2730 **** $self->error_message__( $templ, $self->language($session)->{Bucket_Error1} ); } else { ! if ( $self->classifier_()->is_bucket( $session, $self->{form_}{cname} ) || ! $self->classifier_()->is_pseudo_bucket( $session, $self->{form_}{cname} ) ) { $self->error_message__( # PROFILE BLOCK START $templ, --- 2725,2730 ---- $self->error_message__( $templ, $self->language($session)->{Bucket_Error1} ); } else { ! if ( $self->classifier_()->is_bucket( $session, $self->{form_}{cname} ) || # PROFILE BLOCK START ! $self->classifier_()->is_pseudo_bucket( $session, $self->{form_}{cname} ) ) { # PROFILE BLOCK STOP $self->error_message__( # PROFILE BLOCK START $templ, *************** *** 3028,3035 **** while ( $i < $self->history_()->get_query_size( $q ) ) { my %row_data; ! if ( ( $i == 0 ) || ( ( $i + $self->user_config_( $self->{sessions__}{$session}{user}, 'page_size' ) ) >= $self->history_()->get_query_size( $q ) ) || ( ( ( $i - 2 * $self->user_config_( $self->{sessions__}{$session}{user}, 'page_size' ) ) <= $start_message ) && ! ( ( $i + 2 * $self->user_config_( $self->{sessions__}{$session}{user}, 'page_size' ) ) >= $start_message ) ) ) { $row_data{History_Navigator_Page} = $p; $row_data{History_Navigator_I} = $i; --- 3028,3035 ---- while ( $i < $self->history_()->get_query_size( $q ) ) { my %row_data; ! if ( ( $i == 0 ) || # PROFILE BLOCK START ( ( $i + $self->user_config_( $self->{sessions__}{$session}{user}, 'page_size' ) ) >= $self->history_()->get_query_size( $q ) ) || ( ( ( $i - 2 * $self->user_config_( $self->{sessions__}{$session}{user}, 'page_size' ) ) <= $start_message ) && ! ( ( $i + 2 * $self->user_config_( $self->{sessions__}{$session}{user}, 'page_size' ) ) >= $start_message ) ) ) { # PROFILE BLOCK STOP $row_data{History_Navigator_Page} = $p; $row_data{History_Navigator_I} = $i; *************** *** 3201,3205 **** if ( defined( $self->{form_}{gopage} ) ) { ! my $destination = ( $self->{form_}{jumptopage} - 1 ) * # PROFILE BLOCK START $self->user_config_( $self->{sessions__}{$session}{user}, 'page_size' ); # PROFILE BLOCK STOP my $q = $self->{sessions__}{$session}{q}; --- 3201,3207 ---- if ( defined( $self->{form_}{gopage} ) ) { ! my $jumptopage = $self->{form_}{jumptopage}; ! $jumptopage = 1 if ( ( $jumptopage eq '' ) || ( $jumptopage =~ /[^\d]/ ) ); ! my $destination = ( $jumptopage - 1 ) * # PROFILE BLOCK START $self->user_config_( $self->{sessions__}{$session}{user}, 'page_size' ); # PROFILE BLOCK STOP my $q = $self->{sessions__}{$session}{q}; *************** *** 3212,3217 **** } ! $templ = $self->handle_configuration_bar__( $client, $templ, $template, ! $page, $session ); $self->handle_history_bar__( $client, $templ, $template, $page, $session ); --- 3214,3219 ---- } ! $templ = $self->handle_configuration_bar__( $client, $templ, $template, # PROFILE BLOCK START ! $page, $session ); # PROFILE BLOCK STOP $self->handle_history_bar__( $client, $templ, $template, $page, $session ); *************** *** 3439,3443 **** my %row_data; $header =~ /^(.)/; ! next if ( $1 eq '-' ); $colspan++; $header =~ s/^.//; --- 3441,3445 ---- my %row_data; $header =~ /^(.)/; ! next if ( ( $1 eq '-' ) || ( $1 eq '' ) ); $colspan++; $header =~ s/^.//; *************** *** 3557,3564 **** $self->shorten__( $$row[4], $length, $language_for_user ); # PROFILE BLOCK STOP $col_data{History_Mail_File} = $$row[0]; ! $col_data{History_Fields} = ! $self->print_form_fields_(0,1, # PROFILE BLOCK START ('start_message','filter','search', ! 'sort','negate' ) ); # PROFILE BLOCK STOP push ( @column_data, \%col_data ); next; --- 3559,3566 ---- $self->shorten__( $$row[4], $length, $language_for_user ); # PROFILE BLOCK STOP $col_data{History_Mail_File} = $$row[0]; ! $col_data{History_Fields} = # PROFILE BLOCK START ! $self->print_form_fields_(0,1, ('start_message','filter','search', ! 'sort','negate' ) ); # PROFILE BLOCK STOP push ( @column_data, \%col_data ); next; *************** *** 3925,3930 **** $self->{form_}{username} = 'admin' if ( $single_user ); ! if ( exists( $self->{form_}{username} ) && ! exists( $self->{form_}{password} ) ) { $session = $self->classifier_()->get_session_key( # PROFILE BLOCK START $self->{form_}{username}, --- 3927,3932 ---- $self->{form_}{username} = 'admin' if ( $single_user ); ! if ( exists( $self->{form_}{username} ) && # PROFILE BLOCK START ! exists( $self->{form_}{password} ) ) { # PROFILE BLOCK STOP $session = $self->classifier_()->get_session_key( # PROFILE BLOCK START $self->{form_}{username}, Index: HTTP.pm =================================================================== RCS file: /cvsroot/popfile/engine/UI/HTTP.pm,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** HTTP.pm 30 Apr 2008 14:41:49 -0000 1.42 --- HTTP.pm 1 May 2008 15:21:43 -0000 1.43 *************** *** 125,139 **** # Think of an encryption key for encrypting cookies using Blowfish ! my $module = $self->global_config_( 'random_module' ); ! $self->log_( 1, "Generating random octet using $module" ); my $key = $self->random_()->generate_random_string( # PROFILE BLOCK START ! $module, ! 56, $self->global_config_( 'crypt_strength' ), $self->global_config_( 'crypt_devide' ) ); # PROFILE BLOCK STOP $self->{crypto__} = new Crypt::CBC( { 'key' => $key, # PROFILE BLOCK START ! 'cipher' => 'Blowfish', 'padding' => 'standard', 'prepend_iv' => 0, --- 125,145 ---- # Think of an encryption key for encrypting cookies using Blowfish ! my $cipher = $self->config_( 'cookie_cipher' ); ! my $key_length = 8; ! ! if ( $cipher =~ /(Crypt::)?Blowfish/i ) { ! $key_length = 56; ! } ! if ( $cipher =~ /(Crypt::)?DES/i ) { ! $key_length = 8; ! } my $key = $self->random_()->generate_random_string( # PROFILE BLOCK START ! $key_length, $self->global_config_( 'crypt_strength' ), $self->global_config_( 'crypt_devide' ) ); # PROFILE BLOCK STOP $self->{crypto__} = new Crypt::CBC( { 'key' => $key, # PROFILE BLOCK START ! 'cipher' => $cipher, 'padding' => 'standard', 'prepend_iv' => 0, *************** *** 156,162 **** my ( $self ) = @_; ! if ( defined( $self->{server__} ) ) { foreach my $protocol ( keys %{$self->{server_}} ) { ! close $self->{server_}{$protocol}; } } --- 162,168 ---- my ( $self ) = @_; ! if ( defined( $self->{server_} ) ) { foreach my $protocol ( keys %{$self->{server_}} ) { ! close $self->{server_}{$protocol} if ( defined( $self->{server_}{$protocol} ) ); } } *************** *** 316,325 **** $cookie =~ /popfile=([^\r\n]+)/; ! if ( defined( $1 ) && ( length( $1 ) eq 216 ) ) { my $decoded_cookie = decode_base64( $1 ); ! if ( $decoded_cookie =~ /^Salted__(.{8})/ ) { ! # print "Decrypted : ", $self->{crypto__}->decrypt( $decoded_cookie ), "\n"; ! return $self->{crypto__}->decrypt( $decoded_cookie ); ! } } --- 322,336 ---- $cookie =~ /popfile=([^\r\n]+)/; ! if ( defined( $1 ) ) { my $decoded_cookie = decode_base64( $1 ); ! my $result = ''; ! ! # Workaround to avoid crash when a wrong cookie is sent ! ! eval { ! $result = $self->{crypto__}->decrypt( $decoded_cookie ); ! }; ! ! return $result; } |
|
From: naoki i. <am...@us...> - 2008-05-01 15:21:38
|
Update of /cvsroot/popfile/engine/POPFile In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8666/POPFile Modified Files: Module.pm Random.pm Log Message: Change Log 1. New HTML module option 'cookie_cipher' UI/HTML.pm UI/HTTP.pm Users can choose Crypt::DES instead of Crypt::Blowfish. 2. Update POPFile::Random module POPFile/Random.pm POPFile/Module.pm Classifier/Bayes.pm UI/HTML.pm UI/HTTP.pm 3. New test script for POPFile::Random tests/TestRandom.tst 4. Fixed a bug that users couldn't login to the UI on some environment UI/HTTP.pm 5. Add some tests for UI::HTML 6. Update TestHTML.tst to pass tests/TestHTML.script Config bar History tab View log file View text message Session timeout Change language in the multiuser mode 7. Minor fix of the test scripts tests/TestXMLRPC.tst tests/TestPOP3.tst tests/TestHTTP.tst Current state of the test suite: TestBayesScript PASS TestBayes PASS TestConfiguration PASS TestHistory PASS TestHTML PASS TestHTTP PASS TestIMAP PASS TestInsertScript PASS * TestLogger PASS TestMailParse PASS TestModule PASS TestMQ PASS TestMutex PASS TestPipeScript PASS TestPOP3 PASS TestProxy PASS TestWordMangle PASS TestXMLRPC PASS * : TODO : needs to add tests for multi user support Index: Module.pm =================================================================== RCS file: /cvsroot/popfile/engine/POPFile/Module.pm,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** Module.pm 25 Apr 2008 16:26:17 -0000 1.55 --- Module.pm 1 May 2008 15:21:43 -0000 1.56 *************** *** 955,959 **** if ( !defined( $self->{random__} ) ) { ! $self->{random__} = new POPFile::Random(); } --- 955,959 ---- if ( !defined( $self->{random__} ) ) { ! $self->{random__} = new POPFile::Random( $self->global_config_( 'random_module' ) ); } Index: Random.pm =================================================================== RCS file: /cvsroot/popfile/engine/POPFile/Random.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Random.pm 14 Apr 2008 00:58:28 -0000 1.1 --- Random.pm 1 May 2008 15:21:43 -0000 1.2 *************** *** 32,44 **** # Returns the module itself # #---------------------------------------------------------------------------- sub new { ! my $type = shift; my $self; $self->{name__} = "random"; ! return bless $self, $type; } --- 32,63 ---- # Returns the module itself # + # $module The module to use to generate the random string + # #---------------------------------------------------------------------------- sub new { ! my ( $type, $module ) = @_; my $self; $self->{name__} = "random"; + $self->{module__} = 'Crypt::Random'; ! if ( defined( $module ) ) { ! $module = 'Crypt::' . $module if ( $module !~ /^Crypt::/ ); ! ! if ( ( $module eq 'Crypt::Random' ) || # PROFILE BLOCK START ! ( $module eq 'Crypt::OpenSSL::Random' ) || ! ( $module eq 'Crypt::CBC' ) ) { # PROFILE BLOCK STOP ! $self->{module__} = $module; ! } ! } ! ! my $has_module = eval "require $module; 1;"; ! ! if ( $has_module ) { ! return bless $self, $type; ! } else { ! return undef; ! } } *************** *** 50,73 **** # # $length Length of the string ! # $module The module to use to generate the random string ! # $strength The Strength value ( used only if using Crypt::Random ) ! # $device The Device value ( used only if using Crypt::Random ) # #---------------------------------------------------------------------------- sub generate_random_string { ! my ( $self, $module, $length, $strength, $device ) = @_; ! if ( defined($module) && ( $module eq 'Crypt::Random' ) ) { require Crypt::Random; ! return Crypt::Random::makerandom_octet( Length => $length, Strength => $strength, Device => $device, ! ); } ! if ( defined($module) && ( $module eq 'Crypt::OpenSSL::Random' ) ) { require Crypt::OpenSSL::Random; --- 69,97 ---- # # $length Length of the string ! # $strength The Strength value ( valid only if using Crypt::Random ) ! # $device The Device value ( valid only if using Crypt::Random ) # #---------------------------------------------------------------------------- sub generate_random_string { ! my ( $self, $length, $strength, $device ) = @_; ! return undef if ( !defined( $self->{module__} ) ); ! return undef if ( !defined( $length ) ); ! ! $strength = 0 if ( !defined( $strength ) ); ! $device = '' if ( !defined( $device ) ); ! ! if ( $self->{module__} eq 'Crypt::Random' ) { require Crypt::Random; ! return Crypt::Random::makerandom_octet( # PROFILE BLOCK START Length => $length, Strength => $strength, Device => $device, ! ); # PROFILE BLOCK STOP } ! if ( $self->{module__} eq 'Crypt::OpenSSL::Random' ) { require Crypt::OpenSSL::Random; *************** *** 75,86 **** } ! my $result = ''; ! ! for (1 .. $length) { ! my $random = chr( int( rand(255) ) + 1 ); ! $result .= $random; ! } ! return $result; } --- 99,105 ---- } ! require Crypt::CBC; ! return Crypt::CBC->random_bytes( $length ); } *************** *** 91,103 **** # Give a random seed to the module # #---------------------------------------------------------------------------- sub rand_seed { ! my ( $self, ! $seed ) = @_; ! my $module = $self->global_config_( 'random_module' ); ! if ( defined($module) && $module eq 'Crypt::OpenSSL::Random' ) { require Crypt::OpenSSL::Random; --- 110,123 ---- # Give a random seed to the module # + # $seed A seed + # #---------------------------------------------------------------------------- sub rand_seed { ! my ( $self, $seed ) = @_; ! return undef if ( !defined( $self->{module__} ) ); ! if ( $self->{module__} eq 'Crypt::OpenSSL::Random' ) { require Crypt::OpenSSL::Random; |
11 messages has been excluded from this view by a project administrator.
