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
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29712 Modified Files: MonitorCC.nsi msgcapture.nsi pfi-languages.nsh pfi-library.nsh runpopfile.nsi runsqlite.nsi stop_popfile.nsi WriteEnvStr.nsh Log Message: Bring the installer and the other utilities built using NSIS into line with the rest of POPFile by removing the option for anyone using POPFile to license it under any version of the GPL other than v2. Index: stop_popfile.nsi =================================================================== RCS file: /cvsroot/popfile/windows/stop_popfile.nsi,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** stop_popfile.nsi 2 Mar 2005 20:01:32 -0000 1.16 --- stop_popfile.nsi 21 Dec 2005 20:34:01 -0000 1.17 *************** *** 7,14 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 7,13 ---- # 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, *************** *** 124,128 **** Caption "POPFile Silent Shutdown Utility" ! !define C_VERSION "0.5.11" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "stop_pf.exe" --- 123,127 ---- Caption "POPFile Silent Shutdown Utility" ! !define C_VERSION "0.5.12" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "stop_pf.exe" *************** *** 254,258 **** ${MB_NL} :DONE\ ${MB_NL}${MB_NL}\ ! Distributed under the terms of the GNU General Public License (GPL)." Goto error_exit --- 253,257 ---- ${MB_NL} :DONE\ ${MB_NL}${MB_NL}\ ! Distributed under the terms of the GNU General Public License (GPL) v2." Goto error_exit Index: MonitorCC.nsi =================================================================== RCS file: /cvsroot/popfile/windows/MonitorCC.nsi,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** MonitorCC.nsi 2 Mar 2005 19:59:18 -0000 1.21 --- MonitorCC.nsi 21 Dec 2005 20:34:00 -0000 1.22 *************** *** 9,16 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 9,15 ---- # 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, *************** *** 114,118 **** Name "${C_PFI_PRODUCT}" ! !define C_PFI_VERSION "0.1.19" !define C_OUTFILE "monitorcc.exe" --- 113,117 ---- Name "${C_PFI_PRODUCT}" ! !define C_PFI_VERSION "0.1.20" !define C_OUTFILE "monitorcc.exe" Index: WriteEnvStr.nsh =================================================================== RCS file: /cvsroot/popfile/windows/WriteEnvStr.nsh,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** WriteEnvStr.nsh 2 Mar 2005 19:57:59 -0000 1.13 --- WriteEnvStr.nsh 21 Dec 2005 20:34:01 -0000 1.14 *************** *** 9,16 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 9,15 ---- # 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, Index: pfi-languages.nsh =================================================================== RCS file: /cvsroot/popfile/windows/pfi-languages.nsh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** pfi-languages.nsh 13 Oct 2005 12:00:18 -0000 1.5 --- pfi-languages.nsh 21 Dec 2005 20:34:00 -0000 1.6 *************** *** 9,16 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 9,15 ---- # 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, Index: runpopfile.nsi =================================================================== RCS file: /cvsroot/popfile/windows/runpopfile.nsi,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** runpopfile.nsi 2 Mar 2005 20:01:32 -0000 1.13 --- runpopfile.nsi 21 Dec 2005 20:34:01 -0000 1.14 *************** *** 15,22 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 15,21 ---- # 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, *************** *** 107,111 **** ;-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.1.15" !define C_OUTFILE "runpopfile.exe" --- 106,110 ---- ;-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.1.16" !define C_OUTFILE "runpopfile.exe" Index: msgcapture.nsi =================================================================== RCS file: /cvsroot/popfile/windows/msgcapture.nsi,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** msgcapture.nsi 24 Nov 2005 10:56:52 -0000 1.12 --- msgcapture.nsi 21 Dec 2005 20:34:00 -0000 1.13 *************** *** 11,18 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 11,17 ---- # 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, *************** *** 116,120 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.62" !define C_OUTFILE "msgcapture.exe" --- 115,119 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.63" !define C_OUTFILE "msgcapture.exe" Index: pfi-library.nsh =================================================================== RCS file: /cvsroot/popfile/windows/pfi-library.nsh,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** pfi-library.nsh 20 Aug 2005 11:26:34 -0000 1.65 --- pfi-library.nsh 21 Dec 2005 20:34:01 -0000 1.66 *************** *** 9,16 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 9,15 ---- # 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, *************** *** 59,63 **** #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.1.10" #-------------------------------------------------------------------------- --- 58,62 ---- #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.1.11" #-------------------------------------------------------------------------- Index: runsqlite.nsi =================================================================== RCS file: /cvsroot/popfile/windows/runsqlite.nsi,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** runsqlite.nsi 29 Jun 2005 09:24:12 -0000 1.4 --- runsqlite.nsi 21 Dec 2005 20:34:01 -0000 1.5 *************** *** 14,21 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 14,20 ---- # 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, *************** *** 76,80 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.4" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "runsqlite.exe" --- 75,79 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.5" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "runsqlite.exe" |
|
From: Brian S. <xue...@us...> - 2005-12-21 20:31:36
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29339 Modified Files: installer-SecMinPerl-body.nsh installer-SecPOPFile-body.nsh installer-SecPOPFile-func.nsh installer-Uninstall.nsh installer.nsi Log Message: Bring the installer and the other utilities built using NSIS into line with the rest of POPFile by removing the option for anyone using POPFile to license it under any version of the GPL other than v2. Index: installer-SecPOPFile-body.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-SecPOPFile-body.nsh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** installer-SecPOPFile-body.nsh 12 Aug 2005 12:58:23 -0000 1.3 --- installer-SecPOPFile-body.nsh 21 Dec 2005 20:31:28 -0000 1.4 *************** *** 12,19 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 12,18 ---- # 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, Index: installer.nsi =================================================================== RCS file: /cvsroot/popfile/windows/installer.nsi,v retrieving revision 1.262 retrieving revision 1.263 diff -C2 -d -r1.262 -r1.263 *** installer.nsi 13 Oct 2005 12:01:36 -0000 1.262 --- installer.nsi 21 Dec 2005 20:31:28 -0000 1.263 *************** *** 25,32 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 25,31 ---- # 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, Index: installer-SecPOPFile-func.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-SecPOPFile-func.nsh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** installer-SecPOPFile-func.nsh 2 Mar 2005 19:53:41 -0000 1.1 --- installer-SecPOPFile-func.nsh 21 Dec 2005 20:31:28 -0000 1.2 *************** *** 8,15 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 8,14 ---- # 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, Index: installer-SecMinPerl-body.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-SecMinPerl-body.nsh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** installer-SecMinPerl-body.nsh 16 Sep 2005 13:52:22 -0000 1.3 --- installer-SecMinPerl-body.nsh 21 Dec 2005 20:31:28 -0000 1.4 *************** *** 14,21 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 14,20 ---- # 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, Index: installer-Uninstall.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-Uninstall.nsh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** installer-Uninstall.nsh 2 Sep 2005 17:07:03 -0000 1.4 --- installer-Uninstall.nsh 21 Dec 2005 20:31:28 -0000 1.5 *************** *** 8,15 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 8,14 ---- # 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, |
|
From: Brian S. <xue...@us...> - 2005-12-21 20:30:06
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28961 Modified Files: CBP.nsh getssl.nsh ioA.ini ioB.ini ioC.ini ioE.ini ioF.ini ioG.ini Log Message: Bring the installer and the other utilities built using NSIS into line with the rest of POPFile by removing the option for anyone using POPFile to license it under any version of the GPL other than v2. Index: CBP.nsh =================================================================== RCS file: /cvsroot/popfile/windows/CBP.nsh,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** CBP.nsh 6 Feb 2005 23:08:44 -0000 1.35 --- CBP.nsh 21 Dec 2005 20:29:51 -0000 1.36 *************** *** 10,17 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 10,16 ---- # 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, *************** *** 1109,1113 **** ; WARNING: ! ; This 'FileWrite' uses a string which is only SIX characters less than the maximum allowed ! FileWrite ${L_INI_HANDLE} \ --- 1108,1112 ---- ; WARNING: ! ; This 'FileWrite' uses a string which is a few dozen chars less than the maximum allowed ! FileWrite ${L_INI_HANDLE} \ *************** *** 1116,1127 **** # CBP.ini --- generated by the 'CBP_CreateINIfile' function${MB_NL}\ #${MB_NL}\ ! # Copyright (c) 2003-2004 John Graham-Cumming${MB_NL}\ #${MB_NL}\ # This file is part of POPFile${MB_NL}\ #${MB_NL}\ ! # POPFile is free software; you can redistribute it and/or modify${MB_NL}\ ! # it under the terms of the GNU General Public License as published by${MB_NL}\ ! # the Free Software Foundation; either version 2 of the License, or${MB_NL}\ ! # (at your option) any later version.${MB_NL}\ #${MB_NL}\ # POPFile is distributed in the hope that it will be useful,${MB_NL}\ --- 1115,1125 ---- # CBP.ini --- generated by the 'CBP_CreateINIfile' function${MB_NL}\ #${MB_NL}\ ! # Copyright (c) 2003-2005 John Graham-Cumming${MB_NL}\ #${MB_NL}\ # This file is part of POPFile${MB_NL}\ #${MB_NL}\ ! # POPFile is free software; you can redistribute it and/or modify it${MB_NL}\ ! # under the terms of version 2 of the GNU General Public License as${MB_NL}\ ! # published by the Free Software Foundation.${MB_NL}\ #${MB_NL}\ # POPFile is distributed in the hope that it will be useful,${MB_NL}\ Index: ioF.ini =================================================================== RCS file: /cvsroot/popfile/windows/ioF.ini,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ioF.ini 9 Jun 2004 15:06:04 -0000 1.5 --- ioF.ini 21 Dec 2005 20:29:51 -0000 1.6 *************** *** 6,17 **** # clients found in the registry. # ! # Copyright (c) 2003-2004 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 the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 6,16 ---- # clients found in the registry. # ! # Copyright (c) 2003-2005 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, Index: ioC.ini =================================================================== RCS file: /cvsroot/popfile/windows/ioC.ini,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ioC.ini 9 Jun 2004 15:06:04 -0000 1.13 --- ioC.ini 21 Dec 2005 20:29:51 -0000 1.14 *************** *** 6,17 **** # POPFile. # ! # Copyright (c) 2003-2004 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 the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 6,16 ---- # POPFile. # ! # Copyright (c) 2003-2005 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, Index: getssl.nsh =================================================================== RCS file: /cvsroot/popfile/windows/getssl.nsh,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** getssl.nsh 3 Oct 2005 16:11:28 -0000 1.7 --- getssl.nsh 21 Dec 2005 20:29:51 -0000 1.8 *************** *** 13,20 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 13,19 ---- # 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, Index: ioA.ini =================================================================== RCS file: /cvsroot/popfile/windows/ioA.ini,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** ioA.ini 9 Jun 2004 15:06:04 -0000 1.19 --- ioA.ini 21 Dec 2005 20:29:51 -0000 1.20 *************** *** 6,17 **** # and startup options. # ! # Copyright (c) 2002-2004 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 the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 6,16 ---- # and startup options. # ! # Copyright (c) 2002-2005 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, Index: ioG.ini =================================================================== RCS file: /cvsroot/popfile/windows/ioG.ini,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ioG.ini 9 Jun 2004 15:06:04 -0000 1.5 --- ioG.ini 21 Dec 2005 20:29:51 -0000 1.6 *************** *** 5,16 **** # defines the layout of the custom page used for messages. # ! # Copyright (c) 2003-2004 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 the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 5,15 ---- # defines the layout of the custom page used for messages. # ! # Copyright (c) 2003-2005 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, Index: ioE.ini =================================================================== RCS file: /cvsroot/popfile/windows/ioE.ini,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ioE.ini 9 Jun 2004 15:06:04 -0000 1.4 --- ioE.ini 21 Dec 2005 20:29:51 -0000 1.5 *************** *** 6,17 **** # Eudora personalities. # ! # Copyright (c) 2003-2004 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 the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 6,16 ---- # Eudora personalities. # ! # Copyright (c) 2003-2005 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, Index: ioB.ini =================================================================== RCS file: /cvsroot/popfile/windows/ioB.ini,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ioB.ini 9 Jun 2004 15:06:04 -0000 1.14 --- ioB.ini 21 Dec 2005 20:29:51 -0000 1.15 *************** *** 6,17 **** # Outlook Express and Outlook accounts. # ! # Copyright (c) 2003-2004 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 the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 6,16 ---- # Outlook Express and Outlook accounts. # ! # Copyright (c) 2003-2005 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, |
|
From: Brian S. <xue...@us...> - 2005-12-21 20:27:59
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28174 Modified Files: adduser-EmailConfig.nsh adduser-Uninstall.nsh adduser-Version.nsh adduser.nsi Log Message: Bring the installer and the other utilities built using NSIS into line with the rest of POPFile by removing the option for anyone using POPFile to license it under any version of the GPL other than v2. Index: adduser-Uninstall.nsh =================================================================== RCS file: /cvsroot/popfile/windows/adduser-Uninstall.nsh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** adduser-Uninstall.nsh 12 Aug 2005 12:58:23 -0000 1.2 --- adduser-Uninstall.nsh 21 Dec 2005 20:27:51 -0000 1.3 *************** *** 8,15 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 8,14 ---- # 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, Index: adduser-EmailConfig.nsh =================================================================== RCS file: /cvsroot/popfile/windows/adduser-EmailConfig.nsh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** adduser-EmailConfig.nsh 2 Mar 2005 19:50:18 -0000 1.1 --- adduser-EmailConfig.nsh 21 Dec 2005 20:27:51 -0000 1.2 *************** *** 9,16 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 9,15 ---- # 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, Index: adduser-Version.nsh =================================================================== RCS file: /cvsroot/popfile/windows/adduser-Version.nsh,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** adduser-Version.nsh 27 Sep 2005 13:08:31 -0000 1.7 --- adduser-Version.nsh 21 Dec 2005 20:27:51 -0000 1.8 *************** *** 7,11 **** #-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.3.0" #-------------------------------------------------------------------------- --- 7,11 ---- #-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.3.1" #-------------------------------------------------------------------------- Index: adduser.nsi =================================================================== RCS file: /cvsroot/popfile/windows/adduser.nsi,v retrieving revision 1.79 retrieving revision 1.80 diff -C2 -d -r1.79 -r1.80 *** adduser.nsi 27 Sep 2005 13:08:31 -0000 1.79 --- adduser.nsi 21 Dec 2005 20:27:51 -0000 1.80 *************** *** 12,19 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 12,18 ---- # 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, |
|
From: John Graham-C. <jgr...@us...> - 2005-12-20 21:31:08
|
Update of /cvsroot/popfile/engine/UI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8930/UI Modified Files: HTML.pm Log Message: Move the selection of the single user mode to the Administration tab and the Users tab will appear or disappear depending on the mode Index: HTML.pm =================================================================== RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v retrieving revision 1.366 retrieving revision 1.367 diff -C2 -d -r1.366 -r1.367 *** HTML.pm 20 Dec 2005 20:34:43 -0000 1.366 --- HTML.pm 20 Dec 2005 21:30:59 -0000 1.367 *************** *** 1168,1171 **** --- 1168,1178 ---- my $port_error = ''; + # Handle single user mode + + if ( defined( $self->{form_}{usermode} ) ) { + $self->global_config_( 'single_user', $self->{form_}{singleuser} ); + } + $templ->param( 'Users_If_Single' => $self->global_config_( 'single_user' ) ); + $self->config_( 'local', $self->{form_}{localui}-1 ) if ( defined($self->{form_}{localui}) ); $self->user_config_( $self->{sessions__}{$session}{user}, 'update_check', $self->{form_}{update_check}-1 ) if ( defined($self->{form_}{update_check}) ); *************** *** 1399,1409 **** $page, $session ); - # Handle single user mode - - if ( defined( $self->{form_}{usermode} ) ) { - $self->global_config_( 'single_user', $self->{form_}{singleuser} ); - } - $templ->param( 'Users_If_Single' => $self->global_config_( 'single_user' ) ); - # Handle user creation --- 1406,1409 ---- |
|
From: John Graham-C. <jgr...@us...> - 2005-12-20 21:31:07
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8930/skins/default Modified Files: administration-page.thtml common-middle.thtml users-page.thtml Log Message: Move the selection of the single user mode to the Administration tab and the Users tab will appear or disappear depending on the mode Index: users-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/users-page.thtml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** users-page.thtml 9 Sep 2005 23:00:42 -0000 1.7 --- users-page.thtml 20 Dec 2005 21:30:59 -0000 1.8 *************** *** 2,21 **** <TMPL_INCLUDE NAME="common-middle.thtml"> - <form action="/users" method="post"> - <table cellpadding="10%" cellspacing="0" class="settingsTable" width="100%" summary=""> - <tr> - <td class="settingsPanel" valign="top"> - - <TMPL_IF NAME="Users_If_Single"> - <span class="securityWidgetStateOn"><TMPL_VAR NAME="Localize_Users_SingleUserMode"><br /><TMPL_VAR NAME="Localize_Yes"></span> - <input type="submit" class="submit toggleOn" name="usermode" value="<TMPL_VAR NAME="Localize_ChangeToNo">" /> - <input type="hidden" name="singleuser" value="0"> - </td></tr></table></form> - <TMPL_ELSE> - <span class="securityWidgetStateOff"><TMPL_VAR NAME="Localize_Users_SingleUserMode"><br /><TMPL_VAR NAME="Localize_No"></span> - <input type="submit" class="submit toggleOn" name="usermode" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> - <input type="hidden" name="singleuser" value="1"> - </td></tr></table></form> - <table cellpadding="10%" cellspacing="0" class="settingsTable" width="100%" summary=""> <tr> --- 2,5 ---- *************** *** 176,181 **** </table> - </TMPL_IF> - <TMPL_INCLUDE NAME="configuration-bar.thtml"> <TMPL_INCLUDE NAME="common-bottom.thtml"> --- 160,163 ---- Index: administration-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/administration-page.thtml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** administration-page.thtml 22 May 2005 10:45:43 -0000 1.7 --- administration-page.thtml 20 Dec 2005 21:30:59 -0000 1.8 *************** *** 39,42 **** --- 39,60 ---- <TMPL_VAR NAME="Security_Dynamic_Chain"> </div> + <div class="singleUserMode"> + <hr> + <h2 class="security"><TMPL_VAR NAME="Localize_Users_SingleUserMode"></h2> + <TMPL_IF NAME="Users_If_Single"> + <form action="/administration" method="post"> + <span class="securityWidgetStateOn"><TMPL_VAR NAME="Localize_Yes"></span> + <input type="submit" class="submit toggleOn" name="usermode" value="<TMPL_VAR NAME="Localize_ChangeToNo">" /> + <input type="hidden" name="singleuser" value="0"> + </form> + <TMPL_ELSE> + <form action="/administration" method="post"> + <span class="securityWidgetStateOff"><TMPL_VAR NAME="Localize_No"></span> + <input type="submit" class="submit toggleOn" name="usermode" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> + <input type="hidden" name="singleuser" value="1"> + </form> + </TMPL_IF> + </div> + </td> <td class="settingsPanel" width="33%" valign="top"> Index: common-middle.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/common-middle.thtml,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** common-middle.thtml 28 Sep 2005 18:48:38 -0000 1.21 --- common-middle.thtml 20 Dec 2005 21:30:59 -0000 1.22 *************** *** 54,61 **** --- 54,66 ---- <a class="menuLink" href="/administration" title="<TMPL_VAR NAME="Localize_tip_Menu_Admin">"><TMPL_VAR NAME="Localize_Header_Administration"></a> </td> + + + <TMPL_IF NAME="Users_If_Single"> + <TMPL_ELSE> <td class="menuSpacer"></td> <td class="<TMPL_VAR NAME="Common_Middle_Tab4">" align="center"> <a class="menuLink" href="/users" title="<TMPL_VAR NAME="Localize_tip_Menu_Users">"><TMPL_VAR NAME="Localize_Header_Users"></a> </td> + </TMPL_IF> <td class="menuSpacer"></td> <td class="<TMPL_VAR NAME="Common_Middle_Tab5">" align="center"> |
|
From: John Graham-C. <jgr...@us...> - 2005-12-20 20:34:58
|
Update of /cvsroot/popfile/engine/UI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29690/UI Modified Files: HTML.pm Log Message: Correct a problem where a failed login followed by a correct login generated a 404 error Index: HTML.pm =================================================================== RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v retrieving revision 1.365 retrieving revision 1.366 diff -C2 -d -r1.365 -r1.366 *** HTML.pm 20 Dec 2005 20:26:04 -0000 1.365 --- HTML.pm 20 Dec 2005 20:34:43 -0000 1.366 *************** *** 624,629 **** if ( !defined( $session ) ) { my $continue; ! ($session, $continue) = $self->password_page( $client, $url ); ! $continue = '/' unless defined( $continue ); if ( defined( $session ) ) { $self->http_redirect_( $client, $continue , $session ); --- 624,632 ---- if ( !defined( $session ) ) { my $continue; ! ( $session, $continue ) = $self->password_page( $client, $url ); ! if ( !defined( $continue ) || ! $continue eq '/password' ) { ! $continue = '/'; ! } if ( defined( $session ) ) { $self->http_redirect_( $client, $continue , $session ); *************** *** 823,827 **** my @tab = ( 'menuStandard', 'menuStandard', 'menuStandard', 'menuStandard', 'menuStandard', 'menuStandard' ); ! $tab[$selected] = 'menuSelected' if ( ( $selected <= $#tab ) && ( $selected >= 0 ) ); for my $i (0..$#tab) { --- 826,831 ---- my @tab = ( 'menuStandard', 'menuStandard', 'menuStandard', 'menuStandard', 'menuStandard', 'menuStandard' ); ! $tab[$selected] = 'menuSelected' if ( ( $selected <= $#tab ) && ! ( $selected >= 0 ) ); for my $i (0..$#tab) { *************** *** 835,842 **** # CGI. Also send stats to the same site if that is allowed. ! if ( defined( $session ) && ( $self->{today__} ne $self->user_config_( $self->{sessions__}{$session}{user}, 'last_update_check' ) ) ) { $self->calculate_today(); ! if ( $self->user_config_( $self->{sessions__}{$session}{user}, 'update_check' ) ) { my ( $major_version, $minor_version, $build_version ) = $self->version() =~ /^v([^.]*)\.([^.]*)\.(.*)$/; --- 839,850 ---- # CGI. Also send stats to the same site if that is allowed. ! if ( defined( $session ) && ! ( $self->{today__} ne ! $self->user_config_( $self->{sessions__}{$session}{user}, ! 'last_update_check' ) ) ) { $self->calculate_today(); ! if ( $self->user_config_( $self->{sessions__}{$session}{user}, ! 'update_check' ) ) { my ( $major_version, $minor_version, $build_version ) = $self->version() =~ /^v([^.]*)\.([^.]*)\.(.*)$/; *************** *** 847,851 **** } ! if ( defined( $session ) && ( $self->user_config_( $self->{sessions__}{$session}{user}, 'send_stats' ) ) ) { $templ->param( 'Common_Middle_If_SendStats' => 1 ); my @buckets = $self->classifier_()->get_buckets( --- 855,861 ---- } ! if ( defined( $session ) && ! ( $self->user_config_( $self->{sessions__}{$session}{user}, ! 'send_stats' ) ) ) { $templ->param( 'Common_Middle_If_SendStats' => 1 ); my @buckets = $self->classifier_()->get_buckets( *************** *** 853,861 **** my $bc = $#buckets + 1; $templ->param( 'Common_Middle_Buckets' => $bc ); ! $templ->param( 'Common_Middle_Messages' => $self->mcount__( $session ) ); ! $templ->param( 'Common_Middle_Errors' => $self->ecount__( $session ) ); } ! $self->user_config_( $self->{sessions__}{$session}{user}, 'last_update_check', $self->{today__}, 1 ); } --- 863,874 ---- my $bc = $#buckets + 1; $templ->param( 'Common_Middle_Buckets' => $bc ); ! $templ->param( 'Common_Middle_Messages' => ! $self->mcount__( $session ) ); ! $templ->param( 'Common_Middle_Errors' => ! $self->ecount__( $session ) ); } ! $self->user_config_( $self->{sessions__}{$session}{user}, ! 'last_update_check', $self->{today__}, 1 ); } *************** *** 905,909 **** if ( ( $self->{form_}{page_size} >= 1 ) && ( $self->{form_}{page_size} <= 1000 ) ) { ! $self->user_config_( $self->{sessions__}{$session}{user}, 'page_size', $self->{form_}{page_size} ); } else { $self->error_message__( $templ, --- 918,923 ---- if ( ( $self->{form_}{page_size} >= 1 ) && ( $self->{form_}{page_size} <= 1000 ) ) { ! $self->user_config_( $self->{sessions__}{$session}{user}, ! 'page_size', $self->{form_}{page_size} ); } else { $self->error_message__( $templ, *************** *** 914,924 **** $templ->param( 'Configuration_Page_Size' => ! $self->user_config_( $self->{sessions__}{$session}{user}, 'page_size' ) ); if ( defined($self->{form_}{history_days}) ) { if ( ( $self->{form_}{history_days} >= 1 ) && ( $self->{form_}{history_days} <= 366 ) ) { ! $self->user_module_config_( $self->{sessions__}{$session}{user}, 'history', 'history_days', ! $self->{form_}{history_days} ); } else { $self->error_message__( $templ, --- 928,940 ---- $templ->param( 'Configuration_Page_Size' => ! $self->user_config_( $self->{sessions__}{$session}{user}, ! 'page_size' ) ); if ( defined($self->{form_}{history_days}) ) { if ( ( $self->{form_}{history_days} >= 1 ) && ( $self->{form_}{history_days} <= 366 ) ) { ! $self->user_module_config_( $self->{sessions__}{$session}{user}, ! 'history', 'history_days', ! $self->{form_}{history_days} ); } else { $self->error_message__( $templ, |
|
From: John Graham-C. <jgr...@us...> - 2005-12-20 20:26:16
|
Update of /cvsroot/popfile/engine/UI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27298/UI Modified Files: HTML.pm Log Message: Fix bug that clicking Edit without selecting a user on the Users tab caused POPFile to crash Index: HTML.pm =================================================================== RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v retrieving revision 1.364 retrieving revision 1.365 diff -C2 -d -r1.364 -r1.365 *** HTML.pm 20 Dec 2005 20:13:08 -0000 1.364 --- HTML.pm 20 Dec 2005 20:26:04 -0000 1.365 *************** *** 1392,1396 **** # Handle user creation ! if ( exists( $self->{form_}{create} ) && ( $self->{form_}{newuser} ne '' ) ) { my ( $result, $password ) = $self->classifier_()->create_user( $session, $self->{form_}{newuser}, $self->{form_}{clone} ); if ( $result == 0 ) { --- 1392,1397 ---- # Handle user creation ! if ( exists( $self->{form_}{create} ) && ! ( $self->{form_}{newuser} ne '' ) ) { my ( $result, $password ) = $self->classifier_()->create_user( $session, $self->{form_}{newuser}, $self->{form_}{clone} ); if ( $result == 0 ) { *************** *** 1414,1418 **** # Handle user removal ! if ( exists( $self->{form_}{remove} ) && ( $self->{form_}{toremove} ne '' ) ) { my $result = $self->classifier_()->remove_user( $session, $self->{form_}{toremove} ); if ( $result == 0 ) { --- 1415,1420 ---- # Handle user removal ! if ( exists( $self->{form_}{remove} ) && ! ( $self->{form_}{toremove} ne '' ) ) { my $result = $self->classifier_()->remove_user( $session, $self->{form_}{toremove} ); if ( $result == 0 ) { *************** *** 1487,1491 **** $templ->param( 'Users_Loop_Copy' => \@user_loop ); ! if ( exists( $self->{form_}{edituser} ) ) { my $id = $self->classifier_()->get_user_id( $session, $self->{form_}{editname} ); my @parameters = $self->classifier_()->get_user_parameter_list( $session ); --- 1489,1494 ---- $templ->param( 'Users_Loop_Copy' => \@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 ); |
|
From: John Graham-C. <jgr...@us...> - 2005-12-20 20:22:15
|
Update of /cvsroot/popfile/engine/Classifier In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26398/Classifier Modified Files: Bayes.pm Log Message: When creating a new user without cloning make sure that they have the unclassified bucket Index: Bayes.pm =================================================================== RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v retrieving revision 1.348 retrieving revision 1.349 diff -C2 -d -r1.348 -r1.349 *** Bayes.pm 20 Dec 2005 19:57:32 -0000 1.348 --- Bayes.pm 20 Dec 2005 20:22:06 -0000 1.349 *************** *** 3372,3375 **** --- 3372,3381 ---- # TODO clone bucket parameters + } else { + + # If we are not cloning a user then they need at least the + # default settings + + $self->db_()->do( "insert into buckets ( name, pseudo, userid ) values ( 'unclassified', 1, $id );" ); } |
|
From: John Graham-C. <jgr...@us...> - 2005-12-20 20:13:17
|
Update of /cvsroot/popfile/engine/UI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23908/UI Modified Files: HTML.pm Log Message: Fix bug where the date format in the footer didn't change until a refresh when the language was changed Index: HTML.pm =================================================================== RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v retrieving revision 1.363 retrieving revision 1.364 diff -C2 -d -r1.363 -r1.364 *** HTML.pm 20 Dec 2005 19:33:33 -0000 1.363 --- HTML.pm 20 Dec 2005 20:13:08 -0000 1.364 *************** *** 817,820 **** --- 817,823 ---- my ( $self, $client, $templ, $selected, $session ) = @_; + my $now = time; + $templ->param( 'Common_Bottom_Date' => $self->pretty_date__( $now, undef, $session ) ); + $selected = -1 if ( !defined( $selected ) ); *************** *** 3451,3457 **** # throughout POPFile's pages - my $now = time; my %fixups = ( 'Skin_Root' => $root, - 'Common_Bottom_Date' => $self->pretty_date__( $now, undef, $session ), 'Common_Bottom_LastLogin' => $self->{last_login__}, 'Common_Bottom_Version' => $self->version(), --- 3454,3458 ---- |
|
From: John Graham-C. <jgr...@us...> - 2005-12-20 19:57:46
|
Update of /cvsroot/popfile/engine/POPFile In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20878/POPFile Modified Files: Configuration.pm History.pm Logger.pm Module.pm Log Message: Ensure that the piddir, msgdir and logdir are automatically created using File::Path and expose Configuration::path_join via POPFile::Module so that we correctly concatenate paths Index: History.pm =================================================================== RCS file: /cvsroot/popfile/engine/POPFile/History.pm,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** History.pm 19 Dec 2005 11:41:53 -0000 1.38 --- History.pm 20 Dec 2005 19:57:33 -0000 1.39 *************** *** 736,741 **** my $hex_slot = sprintf( '%8.8x', $slot ); my $path = $self->get_user_path_( ! $self->global_config_( 'msgdir' ) . ! substr( $hex_slot, 0, 2 ) . '/', 0 ); $self->make_directory__( $path ); --- 736,741 ---- my $hex_slot = sprintf( '%8.8x', $slot ); my $path = $self->get_user_path_( ! $self->path_join( $self->global_config_( 'msgdir' ), ! substr( $hex_slot, 0, 2 ) . '/' ), 0 ); $self->make_directory__( $path ); *************** *** 1143,1147 **** my @msgs = sort compare_mf__ glob $self->get_user_path_( ! $self->global_config_( 'msgdir' ) . 'popfile*.msg', 0 ); if ( $#msgs != -1 ) { --- 1143,1148 ---- my @msgs = sort compare_mf__ glob $self->get_user_path_( ! $self->path_join( $self->global_config_( 'msgdir' ), ! 'popfile*.msg' ), 0 ); if ( $#msgs != -1 ) { *************** *** 1181,1185 **** unlink $self->get_user_path_( ! $self->global_config_( 'msgdir' ) . 'history_cache', 0 ); } } --- 1182,1187 ---- unlink $self->get_user_path_( ! $self->path_join( $self->global_config_( 'msgdir' ), ! 'history_cache' ), 0 ); } } Index: Module.pm =================================================================== RCS file: /cvsroot/popfile/engine/POPFile/Module.pm,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** Module.pm 19 Dec 2005 11:41:53 -0000 1.51 --- Module.pm 20 Dec 2005 19:57:33 -0000 1.52 *************** *** 593,596 **** --- 593,615 ---- # ---------------------------------------------------------------------------- # + # path_join + # + # Join two paths togther + # + # $left The LHS + # $right The RHS + # $sandbox Set to 1 if this path must be sandboxed (i.e. absolute + # paths and paths containing .. are not accepted). + # + # ---------------------------------------------------------------------------- + sub path_join + { + my ( $self, $left, $right, $sandbox ) = @_; + + return $self->configuration_()->path_join( $left, $right, $sandbox ); + } + + # ---------------------------------------------------------------------------- + # # flush_slurp_data__ # Index: Logger.pm =================================================================== RCS file: /cvsroot/popfile/engine/POPFile/Logger.pm,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** Logger.pm 19 Dec 2005 11:41:53 -0000 1.44 --- Logger.pm 20 Dec 2005 19:57:33 -0000 1.45 *************** *** 33,36 **** --- 33,38 ---- use locale; + use File::Path; + # Constant used by the log rotation code my $seconds_per_day = 60 * 60 * 24; *************** *** 137,140 **** --- 139,149 ---- $self->calculate_today__(); + # Verify that the logger directory actually exists + + eval { mkpath( $self->config_( 'logdir' ) ) }; + if ( $@ ) { + $self->log_( 0, "Failed to create directory " . $self->config_( 'logdir' ) ); + } + return 1; } *************** *** 181,185 **** $self->{debug_filename__} = $self->get_user_path_( ! $self->config_( 'logdir' ) . "popfile$self->{today__}.log", 0 ); } --- 190,195 ---- $self->{debug_filename__} = $self->get_user_path_( ! $self->path_join( $self->config_( 'logdir' ), ! "popfile$self->{today__}.log" ), 0 ); } *************** *** 196,200 **** my @debug_files = glob( $self->get_user_path_( ! $self->config_( 'logdir' ) . 'popfile*.log', 0 ) ); foreach my $debug_file (@debug_files) { --- 206,211 ---- my @debug_files = glob( $self->get_user_path_( ! $self->path_join( $self->config_( 'logdir' ), ! 'popfile*.log' ), 0 ) ); foreach my $debug_file (@debug_files) { Index: Configuration.pm =================================================================== RCS file: /cvsroot/popfile/engine/POPFile/Configuration.pm,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** Configuration.pm 19 Dec 2005 11:41:53 -0000 1.57 --- Configuration.pm 20 Dec 2005 19:57:33 -0000 1.58 *************** *** 36,39 **** --- 36,40 ---- use Getopt::Long qw(:config pass_through); + use File::Path; #---------------------------------------------------------------------------- *************** *** 157,161 **** # outside the user sandbox ! $self->{pid_file__} = $self->get_user_path( $self->config_( 'piddir' ) . 'popfile.pid', 0 ); if (defined($self->live_check_())) { --- 158,173 ---- # outside the user sandbox ! eval { mkpath( $self->config_( 'piddir' ) ) }; ! if ( $@ ) { ! $self->log_( 0, "Failed to create directory " . $self->config_( 'piddir' ) ); ! } ! eval { mkpath( $self->global_config_( 'msgdir' ) ) }; ! if ( $@ ) { ! $self->log_( 0, "Failed to create directory " . $self->global_config_( 'piddir' ) ); ! } ! ! $self->{pid_file__} = $self->get_user_path( $self->path_join( ! $self->config_( 'piddir' ), ! 'popfile.pid' ), 0 ) ; if (defined($self->live_check_())) { *************** *** 603,607 **** my ( $self, $path, $sandbox ) = @_; ! return $self->path_join__( $self->{popfile_user__}, $path, $sandbox ); } --- 615,619 ---- my ( $self, $path, $sandbox ) = @_; ! return $self->path_join( $self->{popfile_user__}, $path, $sandbox ); } *************** *** 610,619 **** my ( $self, $path, $sandbox ) = @_; ! return $self->path_join__( $self->{popfile_root__}, $path, $sandbox ); } # ---------------------------------------------------------------------------- # ! # path_join__ # # Join two paths togther --- 622,631 ---- my ( $self, $path, $sandbox ) = @_; ! return $self->path_join( $self->{popfile_root__}, $path, $sandbox ); } # ---------------------------------------------------------------------------- # ! # path_join # # Join two paths togther *************** *** 625,629 **** # # ---------------------------------------------------------------------------- ! sub path_join__ { my ( $self, $left, $right, $sandbox ) = @_; --- 637,641 ---- # # ---------------------------------------------------------------------------- ! sub path_join { my ( $self, $left, $right, $sandbox ) = @_; |
|
From: John Graham-C. <jgr...@us...> - 2005-12-20 19:57:42
|
Update of /cvsroot/popfile/engine/Classifier In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20878/Classifier Modified Files: Bayes.pm Log Message: Ensure that the piddir, msgdir and logdir are automatically created using File::Path and expose Configuration::path_join via POPFile::Module so that we correctly concatenate paths Index: Bayes.pm =================================================================== RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v retrieving revision 1.347 retrieving revision 1.348 diff -C2 -d -r1.347 -r1.348 *** Bayes.pm 19 Dec 2005 11:41:52 -0000 1.347 --- Bayes.pm 20 Dec 2005 19:57:32 -0000 1.348 *************** *** 1487,1495 **** # $session A session key previously returned by get_session_key # ! # Releases and invalidates the session key. Worker function that does the work ! # of release_session_key. ! # ****DO NOT CALL DIRECTLY**** ! # unless you want your session key released immediately, possibly preventing ! # asynchronous tasks from completing # #---------------------------------------------------------------------------- --- 1487,1497 ---- # $session A session key previously returned by get_session_key # ! # Releases and invalidates the session key. Worker function that does ! # the work of release_session_key. ! # ! # **** DO NOT CALL DIRECTLY **** ! # ! # unless you want your session key released immediately, possibly ! # preventing asynchronous tasks from completing # #---------------------------------------------------------------------------- |
|
From: John Graham-C. <jgr...@us...> - 2005-12-20 19:33:46
|
Update of /cvsroot/popfile/engine/UI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16797/UI Modified Files: HTML.pm Log Message: Clicking on the Users, Administration or Advanced tabs brought up the right screen but highlighted the wrong tab Index: HTML.pm =================================================================== RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v retrieving revision 1.362 retrieving revision 1.363 diff -C2 -d -r1.362 -r1.363 *** HTML.pm 19 Dec 2005 11:41:53 -0000 1.362 --- HTML.pm 20 Dec 2005 19:33:33 -0000 1.363 *************** *** 1296,1300 **** } ! $self->http_ok( $client,$templ, 4, $session ); } --- 1296,1300 ---- } ! $self->http_ok( $client,$templ, 3, $session ); } *************** *** 1526,1530 **** } ! $self->http_ok( $client, $templ, 5, $session ); } --- 1526,1530 ---- } ! $self->http_ok( $client, $templ, 4, $session ); } *************** *** 1673,1677 **** $templ->param( 'Advanced_Loop_Parameter' => \@param_loop ); ! $self->http_ok( $client, $templ, 6, $session ); } --- 1673,1677 ---- $templ->param( 'Advanced_Loop_Parameter' => \@param_loop ); ! $self->http_ok( $client, $templ, 5, $session ); } |
|
From: John Graham-C. <jgr...@us...> - 2005-12-20 19:26:13
|
Update of /cvsroot/popfile/engine/UI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15290/UI Modified Files: HTTP.pm Log Message: Add a nicer error page when we are reporting 404 etc. Index: HTTP.pm =================================================================== RCS file: /cvsroot/popfile/engine/UI/HTTP.pm,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** HTTP.pm 19 Dec 2005 11:41:53 -0000 1.33 --- HTTP.pm 20 Dec 2005 19:26:02 -0000 1.34 *************** *** 397,401 **** $self->log_( 0, "HTTP error $error returned" ); ! print $client "HTTP/1.0 $error Error$eol$eol"; } --- 397,417 ---- $self->log_( 0, "HTTP error $error returned" ); ! my $text="<html><head><title>POPFile Web Server Error $error</title></head> ! <body> ! <h1>POPFile Web Server Error $error</h1> ! An error has occurred which has caused POPFile to return the error $error. ! <p> ! Click <a href=\"/\">here</a> to continue. ! </body> ! </html>$eol"; ! ! $self->log_( 1, $text ); ! ! print $client "HTTP/1.0 200 OK$eol"; ! print $client "Content-Type: text/html$eol"; ! print $client "Content-Length: "; ! print $client length( $text ); ! print $client "$eol$eol"; ! print $client $text; } *************** *** 436,440 **** print $client $header . $contents; } else { ! http_error_( $self, $client, 404 ); } } --- 452,456 ---- print $client $header . $contents; } else { ! $self->http_error_( $client, 404 ); } } |
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15516 Modified Files: Tag: b0_22_2 CBP.nsh MonitorCC.nsi WriteEnvStr.nsh adduser-EmailConfig.nsh adduser-Uninstall.nsh adduser.nsi getssl.nsh installer-SecMinPerl-body.nsh installer-SecPOPFile-body.nsh installer-SecPOPFile-func.nsh installer-Uninstall.nsh installer.nsi ioA.ini ioB.ini ioC.ini ioE.ini ioF.ini ioG.ini msgcapture.nsi pfi-languages.nsh pfi-library.nsh runpopfile.nsi runsqlite.nsi stop_popfile.nsi Log Message: Change GPL license to remove the option for the person using POPFile to license it under any version of the GPL other than v2 Index: CBP.nsh =================================================================== RCS file: /cvsroot/popfile/windows/CBP.nsh,v retrieving revision 1.33.4.1 retrieving revision 1.33.4.2 diff -C2 -d -r1.33.4.1 -r1.33.4.2 *** CBP.nsh 13 Sep 2005 19:01:55 -0000 1.33.4.1 --- CBP.nsh 19 Dec 2005 11:45:36 -0000 1.33.4.2 *************** *** 10,17 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 10,16 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: MonitorCC.nsi =================================================================== RCS file: /cvsroot/popfile/windows/MonitorCC.nsi,v retrieving revision 1.19.4.1 retrieving revision 1.19.4.2 diff -C2 -d -r1.19.4.1 -r1.19.4.2 *** MonitorCC.nsi 13 Sep 2005 19:01:55 -0000 1.19.4.1 --- MonitorCC.nsi 19 Dec 2005 11:45:36 -0000 1.19.4.2 *************** *** 9,16 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 9,15 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: getssl.nsh =================================================================== RCS file: /cvsroot/popfile/windows/getssl.nsh,v retrieving revision 1.6.2.4 retrieving revision 1.6.2.5 diff -C2 -d -r1.6.2.4 -r1.6.2.5 *** getssl.nsh 2 Oct 2005 14:57:43 -0000 1.6.2.4 --- getssl.nsh 19 Dec 2005 11:45:36 -0000 1.6.2.5 *************** *** 13,20 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 13,19 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: installer-SecMinPerl-body.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-SecMinPerl-body.nsh,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -d -r1.2.2.3 -r1.2.2.4 *** installer-SecMinPerl-body.nsh 16 Sep 2005 10:43:33 -0000 1.2.2.3 --- installer-SecMinPerl-body.nsh 19 Dec 2005 11:45:36 -0000 1.2.2.4 *************** *** 14,21 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 14,20 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: ioB.ini =================================================================== RCS file: /cvsroot/popfile/windows/ioB.ini,v retrieving revision 1.14 retrieving revision 1.14.6.1 diff -C2 -d -r1.14 -r1.14.6.1 *** ioB.ini 9 Jun 2004 15:06:04 -0000 1.14 --- ioB.ini 19 Dec 2005 11:45:36 -0000 1.14.6.1 *************** *** 1,164 **** ! #------------------------------------------------------------------- ! # ! # ioB.ini --- This file is used by "adduser.nsi", one of the NSIS scripts ! # used to create the Windows installer for POPFile. This file ! # defines the layout of the custom page used to configure the ! # Outlook Express and Outlook accounts. ! # ! # Copyright (c) 2003-2004 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 the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. ! # ! # 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 ! # ! #------------------------------------------------------------------- ! ! [Settings] ! NumFields=17 ! BackEnabled=1 ! CancelEnabled=0 ! ! [Field 1] ! Type=Label ! Text= ! Left=0 ! Right=298 ! Top=0 ! Bottom=8 ! ! [Field 2] ! Type=GroupBox ! Left=0 ! Right=300 ! Top=6 ! Bottom=117 ! ! [Field 3] ! Type=Label ! Text= ! Left=0 ! Right=300 ! Top=120 ! Bottom=139 ! ! [Field 4] ! Type=Label ! Text= ! Left=15 ! Right=71 ! Top=12 ! Bottom=20 ! ! [Field 5] ! Type=Label ! Text= ! Left=73 ! Right=171 ! Top=12 ! Bottom=20 ! ! [Field 6] ! Type=Label ! Text= ! Left=173 ! Right=239 ! Top=12 ! Bottom=20 ! ! [Field 7] ! Type=Label ! Text= ! Left=241 ! Right=298 ! Top=12 ! Bottom=20 ! ! [Field 8] ! Type=Text ! Left=11 ! Right=71 ! Top=21 ! Bottom=115 ! Flags=READONLY|MULTILINE|NOWORDWRAP ! ! [Field 9] ! Type=Text ! Left=70 ! Right=171 ! Top=21 ! Bottom=115 ! Flags=READONLY|MULTILINE|NOWORDWRAP ! ! [Field 10] ! Type=Text ! Left=170 ! Right=239 ! Top=21 ! Bottom=115 ! Flags=READONLY|MULTILINE|NOWORDWRAP ! ! [Field 11] ! Type=Text ! Left=238 ! Right=298 ! Top=21 ! Bottom=115 ! Flags=READONLY|MULTILINE|NOWORDWRAP ! ! [Field 12] ! Type=CheckBox ! Left=2 ! Right=10 ! Top=23 ! Bottom=31 ! ! [Field 13] ! Type=CheckBox ! Left=2 ! Right=10 ! Top=39 ! Bottom=47 ! ! [Field 14] ! Type=CheckBox ! Left=2 ! Right=10 ! Top=55 ! Bottom=63 ! ! [Field 15] ! Type=CheckBox ! Left=2 ! Right=10 ! Top=71 ! Bottom=79 ! ! [Field 16] ! Type=CheckBox ! Left=2 ! Right=10 ! Top=87 ! Bottom=95 ! ! [Field 17] ! Type=CheckBox ! Left=2 ! Right=10 ! Top=103 ! Bottom=111 ! ! #-------------------- ! # End of ioB.ini ! #-------------------- --- 1,163 ---- ! #------------------------------------------------------------------- ! # ! # ioB.ini --- This file is used by "adduser.nsi", one of the NSIS scripts ! # used to create the Windows installer for POPFile. This file ! # defines the layout of the custom page used to configure the ! # Outlook Express and Outlook accounts. ! # ! # Copyright (c) 2003-2004 John Graham-Cumming ! # ! # This file is part of POPFile ! # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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 ! # ! #------------------------------------------------------------------- ! ! [Settings] ! NumFields=17 ! BackEnabled=1 ! CancelEnabled=0 ! ! [Field 1] ! Type=Label ! Text= ! Left=0 ! Right=298 ! Top=0 ! Bottom=8 ! ! [Field 2] ! Type=GroupBox ! Left=0 ! Right=300 ! Top=6 ! Bottom=117 ! ! [Field 3] ! Type=Label ! Text= ! Left=0 ! Right=300 ! Top=120 ! Bottom=139 ! ! [Field 4] ! Type=Label ! Text= ! Left=15 ! Right=71 ! Top=12 ! Bottom=20 ! ! [Field 5] ! Type=Label ! Text= ! Left=73 ! Right=171 ! Top=12 ! Bottom=20 ! ! [Field 6] ! Type=Label ! Text= ! Left=173 ! Right=239 ! Top=12 ! Bottom=20 ! ! [Field 7] ! Type=Label ! Text= ! Left=241 ! Right=298 ! Top=12 ! Bottom=20 ! ! [Field 8] ! Type=Text ! Left=11 ! Right=71 ! Top=21 ! Bottom=115 ! Flags=READONLY|MULTILINE|NOWORDWRAP ! ! [Field 9] ! Type=Text ! Left=70 ! Right=171 ! Top=21 ! Bottom=115 ! Flags=READONLY|MULTILINE|NOWORDWRAP ! ! [Field 10] ! Type=Text ! Left=170 ! Right=239 ! Top=21 ! Bottom=115 ! Flags=READONLY|MULTILINE|NOWORDWRAP ! ! [Field 11] ! Type=Text ! Left=238 ! Right=298 ! Top=21 ! Bottom=115 ! Flags=READONLY|MULTILINE|NOWORDWRAP ! ! [Field 12] ! Type=CheckBox ! Left=2 ! Right=10 ! Top=23 ! Bottom=31 ! ! [Field 13] ! Type=CheckBox ! Left=2 ! Right=10 ! Top=39 ! Bottom=47 ! ! [Field 14] ! Type=CheckBox ! Left=2 ! Right=10 ! Top=55 ! Bottom=63 ! ! [Field 15] ! Type=CheckBox ! Left=2 ! Right=10 ! Top=71 ! Bottom=79 ! ! [Field 16] ! Type=CheckBox ! Left=2 ! Right=10 ! Top=87 ! Bottom=95 ! ! [Field 17] ! Type=CheckBox ! Left=2 ! Right=10 ! Top=103 ! Bottom=111 ! ! #-------------------- ! # End of ioB.ini ! #-------------------- Index: runsqlite.nsi =================================================================== RCS file: /cvsroot/popfile/windows/runsqlite.nsi,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.2 diff -C2 -d -r1.1.4.1 -r1.1.4.2 *** runsqlite.nsi 13 Sep 2005 19:01:55 -0000 1.1.4.1 --- runsqlite.nsi 19 Dec 2005 11:45:36 -0000 1.1.4.2 *************** *** 14,21 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 14,20 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: installer-SecPOPFile-body.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-SecPOPFile-body.nsh,v retrieving revision 1.3.2.3 retrieving revision 1.3.2.4 diff -C2 -d -r1.3.2.3 -r1.3.2.4 *** installer-SecPOPFile-body.nsh 13 Sep 2005 19:06:48 -0000 1.3.2.3 --- installer-SecPOPFile-body.nsh 19 Dec 2005 11:45:36 -0000 1.3.2.4 *************** *** 12,19 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 12,18 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: stop_popfile.nsi =================================================================== RCS file: /cvsroot/popfile/windows/stop_popfile.nsi,v retrieving revision 1.14.4.1 retrieving revision 1.14.4.2 diff -C2 -d -r1.14.4.1 -r1.14.4.2 *** stop_popfile.nsi 13 Sep 2005 19:01:55 -0000 1.14.4.1 --- stop_popfile.nsi 19 Dec 2005 11:45:36 -0000 1.14.4.2 *************** *** 7,14 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 7,13 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: ioA.ini =================================================================== RCS file: /cvsroot/popfile/windows/ioA.ini,v retrieving revision 1.19 retrieving revision 1.19.6.1 diff -C2 -d -r1.19 -r1.19.6.1 *** ioA.ini 9 Jun 2004 15:06:04 -0000 1.19 --- ioA.ini 19 Dec 2005 11:45:36 -0000 1.19.6.1 *************** *** 1,90 **** ! #------------------------------------------------------------------- ! # ! # ioA.ini --- This file is used by "adduser.nsi", one of the NSIS scripts ! # used to create the Windows installer for POPFile. This file ! # defines the layout of the custom page used to choose the port ! # and startup options. ! # ! # Copyright (c) 2002-2004 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 the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. ! # ! # 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 ! # ! #------------------------------------------------------------------- ! ! [Settings] ! NumFields=7 ! ! [Field 1] ! Type=label ! Text= ! Left=0 ! Right=300 ! Top=0 ! Bottom=16 ! ! [Field 2] ! Type=combobox ! ListItems=110|111|8110|8111 ! Left=0 ! Right=70 ! Top=17 ! Bottom=72 ! ! [Field 3] ! Type=label ! Text= ! Left=0 ! Right=300 ! Top=38 ! Bottom=54 ! ! [Field 4] ! Type=combobox ! ListItems=8080|8081|9090|9091 ! Left=0 ! Right=70 ! Top=55 ! Bottom=110 ! ! [Field 5] ! Type=checkbox ! Text= ! Left=0 ! Right=300 ! Top=70 ! Bottom=94 ! State=1 ! ! [Field 6] ! Type=GroupBox ! Text= ! Left=0 ! Right=300 ! Top=100 ! Bottom=140 ! ! [Field 7] ! Type=label ! Text= ! Left=5 ! Right=298 ! Top=115 ! Bottom=139 ! ! #-------------------- ! # End of ioA.ini ! #-------------------- --- 1,89 ---- ! #------------------------------------------------------------------- ! # ! # ioA.ini --- This file is used by "adduser.nsi", one of the NSIS scripts ! # used to create the Windows installer for POPFile. This file ! # defines the layout of the custom page used to choose the port ! # and startup options. ! # ! # Copyright (c) 2002-2004 John Graham-Cumming ! # ! # This file is part of POPFile ! # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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 ! # ! #------------------------------------------------------------------- ! ! [Settings] ! NumFields=7 ! ! [Field 1] ! Type=label ! Text= ! Left=0 ! Right=300 ! Top=0 ! Bottom=16 ! ! [Field 2] ! Type=combobox ! ListItems=110|111|8110|8111 ! Left=0 ! Right=70 ! Top=17 ! Bottom=72 ! ! [Field 3] ! Type=label ! Text= ! Left=0 ! Right=300 ! Top=38 ! Bottom=54 ! ! [Field 4] ! Type=combobox ! ListItems=8080|8081|9090|9091 ! Left=0 ! Right=70 ! Top=55 ! Bottom=110 ! ! [Field 5] ! Type=checkbox ! Text= ! Left=0 ! Right=300 ! Top=70 ! Bottom=94 ! State=1 ! ! [Field 6] ! Type=GroupBox ! Text= ! Left=0 ! Right=300 ! Top=100 ! Bottom=140 ! ! [Field 7] ! Type=label ! Text= ! Left=5 ! Right=298 ! Top=115 ! Bottom=139 ! ! #-------------------- ! # End of ioA.ini ! #-------------------- Index: ioC.ini =================================================================== RCS file: /cvsroot/popfile/windows/ioC.ini,v retrieving revision 1.13 retrieving revision 1.13.6.1 diff -C2 -d -r1.13 -r1.13.6.1 *** ioC.ini 9 Jun 2004 15:06:04 -0000 1.13 --- ioC.ini 19 Dec 2005 11:45:36 -0000 1.13.6.1 *************** *** 1,104 **** ! #------------------------------------------------------------------- ! # ! # ioC.ini --- This file is used by "adduser.nsi", one of the NSIS scripts ! # used to create the Windows installer for POPFile. This file ! # defines the layout of the custom page which offers to start ! # POPFile. ! # ! # Copyright (c) 2003-2004 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 the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. ! # ! # 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 ! # ! #------------------------------------------------------------------- ! ! [Settings] ! NumFields=8 ! BackEnabled=0 ! CancelEnabled=0 ! ! [Field 1] ! Type=GroupBox ! Text= ! Left=0 ! Right=300 ! Top=0 ! Bottom=70 ! ! [Field 2] ! Type=RadioButton ! Text= ! Left=5 ! Right=298 ! Top=10 ! Bottom=26 ! Flags=Group ! State=0 ! ! [Field 3] ! Type=RadioButton ! Text= ! Left=5 ! Right=298 ! Top=30 ! Bottom=46 ! State=0 ! ! [Field 4] ! Type=RadioButton ! Text= ! Left=5 ! Right=298 ! Top=50 ! Bottom=66 ! State=1 ! ! [Field 5] ! Type=GroupBox ! Text= ! Left=0 ! Right=300 ! Top=75 ! Bottom=139 ! Flags=Group ! ! [Field 6] ! Type=Label ! Text= ! Left=5 ! Right=298 ! Top=85 ! Bottom=101 ! ! [Field 7] ! Type=Label ! Text= ! Left=5 ! Right=298 ! Top=103 ! Bottom=119 ! ! [Field 8] ! Type=Label ! Text= ! Left=5 ! Right=298 ! Top=121 ! Bottom=137 ! ! #-------------------- ! # End of ioC.ini ! #-------------------- --- 1,103 ---- ! #------------------------------------------------------------------- ! # ! # ioC.ini --- This file is used by "adduser.nsi", one of the NSIS scripts ! # used to create the Windows installer for POPFile. This file ! # defines the layout of the custom page which offers to start ! # POPFile. ! # ! # Copyright (c) 2003-2004 John Graham-Cumming ! # ! # This file is part of POPFile ! # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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 ! # ! #------------------------------------------------------------------- ! ! [Settings] ! NumFields=8 ! BackEnabled=0 ! CancelEnabled=0 ! ! [Field 1] ! Type=GroupBox ! Text= ! Left=0 ! Right=300 ! Top=0 ! Bottom=70 ! ! [Field 2] ! Type=RadioButton ! Text= ! Left=5 ! Right=298 ! Top=10 ! Bottom=26 ! Flags=Group ! State=0 ! ! [Field 3] ! Type=RadioButton ! Text= ! Left=5 ! Right=298 ! Top=30 ! Bottom=46 ! State=0 ! ! [Field 4] ! Type=RadioButton ! Text= ! Left=5 ! Right=298 ! Top=50 ! Bottom=66 ! State=1 ! ! [Field 5] ! Type=GroupBox ! Text= ! Left=0 ! Right=300 ! Top=75 ! Bottom=139 ! Flags=Group ! ! [Field 6] ! Type=Label ! Text= ! Left=5 ! Right=298 ! Top=85 ! Bottom=101 ! ! [Field 7] ! Type=Label ! Text= ! Left=5 ! Right=298 ! Top=103 ! Bottom=119 ! ! [Field 8] ! Type=Label ! Text= ! Left=5 ! Right=298 ! Top=121 ! Bottom=137 ! ! #-------------------- ! # End of ioC.ini ! #-------------------- Index: ioE.ini =================================================================== RCS file: /cvsroot/popfile/windows/ioE.ini,v retrieving revision 1.4 retrieving revision 1.4.6.1 diff -C2 -d -r1.4 -r1.4.6.1 *** ioE.ini 9 Jun 2004 15:06:04 -0000 1.4 --- ioE.ini 19 Dec 2005 11:45:36 -0000 1.4.6.1 *************** *** 1,131 **** ! #------------------------------------------------------------------- ! # ! # ioE.ini --- This file is used by "adduser.nsi", one of the NSIS scripts ! # used to create the Windows installer for POPFile. This file ! # defines the layout of the custom page used to configure the ! # Eudora personalities. ! # ! # Copyright (c) 2003-2004 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 the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. ! # ! # 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 ! # ! #------------------------------------------------------------------- ! ! [Settings] ! NumFields=12 ! BackEnabled=1 ! CancelEnabled=0 ! ! [Field 1] ! Type=label ! Text= ! Left=0 ! Right=300 ! Top=0 ! Bottom=16 ! ! [Field 2] ! Type=checkbox ! Text= ! Left=0 ! Right=300 ! Top=18 ! Bottom=34 ! ! [Field 3] ! Type=label ! Text= ! Left=0 ! Right=300 ! Top=123 ! Bottom=139 ! ! [Field 4] ! Type=GroupBox ! Text= ! Left=0 ! Right=300 ! Top=38 ! Bottom=120 ! ! [Field 5] ! Type=label ! Text= ! Left=5 ! Right=95 ! Top=54 ! Bottom=70 ! ! [Field 6] ! Type=label ! Text= ! Left=5 ! Right=95 ! Top=71 ! Bottom=87 ! ! [Field 7] ! Type=label ! Text= ! Left=5 ! Right=95 ! Top=88 ! Bottom=104 ! ! [Field 8] ! Type=label ! Text= ! Left=5 ! Right=95 ! Top=105 ! Bottom=113 ! ! [Field 9] ! Type=label ! Text= ! Left=96 ! Right=298 ! Top=54 ! Bottom=70 ! ! [Field 10] ! Type=label ! Text= ! Left=96 ! Right=298 ! Top=71 ! Bottom=87 ! ! [Field 11] ! Type=label ! Text= ! Left=96 ! Right=298 ! Top=88 ! Bottom=104 ! ! [Field 12] ! Type=label ! Text= ! Left=96 ! Right=298 ! Top=105 ! Bottom=113 ! ! #-------------------- ! # End of ioE.ini ! #-------------------- --- 1,130 ---- ! #------------------------------------------------------------------- ! # ! # ioE.ini --- This file is used by "adduser.nsi", one of the NSIS scripts ! # used to create the Windows installer for POPFile. This file ! # defines the layout of the custom page used to configure the ! # Eudora personalities. ! # ! # Copyright (c) 2003-2004 John Graham-Cumming ! # ! # This file is part of POPFile ! # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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 ! # ! #------------------------------------------------------------------- ! ! [Settings] ! NumFields=12 ! BackEnabled=1 ! CancelEnabled=0 ! ! [Field 1] ! Type=label ! Text= ! Left=0 ! Right=300 ! Top=0 ! Bottom=16 ! ! [Field 2] ! Type=checkbox ! Text= ! Left=0 ! Right=300 ! Top=18 ! Bottom=34 ! ! [Field 3] ! Type=label ! Text= ! Left=0 ! Right=300 ! Top=123 ! Bottom=139 ! ! [Field 4] ! Type=GroupBox ! Text= ! Left=0 ! Right=300 ! Top=38 ! Bottom=120 ! ! [Field 5] ! Type=label ! Text= ! Left=5 ! Right=95 ! Top=54 ! Bottom=70 ! ! [Field 6] ! Type=label ! Text= ! Left=5 ! Right=95 ! Top=71 ! Bottom=87 ! ! [Field 7] ! Type=label ! Text= ! Left=5 ! Right=95 ! Top=88 ! Bottom=104 ! ! [Field 8] ! Type=label ! Text= ! Left=5 ! Right=95 ! Top=105 ! Bottom=113 ! ! [Field 9] ! Type=label ! Text= ! Left=96 ! Right=298 ! Top=54 ! Bottom=70 ! ! [Field 10] ! Type=label ! Text= ! Left=96 ! Right=298 ! Top=71 ! Bottom=87 ! ! [Field 11] ! Type=label ! Text= ! Left=96 ! Right=298 ! Top=88 ! Bottom=104 ! ! [Field 12] ! Type=label ! Text= ! Left=96 ! Right=298 ! Top=105 ! Bottom=113 ! ! #-------------------- ! # End of ioE.ini ! #-------------------- Index: pfi-library.nsh =================================================================== RCS file: /cvsroot/popfile/windows/pfi-library.nsh,v retrieving revision 1.53.4.1 retrieving revision 1.53.4.2 diff -C2 -d -r1.53.4.1 -r1.53.4.2 *** pfi-library.nsh 13 Sep 2005 19:01:55 -0000 1.53.4.1 --- pfi-library.nsh 19 Dec 2005 11:45:36 -0000 1.53.4.2 *************** *** 9,16 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 9,15 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: adduser.nsi =================================================================== RCS file: /cvsroot/popfile/windows/adduser.nsi,v retrieving revision 1.59.4.4 retrieving revision 1.59.4.5 diff -C2 -d -r1.59.4.4 -r1.59.4.5 *** adduser.nsi 27 Sep 2005 11:47:33 -0000 1.59.4.4 --- adduser.nsi 19 Dec 2005 11:45:36 -0000 1.59.4.5 *************** *** 12,19 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 12,18 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: installer-SecPOPFile-func.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-SecPOPFile-func.nsh,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** installer-SecPOPFile-func.nsh 13 Sep 2005 19:01:55 -0000 1.1.2.2 --- installer-SecPOPFile-func.nsh 19 Dec 2005 11:45:36 -0000 1.1.2.3 *************** *** 8,15 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 8,14 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: pfi-languages.nsh =================================================================== RCS file: /cvsroot/popfile/windows/pfi-languages.nsh,v retrieving revision 1.2.6.2 retrieving revision 1.2.6.3 diff -C2 -d -r1.2.6.2 -r1.2.6.3 *** pfi-languages.nsh 15 Sep 2005 12:03:34 -0000 1.2.6.2 --- pfi-languages.nsh 19 Dec 2005 11:45:36 -0000 1.2.6.3 *************** *** 9,16 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 9,15 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: adduser-Uninstall.nsh =================================================================== RCS file: /cvsroot/popfile/windows/adduser-Uninstall.nsh,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -C2 -d -r1.2.2.2 -r1.2.2.3 *** adduser-Uninstall.nsh 13 Sep 2005 19:01:55 -0000 1.2.2.2 --- adduser-Uninstall.nsh 19 Dec 2005 11:45:36 -0000 1.2.2.3 *************** *** 8,15 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 8,14 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: ioF.ini =================================================================== RCS file: /cvsroot/popfile/windows/ioF.ini,v retrieving revision 1.5 retrieving revision 1.5.6.1 diff -C2 -d -r1.5 -r1.5.6.1 *** ioF.ini 9 Jun 2004 15:06:04 -0000 1.5 --- ioF.ini 19 Dec 2005 11:45:36 -0000 1.5.6.1 *************** *** 1,59 **** ! #------------------------------------------------------------------- ! # ! # ioF.ini --- This file is used by "adduser.nsi", one of the NSIS scripts ! # used to create the Windows installer for POPFile. This file ! # defines the layout of the custom page used to list the email ! # clients found in the registry. ! # ! # Copyright (c) 2003-2004 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 the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. ! # ! # 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 ! # ! #------------------------------------------------------------------- ! ! [Settings] ! NumFields=3 ! BackEnabled=1 ! CancelEnabled=0 ! ! [Field 1] ! Type=label ! Text= ! Left=0 ! Right=300 ! Top=0 ! Bottom=40 ! ! [Field 2] ! Type=text ! Left=0 ! Right=300 ! Top=43 ! Bottom=79 ! Flags=READONLY|MULTILINE|VSCROLL ! ! [Field 3] ! Type=label ! Text= ! Left=0 ! Right=300 ! Top=83 ! Bottom=139 ! ! #-------------------- ! # End of ioF.ini ! #-------------------- --- 1,58 ---- ! #------------------------------------------------------------------- ! # ! # ioF.ini --- This file is used by "adduser.nsi", one of the NSIS scripts ! # used to create the Windows installer for POPFile. This file ! # defines the layout of the custom page used to list the email ! # clients found in the registry. ! # ! # Copyright (c) 2003-2004 John Graham-Cumming ! # ! # This file is part of POPFile ! # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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 ! # ! #------------------------------------------------------------------- ! ! [Settings] ! NumFields=3 ! BackEnabled=1 ! CancelEnabled=0 ! ! [Field 1] ! Type=label ! Text= ! Left=0 ! Right=300 ! Top=0 ! Bottom=40 ! ! [Field 2] ! Type=text ! Left=0 ! Right=300 ! Top=43 ! Bottom=79 ! Flags=READONLY|MULTILINE|VSCROLL ! ! [Field 3] ! Type=label ! Text= ! Left=0 ! Right=300 ! Top=83 ! Bottom=139 ! ! #-------------------- ! # End of ioF.ini ! #-------------------- Index: installer-Uninstall.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-Uninstall.nsh,v retrieving revision 1.4.2.3 retrieving revision 1.4.2.4 diff -C2 -d -r1.4.2.3 -r1.4.2.4 *** installer-Uninstall.nsh 13 Sep 2005 19:06:48 -0000 1.4.2.3 --- installer-Uninstall.nsh 19 Dec 2005 11:45:36 -0000 1.4.2.4 *************** *** 8,15 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 8,14 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: installer.nsi =================================================================== RCS file: /cvsroot/popfile/windows/installer.nsi,v retrieving revision 1.242.4.2 retrieving revision 1.242.4.3 diff -C2 -d -r1.242.4.2 -r1.242.4.3 *** installer.nsi 13 Sep 2005 19:06:48 -0000 1.242.4.2 --- installer.nsi 19 Dec 2005 11:45:36 -0000 1.242.4.3 *************** *** 26,33 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 26,32 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: WriteEnvStr.nsh =================================================================== RCS file: /cvsroot/popfile/windows/WriteEnvStr.nsh,v retrieving revision 1.12.4.1 retrieving revision 1.12.4.2 diff -C2 -d -r1.12.4.1 -r1.12.4.2 *** WriteEnvStr.nsh 13 Sep 2005 19:01:55 -0000 1.12.4.1 --- WriteEnvStr.nsh 19 Dec 2005 11:45:36 -0000 1.12.4.2 *************** *** 9,16 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 9,15 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: runpopfile.nsi =================================================================== RCS file: /cvsroot/popfile/windows/runpopfile.nsi,v retrieving revision 1.11.4.1 retrieving revision 1.11.4.2 diff -C2 -d -r1.11.4.1 -r1.11.4.2 *** runpopfile.nsi 13 Sep 2005 19:01:55 -0000 1.11.4.1 --- runpopfile.nsi 19 Dec 2005 11:45:36 -0000 1.11.4.2 *************** *** 15,22 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 15,21 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: ioG.ini =================================================================== RCS file: /cvsroot/popfile/windows/ioG.ini,v retrieving revision 1.5 retrieving revision 1.5.6.1 diff -C2 -d -r1.5 -r1.5.6.1 *** ioG.ini 9 Jun 2004 15:06:04 -0000 1.5 --- ioG.ini 19 Dec 2005 11:45:36 -0000 1.5.6.1 *************** *** 1,48 **** ! #------------------------------------------------------------------- ! # ! # ioG.ini --- This file is used by "installer.nsi", one of the NSIS scripts ! # used to create the Windows installer for POPFile. This file ! # defines the layout of the custom page used for messages. ! # ! # Copyright (c) 2003-2004 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 the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. ! # ! # 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 ! # ! #------------------------------------------------------------------- ! ! [Settings] ! NumFields=2 ! ! [Field 1] ! Type=label ! Text= ! Left=0 ! Right=300 ! Top=0 ! Bottom=72 ! ! [Field 2] ! Type=label ! Text= ! Left=0 ! Right=300 ! Top=75 ! Bottom=139 ! ! #-------------------- ! # End of ioG.ini ! #-------------------- --- 1,47 ---- ! #------------------------------------------------------------------- ! # ! # ioG.ini --- This file is used by "installer.nsi", one of the NSIS scripts ! # used to create the Windows installer for POPFile. This file ! # defines the layout of the custom page used for messages. ! # ! # Copyright (c) 2003-2004 John Graham-Cumming ! # ! # This file is part of POPFile ! # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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 ! # ! #------------------------------------------------------------------- ! ! [Settings] ! NumFields=2 ! ! [Field 1] ! Type=label ! Text= ! Left=0 ! Right=300 ! Top=0 ! Bottom=72 ! ! [Field 2] ! Type=label ! Text= ! Left=0 ! Right=300 ! Top=75 ! Bottom=139 ! ! #-------------------- ! # End of ioG.ini ! #-------------------- Index: adduser-EmailConfig.nsh =================================================================== RCS file: /cvsroot/popfile/windows/adduser-EmailConfig.nsh,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** adduser-EmailConfig.nsh 13 Sep 2005 19:01:55 -0000 1.1.2.2 --- adduser-EmailConfig.nsh 19 Dec 2005 11:45:36 -0000 1.1.2.3 *************** *** 9,16 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 9,15 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: msgcapture.nsi =================================================================== RCS file: /cvsroot/popfile/windows/msgcapture.nsi,v retrieving revision 1.7.4.1 retrieving revision 1.7.4.2 diff -C2 -d -r1.7.4.1 -r1.7.4.2 *** msgcapture.nsi 13 Sep 2005 19:01:55 -0000 1.7.4.1 --- msgcapture.nsi 19 Dec 2005 11:45:36 -0000 1.7.4.2 *************** *** 11,18 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 11,17 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, |
|
From: John Graham-C. <jgr...@us...> - 2005-12-19 11:42:05
|
Update of /cvsroot/popfile/engine/UI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14989/UI Modified Files: HTML.pm HTTP.pm XMLRPC.pm Log Message: Change GPL license to remove the option for the person using POPFile to license it under any version of the GPL other than v2 Index: HTML.pm =================================================================== RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v retrieving revision 1.361 retrieving revision 1.362 diff -C2 -d -r1.361 -r1.362 *** HTML.pm 28 Sep 2005 19:30:40 -0000 1.361 --- HTML.pm 19 Dec 2005 11:41:53 -0000 1.362 *************** *** 10,17 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 10,16 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: XMLRPC.pm =================================================================== RCS file: /cvsroot/popfile/engine/UI/XMLRPC.pm,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** XMLRPC.pm 25 Feb 2005 21:53:53 -0000 1.21 --- XMLRPC.pm 19 Dec 2005 11:41:53 -0000 1.22 *************** *** 14,21 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 14,20 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: HTTP.pm =================================================================== RCS file: /cvsroot/popfile/engine/UI/HTTP.pm,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** HTTP.pm 31 Aug 2005 17:50:44 -0000 1.32 --- HTTP.pm 19 Dec 2005 11:41:53 -0000 1.33 *************** *** 8,15 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 8,14 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, |
|
From: John Graham-C. <jgr...@us...> - 2005-12-19 11:42:04
|
Update of /cvsroot/popfile/engine/Classifier In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14989/Classifier Modified Files: Bayes.pm MailParse.pm WordMangle.pm popfile.sql Log Message: Change GPL license to remove the option for the person using POPFile to license it under any version of the GPL other than v2 Index: WordMangle.pm =================================================================== RCS file: /cvsroot/popfile/engine/Classifier/WordMangle.pm,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** WordMangle.pm 27 Dec 2004 16:51:26 -0000 1.41 --- WordMangle.pm 19 Dec 2005 11:41:52 -0000 1.42 *************** *** 13,20 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 13,19 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: Bayes.pm =================================================================== RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v retrieving revision 1.346 retrieving revision 1.347 diff -C2 -d -r1.346 -r1.347 *** Bayes.pm 21 Aug 2005 22:17:46 -0000 1.346 --- Bayes.pm 19 Dec 2005 11:41:52 -0000 1.347 *************** *** 13,20 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 13,19 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: MailParse.pm =================================================================== RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v retrieving revision 1.220 retrieving revision 1.221 diff -C2 -d -r1.220 -r1.221 *** MailParse.pm 24 Aug 2005 18:35:13 -0000 1.220 --- MailParse.pm 19 Dec 2005 11:41:52 -0000 1.221 *************** *** 9,16 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 9,15 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: popfile.sql =================================================================== RCS file: /cvsroot/popfile/engine/Classifier/popfile.sql,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** popfile.sql 7 Apr 2005 19:54:44 -0000 1.25 --- popfile.sql 19 Dec 2005 11:41:52 -0000 1.26 *************** *** 8,15 **** -- This file is part of POPFile -- ! -- POPFile is free software; you can redistribute it and/or modify ! -- it under the terms of the GNU General Public License as published by ! -- the Free Software Foundation; either version 2 of the License, or ! -- (at your option) any later version. -- -- POPFile is distributed in the hope that it will be useful, --- 8,14 ---- -- This file is part of POPFile -- ! -- POPFile is free software; you can redistribute it and/or modify it ! -- under the terms 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, |
|
From: John Graham-C. <jgr...@us...> - 2005-12-19 11:42:04
|
Update of /cvsroot/popfile/engine/POPFile In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14989/POPFile Modified Files: API.pm Configuration.pm Database.pm History.pm Loader.pm Logger.pm MQ.pm Module.pm Mutex.pm Log Message: Change GPL license to remove the option for the person using POPFile to license it under any version of the GPL other than v2 Index: History.pm =================================================================== RCS file: /cvsroot/popfile/engine/POPFile/History.pm,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** History.pm 24 Aug 2005 18:35:13 -0000 1.37 --- History.pm 19 Dec 2005 11:41:53 -0000 1.38 *************** *** 14,21 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 14,20 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: Configuration.pm =================================================================== RCS file: /cvsroot/popfile/engine/POPFile/Configuration.pm,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** Configuration.pm 24 Aug 2005 18:35:13 -0000 1.56 --- Configuration.pm 19 Dec 2005 11:41:53 -0000 1.57 *************** *** 16,23 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 16,22 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: Loader.pm =================================================================== RCS file: /cvsroot/popfile/engine/POPFile/Loader.pm,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** Loader.pm 21 Nov 2005 10:26:51 -0000 1.35 --- Loader.pm 19 Dec 2005 11:41:53 -0000 1.36 *************** *** 16,32 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # ! # 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 # # Created by Sam Schinke (ssc...@us...) --- 16,31 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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 # # Created by Sam Schinke (ssc...@us...) Index: Database.pm =================================================================== RCS file: /cvsroot/popfile/engine/POPFile/Database.pm,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Database.pm 24 Aug 2005 18:35:13 -0000 1.5 --- Database.pm 19 Dec 2005 11:41:53 -0000 1.6 *************** *** 14,21 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 14,20 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: Mutex.pm =================================================================== RCS file: /cvsroot/popfile/engine/POPFile/Mutex.pm,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Mutex.pm 7 Dec 2004 00:41:43 -0000 1.3 --- Mutex.pm 19 Dec 2005 11:41:53 -0000 1.4 *************** *** 10,17 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 10,16 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: Module.pm =================================================================== RCS file: /cvsroot/popfile/engine/POPFile/Module.pm,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** Module.pm 13 Feb 2005 02:16:34 -0000 1.50 --- Module.pm 19 Dec 2005 11:41:53 -0000 1.51 *************** *** 7,14 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 7,13 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: MQ.pm =================================================================== RCS file: /cvsroot/popfile/engine/POPFile/MQ.pm,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** MQ.pm 7 Apr 2005 19:54:45 -0000 1.21 --- MQ.pm 19 Dec 2005 11:41:53 -0000 1.22 *************** *** 48,55 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 48,54 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: API.pm =================================================================== RCS file: /cvsroot/popfile/engine/POPFile/API.pm,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** API.pm 21 Aug 2005 22:17:47 -0000 1.12 --- API.pm 19 Dec 2005 11:41:53 -0000 1.13 *************** *** 9,16 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 9,15 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: Logger.pm =================================================================== RCS file: /cvsroot/popfile/engine/POPFile/Logger.pm,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** Logger.pm 27 Dec 2004 18:10:18 -0000 1.43 --- Logger.pm 19 Dec 2005 11:41:53 -0000 1.44 *************** *** 14,21 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 14,20 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, |
|
From: John Graham-C. <jgr...@us...> - 2005-12-19 11:42:04
|
Update of /cvsroot/popfile/engine/Services In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14989/Services Modified Files: IMAP.pm Log Message: Change GPL license to remove the option for the person using POPFile to license it under any version of the GPL other than v2 Index: IMAP.pm =================================================================== RCS file: /cvsroot/popfile/engine/Services/IMAP.pm,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** IMAP.pm 26 Apr 2005 16:38:27 -0000 1.19 --- IMAP.pm 19 Dec 2005 11:41:53 -0000 1.20 *************** *** 13,20 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 13,19 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, |
|
From: John Graham-C. <jgr...@us...> - 2005-12-19 11:42:04
|
Update of /cvsroot/popfile/engine/Proxy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14989/Proxy Modified Files: NNTP.pm POP3.pm Proxy.pm SMTP.pm Log Message: Change GPL license to remove the option for the person using POPFile to license it under any version of the GPL other than v2 Index: POP3.pm =================================================================== RCS file: /cvsroot/popfile/engine/Proxy/POP3.pm,v retrieving revision 1.112 retrieving revision 1.113 diff -C2 -d -r1.112 -r1.113 *** POP3.pm 14 Sep 2005 19:30:47 -0000 1.112 --- POP3.pm 19 Dec 2005 11:41:53 -0000 1.113 *************** *** 14,21 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 14,20 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: NNTP.pm =================================================================== RCS file: /cvsroot/popfile/engine/Proxy/NNTP.pm,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** NNTP.pm 25 Feb 2005 21:53:54 -0000 1.38 --- NNTP.pm 19 Dec 2005 11:41:53 -0000 1.39 *************** *** 13,20 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 13,19 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: Proxy.pm =================================================================== RCS file: /cvsroot/popfile/engine/Proxy/Proxy.pm,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** Proxy.pm 21 Aug 2005 22:17:48 -0000 1.62 --- Proxy.pm 19 Dec 2005 11:41:53 -0000 1.63 *************** *** 9,16 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 9,15 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: SMTP.pm =================================================================== RCS file: /cvsroot/popfile/engine/Proxy/SMTP.pm,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** SMTP.pm 7 Apr 2005 19:54:47 -0000 1.41 --- SMTP.pm 19 Dec 2005 11:41:53 -0000 1.42 *************** *** 13,20 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 13,19 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, |
|
From: John Graham-C. <jgr...@us...> - 2005-12-19 11:42:03
|
Update of /cvsroot/popfile/engine In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14989 Modified Files: bayes.pl coverage.pl insert.pl make_packing_list.pl pipe.pl popfile-check-setup.pl popfile-service.pl popfile-tray.pl popfile-windows.pl popfile.pl Log Message: Change GPL license to remove the option for the person using POPFile to license it under any version of the GPL other than v2 Index: popfile-tray.pl =================================================================== RCS file: /cvsroot/popfile/engine/popfile-tray.pl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** popfile-tray.pl 27 Dec 2004 16:51:24 -0000 1.10 --- popfile-tray.pl 19 Dec 2005 11:41:52 -0000 1.11 *************** *** 14,21 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 14,20 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: coverage.pl =================================================================== RCS file: /cvsroot/popfile/engine/coverage.pl,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** coverage.pl 29 Nov 2004 16:43:39 -0000 1.11 --- coverage.pl 19 Dec 2005 11:41:52 -0000 1.12 *************** *** 10,15 **** use strict; ! # This hash will store a count of the number of times each line is executed # in each file, ! # it is in fact a hash of hashes used as # $count{filename}{linenumber} --- 10,15 ---- use strict; ! # This hash will store a count of the number of times each line is ! # executed # in each file, it is in fact a hash of hashes used as # $count{filename}{linenumber} *************** *** 17,20 **** --- 17,21 ---- # This hash will map file names of POPFile modules to coverage + my %files; *************** *** 25,30 **** foreach my $file (sort @line_files) { ! # Each LNE has a file name of ModuleName.PID.lne and the ModuleName has had ! # / or :: converted to # $file =~ /^(.+)\.pm\.(-?\d+)\.lne$/; --- 26,31 ---- foreach my $file (sort @line_files) { ! # Each LNE has a file name of ModuleName.PID.lne and the ! # ModuleName has had / or :: converted to # $file =~ /^(.+)\.pm\.(-?\d+)\.lne$/; Index: insert.pl =================================================================== RCS file: /cvsroot/popfile/engine/insert.pl,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** insert.pl 27 Dec 2004 18:14:09 -0000 1.39 --- insert.pl 19 Dec 2005 11:41:52 -0000 1.40 *************** *** 8,15 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 8,14 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: popfile-windows.pl =================================================================== RCS file: /cvsroot/popfile/engine/popfile-windows.pl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** popfile-windows.pl 29 Nov 2004 16:43:39 -0000 1.6 --- popfile-windows.pl 19 Dec 2005 11:41:52 -0000 1.7 *************** *** 15,22 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 15,21 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: popfile-service.pl =================================================================== RCS file: /cvsroot/popfile/engine/popfile-service.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** popfile-service.pl 27 Dec 2004 16:51:24 -0000 1.5 --- popfile-service.pl 19 Dec 2005 11:41:52 -0000 1.6 *************** *** 2,10 **** # ---------------------------------------------------------------------------- # ! # popfile-service.pl --- Message analyzer and sorter (Windows loader used with PerlSvc) # ! # Acts as a server and client designed to sit between a real mail/news client and a real mail/ ! # news server using POP3. Inserts an extra header X-Text-Classification: into the header to ! # tell the client which category the message belongs in and much more... # # Copyright (c) 2003-2004 John Graham-Cumming --- 2,12 ---- # ---------------------------------------------------------------------------- # ! # popfile-service.pl --- Message analyzer and sorter (Windows loader ! # used with PerlSvc) # ! # Acts as a server and client designed to sit between a real mail/news ! # client and a real mail/ news server using POP3. Inserts an extra ! # header X-Text-Classification: into the header to tell the client ! # which category the message belongs in and much more... # # Copyright (c) 2003-2004 John Graham-Cumming *************** *** 12,19 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 14,20 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: pipe.pl =================================================================== RCS file: /cvsroot/popfile/engine/pipe.pl,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** pipe.pl 27 Dec 2004 18:14:09 -0000 1.15 --- pipe.pl 19 Dec 2005 11:41:52 -0000 1.16 *************** *** 2,6 **** # ---------------------------------------------------------------------------- # ! # pipe.pl --- Read a message in on STDIN and write out the modified version on STDOUT # # Copyright (c) 2001-2004 John Graham-Cumming --- 2,7 ---- # ---------------------------------------------------------------------------- # ! # pipe.pl --- Read a message in on STDIN and write out the modified ! # version on STDOUT # # Copyright (c) 2001-2004 John Graham-Cumming *************** *** 8,15 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 9,15 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: popfile-check-setup.pl =================================================================== RCS file: /cvsroot/popfile/engine/popfile-check-setup.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** popfile-check-setup.pl 28 Feb 2005 17:00:30 -0000 1.1 --- popfile-check-setup.pl 19 Dec 2005 11:41:52 -0000 1.2 *************** *** 11,18 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 11,17 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: popfile.pl =================================================================== RCS file: /cvsroot/popfile/engine/popfile.pl,v retrieving revision 1.230 retrieving revision 1.231 diff -C2 -d -r1.230 -r1.231 *** popfile.pl 28 Feb 2005 17:00:27 -0000 1.230 --- popfile.pl 19 Dec 2005 11:41:52 -0000 1.231 *************** *** 13,20 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 13,19 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: bayes.pl =================================================================== RCS file: /cvsroot/popfile/engine/bayes.pl,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** bayes.pl 27 Dec 2004 18:14:09 -0000 1.39 --- bayes.pl 19 Dec 2005 11:41:52 -0000 1.40 *************** *** 8,15 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 8,14 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, Index: make_packing_list.pl =================================================================== RCS file: /cvsroot/popfile/engine/make_packing_list.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** make_packing_list.pl 1 Dec 2004 03:06:30 -0000 1.3 --- make_packing_list.pl 19 Dec 2005 11:41:52 -0000 1.4 *************** *** 10,17 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 10,16 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, |
|
From: John Graham-C. <jgr...@us...> - 2005-12-19 11:42:03
|
Update of /cvsroot/popfile/engine/Devel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14989/Devel Modified Files: TestCoverage.pm Log Message: Change GPL license to remove the option for the person using POPFile to license it under any version of the GPL other than v2 Index: TestCoverage.pm =================================================================== RCS file: /cvsroot/popfile/engine/Devel/TestCoverage.pm,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** TestCoverage.pm 8 Jun 2004 14:39:58 -0000 1.14 --- TestCoverage.pm 19 Dec 2005 11:41:53 -0000 1.15 *************** *** 1,3 **** ! # --------------------------------------------------------------------------------------------- # # Devel::TestCoverage - Module to measure code coverage in the test suite --- 1,3 ---- ! # ----------------------------------------------------------------------------- # # Devel::TestCoverage - Module to measure code coverage in the test suite *************** *** 7,14 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 7,13 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, *************** *** 21,56 **** # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # ! # --------------------------------------------------------------------------------------------- ! package Devel::TestCoverage; package DB; ! # This hash will store a count of the number of times each line is executed # in each file, ! # it is in fact a hash of hashes used as # $count{filename}{linenumber} my %count; ! # This is called when we begin the code coverage (or debugging) session BEGIN { unlink 'tests/*.lne'; ! # We want to look inside subroutines so tell the debugger to trace into ! # them $DB::trace = 1; } ! # Perl will call this function for every line of code it executes. We keep ! # a count for each time a line is executed sub DB { ! # The caller function we till us what line of code, in which file and ! # package called us my ($package, $file, $line) = caller; ! # A specific line in a specific file just got executed, we remove ! # certain references to eval code that we wont have traced into $count{$file}{$line} += 1 if ( ( $file =~ /\(eval/ ) == 0 ); } --- 20,60 ---- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # ! # ----------------------------------------------------------------------------- package Devel::TestCoverage; package DB; ! # This hash will store a count of the number of times each line is ! # executed # in each file, it is in fact a hash of hashes used as # $count{filename}{linenumber} + my %count; ! # This is called when we begin the code coverage (or debugging) ! # session ! BEGIN { unlink 'tests/*.lne'; ! # We want to look inside subroutines so tell the debugger to ! # trace into them $DB::trace = 1; } ! # Perl will call this function for every line of code it executes. We ! # keep a count for each time a line is executed sub DB { ! # The caller function we till us what line of code, in which ! # file and package called us ! my ($package, $file, $line) = caller; ! # A specific line in a specific file just got executed, we ! # remove certain references to eval code that we wont have ! # traced into ! $count{$file}{$line} += 1 if ( ( $file =~ /\(eval/ ) == 0 ); } *************** *** 62,66 **** for my $file (keys %count) { ! if ( ( $file =~ /^[^\/]/ ) && ( $file ne '../tests.pl' ) && !( $file =~ /^..\/\/Test\// ) ) { my $current_line = 0; my $block_executed = 0; --- 66,72 ---- for my $file (keys %count) { ! if ( ( $file =~ /^[^\/]/ ) && ! ( $file ne '../tests.pl' ) && ! !( $file =~ /^..\/\/Test\// ) ) { my $current_line = 0; my $block_executed = 0; *************** *** 72,89 **** open LINE_DATA, ">$clean.$$.lne"; ! # Read in each line of the source file and keep track of whether ! # it was executed or not using a new couple of keys in the ! # %count hash for each file: total_lines, total_executable_lines ! # and total_executed ! while (<SOURCE_FILE>) ! { ! # Keep count of the total number of lines in this file $current_line += 1; ! # We do not count lines that are blank or exclusively ! # comments or just have braces on them or ! # just an else or just a subroutine definition if ( ( ( /^\s*\#/ == 0 ) && --- 78,97 ---- open LINE_DATA, ">$clean.$$.lne"; ! # Read in each line of the source file and keep track ! # of whether it was executed or not using a new couple ! # of keys in the %count hash for each file: ! # total_lines, total_executable_lines and ! # total_executed ! while (<SOURCE_FILE>) { ! # Keep count of the total number of lines in ! # this file $current_line += 1; ! # We do not count lines that are blank or ! # exclusively comments or just have braces on ! # them or just an else or just a subroutine ! # definition if ( ( ( /^\s*\#/ == 0 ) && *************** *** 91,99 **** ( /^\s*(\{|\}|else|\s)+\s*$/ == 0 ) && ( /^\s*sub \w+( \{)?\s*$/ == 0 ) && ! ( /^\s*package / == 0 ) ) || ( $block_executed ) ) { $count{$file}{total_executable_lines} += 1; ! # If this line was executed then keep count of ! # that fact if ( /\# PROFILE PLATFORM START ([^\r\n]+)/ ) { --- 99,108 ---- ( /^\s*(\{|\}|else|\s)+\s*$/ == 0 ) && ( /^\s*sub \w+( \{)?\s*$/ == 0 ) && ! ( /^\s*package / == 0 ) ) || ! ( $block_executed ) ) { $count{$file}{total_executable_lines} += 1; ! # If this line was executed then keep ! # count of that fact if ( /\# PROFILE PLATFORM START ([^\r\n]+)/ ) { *************** *** 101,110 **** } ! if ( ( $count{$file}{$current_line} > 0 ) || ( $block_executed ) ) { print LINE_DATA "1\n"; ! # Check to see if the special comment PROFILE BLOCK START is on the line ! # and if so set the block mode where we count lines as being executed ! # in the block if the first line was if ( /\# PROFILE BLOCK START/ ) { --- 110,122 ---- } ! if ( ( $count{$file}{$current_line} > 0 ) || ! ( $block_executed ) ) { print LINE_DATA "1\n"; ! # Check to see if the special comment ! # PROFILE BLOCK START is on the line ! # and if so set the block mode where ! # we count lines as being executed in ! # the block if the first line was if ( /\# PROFILE BLOCK START/ ) { *************** *** 130,134 **** close LINE_DATA; ! # Check for an unterminated PROFILE BLOCK and warn the user if ( $block_executed ) { --- 142,147 ---- close LINE_DATA; ! # Check for an unterminated PROFILE BLOCK and warn the ! # user if ( $block_executed ) { |
|
From: John Graham-C. <jgr...@us...> - 2005-12-19 11:42:03
|
Update of /cvsroot/popfile/engine/Platform In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14989/Platform Modified Files: MSWin32.pm Log Message: Change GPL license to remove the option for the person using POPFile to license it under any version of the GPL other than v2 Index: MSWin32.pm =================================================================== RCS file: /cvsroot/popfile/engine/Platform/MSWin32.pm,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** MSWin32.pm 16 Mar 2005 21:58:45 -0000 1.24 --- MSWin32.pm 19 Dec 2005 11:41:53 -0000 1.25 *************** *** 13,20 **** # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 13,19 ---- # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms 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, |
|
From: Brian S. <xue...@us...> - 2005-11-24 10:57:04
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21893 Modified Files: msgcapture.nsi Log Message: Updated to use POPFile's new '--shutdown' option when a database upgrade is expected. Backwards compatibility still maintained. (The "Add POPFile User" wizard needs to be changed now that the Message Capture utility no longer leaves POPFile running after the upgrade) Index: msgcapture.nsi =================================================================== RCS file: /cvsroot/popfile/windows/msgcapture.nsi,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** msgcapture.nsi 2 Mar 2005 20:01:32 -0000 1.11 --- msgcapture.nsi 24 Nov 2005 10:56:52 -0000 1.12 *************** *** 71,74 **** --- 71,79 ---- #-------------------------------------------------------------------------- + ; Although this utility was originally created for the 0.22.0 installer it is compatible + ; with POPFile 0.20.x and 0.21.x installations created by the installer, though in some + ; cases a small batch file may be required in order to define POPFILE_ROOT and POPFILE_USER + ; before running it (this utility assumes these two environment variables have been defined). + #-------------------------------------------------------------------------- # Optional run-time command-line switch (used by 'msgcapture.exe') *************** *** 111,121 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.61" !define C_OUTFILE "msgcapture.exe" ! ; The timeout used when the installer calls this utility to monitor the SQL database upgrade ! !define C_INSTALLER_TIMEOUT 15 ;-------------------------------------------------------------------------- --- 116,129 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.62" !define C_OUTFILE "msgcapture.exe" ! ; The timeout (in seconds) used when a pre-0.23.0 version of the installer calls ! ; this utility to monitor the SQL database upgrade. Note: 30 seconds may not be ! ; long enough to cope with the upgrade of very large databases (over 100 MB) on ! ; some systems. ! !define C_INSTALLER_TIMEOUT 30 ;-------------------------------------------------------------------------- *************** *** 453,459 **** --- 461,490 ---- ; file as a simple POPFile version test (this file was first used in 0.23.0) + ; This utility is called by the "Add POPFile User" wizard (adduser.exe) with the option + ; '/TIMEOUT=PFI' when the installer detects that an existing SQL database is to be upgraded. + ; Database upgrades can take a very long time if the database is huge (over 30 minutes in + ; some cases). During the upgrade this utility is used to display the progress reports as + ; these are the only indication that POPFile is still working. + ; + ; Since POPFile cannot be used during the upgrade and the installer cannot easily monitor + ; the progress of the upgrade, a new POPFile command-line option was added for the 0.23.0 + ; release. + ; + ; This new option (--shutdown) causes POPFile to shutdown after performing the upgrade so + ; when monitoring a SQL database upgrade we simply wait for POPFile to terminate (instead + ; of using a less than satisfactory 'one-size-fits-all' timeout). + StrCpy ${L_OPTIONS} "" IfFileExists "${L_PFI_ROOT}\POPFile\Database.pm" 0 look_for_exe StrCpy ${L_OPTIONS} "--verbose" + StrCmp $G_MODE_FLAG "" look_for_exe + + ; The upgrading of an existing SQL database is to be monitored, so we tell POPFile to + ; shutdown after the upgrade and then wait for POPFile to exit (i.e. we don't use a timeout). + ; Since POPFile will shutdown afterwards, there is no point in using the system tray icon. + + StrCpy ${L_OPTIONS} "${L_OPTIONS} --shutdown" + StrCpy $G_TIMEOUT "0" + StrCpy ${L_TRAYICON} "" look_for_exe: |
|
From: John Graham-C. <jgr...@us...> - 2005-11-21 10:26:59
|
Update of /cvsroot/popfile/engine/POPFile In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9556/POPFile Modified Files: Loader.pm Log Message: Add --shutdown option which means that POPFile will start up, do a single pass through all running modules' service routines and then do a normal shutdown. Added so that the installer can run POPFile once and then terminate automatically Index: Loader.pm =================================================================== RCS file: /cvsroot/popfile/engine/POPFile/Loader.pm,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** Loader.pm 18 Feb 2005 12:16:44 -0000 1.34 --- Loader.pm 21 Nov 2005 10:26:51 -0000 1.35 *************** *** 90,93 **** --- 90,99 ---- $self->{debug__} = 0; + # If this is set to 1 then POPFile will shutdown straight after it + # has started up. This is used by the installer and set by the + # --shutdown command-line option + + $self->{shutdown__} = 0; + # This stuff lets us do some things in a way that tolerates some # window-isms *************** *** 168,171 **** --- 174,178 ---- GetOptions( "verbose!" => \$self->{debug__}, + "shutdown" => \$self->{shutdown__}, "quiet" => sub{ $self->{debug__} = 0 } ); } *************** *** 738,741 **** --- 745,755 ---- last if $nowait; + + # If we are asked to shutdown then we allow a single run + # through the service routines and then exit + + if ( $self->{shutdown__} == 1 ) { + $self->{alive__} = 0; + } } |
11 messages has been excluded from this view by a project administrator.
