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...> - 2006-08-29 15:51:35
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10953 Modified Files: Tag: b0_22_2 adduser.nsi Log Message: Updated to work with the NSIS 2.19 compiler (for the 0.22.5 release). Version Information now includes a trademark statement and has the build year updated automatically. Extra data stored in the "Add/Remove Program" entry to stop Windows from making wild guesses about how much space the POPFile User Data occupies. Index: adduser.nsi =================================================================== RCS file: /cvsroot/popfile/windows/adduser.nsi,v retrieving revision 1.59.4.7 retrieving revision 1.59.4.8 diff -C2 -d -r1.59.4.7 -r1.59.4.8 *** adduser.nsi 6 Feb 2006 18:56:58 -0000 1.59.4.7 --- adduser.nsi 29 Aug 2006 15:51:12 -0000 1.59.4.8 *************** *** 34,49 **** #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS 2.0" compiler (final), ! ; released 7 February 2004, with no "official" NSIS patches applied. This compiler ! ; can be downloaded from http://prdownloads.sourceforge.net/nsis/nsis20.exe?download !define ${NSIS_VERSION}_found ! !ifndef v2.0_found !warning \ "$\r$\n\ $\r$\n*** NSIS COMPILER WARNING:\ $\r$\n***\ ! $\r$\n*** This script has only been tested using the NSIS 2.0 compiler\ $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ $\r$\n***\ --- 34,49 ---- #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.19" compiler, ! ; released 6 August 2006. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.19-setup.exe?download !define ${NSIS_VERSION}_found ! !ifndef v2.19_found !warning \ "$\r$\n\ $\r$\n*** NSIS COMPILER WARNING:\ $\r$\n***\ ! $\r$\n*** This script has only been tested using the NSIS v2.19 compiler\ $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ $\r$\n***\ *************** *** 54,60 **** !undef ${NSIS_VERSION}_found - ; Expect 3 compiler warnings, all related to standard NSIS language files which are out-of-date - ; (if the default multi-language installer is compiled). - ; ; NOTE: The language selection menu order used in this script assumes that the NSIS MUI ; 'Japanese.nsh' language file has been patched to use 'Nihongo' instead of 'Japanese' --- 54,57 ---- *************** *** 342,349 **** VIProductVersion "${C_PFI_VERSION}.0" VIAddVersionKey "ProductName" "POPFile User wizard" VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalCopyright" "Copyright (c) 2006 John Graham-Cumming" VIAddVersionKey "FileDescription" "Add/Remove POPFile User wizard" VIAddVersionKey "FileVersion" "${C_PFI_VERSION}" --- 339,349 ---- VIProductVersion "${C_PFI_VERSION}.0" + !define /date C_BUILD_YEAR "%Y" + VIAddVersionKey "ProductName" "POPFile User wizard" VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalTrademarks" "POPFile is a registered trademark of John Graham-Cumming" ! VIAddVersionKey "LegalCopyright" "Copyright (c) ${C_BUILD_YEAR} John Graham-Cumming" VIAddVersionKey "FileDescription" "Add/Remove POPFile User wizard" VIAddVersionKey "FileVersion" "${C_PFI_VERSION}" *************** *** 1292,1295 **** --- 1292,1297 ---- WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}_Data" \ "UninstallString" "$G_USERDIR\uninstalluser.exe" + WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}_Data" \ + "InstallLocation" "$G_USERDIR" WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}_Data" \ "NoModify" "1" *************** *** 2020,2024 **** StrCmp ${L_RESULT} "1" check_restore_log StrCpy $G_SFN_DISABLED "1" ! ; Short file names are not supported here, so we cannot accept any path containing spaces. --- 2022,2026 ---- StrCmp ${L_RESULT} "1" check_restore_log StrCpy $G_SFN_DISABLED "1" ! ; Short file names are not supported here, so we cannot accept any path containing spaces. *************** *** 2609,2615 **** !endif ! ; In 'GetDlgItem', use (1200 + Field number - 1) to refer to the field to be changed ! GetDlgItem $G_DLGITEM $G_HWND 1204 ; Field 5 = 'Run POPFile at startup' checkbox CreateFont $G_FONT "MS Shell Dlg" 10 700 ; use larger & bolder version of the font in use SendMessage $G_DLGITEM ${WM_SETFONT} $G_FONT 0 --- 2611,2617 ---- !endif ! ; Field 5 = 'Run POPFile at startup' checkbox control ! !insertmacro MUI_INSTALLOPTIONS_READ $G_DLGITEM "ioA.ini" "Field 5" "HWND" CreateFont $G_FONT "MS Shell Dlg" 10 700 ; use larger & bolder version of the font in use SendMessage $G_DLGITEM ${WM_SETFONT} $G_FONT 0 |
|
From: Brian S. <xue...@us...> - 2006-08-29 15:49:39
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10516 Modified Files: Tag: b0_22_2 adduser-Version.nsh pfi-languages.nsh Log Message: Updated to work with the NSIS 2.19 compiler (for the 0.22.5 release). Index: pfi-languages.nsh =================================================================== RCS file: /cvsroot/popfile/windows/pfi-languages.nsh,v retrieving revision 1.2.6.4 retrieving revision 1.2.6.5 diff -C2 -d -r1.2.6.4 -r1.2.6.5 *** pfi-languages.nsh 6 Feb 2006 14:22:39 -0000 1.2.6.4 --- pfi-languages.nsh 29 Aug 2006 15:49:19 -0000 1.2.6.5 *************** *** 5,9 **** # utilities. This makes maintenance easier. # ! # Copyright (c) 2004-2005 John Graham-Cumming # # This file is part of POPFile --- 5,9 ---- # utilities. This makes maintenance easier. # ! # Copyright (c) 2004-2006 John Graham-Cumming # # This file is part of POPFile *************** *** 64,68 **** # In the file ${NSISDIR}\Contrib\Modern UI\Language files\Japanese.nsh, change the value of the # MUI_LANGNAME string from "Japanese" to "Nihongo". For example, using the file supplied with ! # NSIS 2.0, released 7 February 2004, change line 13 from: # # !define MUI_LANGNAME "Japanese" ;(ú{ê) Use only ASCII characters (if this is not possible, use the English name) --- 64,68 ---- # In the file ${NSISDIR}\Contrib\Modern UI\Language files\Japanese.nsh, change the value of the # MUI_LANGNAME string from "Japanese" to "Nihongo". For example, using the file supplied with ! # NSIS 2.19, released 6 August 2006, change line 13 from: # # !define MUI_LANGNAME "Japanese" ;(ú{ê) Use only ASCII characters (if this is not possible, use the English name) *************** *** 111,121 **** ; been patched to use 'Nihongo' instead of 'Japanese' [see 'SMALL NSIS PATCH REQUIRED' above] ! ; Currently a subset of the languages supported by NSIS MUI 1.70 (using the NSIS names) ! ; NSIS 2.0 compiler error messages use language ID codes when referring to problems with ; language strings, e.g. ; ; LangString "PFI_LANG_NSISDL_PLURAL" is not set in language table of language 1041 ; ; Note: 'English' is 'Language 1033' --- 111,125 ---- ; been patched to use 'Nihongo' instead of 'Japanese' [see 'SMALL NSIS PATCH REQUIRED' above] ! ; Currently a subset of the languages supported by NSIS MUI 1.75 (using the NSIS names) ! ; NSIS 2.0 compiler messages use language ID codes when referring to problems with ; language strings, e.g. ; ; LangString "PFI_LANG_NSISDL_PLURAL" is not set in language table of language 1041 ; + ; NSIS 2.08 (or later) compiler messages usually mention names instead of ID codes, e.g. + ; + ; LangString "PFI_LANG_NSISDL_PLURAL" is not set in language table of language Japanese + ; ; Note: 'English' is 'Language 1033' Index: adduser-Version.nsh =================================================================== RCS file: /cvsroot/popfile/windows/adduser-Version.nsh,v retrieving revision 1.6.2.6 retrieving revision 1.6.2.7 diff -C2 -d -r1.6.2.6 -r1.6.2.7 *** adduser-Version.nsh 6 Feb 2006 16:26:03 -0000 1.6.2.6 --- adduser-Version.nsh 29 Aug 2006 15:49:19 -0000 1.6.2.7 *************** *** 7,11 **** #-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.2.77" #-------------------------------------------------------------------------- --- 7,11 ---- #-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.3.0" #-------------------------------------------------------------------------- |
|
From: Manni H. <man...@us...> - 2006-07-29 19:44:16
|
Update of /cvsroot/popfile/engine/Services In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29412/Services Modified Files: IMAP.pm Log Message: Make training available from UI. Index: IMAP.pm =================================================================== RCS file: /cvsroot/popfile/engine/Services/IMAP.pm,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** IMAP.pm 29 Jul 2006 17:11:33 -0000 1.25 --- IMAP.pm 29 Jul 2006 19:44:11 -0000 1.26 *************** *** 170,173 **** --- 170,177 ---- 'imap-options.thtml', $self ); + $self->register_configuration_item_( 'configuration', + 'imap_6_training', + 'imap-do-training.thtml', + $self ); # Set the time stamp for the last update to the current time *************** *** 2070,2073 **** --- 2074,2082 ---- $templ->param( IMAP_interval => $self->user_config_( 1, 'update_interval' ) ); } + + # Switch the module to training mode + if ( $name eq 'imap_6_training' ) { + $templ->param( imap_currently_training => $self->user_config_( 1, 'training_mode' ) ); + } } *************** *** 2292,2297 **** } ! $self->SUPER::validate_item( $name, $templ, $language, $form ); } --- 2301,2318 ---- } + if ( $name eq 'imap_6_training' ) { ! if ( defined $$form{do_imap_training} ) { ! $self->user_config_( 1, 'training_mode', 1 ); ! return ( $$language{Imap_DoingTraining}, undef ); ! } ! else { ! return ( undef, undef ); ! } ! } ! ! # If we end up here, we forgot to validate some item. ! $self->log_( 0, "A configuration item has been left unvalidated: $name" ); ! return ( undef, "The item $name is not implemented." ); } *************** *** 2366,2369 **** --- 2387,2392 ---- # And disable training mode so we won't do this again the next time service is called. $self->user_config_( 1, 'training_mode', 0 ); + + $self->log_( 0, "Training finished." ); } |
|
From: Manni H. <man...@us...> - 2006-07-29 19:44:16
|
Update of /cvsroot/popfile/engine/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29412/languages Modified Files: Deutsch.msg English.msg Log Message: Make training available from UI. Index: Deutsch.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/Deutsch.msg,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** Deutsch.msg 20 Feb 2006 02:08:27 -0000 1.37 --- Deutsch.msg 29 Jul 2006 19:44:12 -0000 1.38 *************** *** 402,405 **** --- 402,407 ---- Imap_WatchedFoldersUpdated Liste der überwachten Ordner wurde aktualisiert. Imap_WatchedFolderRemoved Ordner '%s' wurde aus der Liste der überwachten Ordner entfernt + Imap_DoingTraining Das IMAP Module wird das Training jetzt anhand Ihrer archivierten Nachrichten starten. Je nach der Größe des Archivs und der Geschwindigkeit der Verbindung zum Server, kann diese einige Zeit dauern, während der die Benutzeroberfläche nicht reagieren wird. + Imap_DoTraining Training anhand archivierter Mail. Shutdown_Message POPFile wurde beendet Index: English.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/English.msg,v retrieving revision 1.102 retrieving revision 1.103 diff -C2 -d -r1.102 -r1.103 *** English.msg 23 Feb 2006 12:23:14 -0000 1.102 --- English.msg 29 Jul 2006 19:44:12 -0000 1.103 *************** *** 415,418 **** --- 415,420 ---- Imap_WatchedFoldersUpdated Updated the list of watched folders Imap_WatchedFolderRemoved Removed folder '%s' from list of watched folders + Imap_DoingTraining The IMAP module is now going to start training on your message archive. The POPFile UI will remain unresponsive until training is completed. Depending on the size of your archive and the speed of the connection to the IMAP server, this may take a while. + Imap_DoTraining Train from existing mail archive. Shutdown_Message POPFile has shut down |
|
From: Manni H. <man...@us...> - 2006-07-29 19:44:15
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29412/skins/default Added Files: imap-do-training.thtml Log Message: Make training available from UI. --- NEW FILE: imap-do-training.thtml --- <!-- This is the output of template imap-update-mailbox-list.thtml --> <TMPL_IF NAME="imap_currently_training"> <p> <TMPL_VAR NAME="Localize_Imap_DoingTraining"> </p> <TMPL_ELSE> <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> <label for="imap_do_training" class="configurationLabel"> <TMPL_VAR NAME="Localize_Imap_DoTraining"> </label> <input id="imap_do_training" type="submit" class="submit" name="do_imap_training" value="<TMPL_VAR NAME="Localize_Imap_Now">" /> </form> </TMPL_IF> <hr width="60%" align="center" /> <!-- End of template imap-do-training.thtml --> |
|
From: Manni H. <man...@us...> - 2006-07-29 17:11:37
|
Update of /cvsroot/popfile/engine/Services In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8266/Services Modified Files: IMAP.pm Log Message: Fix stupid bug in train_on_archive__ Index: IMAP.pm =================================================================== RCS file: /cvsroot/popfile/engine/Services/IMAP.pm,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** IMAP.pm 20 Feb 2006 02:15:25 -0000 1.24 --- IMAP.pm 29 Jul 2006 17:11:33 -0000 1.25 *************** *** 259,263 **** $self->connect_folders__(); ! # Reset the hash containing the hash values we have seen the # last time through service. $self->{hash_values__} = (); --- 259,263 ---- $self->connect_folders__(); ! # Reset the hash containing the hash values we have seen the # last time through service. $self->{hash_values__} = (); *************** *** 2091,2100 **** my ( $status_message, $error_message ); ! # connection details if ( $name eq 'imap_0_connection_details' ) { if ( defined $$form{update_imap_0_connection_details} ) { my $something_happened = 0; ! if ( $$form{imap_hostname} ne '' ) { $self->user_config_( 1, 'hostname', $$form{imap_hostname} ); --- 2091,2100 ---- my ( $status_message, $error_message ); ! # connection details if ( $name eq 'imap_0_connection_details' ) { if ( defined $$form{update_imap_0_connection_details} ) { my $something_happened = 0; ! if ( $$form{imap_hostname} ne '' ) { $self->user_config_( 1, 'hostname', $$form{imap_hostname} ); *************** *** 2128,2135 **** $error_message = $$language{Imap_PasswordError}; } ! $status_message = $$language{Imap_ConnectionDetailsUpdated} if $something_happened; } ! return ( $status_message, $error_message ); } --- 2128,2135 ---- $error_message = $$language{Imap_PasswordError}; } ! $status_message = $$language{Imap_ConnectionDetailsUpdated} if $something_happened; } ! return ( $status_message, $error_message ); } *************** *** 2253,2257 **** $error_message = $$language{Imap_UpdateError3}; } ! unless ( defined $error_message ) { $status_message = $$language{Imap_UpdateOK}; --- 2253,2257 ---- $error_message = $$language{Imap_UpdateError3}; } ! unless ( defined $error_message ) { $status_message = $$language{Imap_UpdateOK}; *************** *** 2283,2291 **** $error_message = $$language{Imap_IntervalError}; } ! unless ( defined $error_message ) { $status_message = $$language{Imap_OptionsUpdated}; } ! } return ( $status_message, $error_message ); --- 2283,2291 ---- $error_message = $$language{Imap_IntervalError}; } ! unless ( defined $error_message ) { $status_message = $$language{Imap_OptionsUpdated}; } ! } return ( $status_message, $error_message ); *************** *** 2319,2326 **** foreach my $folder ( keys %{$self->{folders__}} ) { - - # Set uidnext value to 1. We will train on all messages. - $self->uid_next__( $folder, 1 ); - my @uids = $self->get_new_message_list( $folder ); my $bucket = $self->{folders__}{$folder}{output}; --- 2319,2322 ---- *************** *** 2329,2332 **** --- 2325,2332 ---- next if $folder eq 'INBOX'; + # Set uidnext value to 1. We will train on all messages. + $self->uid_next__( $folder, 1 ); + my @uids = $self->get_new_message_list( $folder ); + $self->log_( 0, "Training on messages in folder $folder to bucket $bucket." ); |
|
From: Brian S. <xue...@us...> - 2006-06-16 09:39:04
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28282 Modified Files: pfi-library.nsh Log Message: Updated to support the new POPFile SQLite Database Analyser utility. Index: pfi-library.nsh =================================================================== RCS file: /cvsroot/popfile/windows/pfi-library.nsh,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** pfi-library.nsh 11 Jan 2006 14:50:12 -0000 1.67 --- pfi-library.nsh 16 Jun 2006 09:38:56 -0000 1.68 *************** *** 34,48 **** # (2) ADDUSER defined in adduser.nsi ('Add POPFile User' wizard) # (3) BACKUP defined in backup.nsi (POPFile 'User Data' Backup utility) ! # (4) DBSTATUS defined in test\pfidbstatus.nsi (POPFile SQLite Database Status Check) ! # (5) IMAPUPDATER defined in add-ons\updateimap.nsi (POPFile 'IMAP Updater' wizard) ! # (6) INSTALLER defined in installer.nsi (the main installer program, setup.exe) ! # (7) MSGCAPTURE defined in msgcapture.nsi (used to capture POPFile's console messages) ! # (8) PFIDIAG defined in test\pfidiag.nsi (helps diagnose installer-related problems) ! # (9) RESTORE defined in restore.nsi (POPFile 'User Data' Restore utility) ! # (10) RUNPOPFILE defined in runpopfile.nsi (simple front-end for popfile.exe) ! # (11) RUNSQLITE defined in runsqlite.nsi (simple front-end for sqlite.exe/sqlite3.exe) ! # (12) STOP_POPFILE defined in stop_popfile.nsi (the 'POPFile Silent Shutdown' utility) ! # (13) TRANSLATOR defined in test\translator.nsi (main installer translations testbed) ! # (14) TRANSLATOR_AUW defined in test\transAUW.nsi ('Add POPFile User' translations testbed) #-------------------------------------------------------------------------- --- 34,49 ---- # (2) ADDUSER defined in adduser.nsi ('Add POPFile User' wizard) # (3) BACKUP defined in backup.nsi (POPFile 'User Data' Backup utility) ! # (4) DBANALYSER defined in test\pfidbanalyser.nsi ('POPFile SQLite Database Analyser') ! # (5) DBSTATUS defined in test\pfidbstatus.nsi (POPFile SQLite Database Status Check) ! # (6) IMAPUPDATER defined in add-ons\updateimap.nsi (POPFile 'IMAP Updater' wizard) ! # (7) INSTALLER defined in installer.nsi (the main installer program, setup.exe) ! # (8) MSGCAPTURE defined in msgcapture.nsi (used to capture POPFile's console messages) ! # (9) PFIDIAG defined in test\pfidiag.nsi (helps diagnose installer-related problems) ! # (10) RESTORE defined in restore.nsi (POPFile 'User Data' Restore utility) ! # (11) RUNPOPFILE defined in runpopfile.nsi (simple front-end for popfile.exe) ! # (12) RUNSQLITE defined in runsqlite.nsi (simple front-end for sqlite.exe/sqlite3.exe) ! # (13) STOP_POPFILE defined in stop_popfile.nsi (the 'POPFile Silent Shutdown' utility) ! # (14) TRANSLATOR defined in test\translator.nsi (main installer translations testbed) ! # (15) TRANSLATOR_AUW defined in test\transAUW.nsi ('Add POPFile User' translations testbed) #-------------------------------------------------------------------------- *************** *** 58,62 **** #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.1.12" #-------------------------------------------------------------------------- --- 59,63 ---- #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.1.13" #-------------------------------------------------------------------------- *************** *** 1528,1532 **** !macroend ! !ifdef ADDUSER | DBSTATUS | INSTALLER | RESTORE #-------------------------------------------------------------------------- # Installer Function: PFI_GetCompleteFPN --- 1529,1533 ---- !macroend ! !ifdef ADDUSER | DBANALYSER | DBSTATUS | INSTALLER | RESTORE #-------------------------------------------------------------------------- # Installer Function: PFI_GetCompleteFPN *************** *** 1970,1974 **** !macroend ! !ifdef ADDUSER | BACKUP | DBSTATUS | RESTORE | RUNPOPFILE #-------------------------------------------------------------------------- # Installer Function: PFI_GetDataPath --- 1971,1975 ---- !macroend ! !ifdef ADDUSER | BACKUP | DBANALYSER | DBSTATUS | RESTORE | RUNPOPFILE #-------------------------------------------------------------------------- # Installer Function: PFI_GetDataPath *************** *** 2686,2690 **** !macroend ! !ifdef ADDSSL | ADDUSER | BACKUP | DBSTATUS | INSTALLER | RESTORE | RUNPOPFILE #-------------------------------------------------------------------------- # Installer Function: PFI_GetParent --- 2687,2691 ---- !macroend ! !ifdef ADDSSL | ADDUSER | BACKUP | DBANALYSER | DBSTATUS | INSTALLER | RESTORE | RUNPOPFILE #-------------------------------------------------------------------------- # Installer Function: PFI_GetParent *************** *** 2988,2992 **** !macroend ! !ifdef ADDUSER | DBSTATUS #-------------------------------------------------------------------------- # Installer Function: PFI_GetSQLdbPathName --- 2989,2993 ---- !macroend ! !ifdef ADDUSER | DBANALYSER | DBSTATUS #-------------------------------------------------------------------------- # Installer Function: PFI_GetSQLdbPathName *************** *** 3110,3114 **** !macroend ! !ifdef ADDUSER | BACKUP | DBSTATUS | RUNSQLITE | RESTORE #-------------------------------------------------------------------------- # Installer Function: PFI_GetSQLiteFormat --- 3111,3115 ---- !macroend ! !ifdef ADDUSER | BACKUP | DBANALYSER | DBSTATUS | RUNSQLITE | RESTORE #-------------------------------------------------------------------------- # Installer Function: PFI_GetSQLiteFormat *************** *** 4047,4051 **** !macroend ! !ifdef ADDSSL | ADDUSER | BACKUP | DBSTATUS | INSTALLER | RESTORE | RUNPOPFILE #-------------------------------------------------------------------------- # Installer Function: PFI_StrBackSlash --- 4048,4052 ---- !macroend ! !ifdef ADDSSL | ADDUSER | BACKUP | DBANALYSER | DBSTATUS | INSTALLER | RESTORE | RUNPOPFILE #-------------------------------------------------------------------------- # Installer Function: PFI_StrBackSlash *************** *** 4144,4148 **** !macroend ! !ifndef PFIDIAG & RUNPOPFILE & RUNSQLITE & TRANSLATOR #-------------------------------------------------------------------------- # Installer Function: PFI_StrCheckDecimal --- 4145,4149 ---- !macroend ! !ifndef DBANALYSER & PFIDIAG & RUNPOPFILE & RUNSQLITE & TRANSLATOR #-------------------------------------------------------------------------- # Installer Function: PFI_StrCheckDecimal *************** *** 4227,4231 **** !macroend ! !ifndef ADDSSL & DBSTATUS & IMAPUPDATER & MSGCAPTURE & RUNSQLITE & STOP_POPFILE & TRANSLATOR #-------------------------------------------------------------------------- # Installer Function: PFI_StrStr --- 4228,4232 ---- !macroend ! !ifndef ADDSSL & DBANALYSER & DBSTATUS & IMAPUPDATER & MSGCAPTURE & RUNSQLITE & STOP_POPFILE & TRANSLATOR #-------------------------------------------------------------------------- # Installer Function: PFI_StrStr |
|
From: Brian S. <xue...@us...> - 2006-06-16 09:36:46
|
Update of /cvsroot/popfile/windows/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27845 Added Files: pfidbanalyser.nsi Log Message: This utility runs the SQLite database analyser and displays the detailed report (over 900 lines long) in a scrollable window. This is a companion to the POPFile SQLite Database Status Check utility. For use as a stand-alone debugging aid (this is not part of the installer). --- NEW FILE: pfidbanalyser.nsi --- #------------------------------------------------------------------------------------------- # # pfidbanalyser.nsi --- A utility to display the output from the SQLite Database Analyser # command-line utility. The report contains a lot of technical detail # about the structure of the specified SQLite database file. # # SQLite 2.x and 3.x database files are not compatible therefore # separate command-line utilities have to be used: # # (a) sqlite_analyzer.exe for 2.x format files, and # (b) sqlite3_analyzer.exe for 3.x format files # # Since the current version of POPFile uses SQLite 2.x format database # files, only SQLite 2.x format files are fully supported in this # release. However if the database is in SQLite 3.x format a search # for the SQLite 3.x version of the analyser utility will be made. # # Copyright (c) 2006 John Graham-Cumming # # This file is part of POPFile # # POPFile is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. # # POPFile is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with POPFile; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #------------------------------------------------------------------------------------------- #------------------------------------------------------------------------------------------- # Usage (one optional parameter): # # pfidbanalyser # or pfidbanalyser database_filename # # Normally 'database_filename' will simply be the default SQLite database filename, popfile.db. # # If no parameter is given the utility makes several attempts to find the database file: # # (1) If the default SQLite database file (popfile.db) is found in the current folder then # it is assumed that this is the database to be analysed. # # (2) If the default SQLite database file (popfile.db) is found in the same folder as the # utility then it is assumed that this is the database to be analysed. # # (3) If the POPFILE_USER environment variable has been defined and the POPFile configuration # file (popfile.cfg) is found in the specified folder then the name and location of the # SQLite database file is extracted. # # (4) If the POPFILE_USER environment variable has been defined and the specified folder exists # but the name and location of the SQLite database file cannot be determined, the utility # looks for the default SQLite database file (popfile.db) in that folder. # # (5) If the 'User Data' folder location is specified in the Registry, the folder exists and # the POPFile configuration file (popfile.cfg) is found there then the name and location # of the SQLite database file is extracted. # # (6) If the 'User Data' folder location is specified in the Registry and the folder exists # but the name and location of the SQLite database file cannot be determined, the utility # looks for the default SQLite database file (popfile.db) in that folder. # # (7) The search is abandoned if the above steps fail to find the database (the utility exits). # # NOTE: Priority is given to the current folder and the folder containing the utility to make # it easy to use the utility (e.g. just put it in the same folder as the popfile.db file) # #------------------------------------------------------------------------------------------- ;-------------------------------------------------------------------------- ; Select LZMA compression (to generate smallest EXE file) ;-------------------------------------------------------------------------- SetCompressor lzma ;-------------------------------------------------------------------------- ; Symbols used to avoid confusion over where the line breaks occur. ; ; ${IO_NL} is used for InstallOptions-style 'new line' sequences. ; ${MB_NL} is used for MessageBox-style 'new line' sequences. ; ; (these two constants do not follow the 'C_' naming convention described below) ;-------------------------------------------------------------------------- !define IO_NL "\r\n" !define MB_NL "$\r$\n" ;-------------------------------------------------------------------------- ; POPFile constants have been given names beginning with 'C_' (eg C_README) ;-------------------------------------------------------------------------- !define C_VERSION "0.0.6" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "pfidbanalyser.exe" ; The default NSIS caption is "Name Setup" so we override it here Name "POPFile SQLite Database Analyser (stand-alone)" Caption "POPFile SQLite Database Analyser ${C_VERSION} (stand-alone)" ; Specify EXE filename and icon for the 'installer' OutFile "${C_OUTFILE}" Icon "..\POPFileIcon\popfile.ico" #-------------------------------------------------------------------------- # Use the "Modern User Interface" #-------------------------------------------------------------------------- !include "MUI.nsh" #-------------------------------------------------------------------------- # Include private library functions and macro definitions #-------------------------------------------------------------------------- ; Avoid compiler warnings by disabling the functions and definitions we do not use !define DBANALYSER !include "..\pfi-library.nsh" #-------------------------------------------------------------------------- ; 'VIProductVersion' format is X.X.X.X where X is a number in range 0 to 65535 ; representing the following values: Major.Minor.Release.Build VIProductVersion "${C_VERSION}.0" VIAddVersionKey "ProductName" "POPFile SQLite Database Analyser (stand-alone version)" VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" VIAddVersionKey "LegalCopyright" "Copyright (c) 2006 John Graham-Cumming" VIAddVersionKey "FileDescription" "Technical analysis of POPFile SQLite database" VIAddVersionKey "FileVersion" "${C_VERSION}" VIAddVersionKey "OriginalFilename" "${C_OUTFILE}" VIAddVersionKey "Build Date/Time" "${__DATE__} @ ${__TIME__}" !ifdef C_PFI_LIBRARY_VERSION VIAddVersionKey "Build Library Version" "${C_PFI_LIBRARY_VERSION}" !endif VIAddVersionKey "Build Script" "${__FILE__}${MB_NL}(${__TIMESTAMP__})" #---------------------------------------------------------------------------------------- #-------------------------------------------------------------------------- # User Variables (Global) #-------------------------------------------------------------------------- ; This script uses 'User Variables' (with names starting with 'G_') to hold GLOBAL data. Var G_WINUSERNAME ; current Windows user login name Var G_DATADIR ; folder path where we expect to find the SQLite database file Var G_DATABASE ; holds name (and possibly path) to the SQLite database Var G_SQLITEINFO ; name of the appropriate SQLite analyser command-line utility Var G_DBFORMAT ; SQLite database format ('2.x', '3.x' or an error string) Var G_PLS_FIELD_1 ; used to customize language strings Var G_PLS_FIELD_2 ; used to customize language strings #-------------------------------------------------------------------------- # Configure the MUI pages #-------------------------------------------------------------------------- ;---------------------------------------------------------------- ; Interface Settings - General Interface Settings ;---------------------------------------------------------------- ; The icon file for the utility !define MUI_ICON "..\POPFileIcon\popfile.ico" !define MUI_HEADERIMAGE !define MUI_HEADERIMAGE_BITMAP "..\hdr-common.bmp" !define MUI_HEADERIMAGE_RIGHT ;---------------------------------------------------------------- ; Interface Settings - Interface Resource Settings ;---------------------------------------------------------------- ; The banner provided by the default 'modern.exe' UI does not provide much room for the ; two lines of text, e.g. the German version is truncated, so we use a custom UI which ; provides slightly wider text areas. Each area is still limited to a single line of text. !define MUI_UI "..\UI\pfi_modern.exe" ; The 'hdr-common.bmp' logo is only 90 x 57 pixels, much smaller than the 150 x 57 pixel ; space provided by the default 'modern_headerbmpr.exe' UI, so we use a custom UI which ; leaves more room for the TITLE and SUBTITLE text. !define MUI_UI_HEADERIMAGE_RIGHT "..\UI\pfi_headerbmpr.exe" ;---------------------------------------------------------------- ; Interface Settings - Installer Finish Page Interface Settings ;---------------------------------------------------------------- ; Show the installation log and leave the window open when utility has completed its work ShowInstDetails show !define MUI_FINISHPAGE_NOAUTOCLOSE #-------------------------------------------------------------------------- # Define the Page order for the utility #-------------------------------------------------------------------------- ;--------------------------------------------------- ; Installer Page - Install files ;--------------------------------------------------- ; Override standard "Installing..." page header !define MUI_PAGE_HEADER_TEXT "$(DBA_LANG_STD_HDR)" !define MUI_PAGE_HEADER_SUBTEXT "$(DBA_LANG_STD_SUBHDR)" ; Override the standard "Installation complete..." page header !define MUI_INSTFILESPAGE_FINISHHEADER_TEXT "$(DBA_LANG_END_HDR)" !define MUI_INSTFILESPAGE_FINISHHEADER_SUBTEXT "$(DBA_LANG_END_SUBHDR)" ; Override the standard "Installation Aborted..." page header !define MUI_INSTFILESPAGE_ABORTHEADER_TEXT "$(DBA_LANG_ABORT_HDR)" !define MUI_INSTFILESPAGE_ABORTHEADER_SUBTEXT "$(DBA_LANG_ABORT_SUBHDR)" !insertmacro MUI_PAGE_INSTFILES #-------------------------------------------------------------------------- # Language Support for the utility #-------------------------------------------------------------------------- !insertmacro MUI_LANGUAGE "English" ;-------------------------------------------------------------------------- ; Current build only supports English and uses local strings ; instead of language strings from languages\*-pfi.nsh files ;-------------------------------------------------------------------------- !macro DBA_TEXT NAME VALUE LangString ${NAME} ${LANG_ENGLISH} "${VALUE}" !macroend !insertmacro DBA_TEXT DBA_LANG_STD_HDR "POPFile SQLite Database Analyser" !insertmacro DBA_TEXT DBA_LANG_STD_SUBHDR "Please wait while the database is analysed" !insertmacro DBA_TEXT DBA_LANG_END_HDR "POPFile SQLite Database Analyser" !insertmacro DBA_TEXT DBA_LANG_END_SUBHDR "To save the report, use right-click in the message window,${MB_NL}copy to the clipboard then paste the report into a text file" !insertmacro DBA_TEXT DBA_LANG_ABORT_HDR "POPFile SQLite Database Analysis Failed" !insertmacro DBA_TEXT DBA_LANG_ABORT_SUBHDR "Problem detected - see error report in window below" !insertmacro DBA_TEXT DBA_LANG_RIGHTCLICK "Right-click in the window below to copy the report to the clipboard" !insertmacro DBA_TEXT DBA_LANG_NOCONFIGDATA "POPFile is not configured for the '$G_WINUSERNAME' user" !insertmacro DBA_TEXT DBA_LANG_DBNOTFOUND_1 "Unable to find the '$G_DATABASE' file (the SQLite database)" !insertmacro DBA_TEXT DBA_LANG_DBNOTFOUND_2 "(looked in '$G_PLS_FIELD_1' folder)" !insertmacro DBA_TEXT DBA_LANG_DBNOTFOUND "$(DBA_LANG_DBNOTFOUND_1)${MB_NL}${MB_NL}$(DBA_LANG_DBNOTFOUND_2)" !insertmacro DBA_TEXT DBA_LANG_NODBPARAM_1 "No SQLite database filename specified." !insertmacro DBA_TEXT DBA_LANG_NODBPARAM_2 "Usage: $G_PLS_FIELD_1 <database>" !insertmacro DBA_TEXT DBA_LANG_NODBPARAM_3 " e.g. $G_PLS_FIELD_1 popfile.db" !insertmacro DBA_TEXT DBA_LANG_NODBPARAM_4 " e.g. $G_PLS_FIELD_1 C:\Program Files\POPFile\popfile.db" !insertmacro DBA_TEXT DBA_LANG_NODBPARAM_5 " e.g. $G_PLS_FIELD_1 /REGISTRY" !insertmacro DBA_TEXT DBA_LANG_NODBPARAM "$(DBA_LANG_NODBPARAM_1)${MB_NL}${MB_NL}$(DBA_LANG_NODBPARAM_2)${MB_NL}$(DBA_LANG_NODBPARAM_3)${MB_NL}$(DBA_LANG_NODBPARAM_4)${MB_NL}$(DBA_LANG_NODBPARAM_5)" !insertmacro DBA_TEXT DBA_LANG_OPENERR "unable to open file" !insertmacro DBA_TEXT DBA_LANG_DBIDENTIFIED "The database file is a SQLite $G_DBFORMAT database" !insertmacro DBA_TEXT DBA_LANG_UTILNOTFOUND_1 "Unable to find the '$G_SQLITEINFO' file (the SQLite $G_DBFORMAT database analyser)" !insertmacro DBA_TEXT DBA_LANG_UTILNOTFOUND_2 "(looked in '$G_PLS_FIELD_1' folder, 'POPFILE_ROOT' and Registry)" !insertmacro DBA_TEXT DBA_LANG_UTILNOTFOUND "$(DBA_LANG_UTILNOTFOUND_1)${MB_NL}${MB_NL}$(DBA_LANG_UTILNOTFOUND_2)" !insertmacro DBA_TEXT DBA_LANG_STARTERROR "Unable to start the '$G_SQLITEINFO' utility" !insertmacro DBA_TEXT DBA_LANG_UNKNOWNFMT_1 "Unable to tell if '$G_DATABASE' is a SQLite database file" !insertmacro DBA_TEXT DBA_LANG_UNKNOWNFMT_2 "File format not known $G_DBFORMAT" !insertmacro DBA_TEXT DBA_LANG_UNKNOWNFMT_3 "Please shutdown POPFile before using this utility" !insertmacro DBA_TEXT DBA_LANG_UNKNOWNFORMAT "$(DBA_LANG_UNKNOWNFMT_1)${MB_NL}${MB_NL}$(DBA_LANG_UNKNOWNFMT_2)${MB_NL}${MB_NL}$(DBA_LANG_UNKNOWNFMT_3)" !insertmacro DBA_TEXT DBA_LANG_NOSQLITE_1 "Error: POPFile not configured to use SQLite" !insertmacro DBA_TEXT DBA_LANG_NOSQLITE_2 "(see the configuration data in '$G_DATADIR')" !insertmacro DBA_TEXT DBA_LANG_NOSQLITE "$(DBA_LANG_NOSQLITE_1)${MB_NL}${MB_NL}$(DBA_LANG_NOSQLITE_2))" !insertmacro DBA_TEXT DBA_LANG_CURRENT_USER "Current user : $G_WINUSERNAME" !insertmacro DBA_TEXT DBA_LANG_CURRENT_DIR "Current folder: $INSTDIR" !insertmacro DBA_TEXT DBA_LANG_UTILITY_DIR "Utility folder: $EXEDIR" !insertmacro DBA_TEXT DBA_LANG_COMMANDLINE "Command line : $G_DATABASE" !insertmacro DBA_TEXT DBA_LANG_NOCOMMANDLINE "Searching for database because no command-line parameter supplied" !insertmacro DBA_TEXT DBA_LANG_TRY_ENV_VAR "Trying to find database using POPFILE_USER environment variable" !insertmacro DBA_TEXT DBA_LANG_ENV_VAR_VAL "'User Data' folder (from POPFILE_USER) = $G_DATADIR" !insertmacro DBA_TEXT DBA_LANG_NOT_ENV_VAR "Unable to find database using POPFILE_USER environment variable" !insertmacro DBA_TEXT DBA_LANG_TRY_HKCU_REG "Trying to find database using registry data (HKCU)" !insertmacro DBA_TEXT DBA_LANG_HKCU_REG_VAL "'User Data' folder (from HKCU entry) = $G_DATADIR" !insertmacro DBA_TEXT DBA_LANG_NOT_HKCU_REG "Unable to find database using registry data (HKCU)" !insertmacro DBA_TEXT DBA_LANG_HKCU_INVALID "Error: No POPFile registry data found for '$G_WINUSERNAME' user" !insertmacro DBA_TEXT DBA_LANG_TRY_CURRENT "Trying to find database (popfile.db) in current folder" !insertmacro DBA_TEXT DBA_LANG_NOT_CURRENT "Unable to find database (popfile.db) in current folder" !insertmacro DBA_TEXT DBA_LANG_TRY_EXEDIR "Trying to find database (popfile.db) in same folder as utility" !insertmacro DBA_TEXT DBA_LANG_NOT_EXEDIR "Unable to find database (popfile.db) in same folder as utility" !insertmacro DBA_TEXT DBA_LANG_SEARCHING "..." !insertmacro DBA_TEXT DBA_LANG_FOUNDIT "... found it!" !insertmacro DBA_TEXT DBA_LANG_DIRNOTFILE "Error: '$G_DATABASE' is a folder, not a database file" !insertmacro DBA_TEXT DBA_LANG_CHECKTHISONE "POPFile database found ($G_DATABASE)" !insertmacro DBA_TEXT DBA_LANG_DBFORMAT "Database is in SQLite $G_DBFORMAT format" !insertmacro DBA_TEXT DBA_LANG_SQLITE_INT "Using built-in SQLite analyser ($G_SQLITEINFO)" !insertmacro DBA_TEXT DBA_LANG_SQLITE_EXT "SQLite analyser ($G_SQLITEINFO) found in $G_PLS_FIELD_1" !insertmacro DBA_TEXT DBA_LANG_SQLITECOMMAND "Starting the database analyser now:" !insertmacro DBA_TEXT DBA_LANG_SQLITEDBDONE "The database analysis has been completed (status code $G_PLS_FIELD_1)" !insertmacro DBA_TEXT DBA_LANG_SQLITEFAIL "Error: The SQLite analyser utility returned error code $G_PLS_FIELD_1" ;------------------------------------------------------------------------ ; Macro to make it easy to delete the last row in the details window ;------------------------------------------------------------------------ !macro DELETE_LAST_ENTRY Push $0 Call GetDetailViewItemCount Pop $0 IntOp $0 $0 - 1 ; decrement to get the right index of last entry Push $0 Call DeleteDetailViewItem Pop $0 !macroend ;-------------------------------------------------------------------------- ;------------------------------ ; Section: AnalyseSQLiteDatabase ;------------------------------ Section AnalyseSQLiteDatabase !define L_TEMP $R9 Push ${L_TEMP} SetDetailsPrint textonly DetailPrint "$(DBA_LANG_RIGHTCLICK)" SetDetailsPrint listonly DetailPrint "------------------------------------------------------------" DetailPrint "$(^Name) v${C_VERSION}" DetailPrint "------------------------------------------------------------" DetailPrint "" ClearErrors UserInfo::GetName IfErrors default_name Pop $G_WINUSERNAME StrCmp $G_WINUSERNAME "" 0 check_input default_name: StrCpy $G_WINUSERNAME "UnknownUser" check_input: ; Set OutPath to the working directory (to cope with cases where no database path is supplied) GetFullPathName $INSTDIR ".\" SetDetailsPrint none SetOutPath "$INSTDIR" SetDetailsPrint listonly DetailPrint "$(DBA_LANG_CURRENT_USER)" DetailPrint "$(DBA_LANG_CURRENT_DIR)" StrCmp "$INSTDIR" "$EXEDIR" check_command_line DetailPrint "$(DBA_LANG_UTILITY_DIR)" check_command_line: ; The command-line can be used to supply the name of a database file in the current folder ; (e.g. mydata.db), a relative filename for the database file (e.g. ..\data\mydata.db) or ; the full pathname for the database file (e.g. D:\Application Data\POPFile\popfile.db). Call PFI_GetParameters Pop $G_DATABASE StrCmp $G_DATABASE "" check_currentdir DetailPrint "$(DBA_LANG_COMMANDLINE)" StrCmp $G_DATABASE "/REGISTRY" 0 lookforfile DetailPrint "" Goto use_registry check_currentdir: DetailPrint "" DetailPrint "$(DBA_LANG_NOCOMMANDLINE)" DetailPrint "" DetailPrint "$(DBA_LANG_TRY_CURRENT)$(DBA_LANG_SEARCHING)" StrCpy $G_DATABASE "popfile.db" IfFileExists "$INSTDIR\$G_DATABASE" found_in_current !insertmacro DELETE_LAST_ENTRY DetailPrint "$(DBA_LANG_NOT_CURRENT)" StrCmp "$INSTDIR" "$EXEDIR" try_env_var DetailPrint "$(DBA_LANG_TRY_EXEDIR)$(DBA_LANG_SEARCHING)" IfFileExists "$EXEDIR\$G_DATABASE" found_in_exedir !insertmacro DELETE_LAST_ENTRY DetailPrint "$(DBA_LANG_NOT_EXEDIR)" try_env_var: DetailPrint "$(DBA_LANG_TRY_ENV_VAR)$(DBA_LANG_SEARCHING)" ReadEnvStr $G_DATADIR "POPFILE_USER" StrCmp $G_DATADIR "" try_registry Push $G_DATADIR Call PFI_GetCompleteFPN Pop $G_DATADIR !insertmacro DELETE_LAST_ENTRY DetailPrint "$(DBA_LANG_ENV_VAR_VAL)" IfFileExists "$G_DATADIR\*.*" 0 try_registry Push $G_DATADIR Call PFI_GetSQLdbPathName Pop $G_DATABASE StrCmp $G_DATABASE "Not SQLite" sqlite_not_used StrCmp $G_DATABASE "" 0 check_env_file_exists StrCpy $G_DATABASE "$G_DATADIR\popfile.db" check_env_file_exists: IfFileExists "$G_DATABASE" 0 try_registry !insertmacro DELETE_LAST_ENTRY DetailPrint "$(DBA_LANG_TRY_ENV_VAR)$(DBA_LANG_FOUNDIT)" Goto split_path try_registry: !insertmacro DELETE_LAST_ENTRY DetailPrint "$(DBA_LANG_NOT_ENV_VAR)" use_registry: DetailPrint "$(DBA_LANG_TRY_HKCU_REG)$(DBA_LANG_SEARCHING)" ReadRegStr $G_DATADIR HKCU "Software\POPFile Project\POPFile\MRI" "Owner" StrCmp $G_DATADIR $G_WINUSERNAME same_owner !insertmacro DELETE_LAST_ENTRY StrCmp $G_DATABASE "/REGISTRY" no_reg_data DetailPrint "" no_reg_data: DetailPrint "$(DBA_LANG_HKCU_INVALID)" Goto usage_msg same_owner: ReadRegStr $G_DATADIR HKCU "Software\POPFile Project\POPFile\MRI" "UserDir_LFN" StrCmp $G_DATADIR "" abandon_search !insertmacro DELETE_LAST_ENTRY DetailPrint "$(DBA_LANG_HKCU_REG_VAL)" IfFileExists "$G_DATADIR\*.*" 0 abandon_search Push $G_DATADIR Call PFI_GetSQLdbPathName Pop $G_DATABASE StrCmp $G_DATABASE "Not SQLite" sqlite_not_used StrCmp $G_DATABASE "" 0 check_reg_file_exists StrCpy $G_DATABASE "$G_DATADIR\popfile.db" check_reg_file_exists: IfFileExists "$G_DATABASE" 0 abandon_search !insertmacro DELETE_LAST_ENTRY DetailPrint "$(DBA_LANG_TRY_HKCU_REG)$(DBA_LANG_FOUNDIT)" Goto split_path sqlite_not_used: DetailPrint "" DetailPrint "$(DBA_LANG_NOSQLITE_1)" DetailPrint "$(DBA_LANG_NOSQLITE_2)" MessageBox MB_OK|MB_ICONEXCLAMATION "$(DBA_LANG_NOSQLITE)" Goto error_exit abandon_search: !insertmacro DELETE_LAST_ENTRY DetailPrint "$(DBA_LANG_NOT_HKCU_REG)" StrCpy $G_PLS_FIELD_1 "$INSTDIR" Goto give_up found_in_current: !insertmacro DELETE_LAST_ENTRY DetailPrint "$(DBA_LANG_TRY_CURRENT)$(DBA_LANG_FOUNDIT)" Goto lookforfile found_in_exedir: !insertmacro DELETE_LAST_ENTRY DetailPrint "$(DBA_LANG_TRY_EXEDIR)$(DBA_LANG_FOUNDIT)" StrCpy $INSTDIR $EXEDIR lookforfile: Push $INSTDIR Push $G_DATABASE Call PFI_GetDataPath Pop $G_DATABASE split_path: Push $G_DATABASE Call PFI_GetParent Pop $G_PLS_FIELD_1 StrLen ${L_TEMP} $G_PLS_FIELD_1 IntOp ${L_TEMP} ${L_TEMP} + 1 StrCpy $G_DATABASE $G_DATABASE "" ${L_TEMP} IfFileExists "$G_PLS_FIELD_1\$G_DATABASE" continue give_up: DetailPrint "" DetailPrint "$(DBA_LANG_DBNOTFOUND_1)" DetailPrint "$(DBA_LANG_DBNOTFOUND_2)" MessageBox MB_OK|MB_ICONEXCLAMATION "$(DBA_LANG_DBNOTFOUND)" usage_msg: ; Ensure the correct program name appears in the 'usage' message added to the log. ; The first system call gets the full pathname (returned in $R0) and the second call ; extracts the filename (and possibly the extension) part (result returned in $R1) Push $R0 Push $R1 System::Call 'kernel32::GetModuleFileNameA(i 0, t .R0, i 1024)' System::Call 'comdlg32::GetFileTitleA(t R0, t .R1, i 1024)' StrCpy $G_PLS_FIELD_1 $R1 Pop $R1 Pop $R0 DetailPrint "" DetailPrint "$(DBA_LANG_NODBPARAM_2)" DetailPrint "" DetailPrint "$(DBA_LANG_NODBPARAM_3)" DetailPrint "$(DBA_LANG_NODBPARAM_4)" DetailPrint "$(DBA_LANG_NODBPARAM_5)" Goto error_exit continue: StrCpy $G_PLS_FIELD_2 $G_DATABASE StrCpy $G_DATABASE "$G_PLS_FIELD_1\$G_DATABASE" IfFileExists "$G_DATABASE\*.*" dir_not_file DetailPrint "" DetailPrint "$(DBA_LANG_CHECKTHISONE)" Push $G_DATABASE Call PFI_GetSQLiteFormat Pop $G_DBFORMAT StrCpy $G_SQLITEINFO "sqlite_analyzer.exe" StrCmp $G_DBFORMAT "2.x" extract_util StrCpy $G_SQLITEINFO "sqlite3_analyzer.exe" StrCmp $G_DBFORMAT "3.x" look_for_util Push $G_DATABASE Call PFI_GetParent Pop $G_PLS_FIELD_1 StrLen ${L_TEMP} $G_PLS_FIELD_1 IntOp ${L_TEMP} ${L_TEMP} + 1 StrCpy $G_DATABASE $G_DATABASE "" ${L_TEMP} DetailPrint "" DetailPrint "$(DBA_LANG_UNKNOWNFMT_1)" DetailPrint "" DetailPrint "$(DBA_LANG_UNKNOWNFMT_2)" DetailPrint "" DetailPrint "$(DBA_LANG_UNKNOWNFMT_3)" MessageBox MB_OK|MB_ICONEXCLAMATION "$(DBA_LANG_UNKNOWNFORMAT)" Goto error_exit look_for_util: DetailPrint "" DetailPrint "$(DBA_LANG_DBIDENTIFIED)" StrCpy ${L_TEMP} "$EXEDIR" StrCpy $G_PLS_FIELD_1 "$EXEDIR" IfFileExists "${L_TEMP}\$G_SQLITEINFO" run_ext_util ; It is not in "our" folder so try looking in the usual places ReadEnvStr ${L_TEMP} "POPFILE_ROOT" StrCmp ${L_TEMP} "" try_HKCU Push ${L_TEMP} Call PFI_GetCompleteFPN Pop ${L_TEMP} StrCmp ${L_TEMP} "" try_HKCU IfFileExists "${L_TEMP}\$G_SQLITEINFO" run_ext_util try_HKCU: ReadRegStr ${L_TEMP} HKCU "Software\POPFile Project\POPFile\MRI" "RootDir_LFN" StrCmp ${L_TEMP} "" try_HKLM IfFileExists "${L_TEMP}\$G_SQLITEINFO" run_ext_util try_HKLM: ReadRegStr ${L_TEMP} HKLM "Software\POPFile Project\POPFile\MRI" "RootDir_LFN" StrCmp ${L_TEMP} "" no_util IfFileExists "${L_TEMP}\$G_SQLITEINFO" run_ext_util no_util: DetailPrint "" DetailPrint "$(DBA_LANG_UTILNOTFOUND_1)" DetailPrint "$(DBA_LANG_UTILNOTFOUND_2)" MessageBox MB_OK|MB_ICONEXCLAMATION \ "$(DBA_LANG_DBIDENTIFIED)\ ${MB_NL}${MB_NL}${MB_NL}\ $(DBA_LANG_UTILNOTFOUND)" Goto error_exit run_ext_util: StrCpy $G_PLS_FIELD_1 ${L_TEMP} DetailPrint "" DetailPrint "$(DBA_LANG_SQLITE_EXT)" Goto run_it extract_util: DetailPrint "" DetailPrint "$(DBA_LANG_DBIDENTIFIED)" SetDetailsPrint none File "/oname=$PLUGINSDIR\sqlite_analyzer.exe" "..\sqlite_analyzer.exe" SetDetailsPrint listonly StrCpy $G_PLS_FIELD_1 "$PLUGINSDIR" DetailPrint "" DetailPrint "$(DBA_LANG_SQLITE_INT)" run_it: DetailPrint "" DetailPrint "$(DBA_LANG_SQLITECOMMAND)" DetailPrint "------------------------------------------------------------" DetailPrint "" nsExec::ExecToLog '"$G_PLS_FIELD_1\$G_SQLITEINFO" "$G_DATABASE"' Pop ${L_TEMP} StrCmp ${L_TEMP} "error" start_error StrCmp ${L_TEMP} "timeout" start_error StrCpy $G_PLS_FIELD_1 ${L_TEMP} IntCmp ${L_TEMP} 0 exit DetailPrint "" DetailPrint "------------------------------------------------------------" DetailPrint "" DetailPrint "$(DBA_LANG_SQLITEFAIL)" Goto error_exit dir_not_file: DetailPrint "" DetailPrint "$(DBA_LANG_DIRNOTFILE)" MessageBox MB_OK|MB_ICONEXCLAMATION "$(DBA_LANG_DIRNOTFILE)" Goto error_exit start_error: DetailPrint "" DetailPrint "$(DBA_LANG_STARTERROR)" MessageBox MB_OK|MB_ICONEXCLAMATION "$(DBA_LANG_STARTERROR)" error_exit: Call PFI_GetDateTimeStamp Pop ${L_TEMP} DetailPrint "" DetailPrint "------------------------------------------------------------" DetailPrint "(database analysis failed ${L_TEMP})" DetailPrint "------------------------------------------------------------" SetDetailsPrint none Abort exit: DetailPrint "" DetailPrint "------------------------------------------------------------" DetailPrint "$(DBA_LANG_SQLITEDBDONE)" Call PFI_GetDateTimeStamp Pop ${L_TEMP} DetailPrint "------------------------------------------------------------" DetailPrint "(report finished ${L_TEMP})" DetailPrint "------------------------------------------------------------" SetDetailsPrint none ; Emphasize the 'status code' part of the report by hiding the less important timestamp part Call HideFinalTimestamp POP ${L_TEMP} !undef L_TEMP SectionEnd #-------------------------------------------------------------------------- # Functions used to manipulate the contents of the details view #-------------------------------------------------------------------------- ;------------------------------------------------------------------------ ; Constants used when accessing the details view ;------------------------------------------------------------------------ !define C_LVM_GETITEMCOUNT 0x1004 !define C_LVM_DELETEITEM 0x1008 !define C_LVM_ENSUREVISIBLE 0x1013 !define C_LVM_GETTOPINDEX 0x1027 #-------------------------------------------------------------------------- # Installer Function: GetDetailViewItemCount # # Returns the number of rows in the details view (on the INSTFILES page) # # Inputs: # none # # Outputs: # (top of stack) - number of rows in the details view window # # Usage: # # Call GetDetailViewItemCount # Pop $R9 # #-------------------------------------------------------------------------- Function GetDetailViewItemCount Push $1 FindWindow $1 "#32770" "" $HWNDPARENT GetDlgItem $1 $1 0x3F8 ; This is the Control ID of the details view SendMessage $1 ${C_LVM_GETITEMCOUNT} 0 0 $1 Exch $1 FunctionEnd #-------------------------------------------------------------------------- # Installer Function: DeleteDetailViewItem # # Deletes one row from the details view (on the INSTFILES page) # # Inputs: # (top of stack) - index number of the row to be deleted # # Outputs: # none # # Usage: # # Push $R9 # Call DeleteDetailViewItem # #-------------------------------------------------------------------------- Function DeleteDetailViewItem Exch $0 Push $1 FindWindow $1 "#32770" "" $HWNDPARENT GetDlgItem $1 $1 0x3F8 ; This is the Control ID of the details view SendMessage $1 ${C_LVM_DELETEITEM} $0 0 Pop $1 Pop $0 FunctionEnd #-------------------------------------------------------------------------- # Installer Function: HideFinalTimestamp # # Scrolls the details view up a little to hide the final timestamp in order # to emphasize the end of the analysis report (the timestamp is less important). # # The "report finished" timestamp can still be seen by scrolling down or saving # the entire report to a file via the clipboard. # # Inputs: # none # # Outputs: # none # # Usage: # Call HideFinalTimestamp # #-------------------------------------------------------------------------- Function HideFinalTimestamp !define L_TEMP $R9 !define L_TOPROW $R8 Push ${L_TEMP} Push ${L_TOPROW} ; The final timestamp block uses 3 lines so we want to scroll up 3 lines to bring ; more important lines back into view at the top of the list. The LVM_SCROLL message ; uses a pixel-based vertical scroll value instead of an item-based value so we take ; an easier approach: find the item index of the currently visible top row and then ; make visible the item which is 3 rows before that. (The item index is zero based so ; we must ensure we never supply a negative item index) FindWindow ${L_TOPROW} "#32770" "" $HWNDPARENT GetDlgItem ${L_TOPROW} ${L_TOPROW} 0x3F8 ; This is the Control ID of the details view SendMessage ${L_TOPROW} ${C_LVM_GETTOPINDEX} 0 0 ${L_TOPROW} IntOp ${L_TOPROW} ${L_TOPROW} - 3 IntCmp ${L_TOPROW} 0 scrollup 0 scrollup StrCpy ${L_TOPROW} 0 scrollup: FindWindow ${L_TEMP} "#32770" "" $HWNDPARENT GetDlgItem ${L_TEMP} ${L_TEMP} 0x3F8 ; This is the Control ID of the details view SendMessage ${L_TEMP} ${C_LVM_ENSUREVISIBLE} ${L_TOPROW} 0 Pop ${L_TOPROW} Pop ${L_TEMP} !undef L_TEMP !undef L_TOPROW FunctionEnd ;-------------------------- ; End of 'pfidbanalyser.nsi' ;-------------------------- |
|
From: Brian S. <xue...@us...> - 2006-05-30 14:12:29
|
Update of /cvsroot/popfile/windows/add-ons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8298 Modified Files: updateimap.nsi Log Message: Updated to work with SourceForge.net's new CVS system Index: updateimap.nsi =================================================================== RCS file: /cvsroot/popfile/windows/add-ons/updateimap.nsi,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** updateimap.nsi 10 Feb 2006 23:51:56 -0000 1.4 --- updateimap.nsi 30 May 2006 14:12:04 -0000 1.5 *************** *** 121,125 **** Name "POPFile IMAP Updater" ! !define C_PFI_VERSION "0.0.8" ; Mention the wizard's version number in the window title --- 121,125 ---- Name "POPFile IMAP Updater" ! !define C_PFI_VERSION "0.0.9" ; Mention the wizard's version number in the window title *************** *** 139,147 **** ; SourceForge URL for the CVS Revision History for the POPFile IMAP module ! !define C_CVS_HISTORY_URL "http://cvs.sourceforge.net/viewcvs.py/popfile/engine/Services/IMAP.pm" ; SourceForge URL used when downloading a particular CVS revision of the IMAP module ! !define C_CVS_IMAP_DL_URL "http://cvs.sourceforge.net/viewcvs.py/*checkout*/popfile/engine/Services/IMAP.pm?rev=$G_REVISION" ;-------------------------------------------------------------------------- --- 139,147 ---- ; SourceForge URL for the CVS Revision History for the POPFile IMAP module ! !define C_CVS_HISTORY_URL "http://popfile.cvs.sourceforge.net/popfile/engine/Services/IMAP.pm?view=log" ; SourceForge URL used when downloading a particular CVS revision of the IMAP module ! !define C_CVS_IMAP_DL_URL "http://popfile.cvs.sourceforge.net/*checkout*/popfile/engine/Services/IMAP.pm?revision=$G_REVISION" ;-------------------------------------------------------------------------- *************** *** 907,913 **** StrCmp ${L_LINE} "" done ! StrCpy ${L_PARAM} ${L_LINE} 12 ! StrCmp ${L_PARAM} "Revision <b>" 0 loop ! StrCpy ${L_TEMP} 12 revision_loop: --- 907,913 ---- StrCmp ${L_LINE} "" done ! StrCpy ${L_PARAM} ${L_LINE} 17 ! StrCmp ${L_PARAM} "Revision <strong>" 0 loop ! StrCpy ${L_TEMP} 17 revision_loop: *************** *** 921,927 **** FileRead ${L_HANDLE} ${L_LINE} StrCmp ${L_LINE} "" done ! StrCpy ${L_PARAM} ${L_LINE} 3 ! StrCmp ${L_PARAM} "<i>" 0 date_loop ! StrCpy ${L_RESULT_DATE} ${L_LINE} 28 3 done: --- 921,927 ---- FileRead ${L_HANDLE} ${L_LINE} StrCmp ${L_LINE} "" done ! StrCpy ${L_PARAM} ${L_LINE} 4 ! StrCmp ${L_PARAM} "<em>" 0 date_loop ! StrCpy ${L_RESULT_DATE} ${L_LINE} 28 4 done: |
|
From: John Graham-C. <jgr...@us...> - 2006-04-29 09:07:27
|
Update of /cvsroot/popfile/engine/Classifier In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13473 Modified Files: popfile.sql Log Message: Add comment fields to buckets table Index: popfile.sql =================================================================== RCS file: /cvsroot/popfile/engine/Classifier/popfile.sql,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** popfile.sql 20 Feb 2006 02:11:14 -0000 1.27 --- popfile.sql 29 Apr 2006 09:07:15 -0000 1.28 *************** *** 1,3 **** ! -- POPFILE SCHEMA 7 -- --------------------------------------------------------------------------- -- --- 1,3 ---- ! -- POPFILE SCHEMA 8 -- --------------------------------------------------------------------------- -- *************** *** 5,9 **** -- -- Copyright (c) 2003-2006 John Graham-Cumming - -- -- This file is part of POPFile --- 5,8 ---- *************** *** 54,58 **** -- / | name | | | name | | | lastseen | -- | | password | | | pseudo | | +----------+ ! -- | +----------+ | +---------+ | -- | | | -- | | +-----------+ | --- 53,58 ---- -- / | name | | | name | | | lastseen | -- | | password | | | pseudo | | +----------+ ! -- | +----------+ | | comment | | ! -- | | +---------+ | -- | | | -- | | +-----------+ | *************** *** 128,131 **** --- 128,132 ---- -- (i.e. one POPFile uses -- internally) + comment varchar(255), -- user defined comment unique (userid,name) -- a user can't have two buckets -- with the same name |
|
From: John Graham-C. <jgr...@us...> - 2006-03-06 12:51:43
|
Update of /cvsroot/popfile/engine/POPFile In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31899 Modified Files: History.pm Log Message: Modify the code that cleans up empty directories so that it doesn't do globbing (it relies on the return code of rmdir instead). Thanks to olivier_myriad for the idea Index: History.pm =================================================================== RCS file: /cvsroot/popfile/engine/POPFile/History.pm,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** History.pm 20 Feb 2006 02:01:57 -0000 1.40 --- History.pm 6 Mar 2006 12:51:36 -0000 1.41 *************** *** 301,324 **** unlink $file; ! # It's not possible that the directory for the slot file is empty ! # and we want to delete it so that things get cleaned up automatically ! $file =~ s/popfile[a-f0-9]{2}\.msg$//i; my $depth = 3; while ( $depth > 0 ) { ! my @files = glob( $file . '*' ); ! ! if ( $#files == -1 ) { ! if ( !( rmdir( $file ) ) ) { ! last; ! } ! $file =~ s![a-f0-9]{2}/$!!i; ! } else { ! last; } - - $depth--; } } --- 301,318 ---- unlink $file; ! # It's now possible that the directory for the slot file is empty ! # and we want to delete it so that things get cleaned up ! # automatically ! my $directory = $file; ! $directory =~ s/popfile[a-f0-9]{2}\.msg$//i; my $depth = 3; while ( $depth > 0 ) { ! if ( rmdir( $directory ) ) { ! $directory =~ s![a-f0-9]{2}/$!!i; ! $depth--; } } } |
|
From: Joseph C. <tex...@us...> - 2006-03-03 09:55:52
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21024/skins/default Modified Files: administration-page.thtml nntp-security-local.thtml pop3-security-panel.thtml smtp-security-local.thtml xmlrpc-local.thtml Log Message: Some more work on new Admin page. Same issues as last commit, plus wrongly using Security_If_Local for disabling remote options while in Stealth Mode (that is for the UI only). We have no global Stealth mode var so this is just a placeholder. Either need a new PF var for the Stealth checkbox or loop through all the modules and if all are local we are in stealth mode. With a sepearate Stealth mode var you could switch to Stealth Mode and leave your current Server Mode options selected. They would be disabled checkboxes but still have checks in them. But that could be confusing. Added Logger Level drop down that needs connecting. Index: xmlrpc-local.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/xmlrpc-local.thtml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** xmlrpc-local.thtml 2 Mar 2006 11:17:00 -0000 1.6 --- xmlrpc-local.thtml 3 Mar 2006 09:55:49 -0000 1.7 *************** *** 1,3 **** ! <input type="checkbox" name="serveropt_xmlrpc" id="securityAcceptXMLRPC" <TMPL_IF NAME="XMLRPC_local_on"><TMPL_ELSE>checked</TMPL_IF> /> <label class="administrationLabel" for="securityAcceptXMLRPC"> <TMPL_VAR NAME="Localize_Security_XMLRPC"> --- 1,3 ---- ! <input type="checkbox" name="serveropt_xmlrpc" id="securityAcceptXMLRPC" <TMPL_IF NAME="XMLRPC_local_on"><TMPL_ELSE>checked</TMPL_IF> <TMPL_IF NAME="Security_If_Local">disabled</TMPL_IF> /> <label class="administrationLabel" for="securityAcceptXMLRPC"> <TMPL_VAR NAME="Localize_Security_XMLRPC"> Index: pop3-security-panel.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/pop3-security-panel.thtml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** pop3-security-panel.thtml 2 Mar 2006 11:17:00 -0000 1.10 --- pop3-security-panel.thtml 3 Mar 2006 09:55:49 -0000 1.11 *************** *** 1,3 **** ! <input type="checkbox" name="serveropt_pop3" id="securityAcceptPOP3" <TMPL_IF NAME="POP3_Security_Local"><TMPL_ELSE>checked</TMPL_IF> /> <label class="administrationLabel" for="securityAcceptPOP3"> <TMPL_VAR NAME="Localize_Security_POP3"> --- 1,3 ---- ! <input type="checkbox" name="serveropt_pop3" id="securityAcceptPOP3" <TMPL_IF NAME="POP3_Security_Local"><TMPL_ELSE>checked</TMPL_IF> <TMPL_IF NAME="Security_If_Local">disabled</TMPL_IF> /> <label class="administrationLabel" for="securityAcceptPOP3"> <TMPL_VAR NAME="Localize_Security_POP3"> Index: nntp-security-local.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/nntp-security-local.thtml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** nntp-security-local.thtml 2 Mar 2006 11:17:00 -0000 1.7 --- nntp-security-local.thtml 3 Mar 2006 09:55:49 -0000 1.8 *************** *** 1,3 **** ! <input type="checkbox" name="serveropt_nntp" id="securityAcceptNNTP" <TMPL_IF NAME="nntp_if_local"><TMPL_ELSE>checked</TMPL_IF> /> <label class="administrationLabel" for="securityAcceptNNTP"> <TMPL_VAR NAME="Localize_Security_NNTP"> --- 1,3 ---- ! <input type="checkbox" name="serveropt_nntp" id="securityAcceptNNTP" <TMPL_IF NAME="nntp_if_local"><TMPL_ELSE>checked</TMPL_IF> <TMPL_IF NAME="Security_If_Local">disabled</TMPL_IF> /> <label class="administrationLabel" for="securityAcceptNNTP"> <TMPL_VAR NAME="Localize_Security_NNTP"> Index: administration-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/administration-page.thtml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** administration-page.thtml 2 Mar 2006 11:17:00 -0000 1.10 --- administration-page.thtml 3 Mar 2006 09:55:48 -0000 1.11 *************** *** 25,34 **** </label> <br /> ! <input type="radio" name="servermode" id="StealthMode" value="StealthMode" onClick="serverMode(false)" checked /> <label class="administrationLabel" for="StealthMode"> Stealth Mode (disable remote connections) </label> <br /> ! <input type="radio" name="servermode" id="ServerMode" value="ServerMode" onClick="serverMode(true)" /> <label class="administrationLabel" for="ServerMode"> Server Mode (allow remote connections) --- 25,34 ---- </label> <br /> ! <input type="radio" name="servermode" id="StealthMode" value="StealthMode" onClick="serverMode(false)" <TMPL_IF NAME="Security_If_Local">checked</TMPL_IF> /> <label class="administrationLabel" for="StealthMode"> Stealth Mode (disable remote connections) </label> <br /> ! <input type="radio" name="servermode" id="ServerMode" value="ServerMode" onClick="serverMode(true)" <TMPL_IF NAME="Security_If_Local"><TMPL_ELSE>checked</TMPL_IF> /> <label class="administrationLabel" for="ServerMode"> Server Mode (allow remote connections) *************** *** 36,46 **** <br /> <div style="margin-left:1em;" class="adminAcceptRemote"> ! <input type="checkbox" name="serveropt_http" id="securityAcceptHTTP" name="toggle" /> ! <label class="administrationLabel" for="securityAcceptHTTP"> ! <TMPL_VAR NAME="Localize_Security_UI"> ! </label> ! <br /> ! <TMPL_VAR NAME="Security_Dynamic_Security"> </div> --- 36,46 ---- <br /> <div style="margin-left:1em;" class="adminAcceptRemote"> ! <input type="checkbox" name="serveropt_http" id="securityAcceptHTTP" name="toggle" <TMPL_IF NAME="Security_If_Local">disabled</TMPL_IF> /> ! <label class="administrationLabel" for="securityAcceptHTTP"> ! <TMPL_VAR NAME="Localize_Security_UI"> ! </label> ! <br /> ! <TMPL_VAR NAME="Security_Dynamic_Security"> </div> *************** *** 49,53 **** <TMPL_INCLUDE NAME="windows-configuration.thtml"> ! <br /> <input type="submit" class="submit" name="apply_operation" value="<TMPL_VAR NAME="Localize_Apply">" /> </form> --- 49,53 ---- <TMPL_INCLUDE NAME="windows-configuration.thtml"> ! <br /><br /> <input type="submit" class="submit" name="apply_operation" value="<TMPL_VAR NAME="Localize_Apply">" /> </form> *************** *** 66,150 **** <h2 class="configuration"><TMPL_VAR NAME="Localize_Security_UpdateTitle"></h2> <form class="securitySwitch" action="<TMPL_VAR NAME="Configuration_Action">" method="post"> ! <div class="securityLabel"> ! <TMPL_VAR NAME="Localize_Security_Update">: ! </div> ! ! <TMPL_IF NAME="Security_If_Update_Check"> ! ! <span class="securityWidgetStateOn"> ! <TMPL_VAR NAME="Localize_Yes"> ! </span> ! <input type="submit" class="submit toggleOff" id="securityUpdateCheckOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" /> ! <input type="hidden" name="update_check" value="1" /> ! ! <TMPL_ELSE> ! ! <span class="securityWidgetStateOff"><TMPL_VAR NAME="Localize_No"></span> ! <input type="submit" class="submit toggleOn" id="securityUpdateCheckOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> ! <input type="hidden" name="update_check" value="2" /> ! ! </TMPL_IF> ! </form> - <i><TMPL_VAR NAME="Localize_Security_ExplainUpdate"></i> <hr /> </div> - <div class="securityStatsWidget"> - <h2 class="configuration"><TMPL_VAR NAME="Localize_Security_StatsTitle"></h2> - <form class="securitySwitch" action="<TMPL_VAR NAME="Configuration_Action">" method="post"> - <div class="securityLabel"> - <TMPL_VAR NAME="Localize_Security_Stats">: - </div> - - <TMPL_IF NAME="Security_If_Send_Stats"> - - <span class="securityWidgetStateOn"> - <TMPL_VAR NAME="Localize_Yes"> - </span> - <input type="submit" class="submit toggleOff" id="securitySendStatsOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" /> - <input type="hidden" name="send_stats" value="1" /> - - <TMPL_ELSE> - - <span class="securityWidgetStateOff"> - <TMPL_VAR NAME="Localize_No"> - </span> - <input type="submit" class="submit toggleOn" id="securitySendStatsOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> - <input type="hidden" name="send_stats" value="2" /> - - </TMPL_IF> - - </form> - <i><TMPL_VAR NAME="Localize_Security_ExplainStats"></i> - <hr /> - </div> - - <h2 class="configuration"><TMPL_VAR NAME="Localize_Configuration_TCPTimeout"></h2> - <form action="/administration" method="post"> - <label class="configurationLabel" for="configTCPTimeout"> - <TMPL_VAR NAME="Localize_Configuration_TCPTimeoutSecs">: - </label> - <br /> - <input name="timeout" type="text" id="configTCPTimeout" value="<TMPL_VAR NAME="Configuration_TCP_Timeout">" /> - <input type="submit" class="submit" name="update_timeout" value="<TMPL_VAR NAME="Localize_Apply">" /> - </form> - - <TMPL_IF NAME="Configuration_If_TCP_Timeout_Error"> - - <blockquote> - <div class="error01"> - <TMPL_VAR NAME="Localize_Configuration_Error6"> - </div> - </blockquote> - - </TMPL_IF> - - <TMPL_VAR NAME="Configuration_TCP_Timeout_Updated"> - <hr /> - <h2 class="configuration"><TMPL_VAR NAME="Localize_Configuration_Logging"></h2> <form action="/administration" method="post"> ! <label class="configurationLabel" for="configLogging"> <TMPL_VAR NAME="Localize_Configuration_LoggerOutput">: </label> --- 66,89 ---- <h2 class="configuration"><TMPL_VAR NAME="Localize_Security_UpdateTitle"></h2> <form class="securitySwitch" action="<TMPL_VAR NAME="Configuration_Action">" method="post"> ! <input type="checkbox" id="securityUpdateCheck" name="update_check" <TMPL_IF NAME="Security_If_Update_Check">checked</TMPL_IF> /> ! <label class="administrationLabel" for="securityUpdateCheck"> ! <TMPL_VAR NAME="Localize_Security_Update"> ! </label> ! <br /> ! <input type="checkbox" id="securitySendStats" name="update_check" <TMPL_IF NAME="Security_If_Send_Stats">checked</TMPL_IF> /> ! <label class="administrationLabel" for="securitySendStats"> ! <TMPL_VAR NAME="Localize_Security_Stats"> ! </label> ! <br /><br /> ! <input type="submit" class="submit" name="privacy" value="<TMPL_VAR NAME="Localize_Apply">" /> ! <br /><br /> ! <i><TMPL_VAR NAME="Localize_Security_ExplainUpdate"></i> </form> <hr /> </div> <h2 class="configuration"><TMPL_VAR NAME="Localize_Configuration_Logging"></h2> <form action="/administration" method="post"> ! <label class="administrationLabel" for="configLogging"> <TMPL_VAR NAME="Localize_Configuration_LoggerOutput">: </label> *************** *** 164,167 **** --- 103,123 ---- </option> </select> + <br /> + <label class="administrationLabel" for="configLoggingLevel"> + Logger level: + </label> + + <select name="level" id="configLoggingLevel"> + <option value="0" > + Low + </option> + <option value="1" > + Default + </option> + <option value="2" > + High + </option> + </select> + <br /><br /> <input type="submit" class="submit" name="submit_debug" value="<TMPL_VAR NAME="Localize_Apply">" /> </form> *************** *** 169,175 **** <TMPL_IF NAME="Configuration_If_Show_Log"> ! <p> ! <a href="popfile_current_log.log" class="downloadLogLink"><TMPL_VAR NAME="Localize_Configuration_CurrentLogFile"></a> ! </p> </TMPL_IF> --- 125,130 ---- <TMPL_IF NAME="Configuration_If_Show_Log"> ! <br /> ! <a href="popfile_current_log.log" class="downloadLogLink"><TMPL_VAR NAME="Localize_Configuration_CurrentLogFile"></a> </TMPL_IF> *************** *** 184,188 **** <br /> <input name="ui_port" id="configUIPort" type="text" value="<TMPL_VAR NAME="Configuration_UI_Port">" /> ! <input type="submit" class="submit" name="update_ui_port" value="<TMPL_VAR NAME="Localize_Apply">" /> </form> --- 139,164 ---- <br /> <input name="ui_port" id="configUIPort" type="text" value="<TMPL_VAR NAME="Configuration_UI_Port">" /> ! <br /> ! ! <label class="configurationLabel" for="configTCPTimeout"> ! <TMPL_VAR NAME="Localize_Configuration_TCPTimeoutSecs">: ! </label> ! <br /> ! <input name="timeout" type="text" id="configTCPTimeout" value="<TMPL_VAR NAME="Configuration_TCP_Timeout">" /> ! ! <TMPL_IF NAME="Configuration_If_TCP_Timeout_Error"> ! ! <blockquote> ! <div class="error01"> ! <TMPL_VAR NAME="Localize_Configuration_Error6"> ! </div> ! </blockquote> ! ! </TMPL_IF> ! ! <TMPL_VAR NAME="Configuration_TCP_Timeout_Updated"> ! ! <br /><br /> ! <input type="submit" class="submit" name="update_modules" value="<TMPL_VAR NAME="Localize_Apply">" /> </form> Index: smtp-security-local.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/smtp-security-local.thtml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** smtp-security-local.thtml 2 Mar 2006 11:17:00 -0000 1.6 --- smtp-security-local.thtml 3 Mar 2006 09:55:49 -0000 1.7 *************** *** 1,3 **** ! <input type="checkbox" name="serveropt_smtp" id="securityAcceptSMTP" <TMPL_IF NAME="smtp_local_on"><TMPL_ELSE>checked</TMPL_IF> /> <label class="administrationLabel" for="securityAcceptSMTP"> <TMPL_VAR NAME="Localize_Security_SMTP"> --- 1,3 ---- ! <input type="checkbox" name="serveropt_smtp" id="securityAcceptSMTP" <TMPL_IF NAME="smtp_local_on"><TMPL_ELSE>checked</TMPL_IF> <TMPL_IF NAME="Security_If_Local">disabled</TMPL_IF> /> <label class="administrationLabel" for="securityAcceptSMTP"> <TMPL_VAR NAME="Localize_Security_SMTP"> |
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13684/skins/default Modified Files: administration-page.thtml nntp-security-local.thtml pop3-security-panel.thtml smtp-security-local.thtml windows-configuration.thtml xmlrpc-local.thtml Log Message: Beginning of Admin page redesign. Needs lots of changes to language file and localization of some new strings but new form layout for first section is there. Windows specific options need help. Index: smtp-security-local.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/smtp-security-local.thtml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** smtp-security-local.thtml 15 Feb 2005 04:23:55 -0000 1.5 --- smtp-security-local.thtml 2 Mar 2006 11:17:00 -0000 1.6 *************** *** 1,24 **** ! <form class="securitySwitch" action="<TMPL_VAR NAME="Configuration_Action">" method="post"> ! <div class="securityLabel"> ! <TMPL_VAR NAME="Localize_Security_SMTP">: ! </div> ! ! <TMPL_IF NAME="smtp_local_on"> ! ! <span class="securityWidgetStateOff"> ! <TMPL_VAR NAME="Localize_Security_NoStealthMode"> ! </span> ! <input type="submit" class="toggleOn" id="securityAcceptSMTPOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> ! <input type="hidden" name="smtp_local" value="0" /> ! ! <TMPL_ELSE> ! ! <span class="securityWidgetStateOn"> ! <TMPL_VAR NAME="Localize_Yes"> ! </span> ! <input type="submit" class="toggleOff" id="securityAcceptSMTPOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo"> <TMPL_VAR NAME="Localize_Security_StealthMode">" /> ! <input type="hidden" name="smtp_local" value="1" /> ! ! </TMPL_IF> ! ! </form> --- 1,5 ---- ! <input type="checkbox" name="serveropt_smtp" id="securityAcceptSMTP" <TMPL_IF NAME="smtp_local_on"><TMPL_ELSE>checked</TMPL_IF> /> ! <label class="administrationLabel" for="securityAcceptSMTP"> ! <TMPL_VAR NAME="Localize_Security_SMTP"> ! </label> ! <br /> Index: pop3-security-panel.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/pop3-security-panel.thtml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** pop3-security-panel.thtml 15 Feb 2005 04:23:54 -0000 1.9 --- pop3-security-panel.thtml 2 Mar 2006 11:17:00 -0000 1.10 *************** *** 1,24 **** ! <form class="securitySwitch" action="<TMPL_VAR NAME="Configuration_Action">" method="post"> ! <div class="securityLabel"> ! <TMPL_VAR NAME="Localize_Security_POP3">: ! </div> ! ! <TMPL_IF NAME="POP3_Security_Local"> ! ! <span class="securityWidgetStateOff"> ! <TMPL_VAR NAME="Localize_Security_NoStealthMode"> ! </span> ! <input type="submit" class="submit toggleOn" id="securityAcceptPOP3On" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> ! <input type="hidden" name="pop3_local" value="1" /> ! ! <TMPL_ELSE> ! ! <span class="securityWidgetStateOn"> ! <TMPL_VAR NAME="Localize_Yes"> ! </span> ! <input type="submit" class="submit toggleOff" id="securityAcceptPOP3Off" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo"> <TMPL_VAR NAME="Localize_Security_StealthMode">" /> ! <input type="hidden" name="pop3_local" value="2" /> ! ! </TMPL_IF> ! ! </form> --- 1,5 ---- ! <input type="checkbox" name="serveropt_pop3" id="securityAcceptPOP3" <TMPL_IF NAME="POP3_Security_Local"><TMPL_ELSE>checked</TMPL_IF> /> ! <label class="administrationLabel" for="securityAcceptPOP3"> ! <TMPL_VAR NAME="Localize_Security_POP3"> ! </label> ! <br /> Index: xmlrpc-local.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/xmlrpc-local.thtml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** xmlrpc-local.thtml 15 Feb 2005 04:23:55 -0000 1.5 --- xmlrpc-local.thtml 2 Mar 2006 11:17:00 -0000 1.6 *************** *** 1,24 **** ! <form class="securitySwitch" action="<TMPL_VAR NAME="Configuration_Action">" method="post"> ! <div class="securityLabel"> ! <TMPL_VAR NAME="Localize_Security_XMLRPC">: ! </div> ! ! <TMPL_IF NAME="XMLRPC_local_on"> ! ! <span class="securityWidgetStateOff"> ! <TMPL_VAR NAME="Localize_Security_NoStealthMode"> ! </span> ! <input type="submit" class="submit toggleOn" id="securityAcceptXMLRPCOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> ! <input type="hidden" name="xmlrpc_local" value="1" /> ! ! <TMPL_ELSE> ! ! <span class="securityWidgetStateOn"> ! <TMPL_VAR NAME="Localize_Yes"> ! </span> ! <input type="submit" class="submit toggleOff" id="securityAcceptXMLRPCOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo"> <TMPL_VAR NAME="Localize_Security_StealthMode">" /> ! <input type="hidden" name="xmlrpc_local" value="2" /> ! ! </TMPL_IF> ! ! </form> --- 1,5 ---- ! <input type="checkbox" name="serveropt_xmlrpc" id="securityAcceptXMLRPC" <TMPL_IF NAME="XMLRPC_local_on"><TMPL_ELSE>checked</TMPL_IF> /> ! <label class="administrationLabel" for="securityAcceptXMLRPC"> ! <TMPL_VAR NAME="Localize_Security_XMLRPC"> ! </label> ! <br /> Index: nntp-security-local.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/nntp-security-local.thtml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** nntp-security-local.thtml 2 Mar 2006 10:07:46 -0000 1.6 --- nntp-security-local.thtml 2 Mar 2006 11:17:00 -0000 1.7 *************** *** 1,24 **** ! <form class="securitySwitch" action="<TMPL_VAR NAME="Configuration_Action">" method="post"> ! <div class="securityLabel"> ! <TMPL_VAR NAME="Localize_Security_NNTP">: ! </div> ! ! <TMPL_IF NAME="nntp_if_local"> ! ! <span class="securityWidgetStateOff"> ! <TMPL_VAR NAME="Localize_Security_NoStealthMode"> ! </span> ! <input type="submit" class="toggleOn" id="securityAcceptNNTPOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> ! <input type="hidden" name="nntp_local" value="0" /> ! ! <TMPL_ELSE> ! ! <span class="securityWidgetStateOn"> ! <TMPL_VAR NAME="Localize_Yes"> ! </span> ! <input type="submit" class="toggleOff" id="securitycceptNNTPOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo"> <TMPL_VAR NAME="Localize_Security_StealthMode">" /> ! <input type="hidden" name="nntp_local" value="1" /> ! ! </TMPL_IF> ! ! </form> --- 1,5 ---- ! <input type="checkbox" name="serveropt_nntp" id="securityAcceptNNTP" <TMPL_IF NAME="nntp_if_local"><TMPL_ELSE>checked</TMPL_IF> /> ! <label class="administrationLabel" for="securityAcceptNNTP"> ! <TMPL_VAR NAME="Localize_Security_NNTP"> ! </label> ! <br /> Index: windows-configuration.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/windows-configuration.thtml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** windows-configuration.thtml 22 May 2005 11:13:50 -0000 1.6 --- windows-configuration.thtml 2 Mar 2006 11:17:00 -0000 1.7 *************** *** 1,62 **** ! <label for="windows_console" class="configurationLabel"> ! <TMPL_VAR NAME="Localize_Windows_Console"> ! </label> ! <br /> ! <table border="0" cellpadding="0" cellspacing="0" summary=""> ! <tr> ! <td nowrap="nowrap"> ! <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> ! <TMPL_IF NAME="windows_console_on"> ! ! <span class="securityWidgetStateOn"> ! <TMPL_VAR NAME="Localize_Yes"> ! </span> ! <input id="windows_console" type="submit" class="submit toggleOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" /> ! <input type="hidden" name="windows_console" value="0" /> ! ! <TMPL_ELSE> ! ! <span class="securityWidgetStateOff"> ! <TMPL_VAR NAME="Localize_No"> ! </span> ! <input id="windows_console" type="submit" class="submit toggleOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> ! <input type="hidden" name="windows_console" value="1" /> ! ! </TMPL_IF> ! ! </form> ! </td> ! </tr> ! </table> ! <br /> ! <label for="windows_trayicon" class="configurationLabel"> ! <TMPL_VAR NAME="Localize_Windows_TrayIcon"> ! </label> ! ! <table border="0" cellpadding="0" cellspacing="0" summary=""> ! <tr> ! <td nowrap="nowrap"> ! <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> ! ! <TMPL_IF NAME="windows_icon_on"> ! ! <span class="securityWidgetStateOn"> ! <TMPL_VAR NAME="Localize_Yes"> ! </span> ! <input id="windows_trayicon" type="submit" class="submit toggleOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" /> ! <input type="hidden" name="windows_trayicon" value="0" /> ! ! <TMPL_ELSE> ! ! <span class="securityWidgetStateOff"> ! <TMPL_VAR NAME="Localize_No"> ! </span> ! <input id="windows_trayicon" type="submit" class="submit toggleOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> ! <input type="hidden" name="windows_trayicon" value="1" /> ! ! </TMPL_IF> ! ! </form> ! </td> ! </tr> ! </table> --- 1,9 ---- ! <input id="windows_console" type="checkbox" name="toggle" <TMPL_IF NAME="windows_console_on">checked</TMPL_IF> /> ! <label for="windows_console" class="administrationLabel"> ! <TMPL_VAR NAME="Localize_Windows_Console"> ! </label> ! <br /> ! <input id="windows_trayicon" type="checkbox" name="toggle" <TMPL_IF NAME="windows_icon_on">checked</TMPL_IF> /> ! <label for="windows_trayicon" class="administrationLabel"> ! <TMPL_VAR NAME="Localize_Windows_TrayIcon"> ! </label> Index: administration-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/administration-page.thtml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** administration-page.thtml 11 Feb 2006 09:07:34 -0000 1.9 --- administration-page.thtml 2 Mar 2006 11:17:00 -0000 1.10 *************** *** 2,5 **** --- 2,17 ---- <TMPL_INCLUDE NAME="common-middle.thtml"> + <script type="text/javascript"> + function serverMode(state) { + var d = document.forms; + for (var i=0; i < d.length; i++) { + for (var j=0; j < d[i].elements.length; j++) + if (d[i].elements[j].name.substr(0,10) == "serveropt_") + d[i].elements[j].disabled = !state; + } + return 0; + } + </script> + <table class="settingsTable" cellpadding="10%" cellspacing="0" summary="<TMPL_VAR NAME="Localize_Security_MainTableSummary">"> <tr> *************** *** 8,35 **** <h2 class="configuration"><TMPL_VAR NAME="Localize_Security_Stealth"></h2> <form class="securitySwitch" action="<TMPL_VAR NAME="Configuration_Action">" method="post"> ! <div class="securityLabel"> ! <TMPL_VAR NAME="Localize_Security_UI">: ! </div> ! ! <TMPL_IF NAME="Security_If_Local"> ! ! <span class="securityWidgetStateOff"> ! <TMPL_VAR NAME="Localize_Security_NoStealthMode"> ! </span> ! <input type="submit" class="submit toggleOn" id="securityAcceptHTTPOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> ! <input type="hidden" name="localui" value="1" /> ! <TMPL_ELSE> ! <span class="securityWidgetStateOn"> ! <TMPL_VAR NAME="Localize_Yes"> ! </span> ! <input type="submit" class="submit toggleOff" id="securityAcceptHTTPOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo"> <TMPL_VAR NAME="Localize_Security_StealthMode">" /> ! <input type="hidden" name="localui" value="2" /> ! </TMPL_IF> </form> ! <TMPL_VAR NAME="Security_Dynamic_Security"> <hr /> </div> --- 20,56 ---- <h2 class="configuration"><TMPL_VAR NAME="Localize_Security_Stealth"></h2> <form class="securitySwitch" action="<TMPL_VAR NAME="Configuration_Action">" method="post"> ! <input type="checkbox" name="usermode" id="UserMode" <TMPL_IF NAME="Users_If_Single">checked</TMPL_IF> /> ! <label class="administrationLabel" for="UserMode"> ! <TMPL_VAR NAME="Localize_Users_SingleUserMode"> ! </label> ! <br /> ! <input type="radio" name="servermode" id="StealthMode" value="StealthMode" onClick="serverMode(false)" checked /> ! <label class="administrationLabel" for="StealthMode"> ! Stealth Mode (disable remote connections) ! </label> ! <br /> ! <input type="radio" name="servermode" id="ServerMode" value="ServerMode" onClick="serverMode(true)" /> ! <label class="administrationLabel" for="ServerMode"> ! Server Mode (allow remote connections) ! </label> ! <br /> ! <div style="margin-left:1em;" class="adminAcceptRemote"> ! <input type="checkbox" name="serveropt_http" id="securityAcceptHTTP" name="toggle" /> ! <label class="administrationLabel" for="securityAcceptHTTP"> ! <TMPL_VAR NAME="Localize_Security_UI"> ! </label> ! <br /> ! <TMPL_VAR NAME="Security_Dynamic_Security"> ! </div> ! <!-- This file is currently being included by Perl in Configuration_Dynamic below when loaded, Perl needs changing so it doesn't load there (if possible) --> ! <TMPL_INCLUDE NAME="windows-configuration.thtml"> + <br /> + <input type="submit" class="submit" name="apply_operation" value="<TMPL_VAR NAME="Localize_Apply">" /> </form> ! <hr /> </div> *************** *** 39,59 **** <TMPL_VAR NAME="Security_Dynamic_Chain"> </div> - <div class="singleUserMode"> - <hr> - <h2 class="configuration"><TMPL_VAR NAME="Localize_Users_SingleUserMode"></h2> - <TMPL_IF NAME="Users_If_Single"> - <form action="/administration" method="post"> - <span class="securityWidgetStateOn"><TMPL_VAR NAME="Localize_Yes"></span> - <input type="submit" class="submit toggleOn" name="usermode" value="<TMPL_VAR NAME="Localize_ChangeToNo">" /> - <input type="hidden" name="singleuser" value="0"> - </form> - <TMPL_ELSE> - <form action="/administration" method="post"> - <span class="securityWidgetStateOff"><TMPL_VAR NAME="Localize_No"></span> - <input type="submit" class="submit toggleOn" name="usermode" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> - <input type="hidden" name="singleuser" value="1"> - </form> - </TMPL_IF> - </div> </td> --- 60,63 ---- *************** *** 83,86 **** --- 87,91 ---- </form> + <i><TMPL_VAR NAME="Localize_Security_ExplainUpdate"></i> <hr /> </div> *************** *** 112,115 **** --- 117,121 ---- </form> + <i><TMPL_VAR NAME="Localize_Security_ExplainStats"></i> <hr /> </div> |
|
From: Manni H. <man...@us...> - 2006-03-02 10:07:55
|
Update of /cvsroot/popfile/engine/Proxy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2917/Proxy Modified Files: NNTP.pm Log Message: Let's not get over-excited. Two templates for the nntp configuration. Keep one extra file for the security option. Index: NNTP.pm =================================================================== RCS file: /cvsroot/popfile/engine/Proxy/NNTP.pm,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** NNTP.pm 2 Mar 2006 09:56:17 -0000 1.41 --- NNTP.pm 2 Mar 2006 10:07:46 -0000 1.42 *************** *** 131,134 **** --- 131,139 ---- 'nntp-configuration.thtml', $self ); + + $self->register_configuration_item_( 'security', + 'nntp_local', + 'nntp-security-local.thtml', + $self ); if ( $self->config_( 'welcome_string' ) =~ /^NNTP POPFile \(v\d+\.\d+\.\d+\) server ready$/ ) { # PROFILE BLOCK START *************** *** 415,421 **** $templ->param( 'nntp_port' => $self->config_( 'port' ) ); $templ->param( 'nntp_separator' => $self->config_( 'separator' ) ); - $templ->param( 'nntp_if_local' => $self->config_( 'local' ) ); $templ->param( 'nntp_force_fork_on' => $self->config_( 'force_fork' ) ); } $self->SUPER::configure_item( $name, $templ, $language); --- 420,429 ---- $templ->param( 'nntp_port' => $self->config_( 'port' ) ); $templ->param( 'nntp_separator' => $self->config_( 'separator' ) ); $templ->param( 'nntp_force_fork_on' => $self->config_( 'force_fork' ) ); } + + if ( $name eq 'nntp_local' ) { + $templ->param( 'nntp_if_local' => $self->config_( 'local' ) ); + } $self->SUPER::configure_item( $name, $templ, $language); *************** *** 460,467 **** } - if ( defined $$form{nntp_local} ) { - $self->config_( 'local', $$form{nntp_local} ); - } - if ( defined $$form{nntp_force_fork} ) { $self->config_( 'force_fork', $$form{nntp_force_fork} ); --- 468,471 ---- *************** *** 470,473 **** --- 474,485 ---- return( $status, $error ); } + + if ( $name eq 'nntp_local' ) { + if ( defined $$form{nntp_local} ) { + $self->config_( 'local', $$form{nntp_local} ); + } + return( undef, undef); + } + return $self->SUPER::validate_item( $name, $templ, $language, $form ); } |
|
From: Manni H. <man...@us...> - 2006-03-02 10:07:50
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2917/skins/default Added Files: nntp-security-local.thtml Log Message: Let's not get over-excited. Two templates for the nntp configuration. Keep one extra file for the security option. --- NEW FILE: nntp-security-local.thtml --- <form class="securitySwitch" action="<TMPL_VAR NAME="Configuration_Action">" method="post"> <div class="securityLabel"> <TMPL_VAR NAME="Localize_Security_NNTP">: </div> <TMPL_IF NAME="nntp_if_local"> <span class="securityWidgetStateOff"> <TMPL_VAR NAME="Localize_Security_NoStealthMode"> </span> <input type="submit" class="toggleOn" id="securityAcceptNNTPOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> <input type="hidden" name="nntp_local" value="0" /> <TMPL_ELSE> <span class="securityWidgetStateOn"> <TMPL_VAR NAME="Localize_Yes"> </span> <input type="submit" class="toggleOff" id="securitycceptNNTPOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo"> <TMPL_VAR NAME="Localize_Security_StealthMode">" /> <input type="hidden" name="nntp_local" value="1" /> </TMPL_IF> </form> |
|
From: Manni H. <man...@us...> - 2006-03-02 09:56:20
|
Update of /cvsroot/popfile/engine/Proxy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28420/Proxy Modified Files: NNTP.pm Log Message: Merge the four nntp configuration templates into one handy template file. Index: NNTP.pm =================================================================== RCS file: /cvsroot/popfile/engine/Proxy/NNTP.pm,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** NNTP.pm 20 Feb 2006 02:14:29 -0000 1.40 --- NNTP.pm 2 Mar 2006 09:56:17 -0000 1.41 *************** *** 128,148 **** $self->register_configuration_item_( 'configuration', ! 'nntp_port', ! 'nntp-port.thtml', ! $self ); ! ! $self->register_configuration_item_( 'configuration', ! 'nntp_force_fork', ! 'nntp-force-fork.thtml', ! $self ); ! ! $self->register_configuration_item_( 'configuration', ! 'nntp_separator', ! 'nntp-separator.thtml', ! $self ); ! ! $self->register_configuration_item_( 'security', ! 'nntp_local', ! 'nntp-security-local.thtml', $self ); --- 128,133 ---- $self->register_configuration_item_( 'configuration', ! 'nntp_config', ! 'nntp-configuration.thtml', $self ); *************** *** 427,444 **** my ( $self, $name, $templ, $language ) = @_; ! if ( $name eq 'nntp_port' ) { $templ->param( 'nntp_port' => $self->config_( 'port' ) ); - } - - # Separator Character widget - if ( $name eq 'nntp_separator' ) { $templ->param( 'nntp_separator' => $self->config_( 'separator' ) ); - } - - if ( $name eq 'nntp_local' ) { $templ->param( 'nntp_if_local' => $self->config_( 'local' ) ); - } - - if ( $name eq 'nntp_force_fork' ) { $templ->param( 'nntp_force_fork_on' => $self->config_( 'force_fork' ) ); } --- 412,419 ---- my ( $self, $name, $templ, $language ) = @_; ! if ( $name eq 'nntp_config' ) { $templ->param( 'nntp_port' => $self->config_( 'port' ) ); $templ->param( 'nntp_separator' => $self->config_( 'separator' ) ); $templ->param( 'nntp_if_local' => $self->config_( 'local' ) ); $templ->param( 'nntp_force_fork_on' => $self->config_( 'force_fork' ) ); } *************** *** 465,480 **** 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); ! } - if ( $name eq 'nntp_separator' ) { if ( defined $$form{nntp_separator} ) { if ( length($$form{nntp_separator}) == 1 ) { --- 440,454 ---- my ($status, $error); ! if ( $name eq 'nntp_config' ) { ! if ( defined $$form{nntp_port} ) { if ( ( $$form{nntp_port} >= 1 ) && ( $$form{nntp_port} < 65536 ) ) { + $self->config_( 'port', $$form{nntp_port} ); $status = sprintf $$language{Configuration_NNTPUpdate}, $self->config_( 'port' ); } else { $error = $$language{Configuration_Error3}; } ! } if ( defined $$form{nntp_separator} ) { if ( length($$form{nntp_separator}) == 1 ) { *************** *** 485,504 **** } } - return ($status, $error); - } - if ( $name eq 'nntp_local' ) { if ( defined $$form{nntp_local} ) { $self->config_( 'local', $$form{nntp_local} ); } - return( undef, undef); - } - - if ( $name eq 'nntp_force_fork' ) { if ( defined $$form{nntp_force_fork} ) { $self->config_( 'force_fork', $$form{nntp_force_fork} ); } ! return( undef, undef); } return $self->SUPER::validate_item( $name, $templ, $language, $form ); --- 459,472 ---- } } if ( defined $$form{nntp_local} ) { $self->config_( 'local', $$form{nntp_local} ); } if ( defined $$form{nntp_force_fork} ) { $self->config_( 'force_fork', $$form{nntp_force_fork} ); } ! ! return( $status, $error ); } return $self->SUPER::validate_item( $name, $templ, $language, $form ); |
|
From: Manni H. <man...@us...> - 2006-03-02 09:56:20
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28420/skins/default Added Files: nntp-configuration.thtml Removed Files: nntp-force-fork.thtml nntp-port.thtml nntp-security-local.thtml nntp-separator.thtml Log Message: Merge the four nntp configuration templates into one handy template file. --- NEW FILE: nntp-configuration.thtml --- <form action="/administration" method="post"> <label class="configurationLabel" for="configNNTPPort"> <TMPL_VAR NAME="Localize_Configuration_NNTPPort">: </label> <br /> <input name="nntp_port" type="text" id="configNNTPPort" value="<TMPL_VAR NAME="nntp_port">" /> <input type="submit" class="submit" name="update_nntp_port" value="<TMPL_VAR NAME="Localize_Apply">" /> </form> <label class="configurationLabel" for="nntpForceFork"> <TMPL_VAR NAME="Localize_Configuration_NNTPFork">: </label> <br /> <table border="0" cellpadding="0" cellspacing="0" summary=""> <tr> <td nowrap="nowrap"> <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> <TMPL_IF NAME="nntp_force_fork_on"> <span class="securityWidgetStateOn"> <TMPL_VAR NAME="Localize_Yes"> </span> <input type="submit" class="toggleOff" id="nntpForceFork" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" /> <input type="hidden" name="nntp_force_fork" value="0" /> <TMPL_ELSE> <span class="securityWidgetStateOff"> <TMPL_VAR NAME="Localize_No"> </span> <input type="submit" class="toggleOn" id="nntpForceFork" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> <input type="hidden" name="nntp_force_fork" value="1" /> </TMPL_IF> </form> </td> </tr> </table> <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> <label class="configurationLabel" for="configNntpSeparator"> <TMPL_VAR NAME="Localize_Configuration_NNTPSeparator">: </label> <br /> <input name="nntp_separator" id="configNntpSeparator" type="text" value="<TMPL_VAR NAME="nntp_separator">" /> <input type="submit" class="submit" name="update_nntp_separator" value="<TMPL_VAR NAME="Localize_Apply">" /> </form> <form class="securitySwitch" action="<TMPL_VAR NAME="Configuration_Action">" method="post"> <div class="securityLabel"> <TMPL_VAR NAME="Localize_Security_NNTP">: </div> <TMPL_IF NAME="nntp_if_local"> <span class="securityWidgetStateOff"> <TMPL_VAR NAME="Localize_Security_NoStealthMode"> </span> <input type="submit" class="toggleOn" id="securityAcceptNNTPOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> <input type="hidden" name="nntp_local" value="0" /> <TMPL_ELSE> <span class="securityWidgetStateOn"> <TMPL_VAR NAME="Localize_Yes"> </span> <input type="submit" class="toggleOff" id="securitycceptNNTPOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo"> <TMPL_VAR NAME="Localize_Security_StealthMode">" /> <input type="hidden" name="nntp_local" value="1" /> </TMPL_IF> </form> --- nntp-security-local.thtml DELETED --- --- nntp-port.thtml DELETED --- --- nntp-separator.thtml DELETED --- --- nntp-force-fork.thtml DELETED --- |
|
From: Brian S. <xue...@us...> - 2006-02-27 12:24:57
|
Update of /cvsroot/popfile/engine/Classifier In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5886 Modified Files: Bayes.pm Log Message: By default the UI operates in Stealth Mode and X-POPFile-Link uses "127.0.0.1". Some email clients (e.g. Eudora 6.x and 7.x) display an annoying warning/confirmation message when this link is clicked. The new bayes_localhostname configuration item is only used when the UI is operating in Stealth Mode. By default the bayes_localhostname configuration item is empty so X-POPFile-Link will use "127.0.0.1" bayes_localhostname can be used to specify a name which stops these messages from being displayed. Eudora still displays these messages if "localhost" is used because it expects to find at least one dot in the name (e.g. it is happy with a name like "froggie.gremlin") (patch #1430184, X-POPFile-Link improvements Mk2) Index: Bayes.pm =================================================================== RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v retrieving revision 1.350 retrieving revision 1.351 diff -C2 -d -r1.350 -r1.351 *** Bayes.pm 20 Feb 2006 02:11:13 -0000 1.350 --- Bayes.pm 27 Feb 2006 12:24:49 -0000 1.351 *************** *** 222,225 **** --- 222,232 ---- $self->config_( 'hostname', $self->{hostname__} ); + + # This parameter is used when the UI is operating in Stealth Mode. + # If left blank (the default setting) the X-POPFile-Link will use 127.0.0.1 + # otherwise it will use this string instead. The system's HOSTS file should + # map the string to 127.0.0.1 + + $self->config_( 'localhostname', '' ); $self->mq_register_( 'COMIT', $self ); *************** *** 2513,2518 **** my $xpl = $self->user_config_( 1, 'xpl_angle' )?'<':''; $xpl .= "http://"; ! $xpl .= $self->module_config_( 'html', 'local' )?"127.0.0.1":$self->config_( 'hostname' ); $xpl .= ":" . $self->module_config_( 'html', 'port' ) . "/jump_to_message?view=$slot"; --- 2520,2527 ---- my $xpl = $self->user_config_( 1, 'xpl_angle' )?'<':''; + my $xpl_localhost = ($self->config_( 'localhostname' ) eq '')?"127.0.0.1":$self->config_( 'localhostname' ); + $xpl .= "http://"; ! $xpl .= $self->module_config_( 'html', 'local' )?$xpl_localhost:$self->config_( 'hostname' ); $xpl .= ":" . $self->module_config_( 'html', 'port' ) . "/jump_to_message?view=$slot"; |
|
From: naoki i. <am...@us...> - 2006-02-24 10:33:36
|
Update of /cvsroot/popfile/engine/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11477/tests Modified Files: Tag: b0_22_2 TestMailParse.tst Log Message: update test suite for Japanese e-mails Index: TestMailParse.tst =================================================================== RCS file: /cvsroot/popfile/engine/tests/TestMailParse.tst,v retrieving revision 1.43.4.2 retrieving revision 1.43.4.3 diff -C2 -d -r1.43.4.2 -r1.43.4.3 *** TestMailParse.tst 21 Feb 2006 13:55:55 -0000 1.43.4.2 --- TestMailParse.tst 24 Feb 2006 10:33:33 -0000 1.43.4.3 *************** *** 360,363 **** --- 360,370 ---- # to be parsed with the resulting values for the words hash in TestMailParse\d+.wrd + # Since the [[:alpha:]] regular expression is affected by the system locale, fix the + # locale to 'C'. + + use POSIX qw( locale_h ); + my $current_locale = setlocale( LC_CTYPE ); + setlocale( LC_CTYPE, 'C' ); + my @parse_tests = sort glob 'TestMailParse*.msg'; *************** *** 398,401 **** --- 405,412 ---- } + # Restore the system locale + + setlocale( LC_CTYPE, $current_locale ); + # Check that from, to and subject get set correctly when parsing a message $cl->parse_file( 'TestMailParse013.msg' ); *************** *** 543,552 **** $cl->{lang__} = 'Nihongo'; ! # TODO: test decode_string - # TODO: test kakasi wakachi-gaki $cl->init_kakasi(); ! $cl->close_kakasi(); --- 554,584 ---- $cl->{lang__} = 'Nihongo'; ! # Test decode_string ! my $original_string = 'POPFile' . pack( "H*", "a4cfbcabc6b0a5e1a1bca5ebbfb6a4eacaaca4b1a5c4a1bca5eba4c7a4b9" ); ! ! test_assert_equal( $cl->decode_string('=?ISO-2022-JP?B?UE9QRmlsZRskQiRPPCtGMCVhITwlaz82JGpKLCQxJUQhPCVrJEckORsoQg==?='), $original_string ); ! test_assert_equal( $cl->decode_string('=?SHIFT_JIS?B?UE9QRmlsZYLNjqmTroOBgVuDi5BVguiVqoKvg2OBW4OLgsWCtw==?='), $original_string ); ! test_assert_equal( $cl->decode_string('=?UTF-8?B?UE9QRmlsZeOBr+iHquWLleODoeODvOODq+aMr+OCiuWIhuOBkeODhOODvOODq+OBp+OBmQ==?='), $original_string ); ! test_assert_equal( $cl->decode_string('=?ISO-2022-JP?Q?POPFile=1B$B$O<+F0%a!<%k?6$jJ,$1%D!<%k$G$9=1B(B?='), $original_string ); ! test_assert_equal( $cl->decode_string('=?SHIFT_JIS?Q?POPFile=82=CD=8E=A9=93=AE=83=81=81[=83=8B=90U=82=E8=95=AA=82=AF=83c=81[=83=8B=82=C5=82=B7?='), $original_string ); ! test_assert_equal( $cl->decode_string('=?UTF-8?Q?POPFile=E3=81=AF=E8=87=AA=E5=8B=95=E3=83=A1=E3=83=BC=E3=83=AB=E6=8C=AF=E3=82=8A=E5=88=86=E3=81=91=E3=83=84=E3=83=BC=E3=83=AB=E3=81=A7=E3=81=99?='), $original_string ); ! ! test_assert_equal( $cl->decode_string('=?UNKNOWN?B?UE9QRmlsZRskQiRPPCtGMCVhITwlaz82JGpKLCQxJUQhPCVrJEckORsoQg==?='), $original_string ); ! test_assert_equal( $cl->decode_string('=?ISO-2022-JP?B?UE9QRmlsZYLNjqmTroOBgVuDi5BVguiVqoKvg2OBW4OLgsWCtw==?='), $original_string ); ! ! test_assert_equal( $cl->decode_string('=?ISO-2022-JP?B?UE9QRmlsZRskQiRPPCtGMCVhITwlaxsoQg==?= =?ISO-2022-JP?B?GyRCPzYkakosJDElRCE8JWskRyQ5GyhC?='), $original_string ); ! test_assert_equal( $cl->decode_string('=?UTF-8?B?UE9QRmlsZeOBr+iHquWLleODoeODvOODqw==?= =?ISO-2022-JP?Q?=1B$B?6$jJ,$1%D!<%k$G$9=1B(B?='), $original_string ); ! test_assert_equal( $cl->decode_string('=?UTF-8?Q?POPFile=E3=81=AF=E8=87=AA=E5=8B=95=E3=83=A1=E3=83=BC=E3=83=AB?= =?UTF-8?B?5oyv44KK5YiG44GR44OE44O844Or44Gn44GZ?='), $original_string ); ! ! # Test kakasi wakachi-gaki $cl->init_kakasi(); ! my $wakati_string = pack( "H*", "504f5046696c6520a4cf20bcabc6b020a5e1a1bca5eb20bfb6a4eacaaca4b120a5c4a1bca5eb20a4c7a4b9" ); ! test_assert_equal( $cl->parse_line_with_kakasi($original_string), $wakati_string ); ! ! $original_string = pack( "H*", "504f5046696c65a4cfbcab0a09c6b0a5e1a1bca5ebbfb609a4ea0dcaac202020a4b1a5c4a1bca5eba4c7a4b9" ); ! $wakati_string = pack( "H*", "504f5046696c6520a4cf20bcabc6b00a09a5e1a1bca5eb20bfb6a4eacaaca4b1090d202020a5c4a1bca5eb20a4c7a4b9" ); ! test_assert_equal( $cl->parse_line_with_kakasi($original_string), $wakati_string ); $cl->close_kakasi(); |
|
From: Joseph C. <tex...@us...> - 2006-02-23 12:23:24
|
Update of /cvsroot/popfile/engine/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1919/languages Modified Files: English.msg Log Message: Some changes to the tool tip text. Index: English.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/English.msg,v retrieving revision 1.101 retrieving revision 1.102 diff -C2 -d -r1.101 -r1.102 *** English.msg 20 Feb 2006 02:50:27 -0000 1.101 --- English.msg 23 Feb 2006 12:23:14 -0000 1.102 *************** *** 431,435 **** tip_History_RecentNum Number of messages matching current Search and Filter - tip_History_Column Sort by this column tip_History_Reclassify Apply bucket corrections tip_History_Search Find matches in the From address or Subject --- 431,434 ---- *************** *** 444,457 **** tip_History_MoveLeft Move left tip_History_MoveRight Move right ! tip_History_Sort Click to sort on this column tip_Bucket_BucketName View bucket details ! tip_Bucket_Distinct Unique words in each bucket ! tip_Bucket_SubjectMod Insert bucket name to the begining of the subject. For clients that can not use the X-Text-Classification header ! tip_Bucket_XTCHeader Insert an "invisible" header that most mail clients can use to apply a rule based on POPFile's classification tip_Bucket_XPLHeader Insert a header with a link to the message to allow for quickly reclassifing a message tip_Bucket_Quarantine Islolate potentially dangerous email by placing it in attachment tip_Bucket_Color Select a color for each bucket tip_Bucket_Lookup Look up the probability and frequency of a word in all buckets tip_Bucket_WordCount Number and percentage of total words in each bucket tip_Bucket_Create Create a new bucket --- 443,458 ---- tip_History_MoveLeft Move left tip_History_MoveRight Move right ! tip_History_Sort Sort by this column tip_Bucket_BucketName View bucket details ! tip_Bucket_Unique Unique words in each bucket ! tip_Bucket_SubjectMod Insert bucket name to begining of the subject ! tip_Bucket_XTCHeader Insert header that most mail clients can use to filter based on POPFile's classification tip_Bucket_XPLHeader Insert a header with a link to the message to allow for quickly reclassifing a message tip_Bucket_Quarantine Islolate potentially dangerous email by placing it in attachment tip_Bucket_Color Select a color for each bucket tip_Bucket_Lookup Look up the probability and frequency of a word in all buckets + tip_Bucket_Accuracy Overall classification accuracy + tip_Bucket_Classified Bucket statistics and accuracy tip_Bucket_WordCount Number and percentage of total words in each bucket tip_Bucket_Create Create a new bucket *************** *** 460,463 **** --- 461,465 ---- tip_Bucket_FalsePos Messages that were incorrectly placed in this bucket tip_Bucket_FalseNeg Messages that were incorrectly NOT placed in this bucket + tip_Bucket_ResetStats Clear classification statistics tip_Magnet_Type Message header to match *************** *** 477,480 **** --- 479,483 ---- tip_Config_HideBar Hide configuration bar tip_Config_ShowBar Show configuration bar + tip_Config_Password Change password for accessing POPFile's Control Center tip_Admin_AcceptRemoteHTTP Allow UI access from another machine |
|
From: Joseph C. <tex...@us...> - 2006-02-23 12:18:14
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31356/skins/default Modified Files: corpus-page.thtml Log Message: Finish adding tooltips for Buckets page. Index: corpus-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/corpus-page.thtml,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** corpus-page.thtml 20 Feb 2006 09:36:35 -0000 1.26 --- corpus-page.thtml 23 Feb 2006 12:18:01 -0000 1.27 *************** *** 38,66 **** </tr> <tr> ! <th class="bucketsLabel" scope="col" align="left"> <TMPL_VAR NAME="Localize_Bucket_BucketName"> </th> ! <th class="bucketsLabel" scope="col" align="right"> <TMPL_VAR NAME="Localize_Bucket_UniqueWords"> </th> ! <th class="bucketsLabel" scope="col" align="center"> <TMPL_VAR NAME="Localize_Bucket_SubjectModification"> </th> ! <th class="bucketsLabel" scope="col" align="center"> <TMPL_VAR NAME="Localize_Configuration_XTCInsertion"> </th> ! <th class="bucketsLabel" scope="col" align="center"> <TMPL_VAR NAME="Localize_Configuration_XPLInsertion"> </th> ! <th class="bucketsLabel" scope="col" align="center"> <TMPL_VAR NAME="Localize_Bucket_Quarantine"> </th> ! <th class="bucketsLabel" scope="col" align="center"> <TMPL_VAR NAME="Localize_Bucket_ChangeColor"> </th> --- 38,66 ---- </tr> <tr> ! <th class="bucketsLabel" scope="col" align="left" title="<TMPL_VAR NAME="Localize_tip_Bucket_BucketName">"> <TMPL_VAR NAME="Localize_Bucket_BucketName"> </th> ! <th class="bucketsLabel" scope="col" align="right" title="<TMPL_VAR NAME="Localize_tip_Bucket_Unique">"> <TMPL_VAR NAME="Localize_Bucket_UniqueWords"> </th> ! <th class="bucketsLabel" scope="col" align="center" title="<TMPL_VAR NAME="Localize_tip_Bucket_SubjectMod">"> <TMPL_VAR NAME="Localize_Bucket_SubjectModification"> </th> ! <th class="bucketsLabel" scope="col" align="center" title="<TMPL_VAR NAME="Localize_tip_Bucket_XTCHeader">"> <TMPL_VAR NAME="Localize_Configuration_XTCInsertion"> </th> ! <th class="bucketsLabel" scope="col" align="center" title="<TMPL_VAR NAME="Localize_tip_Bucket_XPLHeader">"> <TMPL_VAR NAME="Localize_Configuration_XPLInsertion"> </th> ! <th class="bucketsLabel" scope="col" align="center" title="<TMPL_VAR NAME="Localize_tip_Bucket_Quarantine">"> <TMPL_VAR NAME="Localize_Bucket_Quarantine"> </th> ! <th class="bucketsLabel" scope="col" align="center" title="<TMPL_VAR NAME="Localize_tip_Bucket_Color">"> <TMPL_VAR NAME="Localize_Bucket_ChangeColor"> </th> *************** *** 185,189 **** <tr> <td class="settingsPanel" valign="top" width="33%" align="center"> ! <h2 class="buckets"><TMPL_VAR NAME="Localize_Bucket_ClassificationAccuracy"></h2> <table summary="" width="100%"> <tr> --- 185,189 ---- <tr> <td class="settingsPanel" valign="top" width="33%" align="center"> ! <h2 class="buckets" title="<TMPL_VAR NAME="Localize_tip_Bucket_Accuracy">"><TMPL_VAR NAME="Localize_Bucket_ClassificationAccuracy"></h2> <table summary="" width="100%"> <tr> *************** *** 238,242 **** <td colspan="2" align="center"> <form action="/buckets" method="post"> ! <input type="submit" class="submit" name="reset_stats" value="<TMPL_VAR NAME="Localize_Bucket_ResetStatistics">" /> <TMPL_IF NAME="Corpus_If_Last_Reset"> --- 238,242 ---- <td colspan="2" align="center"> <form action="/buckets" method="post"> ! <input type="submit" class="submit" name="reset_stats" value="<TMPL_VAR NAME="Localize_Bucket_ResetStatistics">" title="<TMPL_VAR NAME="Localize_tip_Bucket_ResetStats">" /> <TMPL_IF NAME="Corpus_If_Last_Reset"> *************** *** 253,257 **** </td> <td class="settingsPanel" valign="top" width="33%" align="center"> ! <h2 class="buckets"><TMPL_VAR NAME="Localize_Bucket_EmailsClassifiedUpper"></h2> <table summary="" width="100%"> <tr> --- 253,259 ---- </td> <td class="settingsPanel" valign="top" width="33%" align="center"> ! <h2 class="buckets" title="<TMPL_VAR NAME="Localize_tip_Bucket_Classified">"> ! <TMPL_VAR NAME="Localize_Bucket_EmailsClassifiedUpper"> ! </h2> <table summary="" width="100%"> <tr> *************** *** 265,272 **** <TMPL_VAR NAME="Localize_Bucket_ClassificationCount"> </th> ! <th class="bucketsLabel" scope="col" align="right"> <TMPL_VAR NAME="Localize_Bucket_ClassificationFP"> </th> ! <th class="bucketsLabel" scope="col" align="right"> <TMPL_VAR NAME="Localize_Bucket_ClassificationFN"> </th> --- 267,274 ---- <TMPL_VAR NAME="Localize_Bucket_ClassificationCount"> </th> ! <th class="bucketsLabel" scope="col" align="right" title="<TMPL_VAR NAME="Localize_tip_Bucket_FalsePos">"> <TMPL_VAR NAME="Localize_Bucket_ClassificationFP"> </th> ! <th class="bucketsLabel" scope="col" align="right" title="<TMPL_VAR NAME="Localize_tip_Bucket_FalseNeg">"> <TMPL_VAR NAME="Localize_Bucket_ClassificationFN"> </th> *************** *** 276,280 **** </td> <td class="settingsPanel" width="34%" valign="top" align="center"> ! <h2 class="buckets"><TMPL_VAR NAME="Localize_Bucket_WordCounts"></h2> <table summary="" width="100%"> <tr> --- 278,282 ---- </td> <td class="settingsPanel" width="34%" valign="top" align="center"> ! <h2 class="buckets" title="<TMPL_VAR NAME="Localize_tip_Bucket_WordCount">"><TMPL_VAR NAME="Localize_Bucket_WordCounts"></h2> <table summary="" width="100%"> <tr> *************** *** 301,305 **** <div class="bucketsMaintenanceWidget"> <form action="/buckets" method="post"> ! <label class="bucketsLabel" for="bucketsCreateBucket"> <TMPL_VAR NAME="Localize_Bucket_CreateBucket">: </label> --- 303,307 ---- <div class="bucketsMaintenanceWidget"> <form action="/buckets" method="post"> ! <label class="bucketsLabel" for="bucketsCreateBucket" title="<TMPL_VAR NAME="Localize_tip_Bucket_Create">"> <TMPL_VAR NAME="Localize_Bucket_CreateBucket">: </label> *************** *** 330,334 **** <form action="/buckets" method="post"> ! <label class="bucketsLabel" for="bucketsDeleteBucket"> <TMPL_VAR NAME="Localize_Bucket_DeleteBucket">: </label> --- 332,336 ---- <form action="/buckets" method="post"> ! <label class="bucketsLabel" for="bucketsDeleteBucket" title="<TMPL_VAR NAME="Localize_tip_Bucket_Delete">"> <TMPL_VAR NAME="Localize_Bucket_DeleteBucket">: </label> *************** *** 360,364 **** <form action="/buckets" method="post"> ! <label class="bucketsLabel" for="bucketsRenameBucketFrom"> <TMPL_VAR NAME="Localize_Bucket_RenameBucket">: </label> --- 362,366 ---- <form action="/buckets" method="post"> ! <label class="bucketsLabel" for="bucketsRenameBucketFrom" title="<TMPL_VAR NAME="Localize_tip_Bucket_Rename">"> <TMPL_VAR NAME="Localize_Bucket_RenameBucket">: </label> *************** *** 411,415 **** <div class="bucketsLookupWidget"> <form action="/buckets#Lookup" method="post"> ! <label class="bucketsLabel" for="bucketsLookup"> <TMPL_VAR NAME="Localize_Bucket_LookupMessage">: </label> --- 413,417 ---- <div class="bucketsLookupWidget"> <form action="/buckets#Lookup" method="post"> ! <label class="bucketsLabel" for="bucketsLookup" title="<TMPL_VAR NAME="Localize_tip_Bucket_Lookup">"> <TMPL_VAR NAME="Localize_Bucket_LookupMessage">: </label> |
|
From: Joseph C. <tex...@us...> - 2006-02-23 12:15:23
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29852/skins/default Modified Files: configuration-bar.thtml Log Message: Remove for attribute of label for Change Password. In Firefox, clicking the label caused the form to submit. Index: configuration-bar.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/configuration-bar.thtml,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** configuration-bar.thtml 9 Sep 2005 23:00:42 -0000 1.21 --- configuration-bar.thtml 23 Feb 2006 12:15:13 -0000 1.22 *************** *** 91,95 **** <div class="configBarOption"> ! <label class="configurationLabel" for="configPassword" title="<TMPL_VAR NAME="Localize_tip_Config_Password">"> <TMPL_VAR NAME="Localize_Configuration_ChangePassword">: </label> --- 91,95 ---- <div class="configBarOption"> ! <label class="configurationLabel" title="<TMPL_VAR NAME="Localize_tip_Config_Password">"> <TMPL_VAR NAME="Localize_Configuration_ChangePassword">: </label> |
|
From: John Graham-C. <jgr...@us...> - 2006-02-21 10:07:37
|
Update of /cvsroot/popfile/engine In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21286 Modified Files: Tag: b0_22_2 vars.mak Log Message: Bump version number Index: vars.mak =================================================================== RCS file: /cvsroot/popfile/engine/vars.mak,v retrieving revision 1.11.4.2 retrieving revision 1.11.4.3 diff -C2 -d -r1.11.4.2 -r1.11.4.3 *** vars.mak 7 Feb 2006 11:09:54 -0000 1.11.4.2 --- vars.mak 21 Feb 2006 10:07:29 -0000 1.11.4.3 *************** *** 8,12 **** export POPFILE_MAJOR_VERSION=0 export POPFILE_MINOR_VERSION=22 ! export POPFILE_REVISION=3 export POPFILE_VERSION:=$(POPFILE_MAJOR_VERSION).$(POPFILE_MINOR_VERSION).$(POPFILE_REVISION) POPFILE_VERSION_FILE=POPFile/popfile_version --- 8,12 ---- export POPFILE_MAJOR_VERSION=0 export POPFILE_MINOR_VERSION=22 ! export POPFILE_REVISION=4 export POPFILE_VERSION:=$(POPFILE_MAJOR_VERSION).$(POPFILE_MINOR_VERSION).$(POPFILE_REVISION) POPFILE_VERSION_FILE=POPFile/popfile_version |
|
From: Joseph C. <tex...@us...> - 2006-02-20 09:36:44
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5079/skins/default Modified Files: bar-chart-widget.thtml common-middle.thtml corpus-page.thtml history-page.thtml history-search-filter-widget.thtml magnet-page.thtml users-page.thtml view-page.thtml view-quickmagnets-widget.thtml Log Message: Get rid of some HTML validation warnings and errors. Change font tags for styles. Index: history-search-filter-widget.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/history-search-filter-widget.thtml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** history-search-filter-widget.thtml 25 Aug 2005 08:39:20 -0000 1.14 --- history-search-filter-widget.thtml 20 Feb 2006 09:36:35 -0000 1.15 *************** *** 18,22 **** <input type="hidden" name="sort" value="<TMPL_VAR NAME="History_Field_Sort">" /> <select name="filter" id="historyFilter"> ! <option value=""></option> <TMPL_LOOP NAME="History_Loop_SF_Buckets"> --- 18,22 ---- <input type="hidden" name="sort" value="<TMPL_VAR NAME="History_Field_Sort">" /> <select name="filter" id="historyFilter"> ! <option value=""> </option> <TMPL_LOOP NAME="History_Loop_SF_Buckets"> Index: history-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/history-page.thtml,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** history-page.thtml 11 Feb 2006 09:07:34 -0000 1.72 --- history-page.thtml 20 Feb 2006 09:36:35 -0000 1.73 *************** *** 201,209 **** <select name="reclassify_<TMPL_VAR NAME="History_I">"> ! <option selected="selected"></option> <TMPL_LOOP NAME="History_Loop_Loop_Buckets"> ! <option value="<TMPL_VAR NAME="History_Bucket">" style="color: <TMPL_VAR NAME="History_Bucket_Color">"> <TMPL_VAR NAME="History_Bucket"> </option> --- 201,209 ---- <select name="reclassify_<TMPL_VAR NAME="History_I">"> ! <option value="" selected="selected"> </option> <TMPL_LOOP NAME="History_Loop_Loop_Buckets"> ! <option value="<TMPL_VAR NAME="History_Bucket">" style="color:<TMPL_VAR NAME="History_Bucket_Color">"> <TMPL_VAR NAME="History_Bucket"> </option> Index: bar-chart-widget.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/bar-chart-widget.thtml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** bar-chart-widget.thtml 7 Feb 2005 08:05:51 -0000 1.4 --- bar-chart-widget.thtml 20 Feb 2006 09:36:35 -0000 1.5 *************** *** 2,8 **** <tr> <td align="left"> ! <font color="<TMPL_VAR NAME="bar_bucket_color">"> <TMPL_VAR NAME="bar_bucket_name"> ! </font> </td> <td> --- 2,8 ---- <tr> <td align="left"> ! <span style="color:<TMPL_VAR NAME="bar_bucket_color">"> <TMPL_VAR NAME="bar_bucket_name"> ! </span> </td> <td> Index: view-quickmagnets-widget.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/view-quickmagnets-widget.thtml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** view-quickmagnets-widget.thtml 28 Sep 2005 19:09:52 -0000 1.6 --- view-quickmagnets-widget.thtml 20 Feb 2006 09:36:35 -0000 1.7 *************** *** 9,16 **** </h4> ! <table> <tr> <td> ! <table class="top20Words"> <tr> <th scope="col"> --- 9,16 ---- </h4> ! <table summary=""> <tr> <td> ! <table class="top20Words" summary=""> <tr> <th scope="col"> *************** *** 42,46 **** <input type="hidden" name="type<TMPL_VAR NAME="View_QuickMagnets_I">" class="magnetsAddType" value="<TMPL_VAR NAME="View_QuickMagnets_Type">" /> <select name="bucket<TMPL_VAR NAME="View_QuickMagnets_I">" class="magnetsAddBucket"> ! <option value=""></option> <TMPL_LOOP NAME="View_QuickMagnets_Loop_Buckets"> --- 42,46 ---- <input type="hidden" name="type<TMPL_VAR NAME="View_QuickMagnets_I">" class="magnetsAddType" value="<TMPL_VAR NAME="View_QuickMagnets_Type">" /> <select name="bucket<TMPL_VAR NAME="View_QuickMagnets_I">" class="magnetsAddBucket"> ! <option value=""> </option> <TMPL_LOOP NAME="View_QuickMagnets_Loop_Buckets"> *************** *** 64,69 **** </td> </tr> - - </td> </table> </td> --- 64,67 ---- Index: users-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/users-page.thtml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** users-page.thtml 20 Dec 2005 21:30:59 -0000 1.8 --- users-page.thtml 20 Feb 2006 09:36:35 -0000 1.9 *************** *** 8,17 **** <form action="/users" method="post"> ! <TMPL_VAR NAME="Localize_Users_CreateUser">: <input type="text" id="usersCreateUser" name="newuser" /> <br /> <TMPL_VAR NAME="Localize_Users_CopyFrom">: <select name="clone"> ! <option></option> <TMPL_LOOP NAME="Users_Loop_Copy"> <option><TMPL_VAR NAME="Users_Name"></option> --- 8,17 ---- <form action="/users" method="post"> ! <TMPL_VAR NAME="Localize_Users_CreateUser">: <input type="text" id="usersCreateUser" name="newuser" /> <br /> <TMPL_VAR NAME="Localize_Users_CopyFrom">: <select name="clone"> ! <option value=""> </option> <TMPL_LOOP NAME="Users_Loop_Copy"> <option><TMPL_VAR NAME="Users_Name"></option> *************** *** 29,33 **** <TMPL_VAR NAME="Localize_Users_RemoveUser">: <select name="toremove"> ! <option></option> <TMPL_LOOP NAME="Users_Loop_Remove"> <option><TMPL_VAR NAME="Users_Name"></option> --- 29,33 ---- <TMPL_VAR NAME="Localize_Users_RemoveUser">: <select name="toremove"> ! <option value=""> </option> <TMPL_LOOP NAME="Users_Loop_Remove"> <option><TMPL_VAR NAME="Users_Name"></option> *************** *** 45,49 **** <TMPL_VAR NAME="Localize_Users_EditUser">: <select name="editname"> ! <option></option> <TMPL_LOOP NAME="Users_Loop_Edit"> <option><TMPL_VAR NAME="Users_Name"></option> --- 45,49 ---- <TMPL_VAR NAME="Localize_Users_EditUser">: <select name="editname"> ! <option value=""> </option> <TMPL_LOOP NAME="Users_Loop_Edit"> <option><TMPL_VAR NAME="Users_Name"></option> Index: magnet-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/magnet-page.thtml,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** magnet-page.thtml 19 Feb 2006 10:41:33 -0000 1.16 --- magnet-page.thtml 20 Feb 2006 09:36:35 -0000 1.17 *************** *** 133,137 **** <br /> <select name="bucket0" id="magnetsAddBucket"> ! <option value=""></option> <TMPL_LOOP NAME="Magnet_Loop_Buckets"> --- 133,137 ---- <br /> <select name="bucket0" id="magnetsAddBucket"> ! <option value=""> </option> <TMPL_LOOP NAME="Magnet_Loop_Buckets"> Index: common-middle.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/common-middle.thtml,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** common-middle.thtml 20 Dec 2005 21:30:59 -0000 1.22 --- common-middle.thtml 20 Feb 2006 09:36:35 -0000 1.23 *************** *** 54,66 **** <a class="menuLink" href="/administration" title="<TMPL_VAR NAME="Localize_tip_Menu_Admin">"><TMPL_VAR NAME="Localize_Header_Administration"></a> </td> ! ! ! <TMPL_IF NAME="Users_If_Single"> ! <TMPL_ELSE> <td class="menuSpacer"></td> <td class="<TMPL_VAR NAME="Common_Middle_Tab4">" align="center"> <a class="menuLink" href="/users" title="<TMPL_VAR NAME="Localize_tip_Menu_Users">"><TMPL_VAR NAME="Localize_Header_Users"></a> </td> ! </TMPL_IF> <td class="menuSpacer"></td> <td class="<TMPL_VAR NAME="Common_Middle_Tab5">" align="center"> --- 54,65 ---- <a class="menuLink" href="/administration" title="<TMPL_VAR NAME="Localize_tip_Menu_Admin">"><TMPL_VAR NAME="Localize_Header_Administration"></a> </td> ! <TMPL_IF NAME="Users_If_Single"> ! <xTMPL_IF NAME="Header_If_SingleUser"> ! <TMPL_ELSE> <td class="menuSpacer"></td> <td class="<TMPL_VAR NAME="Common_Middle_Tab4">" align="center"> <a class="menuLink" href="/users" title="<TMPL_VAR NAME="Localize_tip_Menu_Users">"><TMPL_VAR NAME="Localize_Header_Users"></a> </td> ! </TMPL_IF> <td class="menuSpacer"></td> <td class="<TMPL_VAR NAME="Common_Middle_Tab5">" align="center"> Index: corpus-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/corpus-page.thtml,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** corpus-page.thtml 28 Sep 2005 18:48:38 -0000 1.25 --- corpus-page.thtml 20 Feb 2006 09:36:35 -0000 1.26 *************** *** 335,339 **** <br /> <select name="name" id="bucketsDeleteBucket"> ! <option value=""></option> <TMPL_LOOP NAME="Corpus_Loop_Delete_Buckets"> --- 335,339 ---- <br /> <select name="name" id="bucketsDeleteBucket"> ! <option value=""> </option> <TMPL_LOOP NAME="Corpus_Loop_Delete_Buckets"> *************** *** 365,373 **** <br /> <select name="oname" id="bucketsRenameBucketFrom"> ! <option value=""></option> <TMPL_LOOP NAME="Corpus_Loop_Rename_Buckets"> ! <option value="<TMPL_VAR NAME="Corpus_Rename_Bucket">" style="color: <TMPL_VAR NAME="Corpus_Rename_Bucket_Color">"> <TMPL_VAR NAME="Corpus_Rename_Bucket"> </option> --- 365,373 ---- <br /> <select name="oname" id="bucketsRenameBucketFrom"> ! <option value=""> </option> <TMPL_LOOP NAME="Corpus_Loop_Rename_Buckets"> ! <option value="<TMPL_VAR NAME="Corpus_Rename_Bucket">" style="color:<TMPL_VAR NAME="Corpus_Rename_Bucket_Color">"> <TMPL_VAR NAME="Corpus_Rename_Bucket"> </option> Index: view-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/view-page.thtml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** view-page.thtml 15 Feb 2005 04:23:55 -0000 1.10 --- view-page.thtml 20 Feb 2006 09:36:35 -0000 1.11 *************** *** 28,32 **** <input type="hidden" name="filter" value="<TMPL_VAR NAME="View_Field_Filter">" /> ! <table align="left"> <tr valign="top"> <td> --- 28,32 ---- <input type="hidden" name="filter" value="<TMPL_VAR NAME="View_Field_Filter">" /> ! <table align="left" summary=""> <tr valign="top"> <td> |
|
From: Joseph C. <tex...@us...> - 2006-02-20 09:21:36
|
Update of /cvsroot/popfile/engine/UI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29847/UI Modified Files: HTML.pm Log Message: Change font tags for styles. Index: HTML.pm =================================================================== RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v retrieving revision 1.371 retrieving revision 1.372 diff -C2 -d -r1.371 -r1.372 *** HTML.pm 20 Feb 2006 02:22:54 -0000 1.371 --- HTML.pm 20 Feb 2006 09:21:28 -0000 1.372 *************** *** 3317,3321 **** # if ( $arg =~ /\Q$text\E/i ) { # my $new_color = $self->classifier_()->get_bucket_color( $session, $bucket ); ! # $line =~ s/(\Q$text\E)/<b><font color=\"$new_color\">$1<\/font><\/b>/; # } # } --- 3317,3321 ---- # if ( $arg =~ /\Q$text\E/i ) { # my $new_color = $self->classifier_()->get_bucket_color( $session, $bucket ); ! # $line =~ s/(\Q$text\E)/<b style=\"color:$new_color\">$1<\/b>/; # } # } |
11 messages has been excluded from this view by a project administrator.
