Menu
▾
▴
popfile-commit — CVS commit list messages
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
(160) |
Mar
(119) |
Apr
(111) |
May
(118) |
Jun
(101) |
Jul
(304) |
Aug
(113) |
Sep
(140) |
Oct
(137) |
Nov
(87) |
Dec
(122) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(78) |
Feb
(125) |
Mar
(131) |
Apr
(59) |
May
(121) |
Jun
(166) |
Jul
(150) |
Aug
(137) |
Sep
(73) |
Oct
(58) |
Nov
(27) |
Dec
(60) |
| 2005 |
Jan
(131) |
Feb
(84) |
Mar
(36) |
Apr
(8) |
May
(28) |
Jun
(20) |
Jul
(10) |
Aug
(72) |
Sep
(76) |
Oct
(34) |
Nov
(3) |
Dec
(29) |
| 2006 |
Jan
(13) |
Feb
(92) |
Mar
(7) |
Apr
(1) |
May
(1) |
Jun
(2) |
Jul
(4) |
Aug
(17) |
Sep
(5) |
Oct
(2) |
Nov
(8) |
Dec
(12) |
| 2007 |
Jan
(28) |
Feb
(15) |
Mar
|
Apr
|
May
(8) |
Jun
(4) |
Jul
(5) |
Aug
(8) |
Sep
(20) |
Oct
(38) |
Nov
(65) |
Dec
(92) |
| 2008 |
Jan
(21) |
Feb
(56) |
Mar
(27) |
Apr
(174) |
May
(25) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Brian S. <xue...@us...> - 2005-03-02 19:58:18
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26895 Modified Files: WriteEnvStr.nsh Log Message: Library items now use the "PFI_" prefix to help identify them. Index: WriteEnvStr.nsh =================================================================== RCS file: /cvsroot/popfile/windows/WriteEnvStr.nsh,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** WriteEnvStr.nsh 9 Oct 2004 14:02:51 -0000 1.12 --- WriteEnvStr.nsh 2 Mar 2005 19:57:59 -0000 1.13 *************** *** 5,9 **** # 'Kakasi' package. # ! # Copyright (c) 2003-2004 John Graham-Cumming # # This file is part of POPFile --- 5,9 ---- # 'Kakasi' package. # ! # Copyright (c) 2003-2005 John Graham-Cumming # # This file is part of POPFile *************** *** 44,48 **** !ifndef ADDUSER & NO_KAKASI #-------------------------------------------------------------------------- ! # Installer Function: WriteEnv # # Writes an environment variable which is available to the 'current user' on a modern OS. --- 44,48 ---- !ifndef ADDUSER & NO_KAKASI #-------------------------------------------------------------------------- ! # Installer Function: PFI_WriteEnv # # Writes an environment variable which is available to the 'current user' on a modern OS. *************** *** 60,68 **** # Push "HOMEDIR" # Push "C:\New Home Dir" ! # Call WriteEnvStr # #-------------------------------------------------------------------------- ! Function WriteEnvStr ; Registers common to Win9x and non-Win9x processing --- 60,68 ---- # Push "HOMEDIR" # Push "C:\New Home Dir" ! # Call PFI_WriteEnvStr # #-------------------------------------------------------------------------- ! Function PFI_WriteEnvStr ; Registers common to Win9x and non-Win9x processing *************** *** 87,91 **** Push ${TEMP} ! Call IsNT Pop ${TEMP} StrCmp ${TEMP} 1 WriteEnvStr_NT --- 87,91 ---- Push ${TEMP} ! Call PFI_IsNT Pop ${TEMP} StrCmp ${TEMP} 1 WriteEnvStr_NT *************** *** 115,119 **** StrCmp ${LINE} "" eof_found Push ${LINE} ! Call TrimNewlines Pop ${LINE} StrCmp ${LINE} "" copy_line ; Blank lines are preserved in the copy we make --- 115,119 ---- StrCmp ${LINE} "" eof_found Push ${LINE} ! Call PFI_TrimNewlines Pop ${LINE} StrCmp ${LINE} "" copy_line ; Blank lines are preserved in the copy we make *************** *** 190,194 **** #-------------------------------------------------------------------------- ! # Installer Function: WriteEnvNTAU # # Writes an environment variable which is available to all users on a modern OS. --- 190,194 ---- #-------------------------------------------------------------------------- ! # Installer Function: PFI_WriteEnvNTAU # # Writes an environment variable which is available to all users on a modern OS. *************** *** 206,214 **** # Push "HOMEDIR" # Push "C:\New Home Dir" ! # Call WriteEnvStrNTAU # #-------------------------------------------------------------------------- ! Function WriteEnvStrNTAU ; Registers common to Win9x and non-Win9x processing --- 206,214 ---- # Push "HOMEDIR" # Push "C:\New Home Dir" ! # Call PFI_WriteEnvStrNTAU # #-------------------------------------------------------------------------- ! Function PFI_WriteEnvStrNTAU ; Registers common to Win9x and non-Win9x processing *************** *** 233,237 **** Push ${TEMP} ! Call IsNT Pop ${TEMP} StrCmp ${TEMP} 1 WriteEnvStr_NT --- 233,237 ---- Push ${TEMP} ! Call PFI_IsNT Pop ${TEMP} StrCmp ${TEMP} 1 WriteEnvStr_NT *************** *** 261,265 **** StrCmp ${LINE} "" eof_found Push ${LINE} ! Call TrimNewlines Pop ${LINE} StrCmp ${LINE} "" copy_line ; Blank lines are preserved in the copy we make --- 261,265 ---- StrCmp ${LINE} "" eof_found Push ${LINE} ! Call PFI_TrimNewlines Pop ${LINE} StrCmp ${LINE} "" copy_line ; Blank lines are preserved in the copy we make *************** *** 338,342 **** !ifndef ADDUSER #-------------------------------------------------------------------------- ! # Uninstaller Function: un.DeleteEnvStr # # Removes an environment variable defined for the current user on a modern OS. --- 338,342 ---- !ifndef ADDUSER #-------------------------------------------------------------------------- ! # Uninstaller Function: un.PFI_DeleteEnvStr # # Removes an environment variable defined for the current user on a modern OS. *************** *** 351,359 **** # Usage: # Push "HOMEDIR" ! # Call un.DeleteEnvStr # #-------------------------------------------------------------------------- ! Function un.DeleteEnvStr Exch $0 ; $0 now has the name of the variable Push $1 --- 351,359 ---- # Usage: # Push "HOMEDIR" ! # Call un.PFI_DeleteEnvStr # #-------------------------------------------------------------------------- ! Function un.PFI_DeleteEnvStr Exch $0 ; $0 now has the name of the variable Push $1 *************** *** 363,367 **** Push $5 ! Call un.IsNT Pop $1 StrCmp $1 1 DeleteEnvStr_NT --- 363,367 ---- Push $5 ! Call un.PFI_IsNT Pop $1 StrCmp $1 1 DeleteEnvStr_NT *************** *** 420,424 **** #-------------------------------------------------------------------------- ! # Uninstaller Function: un.DeleteEnvStrNTAU # # Removes an environment variable defined for all users on a modern OS. --- 420,424 ---- #-------------------------------------------------------------------------- ! # Uninstaller Function: un.PFI_DeleteEnvStrNTAU # # Removes an environment variable defined for all users on a modern OS. *************** *** 433,441 **** # Usage: # Push "HOMEDIR" ! # Call un.DeleteEnvStrNTAU # #-------------------------------------------------------------------------- ! Function un.DeleteEnvStrNTAU Exch $0 ; $0 now has the name of the variable Push $1 --- 433,441 ---- # Usage: # Push "HOMEDIR" ! # Call un.PFI_DeleteEnvStrNTAU # #-------------------------------------------------------------------------- ! Function un.PFI_DeleteEnvStrNTAU Exch $0 ; $0 now has the name of the variable Push $1 *************** *** 445,449 **** Push $5 ! Call un.IsNT Pop $1 StrCmp $1 1 DeleteEnvStr_NT --- 445,449 ---- Push $5 ! Call un.PFI_IsNT Pop $1 StrCmp $1 1 DeleteEnvStr_NT *************** *** 508,512 **** #-------------------------------------------------------------------------- ! # Macro: IsNT # # The installation process and the uninstall process both use a function which checks if --- 508,512 ---- #-------------------------------------------------------------------------- ! # Macro: PFI_IsNT # # The installation process and the uninstall process both use a function which checks if *************** *** 518,523 **** # # NOTE: ! # The !insertmacro IsNT "" and !insertmacro IsNT "un." commands are included in this file so ! # 'installer.nsi' can use 'Call IsNT' and 'Call un.IsNT' without additional preparation. # # Inputs: --- 518,523 ---- # # NOTE: ! # The !insertmacro PFI_IsNT "" and !insertmacro PFI_IsNT "un." commands are included in this file so ! # 'installer.nsi' can use 'Call PFI_IsNT' and 'Call un.PFI_IsNT' without additional preparation. # # Inputs: *************** *** 529,533 **** # Usage (after macro has been 'inserted'): # ! # Call un.IsNT # Pop $R0 # --- 529,533 ---- # Usage (after macro has been 'inserted'): # ! # Call un.PFI_IsNT # Pop $R0 # *************** *** 536,541 **** #-------------------------------------------------------------------------- ! !macro IsNT UN ! Function ${UN}IsNT Push $0 ReadRegStr $0 HKLM \ --- 536,541 ---- #-------------------------------------------------------------------------- ! !macro PFI_IsNT UN ! Function ${UN}PFI_IsNT Push $0 ReadRegStr $0 HKLM \ *************** *** 555,572 **** #-------------------------------------------------------------------------- ! # Installer Function: IsNT # # This function is used during the installation process #-------------------------------------------------------------------------- ! !insertmacro IsNT "" #-------------------------------------------------------------------------- ! # Uninstaller Function: un.IsNT # # This function is used during the uninstall process #-------------------------------------------------------------------------- ! !insertmacro IsNT "un." #-------------------------------------------------------------------------- --- 555,572 ---- #-------------------------------------------------------------------------- ! # Installer Function: PFI_IsNT # # This function is used during the installation process #-------------------------------------------------------------------------- ! !insertmacro PFI_IsNT "" #-------------------------------------------------------------------------- ! # Uninstaller Function: un.PFI_IsNT # # This function is used during the uninstall process #-------------------------------------------------------------------------- ! !insertmacro PFI_IsNT "un." #-------------------------------------------------------------------------- |
|
From: Brian S. <xue...@us...> - 2005-03-02 19:57:33
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25540 Modified Files: pfi-library.nsh Log Message: Library items now use the "PFI_" prefix to help identify them. Added new functions to support the improved dynamic SFN Support detection (PFI_GetRoot & PFI_GetSFNStatus) Index: pfi-library.nsh =================================================================== RCS file: /cvsroot/popfile/windows/pfi-library.nsh,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** pfi-library.nsh 10 Feb 2005 23:01:30 -0000 1.61 --- pfi-library.nsh 2 Mar 2005 19:57:09 -0000 1.62 *************** *** 57,61 **** #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.1.6" #-------------------------------------------------------------------------- --- 57,61 ---- #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.1.7" [...4062 lines suppressed...] !ifdef ADDSSL | ADDUSER | INSTALLER #-------------------------------------------------------------------------- ! # Installer Function: PFI_WaitUntilUnlocked # # This function is used during the installation process #-------------------------------------------------------------------------- ! !insertmacro PFI_WaitUntilUnlocked "" !endif !ifdef ADDUSER #-------------------------------------------------------------------------- ! # Uninstaller Function: un.PFI_WaitUntilUnlocked # # This function is used during the uninstall process #-------------------------------------------------------------------------- ! !insertmacro PFI_WaitUntilUnlocked "un." !endif |
|
From: Brian S. <xue...@us...> - 2005-03-02 19:55:32
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24269 Modified Files: pfi-languages.nsh Log Message: Correct a spelling mistake. Index: pfi-languages.nsh =================================================================== RCS file: /cvsroot/popfile/windows/pfi-languages.nsh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pfi-languages.nsh 9 Jun 2004 16:07:17 -0000 1.2 --- pfi-languages.nsh 2 Mar 2005 19:54:32 -0000 1.3 *************** *** 3,9 **** # pfi-languages.nsh --- This 'include' file lists the non-English languages currently # supported by the POPFile Windows installer and its associated ! # utilties. This makes maintenance easier. # ! # Copyright (c) 2004 John Graham-Cumming # # This file is part of POPFile --- 3,9 ---- # pfi-languages.nsh --- This 'include' file lists the non-English languages currently # supported by the POPFile Windows installer and its associated ! # utilities. This makes maintenance easier. # ! # Copyright (c) 2004-2005 John Graham-Cumming # # This file is part of POPFile *************** *** 105,111 **** ; Entries will appear in the drop-down list of languages in the order given below ; (the order used here ensures that the list entries appear in alphabetic order). ! ; It is assumed that !insertmacro PFI_LANG_LOAD "English" has been used to define "English" ! ; before including this file (which is why "English" does not appear in the list below). ; NOTE: The order used here assumes that the NSIS MUI 'Japanese.nsh' language file has --- 105,111 ---- ; Entries will appear in the drop-down list of languages in the order given below ; (the order used here ensures that the list entries appear in alphabetic order). ! ; It is assumed that !insertmacro PFI_LANG_LOAD "English" has been used to define "English" ! ; before including this file (which is why "English" does not appear in the list below). ; NOTE: The order used here assumes that the NSIS MUI 'Japanese.nsh' language file has |
|
From: Brian S. <xue...@us...> - 2005-03-02 19:53:56
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23180 Modified Files: installer.nsi Added Files: installer-SecMinPerl-body.nsh installer-SecPOPFile-body.nsh installer-SecPOPFile-func.nsh installer-Uninstall.nsh Log Message: Script now issues a warning if used with a compiler which has not been tested yet. Sometimes compilers fail to compile scripts developed with older versions and even if the script can be compiled the installer's behaviour may differ significantly. Replace the clumsy static "SFN Support" detection with improved dynamic detection based upon the destination selection by the user (no need to check the NTFS flag if the destination uses FAT). Better reporting of SFN problems (now using language strings). Library items now use the "PFI_" prefix to help identify them. Divide the huge 'installer.nsi' script into smaller files. (1) installer.nsi - the master script for the POPFile installer which uses the following 'include' files: (2) installer-SecPOPFile-body.nsh - body of the section used to install the POPFile program (3) installer-SecPOPFile-func.nsh - non-library functions used by (2) (4) installer-SecMinPerl-body.nsh - body of the section used to install the basic minimal Perl required by the default POPFile configuration (5) installer-Uninstall.nsh - source for all of the POPFile uninstaller. --- NEW FILE: installer-SecPOPFile-body.nsh --- #-------------------------------------------------------------------------- # # installer-SecPOPFile-body.nsh --- This 'include' file contains the body of the "POPFile" # Section of the main 'installer.nsi' NSIS script used to # create the Windows installer for POPFile. # # The non-library functions used in this file are contained # in a separate file (see 'installer-SecPOPFile-func.nsh') # # Copyright (c) 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 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 # #-------------------------------------------------------------------------- # The 'installer.nsi' script file contains the following code: # # Section "POPFile" SecPOPFile # !include "installer-SecPOPFile-body.nsh" # SectionEnd # # ; Functions used only by "installer-SecPOPFile-body.nsh" # # !include "installer-SecPOPFile-func.nsh" #-------------------------------------------------------------------------- # Processing performed: # # (a) If upgrading, shutdown existing version and rearrange minimal Perl files # (b) Create registry entries (HKLM and/or HKCU) for POPFile program files # (c) Install POPFile core program files and release notes # (d) Write the uninstaller program and create/update the Start Menu shortcuts # (e) Create 'Add/Remove Program' entry #-------------------------------------------------------------------------- ; Section "POPFile" SecPOPFile !insertmacro SECTIONLOG_ENTER "POPFile" ; Make this section mandatory (i.e. it is always installed) SectionIn RO !define L_RESULT $R9 !define L_TEMP $R8 Push ${L_RESULT} Push ${L_TEMP} SetDetailsPrint textonly DetailPrint "$(PFI_LANG_INST_PROG_UPGRADE) $(PFI_LANG_TAKE_A_FEW_SECONDS)" SetDetailsPrint listonly ; Before POPFile 0.21.0, POPFile and the minimal Perl shared the same folder structure ; and there was only one set of user data (stored in the same folder as POPFile). ; Phase 1 of the multi-user support introduced in 0.21.0 required some slight changes ; to the folder structure (to permit POPFile to be run from any folder after setting the ; POPFILE_ROOT and POPFILE_USER environment variables to appropriate values). ; The folder arrangement used for this build: ; ; (a) $INSTDIR - main POPFile installation folder, holds popfile.pl and several ; other *.pl scripts, runpopfile.exe, popfile*.exe plus three of the ; minimal Perl files (perl.exe, wperl.exe and perl58.dll) ; ; (b) $INSTDIR\kakasi - holds the Kakasi package used to process Japanese email ; (only installed when Japanese support is required) ; ; (c) $INSTDIR\lib - minimal Perl installation (except for the three files stored ; in the $INSTDIR folder to avoid runtime problems) ; ; (d) $INSTDIR\* - the remaining POPFile folders (Classifier, languages, skins, etc) ; ; For this build, each user is expected to have separate user data folders. By default each ; user data folder will contain popfile.cfg, stopwords, stopwords.default, popfile.db, ; the messages folder, etc. The 'Add POPFile User' wizard (adduser.exe) is responsible for ; creating/updating these user data folders and for handling conversion of existing flat file ; or BerkeleyDB corpus files to the new SQL database format. ; ; For increased flexibility, some global user variables are used in addition to $INSTDIR ; (this makes it easier to change the folder structure used by the installer). ; $G_ROOTDIR is initialised by 'CheckExistingProgDir' (the DIRECTORY page's "leave" function) StrCpy $G_MPLIBDIR "$G_ROOTDIR\lib" IfFileExists "$G_ROOTDIR\*.*" rootdir_exists ClearErrors CreateDirectory "$G_ROOTDIR" IfErrors 0 rootdir_exists SetDetailsPrint both DetailPrint "Fatal error: unable to create folder for the POPFile program files" SetDetailsPrint listonly MessageBox MB_OK|MB_ICONSTOP|MB_TOPMOST "Error: Unable to create folder for the POPFile program files\ ${MB_NL}${MB_NL}\ ($G_ROOTDIR)" Abort rootdir_exists: ; Starting with POPFile 0.22.0 the system tray icon uses 'localhost' instead of '127.0.0.1' ; to display the User Interface (and the installer has been updated to follow suit), so we ; need to ensure Win9x systems have a suitable 'hosts' file Call PFI_IsNT Pop ${L_RESULT} StrCmp ${L_RESULT} "1" continue Call CheckHostsFile continue: ; If we are installing over a previous version, ensure that version is not running Call MakeRootDirSafe ; Starting with 0.21.0, a new structure is used for the minimal Perl (to enable POPFile to ; be started from any folder, once POPFILE_ROOT and POPFILE_USER have been initialized) Call MinPerlRestructure ; Now that the HTML for the UI is no longer embedded in the Perl code, a new skin system is ; used so we attempt to convert the existing skins to work with the new system Call SkinsRestructure StrCmp $G_WINUSERTYPE "Admin" 0 current_user_root WriteRegStr HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "Installer Language" "$LANGUAGE" WriteRegStr HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "POPFile Major Version" "${C_POPFILE_MAJOR_VERSION}" WriteRegStr HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "POPFile Minor Version" "${C_POPFILE_MINOR_VERSION}" WriteRegStr HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "POPFile Revision" "${C_POPFILE_REVISION}" WriteRegStr HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "POPFile RevStatus" "${C_POPFILE_RC}" WriteRegStr HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "InstallPath" "$G_ROOTDIR" WriteRegStr HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "Author" "setup.exe" WriteRegStr HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "RootDir_LFN" "$G_ROOTDIR" StrCmp $G_SFN_DISABLED "0" find_HKLM_root_sfn StrCpy ${L_TEMP} "Not supported" Goto save_HKLM_root_sfn find_HKLM_root_sfn: GetFullPathName /SHORT ${L_TEMP} "$G_ROOTDIR" save_HKLM_root_sfn: WriteRegStr HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "RootDir_SFN" "${L_TEMP}" current_user_root: WriteRegStr HKCU "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "Installer Language" "$LANGUAGE" WriteRegStr HKCU "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "POPFile Major Version" "${C_POPFILE_MAJOR_VERSION}" WriteRegStr HKCU "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "POPFile Minor Version" "${C_POPFILE_MINOR_VERSION}" WriteRegStr HKCU "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "POPFile Revision" "${C_POPFILE_REVISION}" WriteRegStr HKCU "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "POPFile RevStatus" "${C_POPFILE_RC}" WriteRegStr HKCU "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "InstallPath" "$G_ROOTDIR" WriteRegStr HKCU "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "Author" "setup.exe" WriteRegStr HKCU "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "RootDir_LFN" "$G_ROOTDIR" StrCmp $G_SFN_DISABLED "0" find_HKCU_root_sfn StrCpy ${L_TEMP} "Not supported" Goto save_HKCU_root_sfn find_HKCU_root_sfn: GetFullPathName /SHORT ${L_TEMP} "$G_ROOTDIR" save_HKCU_root_sfn: WriteRegStr HKCU "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "RootDir_SFN" "${L_TEMP}" ; Install the POPFile Core files SetDetailsPrint textonly DetailPrint "$(PFI_LANG_INST_PROG_CORE)" SetDetailsPrint listonly SetOutPath "$G_ROOTDIR" ; Remove redundant files (from earlier test versions of the installer) Delete "$G_ROOTDIR\wrapper.exe" Delete "$G_ROOTDIR\wrapperf.exe" Delete "$G_ROOTDIR\wrapperb.exe" ; Install POPFile 'core' files File "..\engine\license" File "${C_RELEASE_NOTES}" CopyFiles /SILENT /FILESONLY "$PLUGINSDIR\${C_README}.txt" "$G_ROOTDIR\${C_README}.txt" File "..\engine\popfile.exe" File "..\engine\popfilef.exe" File "..\engine\popfileb.exe" File "..\engine\popfileif.exe" File "..\engine\popfileib.exe" File "..\engine\popfile-service.exe" File /nonfatal "/oname=pfi-stopwords.default" "..\engine\stopwords" File "runpopfile.exe" File "stop_pf.exe" File "sqlite.exe" File "runsqlite.exe" File "adduser.exe" File /nonfatal "test\pfidiag.exe" File "msgcapture.exe" IfFileExists "$G_ROOTDIR\pfimsgcapture.exe" 0 app_paths Delete "$G_ROOTDIR\pfimsgcapture.exe" File "/oname=pfimsgcapture.exe" "msgcapture.exe" app_paths: ; Add 'stop_pf.exe' to 'App Paths' to allow it to be run using Start -> Run -> stop_pf params WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\App Paths\stop_pf.exe" \ "" "$G_ROOTDIR\stop_pf.exe" SetOutPath "$G_ROOTDIR" File "..\engine\popfile.pl" File "..\engine\popfile-check-setup.pl" File "..\engine\popfile.pck" File "..\engine\insert.pl" File "..\engine\bayes.pl" File "..\engine\pipe.pl" File "..\engine\favicon.ico" SetOutPath "$G_ROOTDIR\Classifier" File "..\engine\Classifier\Bayes.pm" File "..\engine\Classifier\WordMangle.pm" File "..\engine\Classifier\MailParse.pm" IfFileExists "$G_ROOTDIR\Classifier\popfile.sql" update_the_schema no_previous_version: WriteINIStr "$G_ROOTDIR\pfi-data.ini" "Settings" "Owner" "$G_WINUSERNAME" DeleteINIStr "$G_ROOTDIR\pfi-data.ini" "Settings" "OldSchema" Goto install_schema update_the_schema: Push "$G_ROOTDIR\Classifier\popfile.sql" Call PFI_GetPOPFileSchemaVersion Pop ${L_RESULT} StrCmp ${L_RESULT} "()" assume_early_schema StrCpy ${L_TEMP} ${L_RESULT} 1 StrCmp ${L_TEMP} "(" no_previous_version remember_version assume_early_schema: StrCpy ${L_RESULT} "0" remember_version: WriteINIStr "$G_ROOTDIR\pfi-data.ini" "Settings" "Owner" "$G_WINUSERNAME" WriteINIStr "$G_ROOTDIR\pfi-data.ini" "Settings" "OldSchema" "${L_RESULT}" install_schema: File "..\engine\Classifier\popfile.sql" SetOutPath "$G_ROOTDIR\Platform" File "..\engine\Platform\MSWin32.pm" Delete "$G_ROOTDIR\Platform\POPFileIcon.dll" SetOutPath "$G_ROOTDIR\POPFile" File "..\engine\POPFile\MQ.pm" File "..\engine\POPFile\Database.pm" File "..\engine\POPFile\History.pm" File "..\engine\POPFile\Loader.pm" File "..\engine\POPFile\Logger.pm" File "..\engine\POPFile\Module.pm" File "..\engine\POPFile\Mutex.pm" File "..\engine\POPFile\Configuration.pm" File "..\engine\POPFile\popfile_version" SetOutPath "$G_ROOTDIR\Proxy" File "..\engine\Proxy\Proxy.pm" File "..\engine\Proxy\POP3.pm" SetOutPath "$G_ROOTDIR\UI" File "..\engine\UI\HTML.pm" File "..\engine\UI\HTTP.pm" ;----------------------------------------------------------------------- ; 'English' version of the QuickStart Guide SetOutPath "$G_ROOTDIR\manual" File "..\engine\manual\*.gif" SetOutPath "$G_ROOTDIR\manual\en" File "..\engine\manual\en\*.html" ;----------------------------------------------------------------------- ; Default UI language SetOutPath "$G_ROOTDIR\languages" File "..\engine\languages\English.msg" ;----------------------------------------------------------------------- ; Default UI skin (the POPFile UI looks better if a skin is used) SetOutPath "$G_ROOTDIR\skins\default" File "..\engine\skins\default\*.*" ;----------------------------------------------------------------------- ; Create the uninstall program BEFORE creating the shortcut to it ; (this ensures that the correct "uninstall" icon appears in the START MENU shortcut) SetOutPath "$G_ROOTDIR" Delete "$G_ROOTDIR\uninstall.exe" WriteUninstaller "$G_ROOTDIR\uninstall.exe" ; Attempt to remove some StartUp and Start Menu shortcuts created by previous installations SetShellVarContext all Delete "$SMSTARTUP\Run POPFile.lnk" Delete "$SMSTARTUP\Run POPFile in background.lnk" Delete "$SMPROGRAMS\${C_PFI_PRODUCT}\Run POPFile in background.lnk" Delete "$SMPROGRAMS\${C_PFI_PRODUCT}\Manual.url" Delete "$SMPROGRAMS\${C_PFI_PRODUCT}\Support\POPFile Manual.url" SetShellVarContext current Delete "$SMSTARTUP\Run POPFile.lnk" Delete "$SMSTARTUP\Run POPFile in background.lnk" Delete "$SMPROGRAMS\${C_PFI_PRODUCT}\Run POPFile in background.lnk" Delete "$SMPROGRAMS\${C_PFI_PRODUCT}\Manual.url" Delete "$SMPROGRAMS\${C_PFI_PRODUCT}\Support\POPFile Manual.url" ; Create the START MENU entries SetDetailsPrint textonly DetailPrint "$(PFI_LANG_INST_PROG_SHORT)" SetDetailsPrint listonly ; 'CreateShortCut' uses '$OUTDIR' as the working directory for the shortcut ; ('SetOutPath' is one way to change the value of $OUTDIR) ; 'CreateShortCut' fails to update existing shortcuts if they are read-only, so try to clear ; the read-only attribute first. Similar handling is required for the Internet shortcuts. ; If the user has 'Admin' rights, create a 'POPFile' folder with a set of shortcuts in ; the 'All Users' Start Menu . If the user does not have 'Admin' rights, the shortcuts ; are created in the 'Current User' Start Menu. ; If the 'All Users' folder is not found, NSIS will return the 'Current User' folder. SetShellVarContext all StrCmp $G_WINUSERTYPE "Admin" create_shortcuts SetShellVarContext current create_shortcuts: SetOutPath "$SMPROGRAMS\${C_PFI_PRODUCT}" SetOutPath "$G_ROOTDIR" SetFileAttributes "$SMPROGRAMS\${C_PFI_PRODUCT}\Run POPFile.lnk" NORMAL CreateShortCut "$SMPROGRAMS\${C_PFI_PRODUCT}\Run POPFile.lnk" \ "$G_ROOTDIR\runpopfile.exe" SetFileAttributes "$SMPROGRAMS\${C_PFI_PRODUCT}\Uninstall POPFile.lnk" NORMAL CreateShortCut "$SMPROGRAMS\${C_PFI_PRODUCT}\Uninstall POPFile.lnk" \ "$G_ROOTDIR\uninstall.exe" SetOutPath "$G_ROOTDIR" SetFileAttributes "$SMPROGRAMS\${C_PFI_PRODUCT}\Release Notes.lnk" NORMAL CreateShortCut "$SMPROGRAMS\${C_PFI_PRODUCT}\Release Notes.lnk" \ "$G_ROOTDIR\${C_README}.txt" SetOutPath "$SMPROGRAMS\${C_PFI_PRODUCT}" SetFileAttributes "$SMPROGRAMS\${C_PFI_PRODUCT}\POPFile User Interface.url" NORMAL WriteINIStr "$SMPROGRAMS\${C_PFI_PRODUCT}\POPFile User Interface.url" \ "InternetShortcut" "URL" "http://${C_UI_URL}:$G_GUI/" SetFileAttributes "$SMPROGRAMS\${C_PFI_PRODUCT}\Shutdown POPFile.url" NORMAL WriteINIStr "$SMPROGRAMS\${C_PFI_PRODUCT}\Shutdown POPFile.url" \ "InternetShortcut" "URL" "http://${C_UI_URL}:$G_GUI/shutdown" SetFileAttributes "$SMPROGRAMS\${C_PFI_PRODUCT}\QuickStart Guide.url" NORMAL WriteINIStr "$SMPROGRAMS\${C_PFI_PRODUCT}\QuickStart Guide.url" \ "InternetShortcut" "URL" "file://$G_ROOTDIR/manual/en/manual.html" SetFileAttributes "$SMPROGRAMS\${C_PFI_PRODUCT}\FAQ.url" NORMAL !ifndef ENGLISH_MODE StrCmp $LANGUAGE ${LANG_JAPANESE} japanese_faq !endif WriteINIStr "$SMPROGRAMS\${C_PFI_PRODUCT}\FAQ.url" \ "InternetShortcut" "URL" \ "http://getpopfile.org/cgi-bin/wiki.pl?FrequentlyAskedQuestions" !ifndef ENGLISH_MODE Goto support japanese_faq: WriteINIStr "$SMPROGRAMS\${C_PFI_PRODUCT}\FAQ.url" \ "InternetShortcut" "URL" \ "http://getpopfile.org/cgi-bin/wiki.pl?JP_FrequentlyAskedQuestions" support: !endif SetOutPath "$SMPROGRAMS\${C_PFI_PRODUCT}\Support" SetFileAttributes "$SMPROGRAMS\${C_PFI_PRODUCT}\Support\POPFile Home Page.url" NORMAL WriteINIStr "$SMPROGRAMS\${C_PFI_PRODUCT}\Support\POPFile Home Page.url" \ "InternetShortcut" "URL" "http://getpopfile.org/" SetFileAttributes "$SMPROGRAMS\${C_PFI_PRODUCT}\Support\POPFile Support (Wiki).url" NORMAL !ifndef ENGLISH_MODE StrCmp $LANGUAGE ${LANG_JAPANESE} japanese_wiki !endif WriteINIStr "$SMPROGRAMS\${C_PFI_PRODUCT}\Support\POPFile Support (Wiki).url" \ "InternetShortcut" "URL" \ "http://getpopfile.org/cgi-bin/wiki.pl?POPFileDocumentationProject" !ifndef ENGLISH_MODE Goto pfidiagnostic japanese_wiki: WriteINIStr "$SMPROGRAMS\${C_PFI_PRODUCT}\Support\POPFile Support (Wiki).url" \ "InternetShortcut" "URL" \ "http://getpopfile.org/cgi-bin/wiki.pl?JP_POPFileDocumentationProject" pfidiagnostic: !endif IfFileExists "$G_ROOTDIR\pfidiag.exe" 0 silent_shutdown Delete "$SMPROGRAMS\${C_PFI_PRODUCT}\PFI Diagnostic utility.lnk" SetFileAttributes "$SMPROGRAMS\${C_PFI_PRODUCT}\Support\PFI Diagnostic utility (simple).lnk" NORMAL CreateShortCut "$SMPROGRAMS\${C_PFI_PRODUCT}\Support\PFI Diagnostic utility (simple).lnk" \ "$G_ROOTDIR\pfidiag.exe" SetFileAttributes "$SMPROGRAMS\${C_PFI_PRODUCT}\Support\PFI Diagnostic utility (full).lnk" NORMAL CreateShortCut "$SMPROGRAMS\${C_PFI_PRODUCT}\Support\PFI Diagnostic utility (full).lnk" \ "$G_ROOTDIR\pfidiag.exe" "/full" silent_shutdown: SetOutPath "$G_ROOTDIR" SetFileAttributes "$SMPROGRAMS\${C_PFI_PRODUCT}\Shutdown POPFile silently.lnk" NORMAL CreateShortCut "$SMPROGRAMS\${C_PFI_PRODUCT}\Shutdown POPFile silently.lnk" \ "$G_ROOTDIR\stop_pf.exe" "/showerrors $G_GUI" ; Create entry in the Control Panel's "Add/Remove Programs" list StrCmp $G_WINUSERTYPE "Admin" use_HKLM WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \ "DisplayName" "${C_PFI_PRODUCT} ${C_PFI_VERSION}" WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \ "UninstallString" "$G_ROOTDIR\uninstall.exe" WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \ "NoModify" "1" WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \ "NoRepair" "1" Goto end_section use_HKLM: WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \ "DisplayName" "${C_PFI_PRODUCT} ${C_PFI_VERSION}" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \ "UninstallString" "$G_ROOTDIR\uninstall.exe" WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \ "NoModify" "1" WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \ "NoRepair" "1" end_section: SetDetailsPrint textonly DetailPrint "$(PFI_LANG_INST_PROG_ENDSEC)" SetDetailsPrint listonly !insertmacro SECTIONLOG_EXIT "POPFile" Pop ${L_TEMP} Pop ${L_RESULT} !undef L_RESULT !undef L_TEMP ; SectionEnd #-------------------------------------------------------------------------- # End of 'installer-SecPOPFile-body.nsh' #-------------------------------------------------------------------------- Index: installer.nsi =================================================================== RCS file: /cvsroot/popfile/windows/installer.nsi,v retrieving revision 1.254 retrieving revision 1.255 diff -C2 -d -r1.254 -r1.255 *** installer.nsi 17 Feb 2005 16:18:27 -0000 1.254 --- installer.nsi 2 Mar 2005 19:53:41 -0000 1.255 *************** *** 39,46 **** # #-------------------------------------------------------------------------- - ; This version of the script has been tested with the "NSIS 2" compiler (final), - ; released 7 February 2004, with no "official" NSIS patches/CVS updates applied. - ; ; Expect 3 compiler warnings, all related to standard NSIS language files which are out-of-date ; (if the default multi-language installer is compiled). --- 39,71 ---- # [...2405 lines suppressed...] ! !include "installer-Uninstall.nsh" ! #========================================================================== ! #========================================================================== #-------------------------------------------------------------------------- *************** *** 3770,3774 **** Push ${L_RESULT} ! Call IsNT Pop ${L_RESULT} StrCmp ${L_RESULT} "1" show_banner --- 1978,1982 ---- Push ${L_RESULT} ! Call PFI_IsNT Pop ${L_RESULT} StrCmp ${L_RESULT} "1" show_banner --- NEW FILE: installer-SecPOPFile-func.nsh --- #-------------------------------------------------------------------------- # # installer-SecPOPFile-func.nsh --- This 'include' file contains the non-library functions # used by the 'installer-SecPOPFile-body.nsh' file. # # Copyright (c) 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 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 # #-------------------------------------------------------------------------- # The 'installer.nsi' script file contains the following code: # # Section "POPFile" SecPOPFile # !include "installer-SecPOPFile-body.nsh" # SectionEnd # # ; Functions used only by "installer-SecPOPFile-body.nsh" # # !include "installer-SecPOPFile-func.nsh" #-------------------------------------------------------------------------- #-------------------------------------------------------------------------- # The following functions are only used by the 'installer-SecPOPFile-body.nsh' file: # # CheckHostsFile # MakeRootDirSafe # MinPerlRestructure # SkinsRestructure #-------------------------------------------------------------------------- #-------------------------------------------------------------------------- # Installer Function: CheckHostsFile # # Starting with the 0.22.0 release the system tray icon uses 'http://localhost:port' to open # the User Interface (earlier versions used 'http://127.0.0.1:port' instead). The installer has # been updated to follow suit. Some Windows 9x systems may not have a HOSTS file which defines # 'localhost' so we ensure a suitable one exists #-------------------------------------------------------------------------- Function CheckHostsFile !define L_CFG $R9 !define L_LINE $R8 !define L_LOCALHOST $R7 !define L_TEMP $R6 Push ${L_CFG} Push ${L_LINE} Push ${L_LOCALHOST} Push ${L_TEMP} IfFileExists "$WINDIR\HOSTS" look_for_localhost FileOpen ${L_CFG} "$WINDIR\HOSTS" w FileWrite ${L_CFG} "# Created by the installer for ${C_PFI_PRODUCT} ${C_PFI_VERSION}${MB_NL}" FileWrite ${L_CFG} "${MB_NL}" FileWrite ${L_CFG} "127.0.0.1 localhost${MB_NL}" FileClose ${L_CFG} Goto exit look_for_localhost: StrCpy ${L_LOCALHOST} "" FileOpen ${L_CFG} "$WINDIR\HOSTS" r loop: FileRead ${L_CFG} ${L_LINE} StrCmp ${L_LINE} "" done StrCpy ${L_TEMP} ${L_LINE} 10 StrCmp ${L_TEMP} "127.0.0.1 " 0 loop Push ${L_LINE} Call PFI_TrimNewlines Push " localhost" Call PFI_StrStr Pop ${L_TEMP} StrCmp ${L_TEMP} "" loop StrCmp ${L_TEMP} " localhost" found StrCpy ${L_TEMP} ${L_TEMP} 11 StrCmp ${L_TEMP} " localhost " found Goto loop found: StrCpy ${L_LOCALHOST} "1" done: FileClose ${L_CFG} StrCmp ${L_LOCALHOST} "1" exit FileOpen ${L_CFG} "$WINDIR\HOSTS" a FileSeek ${L_CFG} 0 END FileWrite ${L_CFG} "${MB_NL}" FileWrite ${L_CFG} "# Inserted by the installer for ${C_PFI_PRODUCT} ${C_PFI_VERSION}${MB_NL}" FileWrite ${L_CFG} "${MB_NL}" FileWrite ${L_CFG} "127.0.0.1 localhost${MB_NL}" FileClose ${L_CFG} exit: Pop ${L_TEMP} Pop ${L_LOCALHOST} Pop ${L_LINE} Pop ${L_CFG} !undef L_CFG !undef L_LINE !undef L_LOCALHOST !undef L_TEMP FunctionEnd #-------------------------------------------------------------------------- # Installer Function: MakeRootDirSafe # # If we are installing on top of a previous installation, we try to shut it down # (to allow the files to be overwritten without requiring a reboot) # # We also need to check if any of the PFI utilities are running (to avoid Abort/Retry/Ignore # messages or the need to reboot in order to update them) #-------------------------------------------------------------------------- Function MakeRootDirSafe IfFileExists "$G_ROOTDIR\*.exe" 0 nothing_to_check !define L_CFG $R9 ; file handle !define L_EXE $R8 ; name of EXE file to be monitored !define L_LINE $R7 !define L_NEW_GUI $R6 !define L_OLD_GUI $R5 !define L_PARAM $R4 !define L_RESULT $R3 !define L_TEXTEND $R2 ; used to ensure correct handling of lines longer than 1023 chars Push ${L_CFG} Push ${L_EXE} Push ${L_LINE} Push ${L_NEW_GUI} Push ${L_OLD_GUI} Push ${L_PARAM} Push ${L_RESULT} Push ${L_TEXTEND} ; Starting with POPfile 0.21.0 an experimental version of 'popfile-service.exe' was included ; to allow POPFile to be run as a Windows service. Push "POPFile" Call PFI_ServiceRunning Pop ${L_RESULT} StrCmp ${L_RESULT} "true" manual_shutdown ; If we are about to overwrite an existing version which is still running, ; then one of the EXE files will be 'locked' which means we have to shutdown POPFile. ; ; POPFile v0.20.0 and later may be using 'popfileb.exe', 'popfilef.exe', 'popfileib.exe', ; 'popfileif.exe', 'perl.exe' or 'wperl.exe'. ; ; Earlier versions of POPFile use only 'perl.exe' or 'wperl.exe'. Push $G_ROOTDIR Call PFI_FindLockedPFE Pop ${L_EXE} StrCmp ${L_EXE} "" check_pfi_utils ; The program files we are about to update are in use so we need to shut POPFile down DetailPrint "... it is locked." ; Attempt to discover which POPFile UI port is used by the current user, so we can issue ; a shutdown request. The following cases are considered: ; ; (a) upgrading a 0.21.0 or later installation and runpopfile.exe was used to start POPFile, ; so POPFile is using environment variables which match the HKCU RootDir_SFN and ; UserDir_SFN registry data (or HKCU RootDir_LFN and UserDir_LFN if short file names are ; not supported) ; ; (b) upgrading a pre-0.21.0 installation, so popfile.cfg is in the $G_ROOTDIR folder. Need to ; look for old-style and new-style UI port specifications just like the old installer did. ReadRegStr ${L_CFG} HKCU "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "UserDir_LFN" StrCmp ${L_CFG} "" try_root_dir IfFileExists "${L_CFG}\popfile.cfg" check_cfg_file try_root_dir: IfFileExists "$G_ROOTDIR\popfile.cfg" 0 manual_shutdown StrCpy ${L_CFG} "$G_ROOTDIR" check_cfg_file: StrCpy ${L_NEW_GUI} "" StrCpy ${L_OLD_GUI} "" ; See if we can get the current gui port from an existing configuration. ; There may be more than one entry for this port in the file - use the last one found ; (but give priority to any "html_port" entry). FileOpen ${L_CFG} "${L_CFG}\popfile.cfg" r found_eol: StrCpy ${L_TEXTEND} "<eol>" loop: FileRead ${L_CFG} ${L_LINE} StrCmp ${L_LINE} "" done StrCmp ${L_TEXTEND} "<eol>" 0 check_eol StrCmp ${L_LINE} "$\n" loop StrCpy ${L_PARAM} ${L_LINE} 10 StrCmp ${L_PARAM} "html_port " got_html_port StrCpy ${L_PARAM} ${L_LINE} 8 StrCmp ${L_PARAM} "ui_port " got_ui_port Goto check_eol got_ui_port: StrCpy ${L_OLD_GUI} ${L_LINE} 5 8 Goto check_eol got_html_port: StrCpy ${L_NEW_GUI} ${L_LINE} 5 10 ; Now read file until we get to end of the current line ; (i.e. until we find text ending in <CR><LF>, <CR> or <LF>) check_eol: StrCpy ${L_TEXTEND} ${L_LINE} 1 -1 StrCmp ${L_TEXTEND} "$\n" found_eol StrCmp ${L_TEXTEND} "$\r" found_eol loop done: FileClose ${L_CFG} Push ${L_NEW_GUI} Call PFI_TrimNewlines Pop ${L_NEW_GUI} Push ${L_OLD_GUI} Call PFI_TrimNewlines Pop ${L_OLD_GUI} StrCmp ${L_NEW_GUI} "" try_old_style DetailPrint "$(PFI_LANG_INST_LOG_SHUTDOWN) ${L_NEW_GUI} [new style port]" DetailPrint "$(PFI_LANG_TAKE_A_FEW_SECONDS)" Push ${L_NEW_GUI} Call PFI_ShutdownViaUI Pop ${L_RESULT} StrCmp ${L_RESULT} "success" check_exe StrCmp ${L_RESULT} "password?" manual_shutdown try_old_style: StrCmp ${L_OLD_GUI} "" manual_shutdown DetailPrint "$(PFI_LANG_INST_LOG_SHUTDOWN) ${L_OLD_GUI} [old style port]" DetailPrint "$(PFI_LANG_TAKE_A_FEW_SECONDS)" Push ${L_OLD_GUI} Call PFI_ShutdownViaUI Pop ${L_RESULT} StrCmp ${L_RESULT} "success" check_exe Goto manual_shutdown check_exe: DetailPrint "Waiting for '${L_EXE}' to unlock after NSISdl request..." DetailPrint "Please be patient, this may take more than 30 seconds" Push ${L_EXE} Call PFI_WaitUntilUnlocked DetailPrint "Checking if '${L_EXE}' is still locked after NSISdl request..." Push ${L_EXE} Call PFI_CheckIfLocked Pop ${L_EXE} StrCmp ${L_EXE} "" unlocked_now manual_shutdown: StrCpy $G_PLS_FIELD_1 "POPFile" DetailPrint "Unable to shutdown $G_PLS_FIELD_1 automatically - manual intervention requested" MessageBox MB_OK|MB_ICONEXCLAMATION|MB_TOPMOST "$(PFI_LANG_MBMANSHUT_1)\ ${MB_NL}${MB_NL}\ $(PFI_LANG_MBMANSHUT_2)\ ${MB_NL}${MB_NL}\ $(PFI_LANG_MBMANSHUT_3)" Goto check_pfi_utils unlocked_now: DetailPrint "File is now unlocked" check_pfi_utils: Push $G_ROOTDIR Call PFI_RequestPFIUtilsShutdown Pop ${L_TEXTEND} Pop ${L_RESULT} Pop ${L_PARAM} Pop ${L_OLD_GUI} Pop ${L_NEW_GUI} Pop ${L_LINE} Pop ${L_EXE} Pop ${L_CFG} !undef L_CFG !undef L_EXE !undef L_LINE !undef L_NEW_GUI !undef L_OLD_GUI !undef L_PARAM !undef L_RESULT !undef L_TEXTEND nothing_to_check: FunctionEnd #-------------------------------------------------------------------------- # Installer Function: MinPerlRestructure # # Prior to POPFile 0.21.0, POPFile really only supported one user so the location of the # popfile.cfg configuration file was hard-coded and the minimal Perl files were intermingled # with the POPFile files. POPFile 0.21.0 introduced some multi-user support which means that # the location of the configuration file is now supplied via an environment variable to allow # POPFile to be run from any folder. As a result, some rearrangement of the minimal Perl files # is required (to avoid Perl runtime errors when POPFile is started from a folder other than # the one where POPFile is installed). #-------------------------------------------------------------------------- Function MinPerlRestructure ; Since the 0.18.0 release (February 2003), the minimal Perl has used perl58.dll. Earlier ; versions of POPFile used earlier versions of Perl (e.g. the 0.17.8 release (December 2002) ; used perl56.dll) Delete "$G_ROOTDIR\perl56.dll" ; If the minimal Perl folder used by 0.21.0 or later exists and has some Perl files in it, ; assume there are no pre-0.21.0 minimal Perl files to be moved out of the way. IfFileExists "$G_MPLIBDIR\*.pm" exit CreateDirectory "$G_MPLIBDIR" IfFileExists "$G_ROOTDIR\*.pm" 0 move_folders CopyFiles /SILENT /FILESONLY "$G_ROOTDIR\*.pm" "$G_MPLIBDIR\" Delete "$G_ROOTDIR\*.pm" move_folders: !insertmacro PFI_MinPerlMove "auto" !insertmacro PFI_MinPerlMove "Carp" !insertmacro PFI_MinPerlMove "DBD" !insertmacro PFI_MinPerlMove "Digest" !insertmacro PFI_MinPerlMove "Encode" !insertmacro PFI_MinPerlMove "Exporter" !insertmacro PFI_MinPerlMove "File" !insertmacro PFI_MinPerlMove "Getopt" !insertmacro PFI_MinPerlMove "IO" !insertmacro PFI_MinPerlMove "MIME" !insertmacro PFI_MinPerlMove "String" !insertmacro PFI_MinPerlMove "Sys" !insertmacro PFI_MinPerlMove "Text" !insertmacro PFI_MinPerlMove "warnings" ; Delete redundant minimal Perl files from earlier installations IfFileExists "$G_ROOTDIR\Win32\*.*" 0 exit Delete "$G_ROOTDIR\Win32\API\Callback.pm" Delete "$G_ROOTDIR\Win32\API\Struct.pm" Delete "$G_ROOTDIR\Win32\API\Type.pm" RMDir "$G_ROOTDIR\Win32\API" Delete "$G_ROOTDIR\Win32\API.pm" RMDir "$G_ROOTDIR\Win32" exit: FunctionEnd #-------------------------------------------------------------------------- # Installer Function: SkinsRestructure # # Now that the HTML for the UI is no longer embedded in the Perl code, some changes need to be # made to the skins. There is now a new default skin which includes a set of HTML template files # in addition to a CSS file. Additional skins consist of separate folders containing 'style.css' # and any image files used by the skin (instead of each skin using a uniquely named CSS file in # the 'skins' folder, with any necessary image files being stored either in the 'skins' folder # or in a separate sub-folder). # # We attempt to rearrange any existing skins to suit this new structure (the current build only # moves files, it does not edit the CSS files to update any image references within them). # # The new default skin and its associated HTML template files are always installed by the # mandatory 'POPFile' component (even if the 'skins' component is not installed). #-------------------------------------------------------------------------- Function SkinsRestructure RMDir "$G_ROOTDIR\skins\lavishImages" RMDir "$G_ROOTDIR\skins\sleetImages" IfFileExists "$G_ROOTDIR\skins\default\*.thtml" exit !insertmacro PFI_SkinMove "blue" "blue" !insertmacro PFI_SkinMove "CoolBlue" "coolblue" !insertmacro PFI_SkinMove "CoolBrown" "coolbrown" !insertmacro PFI_SkinMove "CoolGreen" "coolgreen" !insertmacro PFI_SkinMove "CoolOrange" "coolorange" !insertmacro PFI_SkinMove "CoolYellow" "coolyellow" !insertmacro PFI_SkinMove "default" "default" !insertmacro PFI_SkinMove "glassblue" "glassblue" !insertmacro PFI_SkinMove "green" "green" IfFileExists "$G_ROOTDIR\skins\lavishImages\*.*" 0 lavish Rename "$G_ROOTDIR\skins\lavishImages" "$G_ROOTDIR\skins\lavish" lavish: !insertmacro PFI_SkinMove "Lavish" "lavish" !insertmacro PFI_SkinMove "LRCLaptop" "lrclaptop" !insertmacro PFI_SkinMove "orange" "orange" !insertmacro PFI_SkinMove "orangeCream" "orangecream" !insertmacro PFI_SkinMove "outlook" "outlook" !insertmacro PFI_SkinMove "PRJBlueGrey" "prjbluegrey" !insertmacro PFI_SkinMove "PRJSteelBeach" "prjsteelbeach" !insertmacro PFI_SkinMove "SimplyBlue" "simplyblue" IfFileExists "$G_ROOTDIR\skins\sleetImages\*.*" 0 sleet Rename "$G_ROOTDIR\skins\sleetImages" "$G_ROOTDIR\skins\sleet" sleet: !insertmacro PFI_SkinMove "Sleet" "sleet" !insertmacro PFI_SkinMove "Sleet-RTL" "sleet-rtl" !insertmacro PFI_SkinMove "smalldefault" "smalldefault" !insertmacro PFI_SkinMove "smallgrey" "smallgrey" !insertmacro PFI_SkinMove "StrawberryRose" "strawberryrose" !insertmacro PFI_SkinMove "tinydefault" "tinydefault" !insertmacro PFI_SkinMove "tinygrey" "tinygrey" !insertmacro PFI_SkinMove "white" "white" !insertmacro PFI_SkinMove "windows" "windows" IfFileExists "$G_ROOTDIR\skins\chipped_obsidian.gif" 0 metalback CreateDirectory "$G_ROOTDIR\skins\prjsteelbeach" Rename "$G_ROOTDIR\skins\chipped_obsidian.gif" "$G_ROOTDIR\skins\prjsteelbeach\chipped_obsidian.gif" metalback: IfFileExists "$G_ROOTDIR\skins\metalback.gif" 0 check_for_extra_skins CreateDirectory "$G_ROOTDIR\skins\prjsteelbeach" Rename "$G_ROOTDIR\skins\metalback.gif" "$G_ROOTDIR\skins\prjsteelbeach\metalback.gif" check_for_extra_skins: ; Move any remaining CSS files to an appropriate folder (to make them available for selection) ; Only the CSS files are moved, the user will have to adjust any skins which use images !define L_CSS_HANDLE $R9 ; used when searching for non-standard skins !define L_SKIN_NAME $R8 ; name of a non-standard skin (i.e. not supplied with POPFile) Push ${L_CSS_HANDLE} Push ${L_SKIN_NAME} FindFirst ${L_CSS_HANDLE} ${L_SKIN_NAME} "$G_ROOTDIR\skins\*.css" StrCmp ${L_CSS_HANDLE} "" all_done_now process_skin: StrCmp ${L_SKIN_NAME} "." look_again StrCmp ${L_SKIN_NAME} ".." look_again IfFileExists "$G_ROOTDIR\skins\${L_SKIN_NAME}\*.*" look_again StrCpy ${L_SKIN_NAME} ${L_SKIN_NAME} -4 CreateDirectory "$G_ROOTDIR\skins\${L_SKIN_NAME}" Rename "$G_ROOTDIR\skins\${L_SKIN_NAME}.css" "$G_ROOTDIR\skins\${L_SKIN_NAME}\style.css" look_again: FindNext ${L_CSS_HANDLE} ${L_SKIN_NAME} StrCmp ${L_SKIN_NAME} "" all_done_now process_skin all_done_now: FindClose ${L_CSS_HANDLE} Pop ${L_SKIN_NAME} Pop ${L_CSS_HANDLE} !undef L_CSS_HANDLE !undef L_SKIN_NAME exit: FunctionEnd #-------------------------------------------------------------------------- # End of 'installer-SecPOPFile-func.nsh' #-------------------------------------------------------------------------- --- NEW FILE: installer-SecMinPerl-body.nsh --- #-------------------------------------------------------------------------- # # installer-SecMinPerl-body.nsh --- This 'include' file contains the body of the "MinPerl" # Section of the main 'installer.nsi' NSIS script used to # create the Windows installer for POPFile. The "MinPerl" # section installs a minimal Perl which suits the default # POPFile configuration. For some of the optional POPFile # components (e.g. XMLRPC) additional Perl components are # required and these are installed at the same time as the # optional POPFile component. # # Copyright (c) 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 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 # #-------------------------------------------------------------------------- # The 'installer.nsi' script file contains the following code: # # Section "-Minimal Perl" SecMinPerl # !include "installer-SecMinPerl-body.nsh" # SectionEnd #-------------------------------------------------------------------------- ; Section "-Minimal Perl" SecMinPerl ; This section installs the "core" version of the minimal Perl. Some of the optional ; POPFile components, such as the Kakasi package and POPFile's XMLRPC module, require ; extra Perl components which are added when the optional POPFile components are installed. !insertmacro SECTIONLOG_ENTER "Minimal Perl" ; Install the Minimal Perl files SetDetailsPrint textonly DetailPrint "$(PFI_LANG_INST_PROG_PERL)" SetDetailsPrint listonly ; Remove empty minimal Perl folder (error flag set if folder not empty) ClearErrors RMDir "$G_MPLIBDIR" IfErrors 0 install_now StrCpy $G_PLS_FIELD_1 "$G_MPLIBDIR" MessageBox MB_YESNO|MB_ICONQUESTION "$(PFI_LANG_MINPERL_MBREMOLD)" IDNO install_now DetailPrint "Remove old minimal Perl folder" RMDir /r "$G_MPLIBDIR" DetailPrint "" install_now: SetOutPath "$G_ROOTDIR" File "${C_PERL_DIR}\bin\perl.exe" File "${C_PERL_DIR}\bin\wperl.exe" File "${C_PERL_DIR}\bin\perl58.dll" SetOutPath "$G_MPLIBDIR" File "${C_PERL_DIR}\lib\AutoLoader.pm" File "${C_PERL_DIR}\lib\Carp.pm" File "${C_PERL_DIR}\lib\Config.pm" File "${C_PERL_DIR}\lib\constant.pm" File "${C_PERL_DIR}\lib\DynaLoader.pm" File "${C_PERL_DIR}\lib\Errno.pm" File "${C_PERL_DIR}\lib\Exporter.pm" File "${C_PERL_DIR}\lib\Fcntl.pm" File "${C_PERL_DIR}\lib\integer.pm" File "${C_PERL_DIR}\lib\IO.pm" File "${C_PERL_DIR}\lib\lib.pm" File "${C_PERL_DIR}\lib\locale.pm" File "${C_PERL_DIR}\lib\POSIX.pm" File "${C_PERL_DIR}\lib\re.pm" File "${C_PERL_DIR}\lib\SelectSaver.pm" File "${C_PERL_DIR}\lib\Socket.pm" File "${C_PERL_DIR}\lib\strict.pm" File "${C_PERL_DIR}\lib\Symbol.pm" File "${C_PERL_DIR}\lib\vars.pm" File "${C_PERL_DIR}\lib\warnings.pm" File "${C_PERL_DIR}\lib\XSLoader.pm" SetOutPath "$G_MPLIBDIR\Carp" File "${C_PERL_DIR}\lib\Carp\*" SetOutPath "$G_MPLIBDIR\Date" File "${C_PERL_DIR}\site\lib\Date\Format.pm" File "${C_PERL_DIR}\site\lib\Date\Parse.pm" SetOutPath "$G_MPLIBDIR\Digest" File "${C_PERL_DIR}\lib\Digest\MD5.pm" SetOutPath "$G_MPLIBDIR\Exporter" File "${C_PERL_DIR}\lib\Exporter\*" SetOutPath "$G_MPLIBDIR\File" File "${C_PERL_DIR}\lib\File\Copy.pm" File "${C_PERL_DIR}\lib\File\Glob.pm" File "${C_PERL_DIR}\lib\File\Spec.pm" SetOutPath "$G_MPLIBDIR\File\Spec" File "${C_PERL_DIR}\lib\File\Spec\Unix.pm" File "${C_PERL_DIR}\lib\File\Spec\Win32.pm" SetOutPath "$G_MPLIBDIR\Getopt" File "${C_PERL_DIR}\lib\Getopt\Long.pm" SetOutPath "$G_MPLIBDIR\HTML" File "${C_PERL_DIR}\site\lib\HTML\Tagset.pm" File "${C_PERL_DIR}\site\lib\HTML\Template.pm" SetOutPath "$G_MPLIBDIR\IO" File "${C_PERL_DIR}\lib\IO\*" SetOutPath "$G_MPLIBDIR\IO\Socket" File "${C_PERL_DIR}\lib\IO\Socket\*" SetOutPath "$G_MPLIBDIR\MIME" File "${C_PERL_DIR}\lib\MIME\*" SetOutPath "$G_MPLIBDIR\Sys" File "${C_PERL_DIR}\lib\Sys\*" SetOutPath "$G_MPLIBDIR\Text" File "${C_PERL_DIR}\lib\Text\ParseWords.pm" SetOutPath "$G_MPLIBDIR\Time" File "${C_PERL_DIR}\lib\Time\Local.pm" File "${C_PERL_DIR}\site\lib\Time\Zone.pm" SetOutPath "$G_MPLIBDIR\warnings" File "${C_PERL_DIR}\lib\warnings\register.pm" SetOutPath "$G_MPLIBDIR\auto\Digest\MD5" File "${C_PERL_DIR}\lib\auto\Digest\MD5\*" SetOutPath "$G_MPLIBDIR\auto\DynaLoader" File "${C_PERL_DIR}\lib\auto\DynaLoader\*" SetOutPath "$G_MPLIBDIR\auto\Fcntl" File "${C_PERL_DIR}\lib\auto\Fcntl\Fcntl.dll" SetOutPath "$G_MPLIBDIR\auto\File\Glob" File "${C_PERL_DIR}\lib\auto\File\Glob\*" SetOutPath "$G_MPLIBDIR\auto\IO" File "${C_PERL_DIR}\lib\auto\IO\*" SetOutPath "$G_MPLIBDIR\auto\MIME\Base64" File "${C_PERL_DIR}\lib\auto\MIME\Base64\*" SetOutPath "$G_MPLIBDIR\auto\POSIX" File "${C_PERL_DIR}\lib\auto\POSIX\POSIX.dll" File "${C_PERL_DIR}\lib\auto\POSIX\autosplit.ix" File "${C_PERL_DIR}\lib\auto\POSIX\load_imports.al" SetOutPath "$G_MPLIBDIR\auto\Socket" File "${C_PERL_DIR}\lib\auto\Socket\*" SetOutPath "$G_MPLIBDIR\auto\Sys\Hostname" File "${C_PERL_DIR}\lib\auto\Sys\Hostname\*" ; Install Perl modules and library files for BerkeleyDB support. Although POPFile now uses ; SQLite (or another SQL database) to store the corpus and other essential data, it retains ; the ability to automatically convert old BerkeleyDB format corpus files to the SQL database ; format. Therefore the installer still installs the BerkeleyDB Perl components. SetOutPath "$G_MPLIBDIR" File "${C_PERL_DIR}\site\lib\BerkeleyDB.pm" File "${C_PERL_DIR}\lib\UNIVERSAL.pm" SetOutPath "$G_MPLIBDIR\auto\BerkeleyDB" File "${C_PERL_DIR}\site\lib\auto\BerkeleyDB\autosplit.ix" File "${C_PERL_DIR}\site\lib\auto\BerkeleyDB\BerkeleyDB.bs" File "${C_PERL_DIR}\site\lib\auto\BerkeleyDB\BerkeleyDB.dll" File "${C_PERL_DIR}\site\lib\auto\BerkeleyDB\BerkeleyDB.exp" File "${C_PERL_DIR}\site\lib\auto\BerkeleyDB\BerkeleyDB.lib" ; Install Perl modules and library files for SQLite support SetOutPath "$G_MPLIBDIR" File "${C_PERL_DIR}\lib\base.pm" File "${C_PERL_DIR}\lib\overload.pm" File "${C_PERL_DIR}\site\lib\DBI.pm" ; Required in order to use any version of SQLite SetOutPath "$G_MPLIBDIR\auto\DBI" File "${C_PERL_DIR}\site\lib\auto\DBI\DBI.bs" File "${C_PERL_DIR}\site\lib\auto\DBI\DBI.dll" File "${C_PERL_DIR}\site\lib\auto\DBI\DBI.exp" File "${C_PERL_DIR}\site\lib\auto\DBI\DBI.lib" ; Install SQLite support SetOutPath "$G_MPLIBDIR\DBD" File "${C_PERL_DIR}\site\lib\DBD\SQLite.pm" SetOutPath "$G_MPLIBDIR\auto\DBD\SQLite" File "${C_PERL_DIR}\site\lib\auto\DBD\SQLite\SQLite.bs" File "${C_PERL_DIR}\site\lib\auto\DBD\SQLite\SQLite.dll" File "${C_PERL_DIR}\site\lib\auto\DBD\SQLite\SQLite.exp" File "${C_PERL_DIR}\site\lib\auto\DBD\SQLite\SQLite.lib" ; Extra Perl modules required for the encrypted cookies introduced in POPFile 0.23.0 SetOutPath "$G_MPLIBDIR" File "${C_PERL_DIR}\lib\bytes.pm" File "${C_PERL_DIR}\lib\subs.pm" SetOutPath "$G_MPLIBDIR\Class" File "${C_PERL_DIR}\site\lib\Class\Loader.pm" SetOutPath "$G_MPLIBDIR\Crypt" File "${C_PERL_DIR}\site\lib\Crypt\Blowfish.pm" File "${C_PERL_DIR}\site\lib\Crypt\CBC.pm" File "${C_PERL_DIR}\site\lib\Crypt\Random.pm" SetOutPath "$G_MPLIBDIR\Crypt\Random" File "${C_PERL_DIR}\site\lib\Crypt\Random\Generator.pm" SetOutPath "$G_MPLIBDIR\Crypt\Random\Provider" File "${C_PERL_DIR}\site\lib\Crypt\Random\Provider\*.pm" SetOutPath "$G_MPLIBDIR\Data" File "${C_PERL_DIR}\lib\Data\Dumper.pm" SetOutPath "$G_MPLIBDIR\Digest" File "${C_PERL_DIR}\site\lib\Digest\SHA.pm" SetOutPath "$G_MPLIBDIR\Math" File "${C_PERL_DIR}\site\lib\Math\Pari.pm" SetOutPath "$G_MPLIBDIR\auto\Crypt\Blowfish" File "${C_PERL_DIR}\site\lib\auto\Crypt\Blowfish\Blowfish.bs" File "${C_PERL_DIR}\site\lib\auto\Crypt\Blowfish\Blowfish.dll" File "${C_PERL_DIR}\site\lib\auto\Crypt\Blowfish\Blowfish.exp" File "${C_PERL_DIR}\site\lib\auto\Crypt\Blowfish\Blowfish.lib" SetOutPath "$G_MPLIBDIR\auto\Data\Dumper" File "${C_PERL_DIR}\lib\auto\Data\Dumper\Dumper.bs" File "${C_PERL_DIR}\lib\auto\Data\Dumper\Dumper.dll" File "${C_PERL_DIR}\lib\auto\Data\Dumper\Dumper.exp" File "${C_PERL_DIR}\lib\auto\Data\Dumper\Dumper.lib" SetOutPath "$G_MPLIBDIR\auto\Digest\SHA" File "${C_PERL_DIR}\site\lib\auto\Digest\SHA\SHA.bs" File "${C_PERL_DIR}\site\lib\auto\Digest\SHA\SHA.dll" File "${C_PERL_DIR}\site\lib\auto\Digest\SHA\SHA.exp" File "${C_PERL_DIR}\site\lib\auto\Digest\SHA\SHA.lib" SetOutPath "$G_MPLIBDIR\auto\Math\Pari" File "${C_PERL_DIR}\site\lib\auto\Math\Pari\Pari.bs" File "${C_PERL_DIR}\site\lib\auto\Math\Pari\Pari.dll" File "${C_PERL_DIR}\site\lib\auto\Math\Pari\Pari.exp" File "${C_PERL_DIR}\site\lib\auto\Math\Pari\Pari.lib" SetDetailsPrint textonly DetailPrint "$(PFI_LANG_INST_PROG_ENDSEC)" SetDetailsPrint listonly !insertmacro SECTIONLOG_EXIT "Minimal Perl" ; SectionEnd #-------------------------------------------------------------------------- # End of 'installer-SecMinPerl-body.nsh' #-------------------------------------------------------------------------- --- NEW FILE: installer-Uninstall.nsh --- #-------------------------------------------------------------------------- # # installer-Uninstall.nsh --- This 'include' file contains the 'Uninstall' part of the main # NSIS 'installer.nsi' script used to create the POPFile installer. # # Copyright (c) 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 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 # #-------------------------------------------------------------------------- # The 'installer.nsi' script file contains the following code: # # #========================================================================== # #========================================================================== # # The 'Uninstall' part of the script is in a separate file # #========================================================================== # #========================================================================== # # !include "installer-Uninstall.nsh" # # #========================================================================== # #========================================================================== # #-------------------------------------------------------------------------- ##################################################################################### # # # ## ## ## ## ## ## ## ##### ######## ##### ## ## # # ## ## ### ## ## ### ## ## ## ## ## ## ## ## # # ## ## #### ## ## #### ## ## ## ## ## ## ## # # ## ## ## ## ## ## ## ## ## ##### ## ####### ## ## # # ## ## ## #### ## ## #### ## ## ## ## ## ## # # ## ## ## ### ## ## ### ## ## ## ## ## ## ## # # ###### ## ## ## ## ## ##### ## ## ## ###### ###### # # # ##################################################################################### #-------------------------------------------------------------------------- # Initialise the uninstaller #-------------------------------------------------------------------------- Function un.onInit ; Retrieve the language used when POPFile was installed, and use it for the uninstaller ; (if the language entry is not found in the registry, a 'language selection' dialog is shown) !insertmacro MUI_UNGETLANGUAGE StrCpy $G_ROOTDIR "$INSTDIR" StrCpy $G_MPLIBDIR "$INSTDIR\lib" ; Starting with 0.21.0 the registry is used to store the location of the 'User Data' ; (if setup.exe or adduser.exe was used to create/update the 'User Data' for this user) ReadRegStr $G_USERDIR HKCU "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "UserDir_LFN" StrCmp $G_USERDIR "" 0 got_user_path ; Pre-release versions of the 0.21.0 installer used a sub-folder for the default user data StrCpy $G_USERDIR "$INSTDIR\user" ; If we are uninstalling an upgraded installation, the default user data may be in $INSTDIR ; instead of $INSTDIR\user IfFileExists "$G_USERDIR\popfile.cfg" got_user_path StrCpy $G_USERDIR "$INSTDIR" got_user_path: ; Email settings are stored on a 'per user' basis therefore we need to know which user is ; running the uninstaller (e.g. so we can check ownership of any local 'User Data' we find) ClearErrors UserInfo::GetName IfErrors 0 got_name ; Assume Win9x system, so user has 'Admin' rights ; (UserInfo works on Win98SE so perhaps it is only Win95 that fails ?) StrCpy $G_WINUSERNAME "UnknownUser" StrCpy $G_WINUSERTYPE "Admin" Goto start_uninstall got_name: Pop $G_WINUSERNAME StrCmp $G_WINUSERNAME "" 0 get_usertype StrCpy $G_WINUSERNAME "UnknownUser" get_usertype: UserInfo::GetAccountType Pop $G_WINUSERTYPE StrCmp $G_WINUSERTYPE "Admin" start_uninstall StrCmp $G_WINUSERTYPE "Power" start_uninstall StrCmp $G_WINUSERTYPE "User" start_uninstall StrCmp $G_WINUSERTYPE "Guest" start_uninstall StrCpy $G_WINUSERTYPE "Unknown" start_uninstall: FunctionEnd #-------------------------------------------------------------------------- # Uninstaller Sections (this build uses all of these and executes them in the order shown) # # (1) un.Uninstall Begin - requests confirmation if appropriate # (2) un.Local User Data - looks for and removes 'User Data' from the PROGRAM folder # (3) un.Shutdown POPFile - shutdown POPFile if necessary (to avoid the need to reboot) # (4) un.Start Menu Entries - remove StartUp shortcuts and Start Menu entries # (5) un.POPFile Core - uninstall POPFile PROGRAM files # (6) un.Skins - uninstall POPFile skins # (7) un.Languages - uninstall POPFile UI languages # (8) un.QuickStart Guide - uninstall POPFile English QuickStart Guide # (9) un.Kakasi - uninstall Kakasi package and remove its environment variables # (10) un.Minimal Perl - uninstall minimal Perl, including all of the optional modules # (11) un.Registry Entries - remove 'Add/Remove Program' data and other registry entries # (12) un.Uninstall End - remove remaining files/folders (if it is safe to do so) # #-------------------------------------------------------------------------- #-------------------------------------------------------------------------- # Uninstaller Section: 'un.Uninstall Begin' (the first section in the uninstaller) #-------------------------------------------------------------------------- Section "un.Uninstall Begin" UnSecBegin !define L_TEMP $R9 Push ${L_TEMP} ReadINIStr ${L_TEMP} "$G_USERDIR\install.ini" "Settings" "Owner" StrCmp ${L_TEMP} "" section_exit StrCmp ${L_TEMP} $G_WINUSERNAME section_exit MessageBox MB_YESNO|MB_ICONSTOP|MB_DEFBUTTON2 \ "$(PFI_LANG_UN_MBDIFFUSER_1) ('${L_TEMP}') !\ ${MB_NL}${MB_NL}\ $(PFI_LANG_UN_MBNOTFOUND_2)" IDYES section_exit Abort "$(PFI_LANG_UN_ABORT_1)" section_exit: Pop ${L_TEMP} !undef L_TEMP SectionEnd #-------------------------------------------------------------------------- # Uninstaller Section: 'un.Local User Data' # # There may be 'User Data' in the same folder as the PROGRAM files (especially if this is # an upgraded installation) so we must run the 'User Data' uninstaller before we uninstall # POPFile (to restore any email settings changed by the installer). #-------------------------------------------------------------------------- Section "un.Local User Data" UnSecUserData !define L_RESULT $R9 Push ${L_RESULT} IfFileExists "$G_ROOTDIR\popfile.pl" look_for_uninstalluser IfFileExists "$G_ROOTDIR\popfile.exe" look_for_uninstalluser MessageBox MB_YESNO|MB_ICONSTOP|MB_DEFBUTTON2 \ "$(PFI_LANG_UN_MBNOTFOUND_1) '$G_ROOTDIR'.\ ${MB_NL}${MB_NL}\ $(PFI_LANG_UN_MBNOTFOUND_2)" IDYES look_for_uninstalluser Abort "$(PFI_LANG_UN_ABORT_1)" look_for_uninstalluser: IfFileExists "$G_ROOTDIR\uninstalluser.exe" 0 section_exit SetDetailsPrint textonly DetailPrint " " SetDetailsPrint listonly ; Uninstall the 'User Data' in the PROGRAM folder before uninstalling the PROGRAM files ; (note that running 'uninstalluser.exe' with the '_?=dir' option means it will be unable ; to delete itself because the program is NOT automatically relocated to the TEMP folder) HideWindow ExecWait '"$G_ROOTDIR\uninstalluser.exe" _?=$G_ROOTDIR' ${L_RESULT} BringToFront ; If the 'User Data' uninstaller did not return the normal "success" code (e.g. because user ; cancelled the 'User Data' uninstall) then we must retain the user data and uninstalluser.exe StrCmp ${L_RESULT} "0" 0 section_exit ; If any email settings have NOT been restored and the user wishes to try again later, ; the relevant INI file will still exist and we should not remove it or uninstalluser.exe IfFileExists "$G_ROOTDIR\pfi-outexpress.ini" section_exit IfFileExists "$G_ROOTDIR\pfi-outlook.ini" section_exit IfFileExists "$G_ROOTDIR\pfi-eudora.ini" section_exit Delete "$G_ROOTDIR\uninstalluser.exe" section_exit: SetDetailsPrint textonly DetailPrint " " SetDetailsPrint listonly Pop ${L_RESULT} !undef L_RESULT SectionEnd #-------------------------------------------------------------------------- # Uninstaller Section: 'un.Shutdown POPFile' #-------------------------------------------------------------------------- Section "un.Shutdown POPFile" UnSecShutdown !define L_CFG $R9 ; used as file handle !define L_EXE $R8 ; full path of the EXE to be monitored !define L_LNE $R7 ; a line from popfile.cfg !define L_TEMP $R6 !define L_TEXTEND $R5 ; used to ensure correct handling of lines longer than 1023 chars Push ${L_CFG} Push ${L_EXE} Push ${L_LNE} Push ${L_TEMP} Push ${L_TEXTEND} SetDetailsPrint textonly DetailPrint "$(PFI_LANG_UN_PROG_SHUTDOWN)" SetDetailsPrint listonly ; Starting with POPfile 0.21.0 an experimental version of 'popfile-service.exe' was included ; to allow POPFile to be run as a Windows service. Push "POPFile" Call un.PFI_ServiceRunning Pop ${L_TEMP} StrCmp ${L_TEMP} "true" manual_shutdown ; If the POPFile we are to uninstall is still running, one of the EXE files will be 'locked' Push $G_ROOTDIR Call un.PFI_FindLockedPFE Pop ${L_EXE} StrCmp ${L_EXE} "" check_pfi_utils ; The program files we are about to remove are in use so we need to shut POPFile down IfFileExists "$G_USERDIR\popfile.cfg" 0 manual_shutdown ; Use the UI port setting in the configuration file to shutdown POPFile StrCpy $G_GUI "" FileOpen ${L_CFG} "$G_USERDIR\popfile.cfg" r found_eol: StrCpy ${L_TEXTEND} "<eol>" loop: FileRead ${L_CFG} ${L_LNE} StrCmp ${L_LNE} "" ui_port_done StrCmp ${L_TEXTEND} "<eol>" 0 check_eol StrCmp ${L_LNE} "$\n" loop StrCpy ${L_TEMP} ${L_LNE} 10 StrCmp ${L_TEMP} "html_port " 0 check_eol StrCpy $G_GUI ${L_LNE} 5 10 ; Now read file until we get to end of the current line ; (i.e. until we find text ending in <CR><LF>, <CR> or <LF>) check_eol: StrCpy ${L_TEXTEND} ${L_LNE} 1 -1 StrCmp ${L_TEXTEND} "$\n" found_eol StrCmp ${L_TEXTEND} "$\r" found_eol loop ui_port_done: FileClose ${L_CFG} StrCmp $G_GUI "" manual_shutdown Push $G_GUI Call un.PFI_TrimNewlines Call un.PFI_StrCheckDecimal Pop $G_GUI StrCmp $G_GUI "" manual_shutdown DetailPrint "$(PFI_LANG_UN_LOG_SHUTDOWN) $G_GUI" DetailPrint "$(PFI_LANG_TAKE_A_FEW_SECONDS)" Push $G_GUI Call un.PFI... [truncated message content] |
|
From: Brian S. <xue...@us...> - 2005-03-02 19:50:29
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21184 Modified Files: adduser.nsi Added Files: adduser-EmailConfig.nsh adduser-Uninstall.nsh adduser-Version.nsh Log Message: Script now issues a warning if used with a compiler which has not been tested yet. Sometimes compilers fail to compile scripts developed with older versions and even if the script can be compiled the installer's behaviour may differ significantly. Replace the clumsy static "SFN Support" detection with improved dynamic detection based upon the destination selected by the user (no need to check the NTFS flag if the destination uses FAT). Better reporting of SFN problems (now using language strings). Improve the uninstaller's handling of the email settings. The Outlook and Outlook Express cases now check if the program is running (at last). Library items now use the "PFI_" prefix to help identify them. Divide the huge 'adduser.nsi' script into smaller files. (1) adduser.nsi - the master script for the 'Add POPFile User' wizard which uses the following 'include' files: (2) adduser-Version.nsh - the version number for the title bar of the 'Add POPFile User' wizard, the title bar of its uninstaller and the 'version information' for these two programs. (3) adduser-EmailConfig.nsh - source for all of the email client detection and account reconfiguration custom pages and associated functions. (4) adduser-Uninstall.nsh - source for all of the 'User Data' uninstaller. --- NEW FILE: adduser-Uninstall.nsh --- #-------------------------------------------------------------------------- # # adduser-Uninstall.nsh --- This 'include' file contains the 'Uninstall' part of the NSIS # script (adduser.nsi) used to build the 'Add POPFile User' wizard. # # Copyright (c) 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 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. # [...1240 lines suppressed...] Exch ${L_MESSAGE} !undef L_INDEX !undef L_ININAME !undef L_PERSONA !undef L_POP_ACCOUNT !undef L_POP_LOGIN !undef L_POP_PORT !undef L_POP_SERVER !undef L_TEMP !undef L_UNDOFILE !undef L_USERNAME !undef L_USERTYPE !undef L_ERRORLOG FunctionEnd #-------------------------------------------------------------------------- # End of 'adduser-Uninstall.nsh' #-------------------------------------------------------------------------- --- NEW FILE: adduser-EmailConfig.nsh --- #-------------------------------------------------------------------------- # # adduser-EmailConfig.nsh --- This 'include' file contains all of the custom page and other # functions used by the 'Add POPFile User' wizard (adduser.nsi) # when offering to reconfigure email accounts. # # Copyright (c) 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 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. [...2065 lines suppressed...] Abort exit: Pop ${L_USER} Pop ${L_SERVER} Pop ${L_PORT} Pop ${L_PERSONA} Pop ${L_EMAIL} !undef L_EMAIL !undef L_PERSONA !undef L_PORT !undef L_SERVER !undef L_USER FunctionEnd #-------------------------------------------------------------------------- # End of 'adduser-EmailConfig.nsh' #-------------------------------------------------------------------------- --- NEW FILE: adduser-Version.nsh --- #-------------------------------------------------------------------------- # # adduser-Version.nsh --- This 'include' file contains the version number which appears in # the title bar of the 'Add POPFile User' wizard (adduser.exe) and # its uninstaller (uninstalluser.exe). The same number also appears # in the 'Version Information' of these two executable files. #-------------------------------------------------------------------------- !define C_PFI_VERSION "0.2.69" #-------------------------------------------------------------------------- # End of 'adduser-Version.nsh' #-------------------------------------------------------------------------- Index: adduser.nsi =================================================================== RCS file: /cvsroot/popfile/windows/adduser.nsi,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** adduser.nsi 18 Feb 2005 17:01:11 -0000 1.72 --- adduser.nsi 2 Mar 2005 19:50:18 -0000 1.73 *************** *** 27,34 **** # #-------------------------------------------------------------------------- - ; This version of the script has been tested with the "NSIS 2" compiler (final), - ; released 7 February 2004, with no "official" NSIS patches/CVS updates applied. - ; ; Expect 3 compiler warnings, all related to standard NSIS language files which are out-of-date ; (if the default multi-language installer is compiled). --- 27,58 ---- # [...4184 lines suppressed...] *** 6766,6774 **** ; "English" text for the banner (otherwise the text would be unreadable garbage). ! !define L_RESULT $R9 ; The 'IsNT' function returns 0 if Win9x was detected Push ${L_RESULT} ! Call IsNT Pop ${L_RESULT} StrCmp ${L_RESULT} "1" show_banner --- 3611,3619 ---- ; "English" text for the banner (otherwise the text would be unreadable garbage). ! !define L_RESULT $R9 ; The 'PFI_IsNT' function returns 0 if Win9x was detected Push ${L_RESULT} ! Call PFI_IsNT Pop ${L_RESULT} StrCmp ${L_RESULT} "1" show_banner |
|
From: Brian S. <xue...@us...> - 2005-03-02 17:08:30
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24050 Modified Files: Russian-pfi.nsh SimpChinese-pfi.nsh Slovak-pfi.nsh Spanish-pfi.nsh Swedish-pfi.nsh TradChinese-pfi.nsh Turkish-pfi.nsh Ukrainian-pfi.nsh Log Message: New strings: (a) reporting "lack of SFN support" problems (b) removing old minimal Perl before installing the new version (c) better reporting of SSL download problems (d) better reporting of problems encountered when restoring email settings Index: Swedish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Swedish-pfi.nsh,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** Swedish-pfi.nsh 10 Feb 2005 23:00:01 -0000 1.47 --- Swedish-pfi.nsh 2 Mar 2005 17:08:14 -0000 1.48 *************** *** 132,138 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" --- 132,144 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Standard MUI Page - DIRECTORY ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Used in message box shown if SFN support has been disabled [installer.nsi, adduser.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBNOSFN "To install on the '$G_PLS_FIELD_1' drive${MB_NL}${MB_NL}please select a folder location which does not contain spaces" + + ; Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" *************** *** 334,337 **** --- 340,347 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_XMLRPC "Installing POPFile XMLRPC files..." + ; Message box used to get permission to delete the old minimal Perl before installing the new one + + !insertmacro PFI_LANG_STRING PFI_LANG_MINPERL_MBREMOLD "Delete everything in old minimal Perl folder before installing the new version ?${MB_NL}${MB_NL}($G_PLS_FIELD_1)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] *************** *** 461,464 **** --- 471,476 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" + !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] *************** *** 865,868 **** --- 877,885 ---- ; Uninstall Log Messages + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EXPRUN "Outlook Express is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OUTRUN "Outlook is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EUDRUN "Eudora is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_IGNORE "User requested restore while email program is running" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OPENED "Opened" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_RESTORED "Restored" Index: Slovak-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Slovak-pfi.nsh,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** Slovak-pfi.nsh 10 Feb 2005 23:00:01 -0000 1.47 --- Slovak-pfi.nsh 2 Mar 2005 17:08:13 -0000 1.48 *************** *** 132,138 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" --- 132,144 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Standard MUI Page - DIRECTORY ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Used in message box shown if SFN support has been disabled [installer.nsi, adduser.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBNOSFN "To install on the '$G_PLS_FIELD_1' drive${MB_NL}${MB_NL}please select a folder location which does not contain spaces" + + ; Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" *************** *** 334,337 **** --- 340,347 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_XMLRPC "Installing POPFile XMLRPC files..." + ; Message box used to get permission to delete the old minimal Perl before installing the new one + + !insertmacro PFI_LANG_STRING PFI_LANG_MINPERL_MBREMOLD "Delete everything in old minimal Perl folder before installing the new version ?${MB_NL}${MB_NL}($G_PLS_FIELD_1)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] *************** *** 461,464 **** --- 471,476 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" + !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] *************** *** 865,868 **** --- 877,885 ---- ; Uninstall Log Messages + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EXPRUN "Outlook Express is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OUTRUN "Outlook is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EUDRUN "Eudora is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_IGNORE "User requested restore while email program is running" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OPENED "Opened" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_RESTORED "Restored" Index: TradChinese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/TradChinese-pfi.nsh,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** TradChinese-pfi.nsh 10 Feb 2005 23:00:01 -0000 1.48 --- TradChinese-pfi.nsh 2 Mar 2005 17:08:14 -0000 1.49 *************** *** 132,138 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" --- 132,144 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Standard MUI Page - DIRECTORY ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Used in message box shown if SFN support has been disabled [installer.nsi, adduser.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBNOSFN "To install on the '$G_PLS_FIELD_1' drive${MB_NL}${MB_NL}please select a folder location which does not contain spaces" + + ; Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" *************** *** 338,341 **** --- 344,351 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_XMLRPC "Installing POPFile XMLRPC files..." + ; Message box used to get permission to delete the old minimal Perl before installing the new one + + !insertmacro PFI_LANG_STRING PFI_LANG_MINPERL_MBREMOLD "Delete everything in old minimal Perl folder before installing the new version ?${MB_NL}${MB_NL}($G_PLS_FIELD_1)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] *************** *** 465,468 **** --- 475,480 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" + !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] *************** *** 869,872 **** --- 881,889 ---- ; Uninstall Log Messages + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EXPRUN "Outlook Express is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OUTRUN "Outlook is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EUDRUN "Eudora is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_IGNORE "User requested restore while email program is running" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OPENED "Opened" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_RESTORED "Restored" Index: Russian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Russian-pfi.nsh,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** Russian-pfi.nsh 10 Feb 2005 23:00:00 -0000 1.47 --- Russian-pfi.nsh 2 Mar 2005 17:08:13 -0000 1.48 *************** *** 132,138 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" --- 132,144 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Standard MUI Page - DIRECTORY ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Used in message box shown if SFN support has been disabled [installer.nsi, adduser.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBNOSFN "To install on the '$G_PLS_FIELD_1' drive${MB_NL}${MB_NL}please select a folder location which does not contain spaces" + + ; Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" *************** *** 334,337 **** --- 340,347 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_XMLRPC "Installing POPFile XMLRPC files..." + ; Message box used to get permission to delete the old minimal Perl before installing the new one + + !insertmacro PFI_LANG_STRING PFI_LANG_MINPERL_MBREMOLD "Delete everything in old minimal Perl folder before installing the new version ?${MB_NL}${MB_NL}($G_PLS_FIELD_1)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] *************** *** 461,464 **** --- 471,476 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" + !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] *************** *** 865,868 **** --- 877,885 ---- ; Uninstall Log Messages + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EXPRUN "Outlook Express is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OUTRUN "Outlook is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EUDRUN "Eudora is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_IGNORE "User requested restore while email program is running" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OPENED "Opened" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_RESTORED "Restored" Index: Ukrainian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Ukrainian-pfi.nsh,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** Ukrainian-pfi.nsh 10 Feb 2005 23:00:02 -0000 1.47 --- Ukrainian-pfi.nsh 2 Mar 2005 17:08:14 -0000 1.48 *************** *** 132,138 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" --- 132,144 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Standard MUI Page - DIRECTORY ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Used in message box shown if SFN support has been disabled [installer.nsi, adduser.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBNOSFN "To install on the '$G_PLS_FIELD_1' drive${MB_NL}${MB_NL}please select a folder location which does not contain spaces" + + ; Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" *************** *** 334,337 **** --- 340,347 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_XMLRPC "Installing POPFile XMLRPC files..." + ; Message box used to get permission to delete the old minimal Perl before installing the new one + + !insertmacro PFI_LANG_STRING PFI_LANG_MINPERL_MBREMOLD "Delete everything in old minimal Perl folder before installing the new version ?${MB_NL}${MB_NL}($G_PLS_FIELD_1)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] *************** *** 461,464 **** --- 471,476 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" + !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] *************** *** 865,868 **** --- 877,885 ---- ; Uninstall Log Messages + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EXPRUN "Outlook Express is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OUTRUN "Outlook is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EUDRUN "Eudora is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_IGNORE "User requested restore while email program is running" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OPENED "Opened" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_RESTORED "Restored" Index: Turkish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Turkish-pfi.nsh,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** Turkish-pfi.nsh 10 Feb 2005 23:00:02 -0000 1.36 --- Turkish-pfi.nsh 2 Mar 2005 17:08:14 -0000 1.37 *************** *** 132,138 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" --- 132,144 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Standard MUI Page - DIRECTORY ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Used in message box shown if SFN support has been disabled [installer.nsi, adduser.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBNOSFN "To install on the '$G_PLS_FIELD_1' drive${MB_NL}${MB_NL}please select a folder location which does not contain spaces" + + ; Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" *************** *** 334,337 **** --- 340,347 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_XMLRPC "Installing POPFile XMLRPC files..." + ; Message box used to get permission to delete the old minimal Perl before installing the new one + + !insertmacro PFI_LANG_STRING PFI_LANG_MINPERL_MBREMOLD "Delete everything in old minimal Perl folder before installing the new version ?${MB_NL}${MB_NL}($G_PLS_FIELD_1)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] *************** *** 461,464 **** --- 471,476 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" + !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] *************** *** 865,868 **** --- 877,885 ---- ; Uninstall Log Messages + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EXPRUN "Outlook Express is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OUTRUN "Outlook is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EUDRUN "Eudora is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_IGNORE "User requested restore while email program is running" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OPENED "Opened" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_RESTORED "Restored" Index: Spanish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Spanish-pfi.nsh,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** Spanish-pfi.nsh 10 Feb 2005 23:00:01 -0000 1.52 --- Spanish-pfi.nsh 2 Mar 2005 17:08:13 -0000 1.53 *************** *** 132,138 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" --- 132,144 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Standard MUI Page - DIRECTORY ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Used in message box shown if SFN support has been disabled [installer.nsi, adduser.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBNOSFN "To install on the '$G_PLS_FIELD_1' drive${MB_NL}${MB_NL}please select a folder location which does not contain spaces" + + ; Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" *************** *** 344,347 **** --- 350,357 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_XMLRPC "Installing POPFile XMLRPC files..." + ; Message box used to get permission to delete the old minimal Perl before installing the new one + + !insertmacro PFI_LANG_STRING PFI_LANG_MINPERL_MBREMOLD "Delete everything in old minimal Perl folder before installing the new version ?${MB_NL}${MB_NL}($G_PLS_FIELD_1)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] *************** *** 470,473 **** --- 480,485 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" + !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] *************** *** 909,912 **** --- 921,929 ---- ; Uninstall Log Messages + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EXPRUN "Outlook Express is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OUTRUN "Outlook is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EUDRUN "Eudora is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_IGNORE "User requested restore while email program is running" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OPENED "Abierto" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_RESTORED "Recuperado" Index: SimpChinese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/SimpChinese-pfi.nsh,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** SimpChinese-pfi.nsh 10 Feb 2005 23:00:00 -0000 1.47 --- SimpChinese-pfi.nsh 2 Mar 2005 17:08:13 -0000 1.48 *************** *** 132,138 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" --- 132,144 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Standard MUI Page - DIRECTORY ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Used in message box shown if SFN support has been disabled [installer.nsi, adduser.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBNOSFN "To install on the '$G_PLS_FIELD_1' drive${MB_NL}${MB_NL}please select a folder location which does not contain spaces" + + ; Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" *************** *** 338,341 **** --- 344,351 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_XMLRPC "Installing POPFile XMLRPC files..." + ; Message box used to get permission to delete the old minimal Perl before installing the new one + + !insertmacro PFI_LANG_STRING PFI_LANG_MINPERL_MBREMOLD "Delete everything in old minimal Perl folder before installing the new version ?${MB_NL}${MB_NL}($G_PLS_FIELD_1)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] *************** *** 465,468 **** --- 475,480 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" + !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] *************** *** 869,872 **** --- 881,889 ---- ; Uninstall Log Messages + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EXPRUN "Outlook Express is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OUTRUN "Outlook is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EUDRUN "Eudora is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_IGNORE "User requested restore while email program is running" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OPENED "Opened" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_RESTORED "Restored" |
|
From: Brian S. <xue...@us...> - 2005-03-02 17:04:02
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22191 Modified Files: Greek-pfi.nsh Hungarian-pfi.nsh Italian-pfi.nsh Japanese-pfi.nsh Korean-pfi.nsh Norwegian-pfi.nsh Polish-pfi.nsh Portuguese-pfi.nsh PortugueseBR-pfi.nsh Log Message: New strings: (a) reporting "lack of SFN support" problems (b) removing old minimal Perl before installing the new version (c) better reporting of SSL download problems (d) better reporting of problems encountered when restoring email settings Index: Portuguese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Portuguese-pfi.nsh,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** Portuguese-pfi.nsh 10 Feb 2005 22:55:32 -0000 1.47 --- Portuguese-pfi.nsh 2 Mar 2005 17:03:44 -0000 1.48 *************** *** 132,138 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" --- 132,144 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Standard MUI Page - DIRECTORY ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Used in message box shown if SFN support has been disabled [installer.nsi, adduser.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBNOSFN "To install on the '$G_PLS_FIELD_1' drive${MB_NL}${MB_NL}please select a folder location which does not contain spaces" + + ; Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" *************** *** 334,337 **** --- 340,347 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_XMLRPC "Installing POPFile XMLRPC files..." + ; Message box used to get permission to delete the old minimal Perl before installing the new one + + !insertmacro PFI_LANG_STRING PFI_LANG_MINPERL_MBREMOLD "Delete everything in old minimal Perl folder before installing the new version ?${MB_NL}${MB_NL}($G_PLS_FIELD_1)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] *************** *** 461,464 **** --- 471,476 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" + !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] *************** *** 865,868 **** --- 877,885 ---- ; Uninstall Log Messages + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EXPRUN "Outlook Express is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OUTRUN "Outlook is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EUDRUN "Eudora is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_IGNORE "User requested restore while email program is running" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OPENED "Opened" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_RESTORED "Restored" Index: Italian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Italian-pfi.nsh,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** Italian-pfi.nsh 10 Feb 2005 22:55:31 -0000 1.37 --- Italian-pfi.nsh 2 Mar 2005 17:03:43 -0000 1.38 *************** *** 132,138 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" --- 132,144 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Standard MUI Page - DIRECTORY ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Used in message box shown if SFN support has been disabled [installer.nsi, adduser.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBNOSFN "To install on the '$G_PLS_FIELD_1' drive${MB_NL}${MB_NL}please select a folder location which does not contain spaces" + + ; Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" *************** *** 334,337 **** --- 340,347 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_XMLRPC "Installing POPFile XMLRPC files..." + ; Message box used to get permission to delete the old minimal Perl before installing the new one + + !insertmacro PFI_LANG_STRING PFI_LANG_MINPERL_MBREMOLD "Delete everything in old minimal Perl folder before installing the new version ?${MB_NL}${MB_NL}($G_PLS_FIELD_1)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] *************** *** 461,464 **** --- 471,476 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" + !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] *************** *** 865,868 **** --- 877,885 ---- ; Uninstall Log Messages + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EXPRUN "Outlook Express is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OUTRUN "Outlook is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EUDRUN "Eudora is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_IGNORE "User requested restore while email program is running" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OPENED "Opened" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_RESTORED "Restored" Index: Japanese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Japanese-pfi.nsh,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** Japanese-pfi.nsh 10 Feb 2005 22:55:31 -0000 1.58 --- Japanese-pfi.nsh 2 Mar 2005 17:03:43 -0000 1.59 *************** *** 132,138 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "AbvO[hµÜ·©H" --- 132,144 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Standard MUI Page - DIRECTORY ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Used in message box shown if SFN support has been disabled [installer.nsi, adduser.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBNOSFN "To install on the '$G_PLS_FIELD_1' drive${MB_NL}${MB_NL}please select a folder location which does not contain spaces" + + ; Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "AbvO[hµÜ·©H" *************** *** 344,347 **** --- 350,357 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_XMLRPC "POPFile XMLRPC t@CðCXg[..." + ; Message box used to get permission to delete the old minimal Perl before installing the new one + + !insertmacro PFI_LANG_STRING PFI_LANG_MINPERL_MBREMOLD "Delete everything in old minimal Perl folder before installing the new version ?${MB_NL}${MB_NL}($G_PLS_FIELD_1)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] *************** *** 471,474 **** --- 481,486 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" + !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] *************** *** 910,913 **** --- 922,930 ---- ; Uninstall Log Messages + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EXPRUN "Outlook Express is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OUTRUN "Outlook is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EUDRUN "Eudora is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_IGNORE "User requested restore while email program is running" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OPENED "Opened" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_RESTORED "Restored" Index: PortugueseBR-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/PortugueseBR-pfi.nsh,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** PortugueseBR-pfi.nsh 10 Feb 2005 22:55:33 -0000 1.64 --- PortugueseBR-pfi.nsh 2 Mar 2005 17:03:44 -0000 1.65 *************** *** 132,138 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Você quer atualizá-la?" --- 132,144 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Standard MUI Page - DIRECTORY ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Used in message box shown if SFN support has been disabled [installer.nsi, adduser.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBNOSFN "To install on the '$G_PLS_FIELD_1' drive${MB_NL}${MB_NL}please select a folder location which does not contain spaces" + + ; Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Você quer atualizá-la?" *************** *** 344,347 **** --- 350,357 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_XMLRPC "Instalando os arquivos XMLRPC do POPFile..." + ; Message box used to get permission to delete the old minimal Perl before installing the new one + + !insertmacro PFI_LANG_STRING PFI_LANG_MINPERL_MBREMOLD "Delete everything in old minimal Perl folder before installing the new version ?${MB_NL}${MB_NL}($G_PLS_FIELD_1)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] *************** *** 470,473 **** --- 480,485 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" + !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] *************** *** 909,912 **** --- 921,929 ---- ; Uninstall Log Messages + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EXPRUN "Outlook Express is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OUTRUN "Outlook is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EUDRUN "Eudora is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_IGNORE "User requested restore while email program is running" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OPENED "Aberto" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_RESTORED "Restaurado" Index: Hungarian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Hungarian-pfi.nsh,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** Hungarian-pfi.nsh 10 Feb 2005 22:55:30 -0000 1.47 --- Hungarian-pfi.nsh 2 Mar 2005 17:03:43 -0000 1.48 *************** *** 132,138 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" --- 132,144 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Standard MUI Page - DIRECTORY ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Used in message box shown if SFN support has been disabled [installer.nsi, adduser.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBNOSFN "To install on the '$G_PLS_FIELD_1' drive${MB_NL}${MB_NL}please select a folder location which does not contain spaces" + + ; Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" *************** *** 334,337 **** --- 340,347 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_XMLRPC "Installing POPFile XMLRPC files..." + ; Message box used to get permission to delete the old minimal Perl before installing the new one + + !insertmacro PFI_LANG_STRING PFI_LANG_MINPERL_MBREMOLD "Delete everything in old minimal Perl folder before installing the new version ?${MB_NL}${MB_NL}($G_PLS_FIELD_1)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] *************** *** 461,464 **** --- 471,476 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" + !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] *************** *** 865,868 **** --- 877,885 ---- ; Uninstall Log Messages + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EXPRUN "Outlook Express is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OUTRUN "Outlook is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EUDRUN "Eudora is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_IGNORE "User requested restore while email program is running" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OPENED "Opened" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_RESTORED "Restored" Index: Polish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Polish-pfi.nsh,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** Polish-pfi.nsh 10 Feb 2005 22:55:32 -0000 1.40 --- Polish-pfi.nsh 2 Mar 2005 17:03:44 -0000 1.41 *************** *** 132,138 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" --- 132,144 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Standard MUI Page - DIRECTORY ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Used in message box shown if SFN support has been disabled [installer.nsi, adduser.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBNOSFN "To install on the '$G_PLS_FIELD_1' drive${MB_NL}${MB_NL}please select a folder location which does not contain spaces" + + ; Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" *************** *** 334,337 **** --- 340,347 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_XMLRPC "Installing POPFile XMLRPC files..." + ; Message box used to get permission to delete the old minimal Perl before installing the new one + + !insertmacro PFI_LANG_STRING PFI_LANG_MINPERL_MBREMOLD "Delete everything in old minimal Perl folder before installing the new version ?${MB_NL}${MB_NL}($G_PLS_FIELD_1)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] *************** *** 461,464 **** --- 471,476 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" + !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] *************** *** 865,868 **** --- 877,885 ---- ; Uninstall Log Messages + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EXPRUN "Outlook Express is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OUTRUN "Outlook is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EUDRUN "Eudora is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_IGNORE "User requested restore while email program is running" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OPENED "Opened" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_RESTORED "Restored" Index: Greek-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Greek-pfi.nsh,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** Greek-pfi.nsh 10 Feb 2005 22:55:30 -0000 1.39 --- Greek-pfi.nsh 2 Mar 2005 17:03:43 -0000 1.40 *************** *** 132,138 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" --- 132,144 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Standard MUI Page - DIRECTORY ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Used in message box shown if SFN support has been disabled [installer.nsi, adduser.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBNOSFN "To install on the '$G_PLS_FIELD_1' drive${MB_NL}${MB_NL}please select a folder location which does not contain spaces" + + ; Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" *************** *** 334,337 **** --- 340,347 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_XMLRPC "Installing POPFile XMLRPC files..." + ; Message box used to get permission to delete the old minimal Perl before installing the new one + + !insertmacro PFI_LANG_STRING PFI_LANG_MINPERL_MBREMOLD "Delete everything in old minimal Perl folder before installing the new version ?${MB_NL}${MB_NL}($G_PLS_FIELD_1)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] *************** *** 461,464 **** --- 471,476 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" + !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] *************** *** 865,868 **** --- 877,885 ---- ; Uninstall Log Messages + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EXPRUN "Outlook Express is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OUTRUN "Outlook is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EUDRUN "Eudora is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_IGNORE "User requested restore while email program is running" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OPENED "Opened" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_RESTORED "Restored" Index: Norwegian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Norwegian-pfi.nsh,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** Norwegian-pfi.nsh 10 Feb 2005 22:55:32 -0000 1.33 --- Norwegian-pfi.nsh 2 Mar 2005 17:03:44 -0000 1.34 *************** *** 132,138 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" --- 132,144 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Standard MUI Page - DIRECTORY ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Used in message box shown if SFN support has been disabled [installer.nsi, adduser.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBNOSFN "To install on the '$G_PLS_FIELD_1' drive${MB_NL}${MB_NL}please select a folder location which does not contain spaces" + + ; Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" *************** *** 334,337 **** --- 340,347 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_XMLRPC "Installing POPFile XMLRPC files..." + ; Message box used to get permission to delete the old minimal Perl before installing the new one + + !insertmacro PFI_LANG_STRING PFI_LANG_MINPERL_MBREMOLD "Delete everything in old minimal Perl folder before installing the new version ?${MB_NL}${MB_NL}($G_PLS_FIELD_1)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] *************** *** 461,464 **** --- 471,476 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" + !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] *************** *** 865,868 **** --- 877,885 ---- ; Uninstall Log Messages + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EXPRUN "Outlook Express is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OUTRUN "Outlook is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EUDRUN "Eudora is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_IGNORE "User requested restore while email program is running" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OPENED "Opened" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_RESTORED "Restored" Index: Korean-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Korean-pfi.nsh,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** Korean-pfi.nsh 10 Feb 2005 22:55:32 -0000 1.48 --- Korean-pfi.nsh 2 Mar 2005 17:03:44 -0000 1.49 *************** *** 132,138 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" --- 132,144 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Standard MUI Page - DIRECTORY ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Used in message box shown if SFN support has been disabled [installer.nsi, adduser.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBNOSFN "To install on the '$G_PLS_FIELD_1' drive${MB_NL}${MB_NL}please select a folder location which does not contain spaces" + + ; Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" *************** *** 344,347 **** --- 350,357 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_XMLRPC "Installing POPFile XMLRPC files..." + ; Message box used to get permission to delete the old minimal Perl before installing the new one + + !insertmacro PFI_LANG_STRING PFI_LANG_MINPERL_MBREMOLD "Delete everything in old minimal Perl folder before installing the new version ?${MB_NL}${MB_NL}($G_PLS_FIELD_1)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] *************** *** 471,474 **** --- 481,486 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" + !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] *************** *** 910,913 **** --- 922,930 ---- ; Uninstall Log Messages + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EXPRUN "Outlook Express is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OUTRUN "Outlook is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EUDRUN "Eudora is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_IGNORE "User requested restore while email program is running" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OPENED "¿¸²" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_RESTORED "º¹¿øµÊ" |
|
From: Brian S. <xue...@us...> - 2005-03-02 16:59:04
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20480 Modified Files: Arabic-pfi.nsh Bulgarian-pfi.nsh Czech-pfi.nsh Danish-pfi.nsh Dutch-pfi.nsh English-pfi.nsh Finnish-pfi.nsh French-pfi.nsh German-pfi.nsh Log Message: New strings: (a) reporting "lack of SFN support" problems (b) removing old minimal Perl before installing the new version (c) better reporting of SSL download problems (d) better reporting of problems encountered when restoring email settings Index: Danish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Danish-pfi.nsh,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** Danish-pfi.nsh 10 Feb 2005 22:51:03 -0000 1.47 --- Danish-pfi.nsh 2 Mar 2005 16:58:45 -0000 1.48 *************** *** 132,138 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" --- 132,144 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Standard MUI Page - DIRECTORY ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Used in message box shown if SFN support has been disabled [installer.nsi, adduser.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBNOSFN "To install on the '$G_PLS_FIELD_1' drive${MB_NL}${MB_NL}please select a folder location which does not contain spaces" + + ; Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" *************** *** 334,337 **** --- 340,347 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_XMLRPC "Installing POPFile XMLRPC files..." + ; Message box used to get permission to delete the old minimal Perl before installing the new one + + !insertmacro PFI_LANG_STRING PFI_LANG_MINPERL_MBREMOLD "Delete everything in old minimal Perl folder before installing the new version ?${MB_NL}${MB_NL}($G_PLS_FIELD_1)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] *************** *** 461,464 **** --- 471,476 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" + !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] *************** *** 865,868 **** --- 877,885 ---- ; Uninstall Log Messages + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EXPRUN "Outlook Express is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OUTRUN "Outlook is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EUDRUN "Eudora is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_IGNORE "User requested restore while email program is running" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OPENED "Opened" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_RESTORED "Restored" Index: Czech-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Czech-pfi.nsh,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** Czech-pfi.nsh 10 Feb 2005 22:51:03 -0000 1.42 --- Czech-pfi.nsh 2 Mar 2005 16:58:45 -0000 1.43 *************** *** 132,138 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" --- 132,144 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Standard MUI Page - DIRECTORY ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Used in message box shown if SFN support has been disabled [installer.nsi, adduser.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBNOSFN "To install on the '$G_PLS_FIELD_1' drive${MB_NL}${MB_NL}please select a folder location which does not contain spaces" + + ; Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" *************** *** 334,337 **** --- 340,347 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_XMLRPC "Installing POPFile XMLRPC files..." + ; Message box used to get permission to delete the old minimal Perl before installing the new one + + !insertmacro PFI_LANG_STRING PFI_LANG_MINPERL_MBREMOLD "Delete everything in old minimal Perl folder before installing the new version ?${MB_NL}${MB_NL}($G_PLS_FIELD_1)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] *************** *** 461,464 **** --- 471,476 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" + !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] *************** *** 865,868 **** --- 877,885 ---- ; Uninstall Log Messages + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EXPRUN "Outlook Express is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OUTRUN "Outlook is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EUDRUN "Eudora is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_IGNORE "User requested restore while email program is running" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OPENED "Opened" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_RESTORED "Restored" Index: Dutch-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Dutch-pfi.nsh,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** Dutch-pfi.nsh 10 Feb 2005 22:51:04 -0000 1.47 --- Dutch-pfi.nsh 2 Mar 2005 16:58:46 -0000 1.48 *************** *** 132,138 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" --- 132,144 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Standard MUI Page - DIRECTORY ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Used in message box shown if SFN support has been disabled [installer.nsi, adduser.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBNOSFN "To install on the '$G_PLS_FIELD_1' drive${MB_NL}${MB_NL}please select a folder location which does not contain spaces" + + ; Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" *************** *** 334,337 **** --- 340,347 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_XMLRPC "Installing POPFile XMLRPC files..." + ; Message box used to get permission to delete the old minimal Perl before installing the new one + + !insertmacro PFI_LANG_STRING PFI_LANG_MINPERL_MBREMOLD "Delete everything in old minimal Perl folder before installing the new version ?${MB_NL}${MB_NL}($G_PLS_FIELD_1)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] *************** *** 461,464 **** --- 471,476 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" + !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] *************** *** 865,868 **** --- 877,885 ---- ; Uninstall Log Messages + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EXPRUN "Outlook Express is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OUTRUN "Outlook is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EUDRUN "Eudora is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_IGNORE "User requested restore while email program is running" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OPENED "Opened" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_RESTORED "Restored" Index: French-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/French-pfi.nsh,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** French-pfi.nsh 10 Feb 2005 23:17:13 -0000 1.50 --- French-pfi.nsh 2 Mar 2005 16:58:46 -0000 1.51 *************** *** 132,138 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Voulez-vous la mettre à jour ?" --- 132,144 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Standard MUI Page - DIRECTORY ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Used in message box shown if SFN support has been disabled [installer.nsi, adduser.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBNOSFN "To install on the '$G_PLS_FIELD_1' drive${MB_NL}${MB_NL}please select a folder location which does not contain spaces" + + ; Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Voulez-vous la mettre à jour ?" *************** *** 344,347 **** --- 350,357 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_XMLRPC "Installation des fichiers XMLRPC de POPFile..." + ; Message box used to get permission to delete the old minimal Perl before installing the new one + + !insertmacro PFI_LANG_STRING PFI_LANG_MINPERL_MBREMOLD "Delete everything in old minimal Perl folder before installing the new version ?${MB_NL}${MB_NL}($G_PLS_FIELD_1)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] *************** *** 471,474 **** --- 481,486 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" + !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] *************** *** 910,913 **** --- 922,930 ---- ; Uninstall Log Messages + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EXPRUN "Outlook Express is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OUTRUN "Outlook is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EUDRUN "Eudora is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_IGNORE "User requested restore while email program is running" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OPENED "Ouvert" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_RESTORED "Restauré" Index: German-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/German-pfi.nsh,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** German-pfi.nsh 10 Feb 2005 22:51:05 -0000 1.52 --- German-pfi.nsh 2 Mar 2005 16:58:46 -0000 1.53 *************** *** 134,140 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Wollen Sie die bestehende Version aktualisieren?" --- 134,146 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Standard MUI Page - DIRECTORY ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Used in message box shown if SFN support has been disabled [installer.nsi, adduser.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBNOSFN "To install on the '$G_PLS_FIELD_1' drive${MB_NL}${MB_NL}please select a folder location which does not contain spaces" + + ; Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Wollen Sie die bestehende Version aktualisieren?" *************** *** 346,349 **** --- 352,359 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_XMLRPC "Installiere POPFile XMLRPC Dateien..." + ; Message box used to get permission to delete the old minimal Perl before installing the new one + + !insertmacro PFI_LANG_STRING PFI_LANG_MINPERL_MBREMOLD "Delete everything in old minimal Perl folder before installing the new version ?${MB_NL}${MB_NL}($G_PLS_FIELD_1)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] *************** *** 473,476 **** --- 483,488 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" + !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] *************** *** 912,915 **** --- 924,932 ---- ; Uninstall Log Messages + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EXPRUN "Outlook Express is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OUTRUN "Outlook is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EUDRUN "Eudora is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_IGNORE "User requested restore while email program is running" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OPENED "Geöffnet" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_RESTORED "Wiederhergestellt" Index: Arabic-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Arabic-pfi.nsh,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Arabic-pfi.nsh 10 Feb 2005 22:51:02 -0000 1.20 --- Arabic-pfi.nsh 2 Mar 2005 16:58:45 -0000 1.21 *************** *** 132,138 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "åá ÊÑíÏ ÊÑÞíÊåÇ¿" --- 132,144 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Standard MUI Page - DIRECTORY ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Used in message box shown if SFN support has been disabled [installer.nsi, adduser.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBNOSFN "To install on the '$G_PLS_FIELD_1' drive${MB_NL}${MB_NL}please select a folder location which does not contain spaces" + + ; Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "åá ÊÑíÏ ÊÑÞíÊåÇ¿" *************** *** 344,347 **** --- 350,357 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_XMLRPC "ÊäÕíÈ ãáÝÇÊ XMLRPC..." + ; Message box used to get permission to delete the old minimal Perl before installing the new one + + !insertmacro PFI_LANG_STRING PFI_LANG_MINPERL_MBREMOLD "Delete everything in old minimal Perl folder before installing the new version ?${MB_NL}${MB_NL}($G_PLS_FIELD_1)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] *************** *** 470,473 **** --- 480,485 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" + !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] *************** *** 909,912 **** --- 921,929 ---- ; Uninstall Log Messages + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EXPRUN "Outlook Express is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OUTRUN "Outlook is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EUDRUN "Eudora is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_IGNORE "User requested restore while email program is running" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OPENED "Opened" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_RESTORED "Restored" Index: English-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/English-pfi.nsh,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** English-pfi.nsh 10 Feb 2005 22:51:04 -0000 1.49 --- English-pfi.nsh 2 Mar 2005 16:58:46 -0000 1.50 *************** *** 127,133 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" --- 127,139 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Standard MUI Page - DIRECTORY ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Used in message box shown if SFN support has been disabled [installer.nsi, adduser.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBNOSFN "To install on the '$G_PLS_FIELD_1' drive${MB_NL}${MB_NL}please select a folder location which does not contain spaces" + + ; Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" *************** *** 329,332 **** --- 335,342 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_XMLRPC "Installing POPFile XMLRPC files..." + ; Message box used to get permission to delete the old minimal Perl before installing the new one + + !insertmacro PFI_LANG_STRING PFI_LANG_MINPERL_MBREMOLD "Delete everything in old minimal Perl folder before installing the new version ?${MB_NL}${MB_NL}($G_PLS_FIELD_1)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] *************** *** 456,459 **** --- 466,471 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" + !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] *************** *** 855,858 **** --- 867,875 ---- ; Uninstall Log Messages + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EXPRUN "Outlook Express is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OUTRUN "Outlook is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EUDRUN "Eudora is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_IGNORE "User requested restore while email program is running" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OPENED "Opened" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_RESTORED "Restored" Index: Bulgarian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Bulgarian-pfi.nsh,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** Bulgarian-pfi.nsh 10 Feb 2005 22:51:02 -0000 1.47 --- Bulgarian-pfi.nsh 2 Mar 2005 16:58:45 -0000 1.48 *************** *** 132,138 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" --- 132,144 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Standard MUI Page - DIRECTORY ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Used in message box shown if SFN support has been disabled [installer.nsi, adduser.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBNOSFN "To install on the '$G_PLS_FIELD_1' drive${MB_NL}${MB_NL}please select a folder location which does not contain spaces" + + ; Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" *************** *** 334,337 **** --- 340,347 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_XMLRPC "Installing POPFile XMLRPC files..." + ; Message box used to get permission to delete the old minimal Perl before installing the new one + + !insertmacro PFI_LANG_STRING PFI_LANG_MINPERL_MBREMOLD "Delete everything in old minimal Perl folder before installing the new version ?${MB_NL}${MB_NL}($G_PLS_FIELD_1)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] *************** *** 461,464 **** --- 471,476 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" + !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] *************** *** 865,868 **** --- 877,885 ---- ; Uninstall Log Messages + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EXPRUN "Outlook Express is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OUTRUN "Outlook is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EUDRUN "Eudora is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_IGNORE "User requested restore while email program is running" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OPENED "Opened" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_RESTORED "Restored" Index: Finnish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Finnish-pfi.nsh,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** Finnish-pfi.nsh 10 Feb 2005 22:51:04 -0000 1.47 --- Finnish-pfi.nsh 2 Mar 2005 16:58:46 -0000 1.48 *************** *** 132,138 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" --- 132,144 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ; Shared: Standard MUI Page - DIRECTORY ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Used in message box shown if SFN support has been disabled [installer.nsi, adduser.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBNOSFN "To install on the '$G_PLS_FIELD_1' drive${MB_NL}${MB_NL}please select a folder location which does not contain spaces" + + ; Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] + !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" *************** *** 334,337 **** --- 340,347 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_XMLRPC "Installing POPFile XMLRPC files..." + ; Message box used to get permission to delete the old minimal Perl before installing the new one + + !insertmacro PFI_LANG_STRING PFI_LANG_MINPERL_MBREMOLD "Delete everything in old minimal Perl folder before installing the new version ?${MB_NL}${MB_NL}($G_PLS_FIELD_1)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] *************** *** 461,464 **** --- 471,476 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" + !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] *************** *** 865,868 **** --- 877,885 ---- ; Uninstall Log Messages + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EXPRUN "Outlook Express is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OUTRUN "Outlook is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EUDRUN "Eudora is still running!" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_IGNORE "User requested restore while email program is running" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OPENED "Opened" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_RESTORED "Restored" |
|
From: Manni H. <man...@us...> - 2005-02-28 17:00:45
|
Update of /cvsroot/popfile/engine In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1817 Modified Files: popfile.pl Added Files: popfile-check-setup.pl Log Message: Move checking of the packing list to a separate script to prevent all sort of strange errors. --- NEW FILE: popfile-check-setup.pl --- #!/usr/bin/perl # ---------------------------------------------------------------------------- # # popfile-check-setup.pl # # Checks whether the modules specified in the file popfile.pck are # installed. # # Copyright (c) 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 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 # # ---------------------------------------------------------------------------- my $packing_list = defined($ENV{POPFILE_ROOT})?$ENV{POPFILE_ROOT}:'./'; $packing_list =~ s/[\\\/]$//; $packing_list .= '/popfile.pck'; my $fatal = 0; if ( open PACKING, "<$packing_list" ) { while (<PACKING>) { if ( /^(REQUIRED|OPTIONAL-([^\t]+))\t([^\t]+)\t([^\r\n]+)/ ) { my ( $required, $why, $version, $module ) = ( $1, $2, $3, $4 ); # Find the module and set $ver to the loaded version, or -1 if # the module was not found local $::SIG{__DIE__}; local $::SIG{__WARN__}; eval "require $module"; my $ver = ${"${module}::VERSION"} || ${"${module}::Version"} || 0; $ver = ${"${module}::VERSION"} || ${"${module}::Version"} || 0; $ver = -1 if $@; if ( $ver eq '-1' ) { if ( $required eq 'REQUIRED' ) { $fatal = 1; print STDERR "ERROR: POPFile needs Perl module $module, please install it.\n"; } else { print STDERR "WARNING: POPFile may require Perl module $module; it is needed for \"$why\".\n"; } } } } close PACKING; } else { print STDERR "WARNING: Couldn't open POPFile packing list ($packing_list) so cannot check configuration\n"; } Index: popfile.pl =================================================================== RCS file: /cvsroot/popfile/engine/popfile.pl,v retrieving revision 1.229 retrieving revision 1.230 diff -C2 -d -r1.229 -r1.230 *** popfile.pl 24 Feb 2005 22:44:58 -0000 1.229 --- popfile.pl 28 Feb 2005 17:00:27 -0000 1.230 *************** *** 9,13 **** # which category the message belongs in and much more... # ! # Copyright (c) 2001-2004 John Graham-Cumming # # This file is part of POPFile --- 9,13 ---- # which category the message belongs in and much more... # ! # Copyright (c) 2001-2005 John Graham-Cumming # # This file is part of POPFile *************** *** 31,74 **** # ---------------------------------------------------------------------------- - # Check the packing list of POPFile to ensure that all the required - # modules are present. - - my $packing_list = defined($ENV{POPFILE_ROOT})?$ENV{POPFILE_ROOT}:'./'; - $packing_list =~ s/[\\\/]$//; - $packing_list .= '/popfile.pck'; - - my $fatal = 0; - my $log = ''; - - if ( open PACKING, "<$packing_list" ) { - while (<PACKING>) { - if ( /^(REQUIRED|OPTIONAL-([^\t]+))\t([^\t]+)\t([^\r\n]+)/ ) { - my ( $required, $why, $version, $module ) = ( $1, $2, $3, $4 ); - - # Find the module and set $ver to the loaded version, or -1 if - # the module was not found - - local $::SIG{__DIE__}; - local $::SIG{__WARN__}; - eval "require $module"; - my $ver = ${"${module}::VERSION"} || ${"${module}::Version"} || 0; - $ver = ${"${module}::VERSION"} || ${"${module}::Version"} || 0; - $ver = -1 if $@; - - if ( $ver eq '-1' ) { - if ( $required eq 'REQUIRED' ) { - $fatal = 1; - print STDERR "ERROR: POPFile needs Perl module $module, please install it.\n"; - } else { - $log .= "WARNING: POPFile may require Perl module $module; it is needed for \"$why\".\n"; - } - } - } - } - close PACKING; - } else { - $log .= "WARNING: Couldn't open POPFile packing list ($packing_list) so cannot check configuration\n"; - } - use strict; use locale; --- 31,34 ---- *************** *** 98,108 **** $POPFile->CORE_start(); - # If there were any log messages from the packing list check then - # log them now - - if ( $log ne '' ) { - $POPFile->get_module( 'POPFile::Logger' )->debug( 0, $log ); - } - # This is the main POPFile loop that services requests, it will # exit only when we need to exit --- 58,61 ---- |
|
From: Sam S. <ssc...@us...> - 2005-02-28 12:36:16
|
Update of /cvsroot/popfile/engine/Proxy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21831/Proxy Modified Files: Proxy.pm Log Message: Test coverage for configure_item, validate_item and register_configuration_item for Proxy::Proxy Coverage now at 91%, coverage still needed for SSL and socks connection method Index: Proxy.pm =================================================================== RCS file: /cvsroot/popfile/engine/Proxy/Proxy.pm,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** Proxy.pm 20 Feb 2005 10:06:01 -0000 1.57 --- Proxy.pm 28 Feb 2005 12:36:06 -0000 1.58 *************** *** 214,219 **** # we're off. ! if ( ( defined( $self->{selector__}->can_read(0) ) ) && ! ( $self->{alive_} ) ) { if ( my $client = $self->{server__}->accept() ) { --- 214,219 ---- # we're off. ! if ( ( defined( $self->{selector__}->can_read(0) ) ) && # PROFILE BLOCK START ! ( $self->{alive_} ) ) { # PROFILE BLOCK STOP if ( my $client = $self->{server__}->accept() ) { *************** *** 221,226 **** if ( $self->{api_session__} eq '' ) { ! $self->{api_session__} = ! $self->classifier_()->get_session_key( 'admin', '' ); } --- 221,226 ---- if ( $self->{api_session__} eq '' ) { ! $self->{api_session__} = # PROFILE BLOCK START ! $self->classifier_()->get_session_key( 'admin', '' ); # PROFILE BLOCK STOP } *************** *** 230,238 **** # just anyone's email ! my ( $remote_port, $remote_host ) = sockaddr_in( ! $client->peername() ); ! if ( ( ( $self->config_( 'local' ) || 0 ) == 0 ) || ! ( $remote_host eq inet_aton( "127.0.0.1" ) ) ) { # If we have force_fork turned on then we will do a --- 230,238 ---- # just anyone's email ! my ( $remote_port, $remote_host ) = sockaddr_in( # PROFILE BLOCK START ! $client->peername() ); # PROFILE BLOCK STOP ! if ( ( ( $self->config_( 'local' ) || 0 ) == 0 ) || # PROFILE BLOCK START ! ( $remote_host eq inet_aton( "127.0.0.1" ) ) ) { # PROFILE BLOCK STOP # If we have force_fork turned on then we will do a *************** *** 250,255 **** if ( !defined( $pid ) || ( $pid == 0 ) ) { ! $self->{child_}( $self, $client, ! $self->{api_session__} ); if ( defined( $pid ) ) { &{$self->{childexit_}}(0) --- 250,255 ---- if ( !defined( $pid ) || ( $pid == 0 ) ) { ! $self->{child_}( $self, $client, # PROFILE BLOCK START ! $self->{api_session__} ); # PROFILE BLOCK STOP if ( defined( $pid ) ) { &{$self->{childexit_}}(0) *************** *** 589,595 **** my ( $self, $name, $templ ) = @_; ! $templ->param( 'Socks_Widget_Name' => $self->name() ); ! $templ->param( 'Socks_Server' => $self->config_( 'socks_server' ) ); ! $templ->param( 'Socks_Port' => $self->config_( 'socks_port' ) ); } --- 589,600 ---- my ( $self, $name, $templ ) = @_; ! my $me = $self->name(); ! ! if ( $name eq $me . "_socks_configuration" ) { ! ! $templ->param( 'Socks_Widget_Name' => $me ); ! $templ->param( 'Socks_Server' => $self->config_( 'socks_server' ) ); ! $templ->param( 'Socks_Port' => $self->config_( 'socks_port' ) ); ! } } *************** *** 613,629 **** my ($status, $error); ! if ( defined($$form{"$me" . "_socks_port"}) ) { ! if ( ( $$form{"$me" . "_socks_port"} >= 1 ) && ( $$form{"$me" . "_socks_port"} < 65536 ) ) { ! $self->config_( 'socks_port', $$form{"$me" . "_socks_port"} ); ! $status = sprintf( $$language{Configuration_SOCKSPortUpdate}, $self->config_( 'socks_port' ) ); ! } else { ! $error = $$language{Configuration_Error8}; } - } ! if ( defined($$form{"$me" . "_socks_server"}) ) { ! $self->config_( 'socks_server', $$form{"$me" . "_socks_server"} ); ! $status .= "\n" if (defined $status); ! $status .= sprintf( $$language{Configuration_SOCKSServerUpdate}, $self->config_( 'socks_server' ) ); } --- 618,636 ---- my ($status, $error); ! if ( $name eq $me . "_socks_configuration" ) { ! if ( defined($$form{"$me" . "_socks_port"}) ) { ! if ( ( $$form{"$me" . "_socks_port"} >= 1 ) && ( $$form{"$me" . "_socks_port"} < 65536 ) ) { ! $self->config_( 'socks_port', $$form{"$me" . "_socks_port"} ); ! $status = sprintf( $$language{Configuration_SOCKSPortUpdate}, $self->config_( 'socks_port' ) ); ! } else { ! $error = $$language{Configuration_Error8}; ! } } ! if ( defined($$form{"$me" . "_socks_server"}) ) { ! $self->config_( 'socks_server', $$form{"$me" . "_socks_server"} ); ! $status .= "\n" if (defined $status); ! $status .= sprintf( $$language{Configuration_SOCKSServerUpdate}, $self->config_( 'socks_server' ) ); ! } } |
|
From: Sam S. <ssc...@us...> - 2005-02-28 12:36:15
|
Update of /cvsroot/popfile/engine/POPFile In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21831/POPFile Modified Files: MQ.pm Log Message: Test coverage for configure_item, validate_item and register_configuration_item for Proxy::Proxy Coverage now at 91%, coverage still needed for SSL and socks connection method Index: MQ.pm =================================================================== RCS file: /cvsroot/popfile/engine/POPFile/MQ.pm,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** MQ.pm 4 Jan 2005 22:50:55 -0000 1.19 --- MQ.pm 28 Feb 2005 12:36:04 -0000 1.20 *************** *** 12,16 **** # its messages. # ! # Message delivery is asynchronous and guaranteed, as well as guaranteed # first in, first out (FIFO) per process. # --- 12,16 ---- # its messages. # ! # Message delivery is asynchronous and guaranteed, as well as guaranteed # first in, first out (FIFO) per process. # *************** *** 38,42 **** # to POPFile::History::commit_slot # ! # RELSE Sent when a session key is being released by a client # # Copyright (c) 2001-2004 John Graham-Cumming --- 38,42 ---- # to POPFile::History::commit_slot # ! # RELSE Sent when a session key is being released by a client # # Copyright (c) 2001-2004 John Graham-Cumming |
|
From: Sam S. <ssc...@us...> - 2005-02-28 12:36:15
|
Update of /cvsroot/popfile/engine/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21831/tests Modified Files: TestProxy.tst Log Message: Test coverage for configure_item, validate_item and register_configuration_item for Proxy::Proxy Coverage now at 91%, coverage still needed for SSL and socks connection method Index: TestProxy.tst =================================================================== RCS file: /cvsroot/popfile/engine/tests/TestProxy.tst,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** TestProxy.tst 3 Sep 2004 15:35:40 -0000 1.24 --- TestProxy.tst 28 Feb 2005 12:36:04 -0000 1.25 *************** *** 25,30 **** unlink 'popfile.db'; ! use POPFile::MQ; ! my $mq = new POPFile::MQ; sub forker --- 25,47 ---- unlink 'popfile.db'; ! use POPFile::Loader; ! my $POPFile = POPFile::Loader->new(); ! $POPFile->CORE_loader_init(); ! $POPFile->CORE_signals(); ! ! my %valid = ( 'POPFile/Module' => 1, ! 'POPFile/Logger' => 1, ! 'POPFile/MQ' => 1, ! 'POPFile/Configuration' => 1, ! 'POPFile/Database' =>1, ! 'Classifier/Bayes' => 1 ); ! ! $POPFile->CORE_load( 0, \%valid ); ! $POPFile->CORE_initialize(); ! $POPFile->CORE_config( 1 ); ! $POPFile->CORE_start(); ! ! my $mq = $POPFile->get_module('POPFile::MQ'); ! my $l = $POPFile->get_module('POPFile::Logger'); sub forker *************** *** 73,120 **** } - use Classifier::Bayes; - use POPFile::Configuration; - use POPFile::Logger; use Proxy::Proxy; use IO::Handle; use IO::Socket; ! my $c = new POPFile::Configuration; ! my $l = new POPFile::Logger; ! my $p = new Proxy::Proxy ! my $b = new Classifier::Bayes; ! ! $c->configuration( $c ); ! $c->mq( $mq ); ! $c->logger( $l ); ! ! $c->initialize(); ! ! $b->configuration( $c ); ! $b->mq( $mq ); ! $b->logger( $l ); ! ! $b->initialize(); ! ! $l->configuration( $c ); ! $l->mq( $mq ); ! $l->logger( $l ); ! ! $l->initialize(); ! $l->start(); ! $mq->configuration( $c ); ! $mq->mq( $mq ); ! $mq->logger( $l ); ! $p->configuration( $c ); ! $p->mq( $mq ); ! $p->logger( $l ); $p->initialize(); - $p->classifier( $b ); ! $b->module_config_( 'html', 'language', 'English' ); ! $b->start(); test_assert_equal( $p->config_( 'enabled' ), 1 ); --- 90,112 ---- } use Proxy::Proxy; use IO::Handle; use IO::Socket; ! my $p = new Proxy::Proxy; ! #my $b = new Classifier::Bayes; ! #$b->configuration( $c ); ! #$b->mq( $mq ); ! #$b->logger( $l ); ! # ! #$b->initialize(); ! $p->loader( $POPFile ); $p->initialize(); ! #$b->module_config_( 'html', 'language', 'English' ); ! #$b->start(); test_assert_equal( $p->config_( 'enabled' ), 1 ); *************** *** 127,132 **** # Exercise the classifier setter ! $p->classifier( 'foo' ); ! test_assert_equal( $p->{classifier__}, 'foo' ); # Test the helper methods of Proxy --- 119,131 ---- # Exercise the classifier setter ! #$p->classifier( 'foo' ); ! #test_assert_equal( $p->{classifier__}, 'foo' ); ! ! # To test Proxy's use of MQ, we need to receive messages ! use Test::MQReceiver; ! ! my $rmq = new Test::MQReceiver; ! ! $mq->register( 'UIREG', $rmq ); # Test the helper methods of Proxy *************** *** 134,147 **** my $sp = new Test::SimpleProxy; ! $sp->configuration( $c ); ! $sp->mq( $mq ); ! $sp->logger( $l ); $sp->forker( \&forker ); $mq->pipeready( \&pipeready ); ! $sp->classifier( $b ); $sp->initialize(); $sp->config_( 'port', $port ); $sp->config_( 'force_fork', 1 ); --- 133,147 ---- my $sp = new Test::SimpleProxy; ! $sp->loader( $POPFile ); $sp->forker( \&forker ); $mq->pipeready( \&pipeready ); ! #$sp->classifier( $b ); $sp->initialize(); + + $sp->setchildexit( $POPFile->{childexit__} ); + $sp->config_( 'port', $port ); $sp->config_( 'force_fork', 1 ); *************** *** 149,152 **** --- 149,239 ---- test_assert_equal( $sp->start_server(), 1 ); + # Test dynamic UI + + # $sp->start() should send a UIREG message: + + $mq->service(); + my @messages = $rmq->read(); + + test_assert_equal( $#messages, 0 ); + test_assert_equal( $messages[0][0], 'UIREG' ); + test_assert_equal( $#{$messages[0][1]}, 3 ); + test_assert_equal( $messages[0][1][0], 'configuration' ); + test_assert_equal( $messages[0][1][1], 'simple_socks_configuration' ); + test_assert_equal( $messages[0][1][2], 'socks-widget.thtml' ); + test_assert_equal( ref $messages[0][1][3], 'Test::SimpleProxy' ); + + # Test configure_item + + use Test::SimpleTemplate; + + my $templ = new Test::SimpleTemplate; + + # nothing happens for unknown configuration item names + + $sp->configure_item('foo', $templ); + my $params = $templ->{params__}; + test_assert_equal( scalar( keys(%{$params}) ), 0); + + # the right things have to happen for known configuration item names + + $sp->configure_item('simple_socks_configuration', $templ); + $params = $templ->{params__}; + test_assert_equal( scalar( keys( %{$params} ) ), 3); + test_assert_equal( $templ->param( 'Socks_Widget_Name' ), 'simple' ); + test_assert_equal( $templ->param( 'Socks_Server' ), $sp->config_( 'socks_server' ) ); + test_assert_equal( $templ->param( 'Socks_Port' ), $sp->config_( 'socks_port' ) ); + + # test changing/validating of configuration values + + my $form = {}; + my $language= {}; + + my ($status, $error); + + test_assert_equal( $sp->config_( 'socks_port' ), 1080 ); + + $form->{simple_socks_port} = 10080; + $language->{Configuration_SOCKSPortUpdate} = "socks port update %s"; + + ($status, $error) = $sp->validate_item( 'simple_socks_configuration', $templ, $language, $form ); + + test_assert_equal( $status, "socks port update 10080"); + test_assert_equal( defined( $error), defined(undef) ); + test_assert_equal( $sp->config_( 'socks_port' ), 10080 ); + + $sp->config_( 'socks_port', 1080 ); + + $form->{simple_socks_port} = 'aaa'; + $language->{Configuration_Error8} = "configuration error 8"; + + ($status, $error) = $sp->validate_item( 'simple_socks_configuration', $templ, $language, $form ); + + test_assert_equal( $error, "configuration error 8"); + test_assert_equal( defined( $status), defined(undef) ); + test_assert_equal( $sp->config_( 'socks_port' ), 1080 ); + + $form->{simple_socks_server} = 'example.com'; + $language->{Configuration_SOCKSServerUpdate} = 'socks server update %s'; + delete $form->{simple_socks_port}; + + ($status, $error) = $sp->validate_item( 'simple_socks_configuration', $templ, $language, $form ); + + test_assert_equal( $status, "socks server update example.com"); + test_assert_equal( defined( $error ), defined(undef) ); + test_assert_equal( $sp->config_( 'socks_server' ), 'example.com' ); + + $form->{simple_socks_port} = '10081'; + $form->{simple_socks_server} = 'subdomain.example.com'; + + ($status, $error) = $sp->validate_item( 'simple_socks_configuration', $templ, $language, $form ); + + test_assert_equal( $status, "socks port update 10081\nsocks server update subdomain.example.com"); + test_assert_equal( defined( $error ), defined(undef) ); + test_assert_equal( $sp->config_( 'socks_server' ), 'subdomain.example.com' ); + test_assert_equal( $sp->config_( 'socks_port' ), 10081 ); + + $sp->config_( 'socks_server', '' ); + # Now connect a socket to the proxy through which # we can test it *************** *** 203,207 **** close TEMP; open TEMP, "<temp.tmp"; ! my $line = <TEMP>; test_assert_regexp( $line, 'before1' ); $line = <TEMP>; --- 290,294 ---- close TEMP; open TEMP, "<temp.tmp"; ! $line = <TEMP>; test_assert_regexp( $line, 'before1' ); $line = <TEMP>; *************** *** 404,415 **** close TEMP; - # Check that we receive the messages sent up the pipe - - use Test::MQReceiver; - my $r = new Test::MQReceiver; - # Register three different message types ! $mq->register( 'LOGIN', $r ); # Close down the child process --- 491,497 ---- close TEMP; # Register three different message types ! $mq->register( 'LOGIN', $rmq ); # Close down the child process *************** *** 434,438 **** $mq->service(); ! my @messages = $r->read(); test_assert_equal( $#messages, 0 ); test_assert_equal( $messages[0][0], 'LOGIN' ); --- 516,520 ---- $mq->service(); ! @messages = $rmq->read(); test_assert_equal( $#messages, 0 ); test_assert_equal( $messages[0][0], 'LOGIN' ); *************** *** 443,456 **** $sp = new Test::SimpleProxy; ! $sp->configuration( $c ); ! $sp->mq( $mq ); ! $sp->logger( $l ); ! $sp->forker( \&forker ); $sp->initialize(); $sp->config_( 'port', $port ); ! $sp->classifier( $b ); test_assert_equal( $sp->start(), 1 ); --- 525,536 ---- $sp = new Test::SimpleProxy; ! $sp->loader( $POPFile ); $sp->forker( \&forker ); $sp->initialize(); + $sp->setchildexit( $POPFile->{childexit__} ); $sp->config_( 'port', $port ); ! #$sp->classifier( $b ); test_assert_equal( $sp->start(), 1 ); *************** *** 487,500 **** $sp = new Test::SimpleProxy; ! $sp->configuration( $c ); ! $sp->mq( $mq ); ! $sp->logger( $l ); ! $sp->forker( \&forker ); $sp->initialize(); $sp->config_( 'port', $port ); ! $sp->classifier( $b ); test_assert_equal( $sp->start(), 1 ); --- 567,578 ---- $sp = new Test::SimpleProxy; ! $sp->loader( $POPFile ); $sp->forker( \&forker ); $sp->initialize(); + $sp->setchildexit( $POPFile->{childexit__} ); $sp->config_( 'port', $port ); ! #$sp->classifier( $b ); test_assert_equal( $sp->start(), 1 ); *************** *** 532,539 **** $sp = new Test::SimpleProxy; ! $sp->configuration( $c ); ! $sp->mq( $mq ); ! $sp->logger( $l ); ! $sp->forker( \&forker ); --- 610,614 ---- $sp = new Test::SimpleProxy; ! $sp->loader( $POPFile ); $sp->forker( \&forker ); *************** *** 541,545 **** $sp->config_( 'port', $port ); ! $sp->classifier( $b ); $sp->{connection_failed_error_} = 'failed error'; --- 616,620 ---- $sp->config_( 'port', $port ); ! #$sp->classifier( $b ); $sp->{connection_failed_error_} = 'failed error'; *************** *** 560,567 **** my $sp2 = new Test::SimpleProxy; ! $sp2->configuration( $c ); ! $sp2->mq( $mq ); ! $sp2->logger( $l ); ! $sp2->forker( \&forker ); --- 635,639 ---- my $sp2 = new Test::SimpleProxy; ! $sp2->loader( $POPFile ); $sp2->forker( \&forker ); *************** *** 569,573 **** $sp2->config_( 'port', -1 ); ! $sp2->classifier( $b ); open (STDERR, ">stdout.tmp"); --- 641,645 ---- $sp2->config_( 'port', -1 ); ! #$sp2->classifier( $b ); open (STDERR, ">stdout.tmp"); *************** *** 584,588 **** $sp2->stop(); ! $b->stop(); 1; --- 656,660 ---- $sp2->stop(); ! #$b->stop(); 1; |
|
From: Sam S. <ssc...@us...> - 2005-02-28 12:36:15
|
Update of /cvsroot/popfile/engine/Test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21831/Test Added Files: SimpleTemplate.pm Log Message: Test coverage for configure_item, validate_item and register_configuration_item for Proxy::Proxy Coverage now at 91%, coverage still needed for SSL and socks connection method --- NEW FILE: SimpleTemplate.pm --- package Test::SimpleTemplate; # ---------------------------------------------------------------------------- # # A helper class for testing template use # # Copyright (c) 2001-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 # # ---------------------------------------------------------------------------- #---------------------------------------------------------------------------- # new # # Class new() function #---------------------------------------------------------------------------- sub new { my $type = shift; $self->{params__} = {}; return bless $self, $type; } #---------------------------------------------------------------------------- # param # # A re-implementation of HTML::Template->param() that does nothing except # blindly modify an internal hash without ever dying or failing # All three calling modes of HTML::Template->param() are supported # (parameterless, value get, value set) #---------------------------------------------------------------------------- sub param { my $self = shift; $params = $self->{params__}; return keys(%{$params}) unless scalar(@_); my $first = shift; my $type = ref $first; # the one-parameter case - could be a parameter value request or a # hash-ref. if (!scalar(@_) and !length($type)) { return undef unless (exists($params->{$first}) and defined($params->{$first})); return $params->{$first}; } if (!scalar(@_)) { push( @_, %$first ); } else { unshift( @_, $first ); } my %hash = @_; # Take each input and copy it into our params__ hash foreach my $key ( keys( %hash ) ) { $self->{params__}->{$key} = $hash{$key}; } } 1; |
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25399/skins/default Modified Files: nntp-separator.thtml nntp-port.thtml smtp-chain-server-port.thtml xmlrpc-port.thtml smtp-chain-server.thtml smtp-configuration.thtml Log Message: Continue refactoring HTML UI "status" and "error" messages to use the new status_message__ and error_message__ functions. Progress: All proxy and UI dynamic widgets complete. IMAP _not_ done. Tests forthcoming. Also, these changes make the configuration widgets presentation-language agnostic. That is pretty neat. Perhaps XMLRPC could provide a source-validated configuration API. Index: smtp-chain-server.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/smtp-chain-server.thtml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** smtp-chain-server.thtml 15 Feb 2005 04:23:54 -0000 1.3 --- smtp-chain-server.thtml 25 Feb 2005 21:53:51 -0000 1.4 *************** *** 6,17 **** <input type="text" name="smtp_chain_server" id="securitySecureServer" value="<TMPL_VAR NAME="smtp_chain_server">" /> <input type="submit" class="submit" name="update_smtp_server" value="<TMPL_VAR NAME="Localize_Apply">" /> - - <TMPL_IF NAME="smtp_server_feedback"> - - <blockquote> - <TMPL_VAR NAME="smtp_server_feedback"> - </blockquote> - - </TMPL_IF> - </form> --- 6,8 ---- Index: smtp-configuration.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/smtp-configuration.thtml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** smtp-configuration.thtml 15 Feb 2005 04:23:54 -0000 1.5 --- smtp-configuration.thtml 25 Feb 2005 21:53:51 -0000 1.6 *************** *** 8,12 **** <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> <TMPL_IF NAME="smtp_force_fork_on"> ! <span class="securityWidgetStateOn"> <TMPL_VAR NAME="Localize_Yes"> --- 8,12 ---- <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> <TMPL_IF NAME="smtp_force_fork_on"> ! <span class="securityWidgetStateOn"> <TMPL_VAR NAME="Localize_Yes"> *************** *** 14,20 **** <input type="submit" class="toggleOff" id="windowTrayIconOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" /> <input type="hidden" name="smtp_force_fork" value="0" /> ! <TMPL_ELSE> ! <span class="securityWidgetStateOff"> <TMPL_VAR NAME="Localize_No"> --- 14,20 ---- <input type="submit" class="toggleOff" id="windowTrayIconOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" /> <input type="hidden" name="smtp_force_fork" value="0" /> ! <TMPL_ELSE> ! <span class="securityWidgetStateOff"> <TMPL_VAR NAME="Localize_No"> *************** *** 22,28 **** <input type="submit" class="toggleOn" id="windowTrayIconOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> <input type="hidden" name="smtp_force_fork" value="1" /> ! </TMPL_IF> ! </form> </td> --- 22,28 ---- <input type="submit" class="toggleOn" id="windowTrayIconOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> <input type="hidden" name="smtp_force_fork" value="1" /> ! </TMPL_IF> ! </form> </td> *************** *** 39,52 **** <input name="smtp_port" type="text" id="configPopPort" value="<TMPL_VAR NAME="smtp_port">" /> <input type="submit" class="submit" name="update_smtp_port" value="<TMPL_VAR NAME="Localize_Apply">" /> ! ! <TMPL_IF NAME="smtp_port_feedback"> ! <p> ! <div class="error01"> ! <TMPL_VAR NAME="smtp_port_feedback"> ! </div> ! </p> ! ! </TMPL_IF> ! </form> </td> --- 39,43 ---- <input name="smtp_port" type="text" id="configPopPort" value="<TMPL_VAR NAME="smtp_port">" /> <input type="submit" class="submit" name="update_smtp_port" value="<TMPL_VAR NAME="Localize_Apply">" /> ! </form> </td> Index: smtp-chain-server-port.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/smtp-chain-server-port.thtml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** smtp-chain-server-port.thtml 15 Feb 2005 04:23:54 -0000 1.3 --- smtp-chain-server-port.thtml 25 Feb 2005 21:53:51 -0000 1.4 *************** *** 6,17 **** <input type="text" name="smtp_chain_server_port" id="securitySecurePort" value="<TMPL_VAR NAME="smtp_chain_port">" /> <input type="submit" class="submit" name="update_smtp_server_port" value="<TMPL_VAR NAME="Localize_Apply">" /> - - <TMPL_IF NAME="smtp_port_feedback"> - - <blockquote> - <TMPL_VAR NAME="smtp_port_feedback"> - </blockquote> - - </TMPL_IF> - </form> --- 6,8 ---- Index: nntp-port.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/nntp-port.thtml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** nntp-port.thtml 15 Feb 2005 04:23:54 -0000 1.2 --- nntp-port.thtml 25 Feb 2005 21:53:51 -0000 1.3 *************** *** 1,3 **** ! <form action="/configuration" method="post"> <label class="configurationLabel" for="configPopPort"> <TMPL_VAR NAME="Localize_Configuration_NNTPPort">: --- 1,3 ---- ! <form action="/administration" method="post"> <label class="configurationLabel" for="configPopPort"> <TMPL_VAR NAME="Localize_Configuration_NNTPPort">: *************** *** 6,17 **** <input name="nntp_port" type="text" id="configPopPort" value="<TMPL_VAR NAME="nntp_port">" /> <input type="submit" class="submit" name="update_nntp_port" value="<TMPL_VAR NAME="Localize_Apply">" /> - - <TMPL_IF NAME="nntp_port_feedback"> - - <blockquote> - <TMPL_VAR NAME="nntp_port_feedback"> - </blockquote> - - </TMPL_IF> - </form> --- 6,8 ---- Index: nntp-separator.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/nntp-separator.thtml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** nntp-separator.thtml 15 Feb 2005 04:23:54 -0000 1.3 --- nntp-separator.thtml 25 Feb 2005 21:53:51 -0000 1.4 *************** *** 6,17 **** <input name="nntp_separator" id="configSeparator" type="text" value="<TMPL_VAR NAME="nntp_separator">" /> <input type="submit" class="submit" name="update_nntp_separator" value="<TMPL_VAR NAME="Localize_Apply">" /> - - <TMPL_IF NAME="nntp_separator_feedback"> - - <blockquote> - <TMPL_VAR NAME="nntp_separator_feedback"> - </blockquote> - - </TMPL_IF> - </form> --- 6,8 ---- Index: xmlrpc-port.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/xmlrpc-port.thtml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** xmlrpc-port.thtml 15 Feb 2005 04:23:55 -0000 1.5 --- xmlrpc-port.thtml 25 Feb 2005 21:53:51 -0000 1.6 *************** *** 5,27 **** <br /> <input name="xmlrpc_port" type="text" id="configPopPort" value="<TMPL_VAR NAME="XMLRPC_Port">" /> - - <TMPL_IF NAME="XMLRPC_port_if_error"> - - <blockquote> - <div class="error01"> - <TMPL_VAR NAME="Localize_Configuration_Error7"> - </div> - </blockquote> - - </TMPL_IF> - - <TMPL_IF NAME="XMLRPC_port_updated"> - - <blockquote> - <TMPL_VAR NAME="XMLRPC_port_updated"> - </blockquote> - - </TMPL_IF> - <input type="submit" class="submit" name="update_xmlrpc_port" value="<TMPL_VAR NAME="Localize_Apply">" /> </form> --- 5,8 ---- |
|
From: Sam S. <ssc...@us...> - 2005-02-25 21:54:05
|
Update of /cvsroot/popfile/engine/Proxy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25399/Proxy Modified Files: SMTP.pm NNTP.pm POP3.pm Log Message: Continue refactoring HTML UI "status" and "error" messages to use the new status_message__ and error_message__ functions. Progress: All proxy and UI dynamic widgets complete. IMAP _not_ done. Tests forthcoming. Also, these changes make the configuration widgets presentation-language agnostic. That is pretty neat. Perhaps XMLRPC could provide a source-validated configuration API. Index: POP3.pm =================================================================== RCS file: /cvsroot/popfile/engine/Proxy/POP3.pm,v retrieving revision 1.107 retrieving revision 1.108 diff -C2 -d -r1.107 -r1.108 *** POP3.pm 20 Feb 2005 10:06:02 -0000 1.107 --- POP3.pm 25 Feb 2005 21:53:54 -0000 1.108 *************** *** 505,509 **** if ( $response == 0 ) { $self->echo_to_dot_( $mail, $client ); ! } } --- 505,509 ---- if ( $response == 0 ) { $self->echo_to_dot_( $mail, $client ); ! } } *************** *** 524,528 **** if ( $response == 0 ) { $self->echo_to_dot_( $mail, $client ); ! } } else { next; --- 524,528 ---- if ( $response == 0 ) { $self->echo_to_dot_( $mail, $client ); ! } } else { next; *************** *** 692,702 **** if ( $name eq 'pop3_security' ) { $templ->param( 'POP3_Security_Local' => ( $self->config_( 'local' ) == 1 ) ); ! } else { ! if ( $name eq 'pop3_chain' ) { $templ->param( 'POP3_Chain_Secure_Server' => $self->config_( 'secure_server' ) ); $templ->param( 'POP3_Chain_Secure_Port' => $self->config_( 'secure_port' ) ); ! } else { $self->SUPER::configure_item( $name, $templ, $language ); ! } } } --- 692,702 ---- if ( $name eq 'pop3_security' ) { $templ->param( 'POP3_Security_Local' => ( $self->config_( 'local' ) == 1 ) ); ! } else { ! if ( $name eq 'pop3_chain' ) { $templ->param( 'POP3_Chain_Secure_Server' => $self->config_( 'secure_server' ) ); $templ->param( 'POP3_Chain_Secure_Port' => $self->config_( 'secure_port' ) ); ! } else { $self->SUPER::configure_item( $name, $templ, $language ); ! } } } Index: NNTP.pm =================================================================== RCS file: /cvsroot/popfile/engine/Proxy/NNTP.pm,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** NNTP.pm 27 Dec 2004 16:51:28 -0000 1.37 --- NNTP.pm 25 Feb 2005 21:53:54 -0000 1.38 *************** *** 152,156 **** } ! return $self->SUPER::start();; } # ---------------------------------------------------------------------------- --- 152,157 ---- } ! return $self->SUPER::start();; ! } # ---------------------------------------------------------------------------- *************** *** 325,329 **** # Commands expecting a code + text response ! if ( $command =~ /^ *(LIST|HEAD|BODY|NEWGROUPS|NEWNEWS|LISTGROUP|XGTITLE|XINDEX|XHDR|XOVER|XPAT|XROVER|XTHREAD)/i ) { my ( $response, $ok ) = $self->get_response_( $news, --- 326,330 ---- # Commands expecting a code + text response ! if ( $command =~ /^ *(LIST|HEAD|BODY|NEWGROUPS|NEWNEWS|LISTGROUP|XGTITLE|XINDEX|XHDR|XOVER|XPAT|XROVER|XTHREAD)/i ) { my ( $response, $ok ) = $self->get_response_( $news, *************** *** 352,356 **** # Commands expecting a single-line response ! if ( $command =~ /^ *(GROUP|STAT|IHAVE|LAST|NEXT|SLAVE|MODE|XPATH)/i ) { $self->get_response_( $news, $client, $command ); --- 353,357 ---- # Commands expecting a single-line response ! if ( $command =~ /^ *(GROUP|STAT|IHAVE|LAST|NEXT|SLAVE|MODE|XPATH)/i ) { $self->get_response_( $news, $client, $command ); *************** *** 444,448 **** } ! #$self->SUPER::configure_item( $name, $language, $session_key ); } --- 445,449 ---- } ! $self->SUPER::configure_item( $name, $templ, $language); } *************** *** 463,476 **** my ( $self, $name, $templ, $language, $form ) = @_; if ( $name eq 'nntp_port' ) { if ( defined $$form{nntp_port} ) { if ( ( $$form{nntp_port} >= 1 ) && ( $$form{nntp_port} < 65536 ) ) { ! $self->config_( 'port', $$form{nntp_port} ); ! $templ->param( 'nntp_port_feedback' => sprintf $$language{Configuration_NNTPUpdate}, $self->config_( 'port' ) ); ! } ! else { ! $templ->param( 'nntp_port_feedback' => "<div class=\"error01\">$$language{Configuration_Error3}</div>" ); } ! } } --- 464,478 ---- my ( $self, $name, $templ, $language, $form ) = @_; + my ($status, $error); + if ( $name eq 'nntp_port' ) { if ( defined $$form{nntp_port} ) { if ( ( $$form{nntp_port} >= 1 ) && ( $$form{nntp_port} < 65536 ) ) { ! $status = sprintf $$language{Configuration_NNTPUpdate}, $self->config_( 'port' ); ! } else { ! $error = $$language{Configuration_Error3}; } ! } ! return ($status, $error); } *************** *** 479,488 **** if ( length($$form{nntp_separator}) == 1 ) { $self->config_( 'separator', $$form{nntp_separator} ); ! $templ->param( 'nntp_separator_feedback' => sprintf $$language{Configuration_NNTPSepUpdate}, $self->config_( 'separator' ) ); ! } ! else { ! $templ->param( 'nntp_separator_feedback' => "<div class=\"error01\">\n$$language{Configuration_Error1}</div>\n" ); } } } --- 481,490 ---- if ( length($$form{nntp_separator}) == 1 ) { $self->config_( 'separator', $$form{nntp_separator} ); ! $status = sprintf $$language{Configuration_NNTPSepUpdate}, $self->config_( 'separator' ); ! } else { ! $error = $$language{Configuration_Error1}; } } + return ($status, $error); } *************** *** 491,494 **** --- 493,497 ---- $self->config_( 'local', $$form{nntp_local} ); } + return( undef, undef); } *************** *** 498,504 **** $self->config_( 'force_fork', $$form{nntp_force_fork} ); } } ! ! # $self->SUPER::validate_item( $name, $language, $form ); } --- 501,507 ---- $self->config_( 'force_fork', $$form{nntp_force_fork} ); } + return( undef, undef); } ! return $self->SUPER::validate_item( $name, $templ, $language, $form ); } Index: SMTP.pm =================================================================== RCS file: /cvsroot/popfile/engine/Proxy/SMTP.pm,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** SMTP.pm 27 Dec 2004 16:51:28 -0000 1.39 --- SMTP.pm 25 Feb 2005 21:53:54 -0000 1.40 *************** *** 350,354 **** ! #$self->SUPER::configure_item( $name, $templ, $language ); } --- 350,354 ---- ! $self->SUPER::configure_item( $name, $templ, $language ); } *************** *** 369,372 **** --- 369,374 ---- my ( $self, $name, $templ, $language, $form ) = @_; + my ($status, $error, $changed); + if ( $name eq 'smtp_fork_and_port' ) { *************** *** 378,386 **** if ( ( $$form{smtp_port} >= 1 ) && ( $$form{smtp_port} < 65536 ) ) { $self->config_( 'port', $$form{smtp_port} ); ! $templ->param( 'smtp_port_feedback' => sprintf( $$language{Configuration_SMTPUpdate}, $self->config_( 'port' ) ) ); } else { ! $templ->param( 'smtp_port_feedback' => "<div class=\"error01\">$$language{Configuration_Error3}</div>" ); } } } --- 380,389 ---- if ( ( $$form{smtp_port} >= 1 ) && ( $$form{smtp_port} < 65536 ) ) { $self->config_( 'port', $$form{smtp_port} ); ! $status = sprintf( $$language{Configuration_SMTPUpdate}, $self->config_( 'port' ) ); } else { ! $error = $$language{Configuration_Error3}; } } + return( $status, $error ); } *************** *** 389,392 **** --- 392,396 ---- $self->config_( 'local', $$form{smtp_local} ); } + return ( $status, $error ); } *************** *** 394,399 **** if ( defined $$form{smtp_chain_server} ) { $self->config_( 'chain_server', $$form{smtp_chain_server} ); ! $templ->param( 'smtp_server_feedback' => sprintf $$language{Security_SMTPServerUpdate}, $self->config_( 'chain_server' ) ) ; } } --- 398,404 ---- if ( defined $$form{smtp_chain_server} ) { $self->config_( 'chain_server', $$form{smtp_chain_server} ); ! $status = sprintf( $$language{Security_SMTPServerUpdate}, $self->config_( 'chain_server' ) ); } + return( $status, $error ); } *************** *** 403,416 **** if ( ( $$form{smtp_chain_server_port} >= 1 ) && ( $$form{smtp_chain_server_port} < 65536 ) ) { $self->config_( 'chain_port', $$form{smtp_chain_server_port} ); ! $templ->param( 'smtp_port_feedback' => sprintf $$language{Security_SMTPPortUpdate}, $self->config_( 'chain_port' ) ); ! } ! else { ! $templ->param( 'smtp_port_feedback' => "<div class=\"error01\">$$language{Security_Error1}</div>" ); } } } ! ! #$self->SUPER::validate_item( $name, $templ, $language, $form ); } --- 408,420 ---- if ( ( $$form{smtp_chain_server_port} >= 1 ) && ( $$form{smtp_chain_server_port} < 65536 ) ) { $self->config_( 'chain_port', $$form{smtp_chain_server_port} ); ! $status = sprintf( $$language{Security_SMTPPortUpdate}, $self->config_( 'chain_port' ) ) ! } else { ! $error = $$language{Security_Error1}; } } + return( $status, $error ); } ! return $self->SUPER::validate_item( $name, $templ, $language, $form ); } |
|
From: Sam S. <ssc...@us...> - 2005-02-25 21:54:05
|
Update of /cvsroot/popfile/engine/UI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25399/UI Modified Files: HTML.pm XMLRPC.pm Log Message: Continue refactoring HTML UI "status" and "error" messages to use the new status_message__ and error_message__ functions. Progress: All proxy and UI dynamic widgets complete. IMAP _not_ done. Tests forthcoming. Also, these changes make the configuration widgets presentation-language agnostic. That is pretty neat. Perhaps XMLRPC could provide a source-validated configuration API. Index: HTML.pm =================================================================== RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v retrieving revision 1.345 retrieving revision 1.346 diff -C2 -d -r1.345 -r1.346 *** HTML.pm 24 Feb 2005 13:49:24 -0000 1.345 --- HTML.pm 25 Feb 2005 21:53:52 -0000 1.346 *************** *** 1108,1111 **** --- 1108,1112 ---- # Tell the user anything the dynamic UI was interested in sharing + $self->log_( 3, "dynamic security UI $name had status/error $status_message/$error_message") if (defined $status_message || defined $error_message); $self->status_message__($templ,$status_message) if ( defined( $status_message )); $self->error_message__($templ, $error_message) if ( defined( $error_message )); *************** *** 1122,1125 **** --- 1123,1127 ---- # Tell the user anything the dynamic UI was interested in sharing + $self->log_( 3, "dynamic chain UI $name had status/error $status_message/$error_message") if (defined $status_message || defined $error_message); $self->status_message__($templ,$status_message) if ( defined( $status_message )); $self->error_message__($templ, $error_message) if ( defined( $error_message )); *************** *** 1169,1172 **** --- 1171,1175 ---- # Tell the user anything the dynamic UI was interested in sharing + $self->log_( 3, "dynamic config UI $name had status/error $status_message/$error_message") if (defined $status_message || defined $error_message); $self->status_message__($templ,$status_message) if ( defined( $status_message )); $self->error_message__($templ, $error_message) if ( defined( $error_message )); *************** *** 3520,3529 **** # $object Reference to the object calling this method # ! # This seemingly innocent method disguises a lot. It is called by ! # modules that wish to register that they have specific elements of UI ! # that need to be dynamically added to the Configuration and Security ! # screens of POPFile. This is done so that the HTML module does not ! # need to know about the modules that are loaded, their individual ! # configuration elements or how to do validation # # A module calls this method for each separate UI element (normally an --- 3523,3535 ---- # $object Reference to the object calling this method # ! # This seemingly innocent method disguises a lot. The UIREG signal is ! # generated by modules using their inherited register_configuration_item ! # (see POPFile::Module) interface that wish to register that they have ! # specific elements of UI that need to be dynamically added to the ! # Configuration and Security screens of POPFile. The HTML module then ! # 'registers' the modules to receive appropriate callbacks. This is done ! # so that the HTML module does not need to know about the modules that ! # are loaded, their individual configuration elements or how to do ! # validation # # A module calls this method for each separate UI element (normally an Index: XMLRPC.pm =================================================================== RCS file: /cvsroot/popfile/engine/UI/XMLRPC.pm,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** XMLRPC.pm 4 Jan 2005 22:51:48 -0000 1.20 --- XMLRPC.pm 25 Feb 2005 21:53:53 -0000 1.21 *************** *** 229,233 **** $self->{server__}->SOAP::Transport::HTTP::Server::handle(); $client->send_response( $self->{server__}->response ); ! } $client->close(); } --- 229,233 ---- $self->{server__}->SOAP::Transport::HTTP::Server::handle(); $client->send_response( $self->{server__}->response ); ! } $client->close(); } *************** *** 284,287 **** --- 284,289 ---- my ( $self, $name, $templ, $language, $form ) = @_; + my ($status, $error); + # Just check to see if the XML rpc port was change and check its value *************** *** 290,298 **** if ( ( $$form{xmlrpc_port} >= 1 ) && ( $$form{xmlrpc_port} < 65536 ) ) { $self->config_( 'port', $$form{xmlrpc_port} ); ! $templ->param( 'XMLRPC_port_if_error' => 0 ); ! $templ->param( 'XMLRPC_port_updated' => sprintf( $$language{Configuration_XMLRPCUpdate}, $self->config_( 'port' ) ) ); ! } ! else { ! $templ->param( 'XMLRPC_port_if_error' => 1 ); } } --- 292,298 ---- if ( ( $$form{xmlrpc_port} >= 1 ) && ( $$form{xmlrpc_port} < 65536 ) ) { $self->config_( 'port', $$form{xmlrpc_port} ); ! $status = sprintf( $$language{Configuration_XMLRPCUpdate}, $self->config_( 'port' ) ); ! } else { ! $error = $$language{Configuration_Error7}; } } *************** *** 303,307 **** } ! return ''; } --- 303,307 ---- } ! return ( $status, $error ); } |
|
From: Joseph C. <tex...@us...> - 2005-02-25 04:14:16
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5586/skins/default Modified Files: common-middle.thtml common-top.thtml history-javascript.thtml password-page.thtml Log Message: Define empty default body onLoad Javascript function called OnLoadHandler. Pages that need to use an onLoad function can redefine the empty function. This method fixes the limitations of the script to set focus on the password page in some browsers. Index: common-top.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/common-top.thtml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** common-top.thtml 14 Jan 2005 09:30:24 -0000 1.4 --- common-top.thtml 25 Feb 2005 04:14:04 -0000 1.5 *************** *** 5,7 **** --- 5,8 ---- <link rel="icon" href="favicon.ico"> <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="Skin_Root">style.css" title="POPFile-Style"> + <script language="javascript">function OnLoadHandler(){}</script> </head> Index: common-middle.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/common-middle.thtml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** common-middle.thtml 16 Feb 2005 13:59:36 -0000 1.10 --- common-middle.thtml 25 Feb 2005 04:14:04 -0000 1.11 *************** *** 1,3 **** ! <body dir="<TMPL_VAR NAME="Localize_LanguageDirection">"> <table class="shellTop" align="center" width="100%" summary=""> <tr class="shellTopRow"> --- 1,3 ---- ! <body dir="<TMPL_VAR NAME="Localize_LanguageDirection">" onLoad="OnLoadHandler()"> <table class="shellTop" align="center" width="100%" summary=""> <tr class="shellTopRow"> Index: password-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/password-page.thtml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** password-page.thtml 17 Feb 2005 08:51:28 -0000 1.4 --- password-page.thtml 25 Feb 2005 04:14:04 -0000 1.5 *************** *** 21,27 **** </form> ! <script language="JavaScript"> <!-- ! document.getElementById("theUsername").focus(); //--> </script> --- 21,29 ---- </form> ! <script language="Javascript"> <!-- ! function OnLoadHandler() { // redefine default OnLoadHandler ! document.getElementById("theUsername").focus(); ! } //--> </script> Index: history-javascript.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/history-javascript.thtml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** history-javascript.thtml 31 Jan 2005 09:42:10 -0000 1.1 --- history-javascript.thtml 25 Feb 2005 04:14:04 -0000 1.2 *************** *** 1,8 **** ! <script language="JavaScript1.2"> ! if (document.getElementById("removeChecks")) ! document.getElementById("removeChecks").innerHTML = "<input type='checkbox' class='checkbox' onclick='javascript:toggleChecks(this);' title='Select All' />" ! function toggleChecks(x) ! { d = document.forms; for (var i=0; i < d.length; i++) --- 1,10 ---- ! <script language="JavaScript"> ! <!-- ! function OnLoadHandler() { // redefine default OnLoadHandler ! if (document.getElementById("removeChecks")) ! document.getElementById("removeChecks").innerHTML = "<input type='checkbox' class='checkbox' onclick='javascript:toggleChecks(this);' title='Select All' />" ! } ! function toggleChecks(x) { d = document.forms; for (var i=0; i < d.length; i++) *************** *** 14,16 **** --- 16,19 ---- return 0; } + --> </script> \ No newline at end of file |
|
From: Manni H. <man...@us...> - 2005-02-24 22:45:07
|
Update of /cvsroot/popfile/engine In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19760 Modified Files: popfile.pl Log Message: Check VERSION and Version of module required by POPFile. Index: popfile.pl =================================================================== RCS file: /cvsroot/popfile/engine/popfile.pl,v retrieving revision 1.228 retrieving revision 1.229 diff -C2 -d -r1.228 -r1.229 *** popfile.pl 24 Feb 2005 12:53:11 -0000 1.228 --- popfile.pl 24 Feb 2005 22:44:58 -0000 1.229 *************** *** 52,57 **** local $::SIG{__WARN__}; eval "require $module"; ! my $ver = ${"${module}::VERSION"} || ${"${module}::VERSION"} || 0; ! $ver = ${"${module}::VERSION"} || ${"${module}::VERSION"} || 0; $ver = -1 if $@; --- 52,57 ---- local $::SIG{__WARN__}; eval "require $module"; ! my $ver = ${"${module}::VERSION"} || ${"${module}::Version"} || 0; ! $ver = ${"${module}::VERSION"} || ${"${module}::Version"} || 0; $ver = -1 if $@; |
|
From: Manni H. <man...@us...> - 2005-02-24 13:49:39
|
Update of /cvsroot/popfile/engine/UI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25150/UI Modified Files: HTML.pm Log Message: Perform range checking on the value entered in the Jump to page form. Index: HTML.pm =================================================================== RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v retrieving revision 1.344 retrieving revision 1.345 diff -C2 -d -r1.344 -r1.345 *** HTML.pm 24 Feb 2005 09:05:47 -0000 1.344 --- HTML.pm 24 Feb 2005 13:49:24 -0000 1.345 *************** *** 2528,2532 **** if ( defined( $self->{form_}{gopage} ) ) { ! return $self->http_redirect_( $client, "/history?start_message=" . ( ( $self->{form_}{jumptopage} - 1 ) * $self->user_config_( $self->{sessions__}{$session}{user}, 'page_size' ) ) . '&' . $self->print_form_fields_(1,0,('filter','search','sort','session','negate') ), $session ); } --- 2528,2539 ---- if ( defined( $self->{form_}{gopage} ) ) { ! my $destination = ( $self->{form_}{jumptopage} - 1 ) * ! $self->user_config_( $self->{sessions__}{$session}{user}, 'page_size' ); ! my $maximum = $self->history_()->get_query_size( $self->{q__} ); ! ! if ( $destination <= $maximum && $destination > 0 ) { ! return $self->http_redirect_( $client, "/history?start_message=$destination&" ! . $self->print_form_fields_(1,0,('filter','search','sort','session','negate') ), $session ); ! } } |
|
From: Manni H. <man...@us...> - 2005-02-24 12:53:34
|
Update of /cvsroot/popfile/engine In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11232 Modified Files: popfile.pl Log Message: Silence warnings that occur when modules are checked that have a strange numbering scheme by treating $ver and -1 as strings. Index: popfile.pl =================================================================== RCS file: /cvsroot/popfile/engine/popfile.pl,v retrieving revision 1.227 retrieving revision 1.228 diff -C2 -d -r1.227 -r1.228 *** popfile.pl 27 Dec 2004 18:14:09 -0000 1.227 --- popfile.pl 24 Feb 2005 12:53:11 -0000 1.228 *************** *** 56,60 **** $ver = -1 if $@; ! if ( $ver == -1 ) { if ( $required eq 'REQUIRED' ) { $fatal = 1; --- 56,60 ---- $ver = -1 if $@; ! if ( $ver eq '-1' ) { if ( $required eq 'REQUIRED' ) { $fatal = 1; |
|
From: Manni H. <man...@us...> - 2005-02-24 09:06:07
|
Update of /cvsroot/popfile/engine/UI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17731/UI Modified Files: HTML.pm Log Message: Correct parenthesis bug that in call to load_language that didn't pass the session variable to load language but to user_config_ instead. Index: HTML.pm =================================================================== RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v retrieving revision 1.343 retrieving revision 1.344 diff -C2 -d -r1.343 -r1.344 *** HTML.pm 24 Feb 2005 00:18:02 -0000 1.343 --- HTML.pm 24 Feb 2005 09:05:47 -0000 1.344 *************** *** 1007,1011 **** $self->load_language( 'English', $session ); } ! $self->load_language( $self->user_config_( $self->{sessions__}{$session}{user}, 'language', $session ) ); # Force a template relocalization because the language has been --- 1007,1011 ---- $self->load_language( 'English', $session ); } ! $self->load_language( $self->user_config_( $self->{sessions__}{$session}{user}, 'language' ), $session ); # Force a template relocalization because the language has been |
|
From: Manni H. <man...@us...> - 2005-02-24 01:39:27
|
Update of /cvsroot/popfile/engine/Classifier In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12026/Classifier Modified Files: Bayes.pm Log Message: Call makerandom_octet the way it is called in HTTP::start() and hope for the best. Index: Bayes.pm =================================================================== RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v retrieving revision 1.342 retrieving revision 1.343 diff -C2 -d -r1.342 -r1.343 *** Bayes.pm 23 Feb 2005 23:29:23 -0000 1.342 --- Bayes.pm 24 Feb 2005 01:39:15 -0000 1.343 *************** *** 42,46 **** use MIME::Base64; ! use Crypt::Random qw( makerandom_octet ); # This is used to get the hostname of the current machine --- 42,46 ---- use MIME::Base64; ! use Crypt::Random; # This is used to get the hostname of the current machine *************** *** 1444,1448 **** # get a random session key in hex ! my $random = makerandom_octet( Length => 128, Strength => 1 ); my $now = time; return sha256_hex( "$random$now" ); --- 1444,1448 ---- # get a random session key in hex ! my $random = Crypt::Random::makerandom_octet( Length => 128, Strength => 1 ); my $now = time; return sha256_hex( "$random$now" ); |
|
From: Manni H. <man...@us...> - 2005-02-24 00:18:12
|
Update of /cvsroot/popfile/engine/UI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21460/UI Modified Files: HTML.pm Log Message: Make Bucket Detail page work again by providing necessary arguments in the call to bucket_page(). Index: HTML.pm =================================================================== RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v retrieving revision 1.342 retrieving revision 1.343 diff -C2 -d -r1.342 -r1.343 *** HTML.pm 23 Feb 2005 23:58:16 -0000 1.342 --- HTML.pm 24 Feb 2005 00:18:02 -0000 1.343 *************** *** 2054,2058 **** if ( defined($self->{form_}{showbucket}) ) { ! $self->bucket_page( $client, $templ ); return; } --- 2054,2058 ---- if ( defined($self->{form_}{showbucket}) ) { ! $self->bucket_page( $client, $templ, $template, $page, $session ); return; } |
|
From: Manni H. <man...@us...> - 2005-02-23 23:58:33
|
Update of /cvsroot/popfile/engine/UI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13858/UI Modified Files: HTML.pm Log Message: Get rid of warnings upon shutdown by providing the shutdown_page__ sub with the current session. Index: HTML.pm =================================================================== RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v retrieving revision 1.341 retrieving revision 1.342 diff -C2 -d -r1.341 -r1.342 *** HTML.pm 20 Feb 2005 10:05:59 -0000 1.341 --- HTML.pm 23 Feb 2005 23:58:16 -0000 1.342 *************** *** 640,644 **** $http_header .= "Content-Length: "; ! my $text = $self->shutdown_page__(); $http_header .= length($text); --- 640,644 ---- $http_header .= "Content-Length: "; ! my $text = $self->shutdown_page__( $session ); $http_header .= length($text); |
|
From: Manni H. <man...@us...> - 2005-02-23 23:29:32
|
Update of /cvsroot/popfile/engine/Classifier In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3617/Classifier Modified Files: Bayes.pm Log Message: import makerandom_octet from Crypt::Random and call it directly in generate_unique_session_key__ Index: Bayes.pm =================================================================== RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v retrieving revision 1.341 retrieving revision 1.342 diff -C2 -d -r1.341 -r1.342 *** Bayes.pm 15 Feb 2005 04:23:50 -0000 1.341 --- Bayes.pm 23 Feb 2005 23:29:23 -0000 1.342 *************** *** 42,46 **** use MIME::Base64; ! use Crypt::Random::Generator; # This is used to get the hostname of the current machine --- 42,46 ---- use MIME::Base64; ! use Crypt::Random qw( makerandom_octet ); # This is used to get the hostname of the current machine *************** *** 1444,1449 **** # get a random session key in hex ! my $r = new Crypt::Random::Generator; ! my $random = $r->makerandom_octet( Length => 128, Strength => 1 ); my $now = time; return sha256_hex( "$random$now" ); --- 1444,1448 ---- # get a random session key in hex ! my $random = makerandom_octet( Length => 128, Strength => 1 ); my $now = time; return sha256_hex( "$random$now" ); *************** *** 1583,1587 **** $self->mq_post_( "RELSE", $session ); ! return undef; } --- 1582,1586 ---- $self->mq_post_( "RELSE", $session ); ! return undef; } |
11 messages has been excluded from this view by a project administrator.
