popfile-commit — CVS commit list messages

[popfile-commit] engine/Proxy POP3.pm,1.108,1.109

[Sam S. <ssc...@us...>]

Update of /cvsroot/popfile/engine/Proxy
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2438/Proxy

Modified Files:
	POP3.pm 
Log Message:
POP3 tests updated for dynamic loading and validate/configure_item
interfaces.
POP3 test isn't classifying yet (31 errors) but test runs to completion.
Some warnings still need ironing out in validate_item

Index: POP3.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/POP3.pm,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -d -r1.108 -r1.109
*** POP3.pm	25 Feb 2005 21:53:54 -0000	1.108
--- POP3.pm	22 Mar 2005 19:29:10 -0000	1.109
***************
*** 743,747 ****
  
          if ( defined($$form{pop3_force_fork}) ) {
!             $self->config_( 'force_fork', $$form{pop3_force_fork} );
          }
  
--- 743,747 ----
  
          if ( defined($$form{pop3_force_fork}) ) {
!             $self->config_( 'force_fork', $$form{pop3_force_fork} ) if ($$form{pop3_force_fork} eq 1 || $$form{pop3_force_fork} eq 0);
          }
  

[popfile-commit] engine/languages Deutsch.msg,1.35,1.36 English.msg,1.90,1.91

[Manni H. <man...@us...>]

Update of /cvsroot/popfile/engine/languages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27820/languages

Modified Files:
	Deutsch.msg English.msg 
Log Message:
Translate missing strings to German and make some IMAP messages a bit more pretty.

Index: Deutsch.msg
===================================================================
RCS file: /cvsroot/popfile/engine/languages/Deutsch.msg,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** Deutsch.msg	6 Feb 2005 02:05:33 -0000	1.35
--- Deutsch.msg	17 Mar 2005 11:25:38 -0000	1.36
***************
*** 73,76 ****
--- 73,79 ----
  Arrived                                 Eingang
  Size                                    Größe
+ Go                                      Los
+ Edit                                    Bearbeiten
+ Logout                                  Abmelden
  
  # This is a regular expression pattern that is used to convert
***************
*** 99,103 ****
--- 102,108 ----
  Header_Advanced                         Erweitert
  Header_Security                         Sicherheit
+ Header_Administration                   Administration
  Header_Magnets                          Magnete
+ Header_Users                            Benutzer
  
  Footer_HomePage                         POPFile Homepage
***************
*** 167,170 ****
--- 172,177 ----
  Configuration_SOCKSServerUpdate         SOCKS V Proxy Host geändert auf %s
  Configuration_Fields                    Spalten im Verlauf
+ Configuration_Hide_Bar                  Konfigurationsleiste ausblenden
+ Configuration_Show_Bar                  Konfigurationsleites anzeigen
  
  Advanced_Error1                         '%s' ist bereits in der Liste der ignorierten Wörter
***************
*** 183,186 ****
--- 190,210 ----
  Advanced_ConfigFile                     Konfigurationsdatei:
  
+ Users_Create                            Neuen Benutzer anlegen
+ Users_Remove                            Bestehenden Benutzer löschen
+ Users_Edit                              Benutzereinstellungen bearbeiten
+ Users_CopyFrom                          Einstellungen übernehmen von Benutzer
+ Users_RemoveUser                        Benutzer löschen
+ Users_CreateUser                        Anlegen des neuen Bentuzers
+ Users_EditUser                          Benutzer bearbeiten
+ Users_Parameters                        Parameter
+ Users_Created                           Benutzer '%s' wurde angelegt
+ Users_Not_Created                       Benutzer '%s' konnte nicht angelegt werden
+ Users_Created_And_Cloned                Benutzer '%s' wurde als Klon von '%s' angelegt
+ Users_Not_Created_Exists                Benutzer '%s' existiert bereits
+ Users_Created_Not_Cloned                Benutzer '%s' wurde angelegt, aber Übernahme der Einstellungen von '%s' schlug fehl
+ Users_Removed                           Benutzer '%s' wurde gelöscht
+ Users_Removed_Failed                    Benutzer '%s' konnte nicht entfernt werden
+ Users_Removed_Failed_Admin              Benutzer '%s' konnte nicht entfernt werden: zuerst die Administrationsrechte entfernen
+ 
  History_Filter                          &nbsp;(zeige nur Kategorie <font color="%s">%s</font>)
  History_FilterBy                        Filtern nach
***************
*** 193,196 ****
--- 217,223 ----
  History_NoSubject                       kein Betreff
  History_ClassifyAs                      eingestuft als
+ History_RemoveColumn                    Spalte entfernen
+ History_MoveLeft                        nach links bewegen
+ History_MoveRight                       nach rechts bewegen
  History_MagnetUsed                      Magnet benutzt
  History_MagnetBecause                   <b>Magnet benutzt</b><p>Eingestuft als <font color="%s">%s</font> durch Magnet %s </p>
***************
*** 218,224 ****
  History_Size_KiloBytes                  %.1f&nbsp;KB
  History_Size_MegaBytes                  %.1f&nbsp;MB
  
  Password_Title                          Paßwort
! Password_Enter                          Paßwort eingeben
  Password_Go                             Anmelden
  Password_Error1                         Falsches Paßwort
--- 245,253 ----
  History_Size_KiloBytes                  %.1f&nbsp;KB
  History_Size_MegaBytes                  %.1f&nbsp;MB
+ History_Click_To_Sort                   Anklicken um nach dem Inhalt dieser Spalte zu sortieren
  
  Password_Title                          Paßwort
! Password_Password                       Paßwort
! Password_Username                       Benutzer
  Password_Go                             Anmelden
  Password_Error1                         Falsches Paßwort
***************
*** 288,291 ****
--- 317,321 ----
  Bucket_ResetStatistics                  Statistiken zurücksetzen
  Bucket_LastReset                        Läuft seit
+ Bucket_MessagesPerDay                   Nachrichten pro Tag:
  Bucket_CurrentColor                     Derzeitige Farbe von %s ist %s
  Bucket_SetColorTo                       Setze Farbe von %s auf %s
***************
*** 327,331 ****
  Windows_TrayIcon                        POPFile-Symbol neben der Uhr anzeigen?
  Windows_Console                         POPFile in einem Konsolenfenster ausführen?
! Windows_NextTime                        <p><font color="red">Diese Änderung wird erst beim nächsten Start von POPFile wirksam.</font>
  
  Header_MenuSummary                      Diese Tabelle ist das Navigationsmenü, das Zugang zu den einzelnen Bereichen des Kontrollzentrums bietet.
--- 357,361 ----
  Windows_TrayIcon                        POPFile-Symbol neben der Uhr anzeigen?
  Windows_Console                         POPFile in einem Konsolenfenster ausführen?
! Windows_NextTime                        Diese Änderung wird erst beim nächsten Start von POPFile wirksam.
  
  Header_MenuSummary                      Diese Tabelle ist das Navigationsmenü, das Zugang zu den einzelnen Bereichen des Kontrollzentrums bietet.
***************
*** 345,350 ****
  Advanced_MainTableSummary               Diese Tabelle enthält eine Liste von Wörtern, die POPFile ignoriert, wenn es eine Nachricht analysiert. Dies betrifft Wörter, die besonders häufig in Nachrichten auftauchen. Diese sind reihenweise alphabetisch nach dem ersten Buchstaben sortiert.
  
! Imap_Bucket2Folder                      Mail der Kategorie <b>%s</b> kommt in den Ordner
  Imap_MapError                           Sie können nicht mehr als eine Kategorie einem einzelnen Ordner zuordnen!
  Imap_Server                             IMAP Server Hostname:
  Imap_ServerNameError                    Bitte geben Sie den Namen des Servers ein!
--- 375,381 ----
  Advanced_MainTableSummary               Diese Tabelle enthält eine Liste von Wörtern, die POPFile ignoriert, wenn es eine Nachricht analysiert. Dies betrifft Wörter, die besonders häufig in Nachrichten auftauchen. Diese sind reihenweise alphabetisch nach dem ersten Buchstaben sortiert.
  
! Imap_Bucket2Folder                      Mail der Kategorie '<b>%s</b>' kommt in den Ordner
  Imap_MapError                           Sie können nicht mehr als eine Kategorie einem einzelnen Ordner zuordnen!
+ Imap_MapUpdated                         Kategorie '%s' wurde Ordner '%s' zugeordnet.
  Imap_Server                             IMAP Server Hostname:
  Imap_ServerNameError                    Bitte geben Sie den Namen des Servers ein!
***************
*** 355,363 ****
  Imap_Password                           Password für IMAP Konto:
  Imap_PasswordError                      Bitte geben Sie ein Passwort an!
  Imap_Expunge                            Gelöschte Nachrichten aus den überwachten Ordnern endgültig löschen.
  Imap_Interval                           Update Intervall in Sekunden:
  Imap_IntervalError                      Bitte geben Sie ein Intervall zwischen 10 und 3600 Sekunden ein.
! Imap_Bytelimit                          Bytes pro Email, die zur Klassifikation genutzt werden. Geben Sie bitte 0 (Null) ein, um die komplette Nachricht zu nutzen.
! Imap_BytelimitError                     Bitte geben Sie eine Zahl ein.
  Imap_RefreshFolders                     Ordnerliste neu laden:
  Imap_Now                                jetzt!
--- 386,394 ----
  Imap_Password                           Password für IMAP Konto:
  Imap_PasswordError                      Bitte geben Sie ein Passwort an!
+ Imap_ConnectionDetailsUpdated           Die IMAP Verbindungsdetails wurden aktualisiert. Bitte laden Sie jetzt die Liste der Ordner neu.
  Imap_Expunge                            Gelöschte Nachrichten aus den überwachten Ordnern endgültig löschen.
  Imap_Interval                           Update Intervall in Sekunden:
  Imap_IntervalError                      Bitte geben Sie ein Intervall zwischen 10 und 3600 Sekunden ein.
! Imap_OptionsUpdated                     Die IMAP Optionen wurden erfolgreicht aktualisiert.
  Imap_RefreshFolders                     Ordnerliste neu laden:
  Imap_Now                                jetzt!
***************
*** 365,371 ****
--- 396,406 ----
  Imap_UpdateError2                       Verbindung zum Server fehlgeschlagen! Bitte überprüfen Sie den Namen des Servers, den Port und stellen Sie sicher, dass Sie Zugang zum Internet haben.
  Imap_UpdateError3                       Bitte konfigurieren Sie erst die Verbindung zum Server.
+ Imap_UpdateOK                           Die Ordnerliste wurde erfolgreich geladen.
  Imap_NoConnectionMessage                Bitte konfigurieren Sie erst die Verbindung zum Server. Nachdem Sie das getan haben, werden Sie an dieser Stelle mehr Konfigurationsmöglichkeiten finden.
  Imap_WatchMore                          : einen weiteren zu überwachenden Ordner
+ Imap_WatchedFolderAdded                 Ein Ordner wurde hinzugefügt. Bitte wählen Sie jetzt den gewünschten Ordner.
  Imap_WatchedFolder                      Überwachter Ordner Nr.
+ Imap_WatchedFoldersUpdated              Liste der überwachten Ordner wurde aktualisiert.
+ Imap_WatchedFolderRemoved               Ordner '%s' wurde aus der Liste der überwachten Ordner entfernt
  
  Shutdown_Message                        POPFile wurde beendet

Index: English.msg
===================================================================
RCS file: /cvsroot/popfile/engine/languages/English.msg,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -d -r1.90 -r1.91
*** English.msg	17 Mar 2005 11:17:54 -0000	1.90
--- English.msg	17 Mar 2005 11:25:38 -0000	1.91
***************
*** 378,384 ****
  Advanced_MainTableSummary               This table provides a list of words that POPFile ignores when classifying message due to their relative frequency in message in general.  They are organized per row according to the first letter of the words.
  
! Imap_Bucket2Folder                      Mail for bucket <b>%s</b> goes to folder
  Imap_MapError                           You cannot map more than one bucket to a single folder!
! Imap_MapUpdated                         Mapped bucket %s to folder %s.
  Imap_Server                             IMAP server hostname:
  Imap_ServerNameError                    Please enter the server's hostname!
--- 378,384 ----
  Advanced_MainTableSummary               This table provides a list of words that POPFile ignores when classifying message due to their relative frequency in message in general.  They are organized per row according to the first letter of the words.
  
! Imap_Bucket2Folder                      Mail for bucket '<b>%s</b>' goes to folder
  Imap_MapError                           You cannot map more than one bucket to a single folder!
! Imap_MapUpdated                         Mapped bucket '%s' to folder '%s'.
  Imap_Server                             IMAP server hostname:
  Imap_ServerNameError                    Please enter the server's hostname!
***************
*** 405,409 ****
  Imap_WatchedFolder                      Watched folder no
  Imap_WatchedFoldersUpdated              Updated the list of watched folders
! Imap_WatchedFolderRemoved               Removed folder %s from list of watched folders
  
  Shutdown_Message                        POPFile has shut down
--- 405,409 ----
  Imap_WatchedFolder                      Watched folder no
  Imap_WatchedFoldersUpdated              Updated the list of watched folders
! Imap_WatchedFolderRemoved               Removed folder '%s' from list of watched folders
  
  Shutdown_Message                        POPFile has shut down

[popfile-commit] engine/languages English-UK.msg,1.9,1.10 English.msg,1.89,1.90 Francais.msg,1.13,1.14 Italiano.msg,1.3,1.4 Portugues do Brasil.msg,1.9,1.10 Suomi.msg,1.13,1.14 Turkce.msg,1.4,1.5

[Manni H. <man...@us...>]

Update of /cvsroot/popfile/engine/languages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26720/languages

Modified Files:
	English-UK.msg English.msg Francais.msg Italiano.msg 
	Portugues do Brasil.msg Suomi.msg Turkce.msg 
Log Message:
Remove language variables 'Imap_ByteLimi' and 'Imap_ByteLimitError' that are no longer used.

Index: English-UK.msg
===================================================================
RCS file: /cvsroot/popfile/engine/languages/English-UK.msg,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** English-UK.msg	7 Feb 2005 08:05:35 -0000	1.9
--- English-UK.msg	17 Mar 2005 11:17:54 -0000	1.10
***************
*** 369,374 ****
  Imap_Interval                           Update interval in seconds:
  Imap_IntervalError                      Please enter an interval between 10 and 3600 seconds.
- Imap_Bytelimit                          Bytes per message to use for classification. Enter 0 (Null) for the complete message:
- Imap_BytelimitError                     Please enter a number.
  Imap_RefreshFolders                     Refresh list of folders
  Imap_Now                                now!
--- 369,372 ----

Index: Turkce.msg
===================================================================
RCS file: /cvsroot/popfile/engine/languages/Turkce.msg,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Turkce.msg	6 Feb 2005 02:05:35 -0000	1.4
--- Turkce.msg	17 Mar 2005 11:17:55 -0000	1.5
***************
*** 363,368 ****
  Imap_Interval                           Güncelleme aralýðý, saniye:
  Imap_IntervalError                      Lütfen 10 ile 3600 saniye arasýnda bir sayý girin.
- Imap_Bytelimit                          Her mesajýn sýnýflandýrýlmasýnda kullanýlacak bayt. Tüm mesaj için 0 girin:
- Imap_BytelimitError                     Lütfen bir sayý girin.
  Imap_RefreshFolders                     Klasör listesini yenile
  Imap_Now                                þimdi!
--- 363,366 ----

Index: Francais.msg
===================================================================
RCS file: /cvsroot/popfile/engine/languages/Francais.msg,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Francais.msg	6 Feb 2005 02:05:33 -0000	1.13
--- Francais.msg	17 Mar 2005 11:17:54 -0000	1.14
***************
*** 357,362 ****
  Imap_Interval                           Période de rafraîchissement en secondes :
  Imap_IntervalError                      Veuillez entrer un délai compris entre 10 et 3600 secondes.
- Imap_Bytelimit                          Par message, nombre d'octets pris en compte pour la classification. Entrez 0 (zéro) pour le message complet :
- Imap_BytelimitError                     Veuillez entrer un nombre.
  Imap_RefreshFolders                     Actualiser la liste des dossiers
  Imap_Now                                maintenant !
--- 357,360 ----

Index: Italiano.msg
===================================================================
RCS file: /cvsroot/popfile/engine/languages/Italiano.msg,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Italiano.msg	6 Feb 2005 02:05:34 -0000	1.3
--- Italiano.msg	17 Mar 2005 11:17:55 -0000	1.4
***************
*** 362,367 ****
  Imap_Interval                           Intervallo di aggiornamento in secondi:
  Imap_IntervalError                      Inserisci un intervallo tra 10 e 3600 secondi.
- Imap_Bytelimit                          Byte per messaggio da usare per la classificazione. Inserisci 0 (Null) per il messaggio completo:
- Imap_BytelimitError                     Inserisci un numero.
  Imap_RefreshFolders                     Aggiorna lista delle cartelle
  Imap_Now                                ora!
--- 362,365 ----

Index: Portugues do Brasil.msg
===================================================================
RCS file: /cvsroot/popfile/engine/languages/Portugues do Brasil.msg,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Portugues do Brasil.msg	6 Feb 2005 02:05:35 -0000	1.9
--- Portugues do Brasil.msg	17 Mar 2005 11:17:55 -0000	1.10
***************
*** 362,367 ****
  Imap_Interval                           Intervalo de atualização em segundos:
  Imap_IntervalError                      Por favor informe um intervalo entre 10 e 3600 segundos.
- Imap_Bytelimit                          Bytes por mensagem para usar para classificação. Informe 0 (Nulo) para usar a mensagem completa:
- Imap_BytelimitError                     Por favor informe um número.
  Imap_RefreshFolders                     Atualizar a lista de pastas
  Imap_Now                                agora!
--- 362,365 ----

Index: Suomi.msg
===================================================================
RCS file: /cvsroot/popfile/engine/languages/Suomi.msg,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Suomi.msg	6 Feb 2005 02:05:35 -0000	1.13
--- Suomi.msg	17 Mar 2005 11:17:55 -0000	1.14
***************
*** 360,365 ****
  Imap_Interval                           Päivitysväli sekunneissa.
  Imap_IntervalError                      Täytä päivitysväli 10 ja 3600 sekunnin väliltä.
- Imap_Bytelimit                          Luokitteluun käytettävä tavumäärä. Kirjoita 0 (nolla), jos haluat käyttää koko viestiä:
- Imap_BytelimitError                     Täytä numero.
  Imap_RefreshFolders                     Päivitä kansiolista.
  Imap_Now                                nyt
--- 360,363 ----

Index: English.msg
===================================================================
RCS file: /cvsroot/popfile/engine/languages/English.msg,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -d -r1.89 -r1.90
*** English.msg	17 Mar 2005 10:55:32 -0000	1.89
--- English.msg	17 Mar 2005 11:17:54 -0000	1.90
***************
*** 394,399 ****
  Imap_IntervalError                      Please enter an interval between 10 and 3600 seconds.
  Imap_OptionsUpdated                     IMAP options were successfully updated.
- Imap_Bytelimit                          Bytes per message to use for classification. Enter 0 (Null) for the complete message:
- Imap_BytelimitError                     Please enter a number.
  Imap_RefreshFolders                     Refresh list of folders
  Imap_Now                                now!
--- 394,397 ----

[popfile-commit] engine/languages English.msg,1.88,1.89

[Manni H. <man...@us...>]

Update of /cvsroot/popfile/engine/languages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23117/languages

Modified Files:
	English.msg 
Log Message:
Remove language variables 'Up' and 'Down' that are no longer used.

Index: English.msg
===================================================================
RCS file: /cvsroot/popfile/engine/languages/English.msg,v
retrieving revision 1.88
retrieving revision 1.89
diff -C2 -d -r1.88 -r1.89
*** English.msg	16 Mar 2005 21:57:55 -0000	1.88
--- English.msg	17 Mar 2005 10:55:32 -0000	1.89
***************
*** 76,81 ****
  Arrived                                 Arrived
  Size                                    Size
- Up                                      Up
- Down                                    Down
  Go                                      Go
  Edit                                    Edit
--- 76,79 ----

[popfile-commit] engine/Services IMAP.pm,1.16,1.17

[Manni H. <man...@us...>]

Update of /cvsroot/popfile/engine/Services
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4994/Services

Modified Files:
	IMAP.pm 
Log Message:
UI: Don't provide a 'Remove' button for the first watched folder.

Index: IMAP.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Services/IMAP.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** IMAP.pm	16 Mar 2005 21:49:29 -0000	1.16
--- IMAP.pm	16 Mar 2005 22:03:48 -0000	1.17
***************
*** 1973,1976 ****
--- 1973,1977 ----
                  $data_watched_folders{IMAP_WatchedFolder_Msg} = $$language{Imap_WatchedFolder};
                  $data_watched_folders{Localize_Remove} = $$language{Remove};
+                 $data_watched_folders{IMAP_ifnot_first_folder} = ( $i == 1 ) ? 0 : 1;
  
                  push @loop_watched_folders, \%data_watched_folders;

[popfile-commit] engine/skins/default imap-watch-folders.thtml,1.6,1.7

[Manni H. <man...@us...>]

Update of /cvsroot/popfile/engine/skins/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4994/skins/default

Modified Files:
	imap-watch-folders.thtml 
Log Message:
UI: Don't provide a 'Remove' button for the first watched folder.

Index: imap-watch-folders.thtml
===================================================================
RCS file: /cvsroot/popfile/engine/skins/default/imap-watch-folders.thtml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** imap-watch-folders.thtml	16 Mar 2005 21:49:46 -0000	1.6
--- imap-watch-folders.thtml	16 Mar 2005 22:03:48 -0000	1.7
***************
*** 24,28 ****
--- 24,34 ----
  
      </select>
+     
+     <TMPL_IF NAME="IMAP_ifnot_first_folder">
+     
      <input type="submit" class="submit" name="remove_imap_watched_folder_<TMPL_VAR NAME="IMAP_loop_counter">" value="<TMPL_VAR NAME="Localize_Remove">" />
+     
+     </TMPL_IF>
+     
      <br />
  

[popfile-commit] engine/Platform MSWin32.pm,1.23,1.24

[Manni H. <man...@us...>]

Update of /cvsroot/popfile/engine/Platform
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3880/Platform

Modified Files:
	MSWin32.pm 
Log Message:
Remove tab characters.

Index: MSWin32.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Platform/MSWin32.pm,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** MSWin32.pm	16 Mar 2005 21:57:53 -0000	1.23
--- MSWin32.pm	16 Mar 2005 21:58:45 -0000	1.24
***************
*** 105,111 ****
      foreach my $dir (@temp) {
          if ( $dir =~ /pdk\-.+\-(\d+)$/ ) {
!    	        if ( $$ != $1 ) {
                  rmdir $dir;
! 	        }
          }
      }
--- 105,111 ----
      foreach my $dir (@temp) {
          if ( $dir =~ /pdk\-.+\-(\d+)$/ ) {
!             if ( $$ != $1 ) {
                  rmdir $dir;
!             }
          }
      }

[popfile-commit] engine/Platform MSWin32.pm,1.22,1.23

[Manni H. <man...@us...>]

Update of /cvsroot/popfile/engine/Platform
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3417/Platform

Modified Files:
	MSWin32.pm 
Log Message:
Let the MSWin32 module use the status message facility. 

Remove font tag from language file.

Use labels for the descriptions.

Index: MSWin32.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Platform/MSWin32.pm,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** MSWin32.pm	1 Jan 2005 15:53:34 -0000	1.22
--- MSWin32.pm	16 Mar 2005 21:57:53 -0000	1.23
***************
*** 151,168 ****
      my ( $self, $name, $templ, $language, $form ) = @_;
  
      if ( $name eq 'windows_trayicon_and_console' ) {
  
          if ( defined($$form{windows_trayicon}) ) {
              $self->config_( 'trayicon', $$form{windows_trayicon} );
!             $templ->param( 'trayicon_feedback' => 1 );
          }
  
          if ( defined($$form{windows_console}) ) {
              $self->config_( 'console', $$form{windows_console} );
!             $templ->param( 'console_feedback' => 1 );
          }
      }
  
!    return '';
  }
  
--- 151,170 ----
      my ( $self, $name, $templ, $language, $form ) = @_;
  
+     my ( $status_message );
+ 
      if ( $name eq 'windows_trayicon_and_console' ) {
  
          if ( defined($$form{windows_trayicon}) ) {
              $self->config_( 'trayicon', $$form{windows_trayicon} );
!             $status_message = $$language{Windows_NextTime};
          }
  
          if ( defined($$form{windows_console}) ) {
              $self->config_( 'console', $$form{windows_console} );
!             $status_message = $$language{Windows_NextTime};
          }
      }
  
!    return ( $status_message, undef );
  }
  

[popfile-commit] engine/skins/default windows-configuration.thtml,1.4,1.5

[Manni H. <man...@us...>]

Update of /cvsroot/popfile/engine/skins/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3417/skins/default

Modified Files:
	windows-configuration.thtml 
Log Message:
Let the MSWin32 module use the status message facility. 

Remove font tag from language file.

Use labels for the descriptions.

Index: windows-configuration.thtml
===================================================================
RCS file: /cvsroot/popfile/engine/skins/default/windows-configuration.thtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** windows-configuration.thtml	15 Feb 2005 04:23:55 -0000	1.4
--- windows-configuration.thtml	16 Mar 2005 21:57:57 -0000	1.5
***************
*** 1,5 ****
! <span class="configurationLabel">
      <TMPL_VAR NAME="Localize_Windows_Console">
! </span>
  <br />
  <table border="0" cellpadding="0" cellspacing="0" summary="">
--- 1,5 ----
! <label for="windows_console" class="configurationLabel">
      <TMPL_VAR NAME="Localize_Windows_Console">
! </label>
  <br />
  <table border="0" cellpadding="0" cellspacing="0" summary="">
***************
*** 12,16 ****
                      <TMPL_VAR NAME="Localize_Yes">
                  </span>
!                 <input type="submit" class="submit toggleOff" id="windowConsoleOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" />
                  <input type="hidden" name="windows_console" value="0" />
  
--- 12,16 ----
                      <TMPL_VAR NAME="Localize_Yes">
                  </span>
!                 <input id="windows_console" type="submit" class="submit toggleOff" id="windowConsoleOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" />
                  <input type="hidden" name="windows_console" value="0" />
  
***************
*** 20,34 ****
                      <TMPL_VAR NAME="Localize_No">
                  </span>
!                 <input type="submit" class="submit toggleOn" id="windowConsoleOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" />
                  <input type="hidden" name="windows_console" value="1" />
  
                  </TMPL_IF>
  
-                 <TMPL_IF NAME="console_feedback">
- 
-                 <TMPL_VAR NAME="Localize_Windows_NextTime">
- 
-                 </TMPL_IF>
- 
              </form>
          </td>
--- 20,28 ----
                      <TMPL_VAR NAME="Localize_No">
                  </span>
!                 <input id="windows_console" type="submit" class="submit toggleOn" id="windowConsoleOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" />
                  <input type="hidden" name="windows_console" value="1" />
  
                  </TMPL_IF>
  
              </form>
          </td>
***************
*** 36,42 ****
  </table>
  <br />
! <span class="configurationLabel">
      <TMPL_VAR NAME="Localize_Windows_TrayIcon">
! </span>
  
  <table border="0" cellpadding="0" cellspacing="0" summary="">
--- 30,36 ----
  </table>
  <br />
! <label for="windows_trayicon" class="configurationLabel">
      <TMPL_VAR NAME="Localize_Windows_TrayIcon">
! </label>
  
  <table border="0" cellpadding="0" cellspacing="0" summary="">
***************
*** 50,54 ****
                      <TMPL_VAR NAME="Localize_Yes">
                  </span>
!                 <input type="submit" class="submit toggleOff" id="windowTrayIconOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" />
                  <input type="hidden" name="windows_trayicon" value="0" />
  
--- 44,48 ----
                      <TMPL_VAR NAME="Localize_Yes">
                  </span>
!                 <input id="windows_trayicon" type="submit" class="submit toggleOff" id="windowTrayIconOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" />
                  <input type="hidden" name="windows_trayicon" value="0" />
  
***************
*** 58,72 ****
                      <TMPL_VAR NAME="Localize_No">
                  </span>
!                 <input type="submit" class="submit toggleOn" id="windowTrayIconOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" />
                  <input type="hidden" name="windows_trayicon" value="1" />
  
                  </TMPL_IF>
  
-                 <TMPL_IF NAME="trayicon_feedback">
- 
-                 <TMPL_VAR NAME="Localize_Windows_NextTime">
- 
-                 </TMPL_IF>
- 
              </form>
          </td>
--- 52,60 ----
                      <TMPL_VAR NAME="Localize_No">
                  </span>
!                 <input id="windows_trayicon" type="submit" class="submit toggleOn" id="windowTrayIconOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" />
                  <input type="hidden" name="windows_trayicon" value="1" />
  
                  </TMPL_IF>
  
              </form>
          </td>

[popfile-commit] engine/languages English.msg,1.87,1.88

[Manni H. <man...@us...>]

Update of /cvsroot/popfile/engine/languages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3417/languages

Modified Files:
	English.msg 
Log Message:
Let the MSWin32 module use the status message facility. 

Remove font tag from language file.

Use labels for the descriptions.

Index: English.msg
===================================================================
RCS file: /cvsroot/popfile/engine/languages/English.msg,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** English.msg	16 Mar 2005 21:49:30 -0000	1.87
--- English.msg	16 Mar 2005 21:57:55 -0000	1.88
***************
*** 362,366 ****
  Windows_TrayIcon                        Show POPFile icon in Windows system tray?
  Windows_Console                         Run POPFile in a console window?
! Windows_NextTime                        <p><font color="red">This change will not take effect until the next time you start POPFile</font>
  
  Header_MenuSummary                      This table is the navigation menu which allows access to each of the different pages of the control center.
--- 362,366 ----
  Windows_TrayIcon                        Show POPFile icon in Windows system tray?
  Windows_Console                         Run POPFile in a console window?
! Windows_NextTime                        This change will not take effect until the next time you start POPFile
  
  Header_MenuSummary                      This table is the navigation menu which allows access to each of the different pages of the control center.

[popfile-commit] engine/Services IMAP.pm,1.15,1.16

[Manni H. <man...@us...>]

Update of /cvsroot/popfile/engine/Services
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1620/Services

Modified Files:
	IMAP.pm 
Log Message:
Make use of the status and error message feature.

Add a couple of previously hard-coded strings to the language file(s).

Fix html labels so that they now have the 'for' attribute and let the according input widgets have the corresponding id.

Index: IMAP.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Services/IMAP.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** IMAP.pm	9 Feb 2005 21:25:06 -0000	1.15
--- IMAP.pm	16 Mar 2005 21:49:29 -0000	1.16
***************
*** 2077,2116 ****
      my ( $self, $name, $templ, $language, $form ) = @_;
  
      # connection details
      if ( $name eq 'imap_0_connection_details' ) {
          if ( defined $$form{update_imap_0_connection_details} ) {
              if ( $$form{imap_hostname} ne '' ) {
-                 $templ->param( IMAP_connection_if_hostname_error => 0 );
                  $self->user_config_( 1, 'hostname', $$form{imap_hostname} );
              }
              else {
!                 $templ->param( IMAP_connection_if_hostname_error => 1 );
              }
  
              if ( $$form{imap_port} >= 1 && $$form{imap_port} < 65536 ) {
                  $self->user_config_( 1, 'port', $$form{imap_port} );
!                 $templ->param( IMAP_connection_if_port_error => 0 );
              }
              else {
!                 $templ->param( IMAP_connection_if_port_error => 1 );
              }
  
              if ( $$form{imap_login} ne '' ) {
                  $self->user_config_( 1, 'login', $$form{imap_login} );
!                 $templ->param( IMAP_connection_if_login_error => 0 );
              }
              else {
!                 $templ->param( IMAP_connection_if_login_error => 1 );
              }
  
              if ( $$form{imap_password} ne '' ) {
                  $self->user_config_( 1, 'password', $$form{imap_password} );
!                 $templ->param( IMAP_connection_if_password_error => 0 );
              }
              else {
!                 $templ->param( IMAP_connection_if_password_error => 1 );
              }
          }
!         return;
      }
  
--- 2077,2123 ----
      my ( $self, $name, $templ, $language, $form ) = @_;
  
+     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} );
+                 $something_happened++;
              }
              else {
!                 $error_message = $$language{Imap_ServerNameError};
              }
  
              if ( $$form{imap_port} >= 1 && $$form{imap_port} < 65536 ) {
                  $self->user_config_( 1, 'port', $$form{imap_port} );
!                 $something_happened++;
              }
              else {
!                 $error_message = $$language{Imap_PortError};
              }
  
              if ( $$form{imap_login} ne '' ) {
                  $self->user_config_( 1, 'login', $$form{imap_login} );
!                 $something_happened++;
              }
              else {
!                 $error_message = $$language{Imap_LoginError};
              }
  
              if ( $$form{imap_password} ne '' ) {
                  $self->user_config_( 1, 'password', $$form{imap_password} );
!                 $something_happened++;
              }
              else {
!                 $error_message = $$language{Imap_PasswordError};
              }
+             
+             $status_message = $$language{Imap_ConnectionDetailsUpdated} if $something_happened;
          }
!         
!         return ( $status_message, $error_message );
      }
  
***************
*** 2130,2133 ****
--- 2137,2141 ----
              $self->watched_folders__( sort keys %folders );
              $self->{folder_change_flag__} = 1;
+             $status_message = $$language{Imap_WatchedFoldersUpdated};
          }
  
***************
*** 2137,2149 ****
              if ( defined $$form{"remove_imap_watched_folder_$i"} ) {
                  my @watched = $self->watched_folders__();
!                 splice @watched, $i - 1, 1;
                  $self->watched_folders__( @watched );
                  $self->{folder_change_flag__} = 1;
                  last;
              }
          }
  
! 
!         return;
      }
  
--- 2145,2157 ----
              if ( defined $$form{"remove_imap_watched_folder_$i"} ) {
                  my @watched = $self->watched_folders__();
!                 my $removed = splice @watched, $i - 1, 1;
                  $self->watched_folders__( @watched );
                  $self->{folder_change_flag__} = 1;
+                 $status_message = sprintf $$language{Imap_WatchedFolderRemoved}, $removed;
                  last;
              }
          }
  
!         return ( $status_message, $error_message );
      }
  
***************
*** 2154,2159 ****
              push @current, 'INBOX';
              $self->watched_folders__( @current );
          }
!         return;
      }
  
--- 2162,2168 ----
              push @current, 'INBOX';
              $self->watched_folders__( @current );
+             $status_message = $$language{Imap_WatchedFolderAdded};
          }
!         return ( $status_message, $error_message );
      }
  
***************
*** 2185,2203 ****
              }
  
-             my $bad = 0;
              while ( my ( $bucket, $folder ) = each %bucket2folder ) {
  
                  if ( exists $folders{$folder} && $folders{ $folder } > 1 ) {
!                     $bad = 1;
                  }
                  else {
!                     $self->folder_for_bucket__( $bucket, $folder );
! 
!                     $self->{folder_change_flag__} = 1;
                  }
              }
-             $templ->param( IMAP_buckets_to_folders_if_error => $bad );
          }
!         return;
      }
  
--- 2194,2213 ----
              }
  
              while ( my ( $bucket, $folder ) = each %bucket2folder ) {
  
+                 # If a folder is supposed to be mapped to more than one bucket
                  if ( exists $folders{$folder} && $folders{ $folder } > 1 ) {
!                     $error_message = $$language{Imap_MapError}
                  }
                  else {
!                     if ( $self->folder_for_bucket__( $bucket ) ne $folder ) {
!                         $self->folder_for_bucket__( $bucket, $folder );
!                         $self->{folder_change_flag__} = 1;
!                         $status_message = sprintf $$language{Imap_MapUpdated}, $bucket, $folder;
!                     }
                  }
              }
          }
!         return ( $status_message, $error_message );
      }
  
***************
*** 2220,2238 ****
                          }
                          else {
!                             $templ->param( IMAP_update_list_failed => 'Could not login. Verify your login name and password, please.' );
!                             # should be language__{Imap_UpdateError1}
                          }
                      }
                      else {
!                         $templ->param( IMAP_update_list_failed => 'Failed to connect to server. Please check the host name and port and make sure you are online.' );
!                         # should be language__{Imap_UpdateError2}
                      }
              }
              else {
!                 $templ->param( IMAP_update_list_failed => 'Please configure the connection details first.' );
!                 # should be language__{Imap_UpdateError3}
              }
          }
!         return;
      }
  
--- 2230,2249 ----
                          }
                          else {
!                             $error_message = $$language{Imap_UpdateError1};
                          }
                      }
                      else {
!                         $error_message = $$language{Imap_UpdateError2};
                      }
              }
              else {
!                 $error_message = $$language{Imap_UpdateError3};
!             }
!             
!             unless ( defined $error_message ) {
!                 $status_message = $$language{Imap_UpdateOK};
              }
          }
!         return ( $status_message, $error_message );
      }
  
***************
*** 2253,2270 ****
              # update interval
              my $form_interval = $$form{imap_options_update_interval};
!             if ( defined $form_interval ) {
!                 if ( $form_interval > 10 && $form_interval < 60*60 ) {
                      $self->user_config_( 1, 'update_interval', $form_interval );
-                     $templ->param( IMAP_if_interval_error => 0 );
-                 }
-                 else {
-                     $templ->param( IMAP_if_interval_error => 1 );
-                 }
              }
              else {
!                 $templ->param( IMAP_if_interval_error => 1 );
              }
          }
!         return;
      }
  
--- 2264,2280 ----
              # update interval
              my $form_interval = $$form{imap_options_update_interval};
!             if ( $form_interval =~ /^\d+$/ && $form_interval > 10 && $form_interval < 60*60 ) {
                      $self->user_config_( 1, 'update_interval', $form_interval );
              }
              else {
!                 $error_message = $$language{Imap_IntervalError};
!             }
!             
!             unless ( defined $error_message ) {
!                 $status_message = $$language{Imap_OptionsUpdated};
              }
+             
          }
!         return ( $status_message, $error_message );
      }
  

[popfile-commit] engine/skins/default imap-bucket-folders.thtml,1.7,1.8 imap-connection-details.thtml,1.5,1.6 imap-options.thtml,1.8,1.9 imap-update-mailbox-list.thtml,1.4,1.5 imap-watch-folders.thtml,1.5,1.6 imap-watch-more-folders.thtml,1.4,1.5

[Manni H. <man...@us...>]

Update of /cvsroot/popfile/engine/skins/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1620/skins/default

Modified Files:
	imap-bucket-folders.thtml imap-connection-details.thtml 
	imap-options.thtml imap-update-mailbox-list.thtml 
	imap-watch-folders.thtml imap-watch-more-folders.thtml 
Log Message:
Make use of the status and error message feature.

Add a couple of previously hard-coded strings to the language file(s).

Fix html labels so that they now have the 'for' attribute and let the according input widgets have the corresponding id.

Index: imap-bucket-folders.thtml
===================================================================
RCS file: /cvsroot/popfile/engine/skins/default/imap-bucket-folders.thtml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** imap-bucket-folders.thtml	15 Feb 2005 04:23:54 -0000	1.7
--- imap-bucket-folders.thtml	16 Mar 2005 21:49:46 -0000	1.8
***************
*** 3,15 ****
  <TMPL_IF NAME="IMAP_if_mailboxes">
  
  <form action="<TMPL_VAR NAME="Configuration_Action">" method="post">
  
      <TMPL_LOOP NAME="IMAP_loop_buckets">
  
!     <label class="configurationLabel">
          <TMPL_VAR NAME="IMAP_Bucket_Header">
      </label>
      <br />
!     <select name="imap_folder_for_<TMPL_VAR NAME="IMAP_bucket">">
  
      <TMPL_UNLESS NAME="IMAP_mailbox_defined">
--- 3,16 ----
  <TMPL_IF NAME="IMAP_if_mailboxes">
  
+ <hr width="60%" align="center" />
  <form action="<TMPL_VAR NAME="Configuration_Action">" method="post">
  
      <TMPL_LOOP NAME="IMAP_loop_buckets">
  
!     <label for="folder_for_<TMPL_VAR NAME="IMAP_bucket">" class="configurationLabel">
          <TMPL_VAR NAME="IMAP_Bucket_Header">
      </label>
      <br />
!     <select id="folder_for_<TMPL_VAR NAME="IMAP_bucket">" name="imap_folder_for_<TMPL_VAR NAME="IMAP_bucket">">
  
      <TMPL_UNLESS NAME="IMAP_mailbox_defined">
***************
*** 25,46 ****
      </TMPL_LOOP>
  
!     </select><br />
  
      </TMPL_LOOP>
  
!     <TMPL_IF NAME="IMAP_buckets_to_folders_if_error">
!        <blockquote>
!         <div class="error01">
!             <TMPL_VAR NAME="Localize_Imap_MapError">
!         </div>
!     </blockquote>
!     </TMPL_IF>
! 
      <input type="submit" class="submit" name="imap_3_bucket_folders" value="<TMPL_VAR NAME="Localize_Apply">" />
  </form>
! 
! <TMPL_ELSE>
! 
!     <!-- Nothing to do for imap-bucket-folders.thtml -->
  
  </TMPL_IF>
--- 26,38 ----
      </TMPL_LOOP>
  
!     </select>
!     <br />
  
      </TMPL_LOOP>
  
!     <br />
      <input type="submit" class="submit" name="imap_3_bucket_folders" value="<TMPL_VAR NAME="Localize_Apply">" />
  </form>
! <hr width="60%" align="center" />
  
  </TMPL_IF>

Index: imap-watch-more-folders.thtml
===================================================================
RCS file: /cvsroot/popfile/engine/skins/default/imap-watch-more-folders.thtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** imap-watch-more-folders.thtml	15 Feb 2005 04:23:54 -0000	1.4
--- imap-watch-more-folders.thtml	16 Mar 2005 21:49:46 -0000	1.5
***************
*** 4,9 ****
  
  <form action="<TMPL_VAR NAME="Configuration_Action">" method="post">
!     <input type="submit" class="submit" name="imap_2_watch_more_folders" value="<TMPL_VAR NAME="Localize_Add">" />
!     <label class="configurationLabel">
          <TMPL_VAR NAME="Localize_Imap_WatchMore">
      </label>
--- 4,9 ----
  
  <form action="<TMPL_VAR NAME="Configuration_Action">" method="post">
!     <input id="imap_watch_more" type="submit" class="submit" name="imap_2_watch_more_folders" value="<TMPL_VAR NAME="Localize_Add">" />
!     <label for="imap_watch_more" class="configurationLabel">
          <TMPL_VAR NAME="Localize_Imap_WatchMore">
      </label>
***************
*** 11,18 ****
  </form>
  
- <TMPL_ELSE>
- 
-     <!-- Nothing to do for imap-watch-more-folders.thtml -->
- 
  </TMPL_IF>
  
--- 11,14 ----

Index: imap-connection-details.thtml
===================================================================
RCS file: /cvsroot/popfile/engine/skins/default/imap-connection-details.thtml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** imap-connection-details.thtml	15 Feb 2005 04:23:54 -0000	1.5
--- imap-connection-details.thtml	16 Mar 2005 21:49:46 -0000	1.6
***************
*** 2,62 ****
  
  <form action="<TMPL_VAR NAME="Configuration_Action">" method="post">
!     <label class="configurationLabel">
          <TMPL_VAR NAME="Localize_Imap_Server">
      </label>
      <br />
!     <input name="imap_hostname" type="text" value="<TMPL_VAR NAME="IMAP_hostname">" /> <br />
! 
!     <TMPL_IF NAME="IMAP_connection_if_hostname_error">
!     <blockquote>
!       <div class="error01">
!         <TMPL_VAR NAME="Localize_Imap_ServerNameError">
!       </div>
!     </blockquote>
!     </TMPL_IF>
! 
!     <label class="configurationLabel">
          <TMPL_VAR NAME="Localize_Imap_Port">
      </label>
      <br />
!     <input name="imap_port" type="text" value="<TMPL_VAR NAME="IMAP_port">" /><br />
! 
!     <TMPL_IF NAME="IMAP_connection_if_port_error">
!     <blockquote>
!       <div class="error01">
!         <TMPL_VAR NAME="Localize_Imap_PortError">
!       </div>
!     </blockquote>
!     </TMPL_IF>
!     
!     <label class="configurationLabel">
          <TMPL_VAR NAME="Localize_Imap_Login">
      </label>
      <br />
!     <input name="imap_login" type="text" value="<TMPL_VAR NAME="IMAP_login">" /><br />
! 
!     <TMPL_IF NAME="IMAP_connection_if_login_error">
!     <blockquote>
!       <div class="error01">
!         <TMPL_VAR NAME="Localize_Imap_LoginError">
!       </div>
!     </blockquote>
!     </TMPL_IF>
! 
!     <label class="configurationLabel">
          <TMPL_VAR NAME="Localize_Imap_Password">
      </label>
      <br />
!     <input type="password" name="imap_password" value="<TMPL_VAR NAME="IMAP_password">" /><br />
! 
!     <TMPL_IF NAME="IMAP_connection_if_password_error">
!     <blockquote>
!       <div class="error01">
!         <TMPL_VAR NAME="Localize_Imap_PasswordError">
!       </div>
!     </blockquote>
!     </TMPL_IF>
! 
!     <p />
      <input type="submit" class="submit" name="update_imap_0_connection_details" value="<TMPL_VAR NAME="Localize_Apply">" />
      <hr width="60%" align="center" />
--- 2,29 ----
  
  <form action="<TMPL_VAR NAME="Configuration_Action">" method="post">
!     <label for="imap_hostname" class="configurationLabel">
          <TMPL_VAR NAME="Localize_Imap_Server">
      </label>
      <br />
!     <input id="imap_hostname" name="imap_hostname" type="text" value="<TMPL_VAR NAME="IMAP_hostname">" />
!     <br />
!     <label for="imap_port" class="configurationLabel">
          <TMPL_VAR NAME="Localize_Imap_Port">
      </label>
      <br />
!     <input id="imap_port" name="imap_port" type="text" value="<TMPL_VAR NAME="IMAP_port">" />
!     <br />
!     <label for="imap_login" class="configurationLabel">
          <TMPL_VAR NAME="Localize_Imap_Login">
      </label>
      <br />
!     <input id="imap_login" name="imap_login" type="text" value="<TMPL_VAR NAME="IMAP_login">" />
!     <br />
!     <label for="imap_password" class="configurationLabel">
          <TMPL_VAR NAME="Localize_Imap_Password">
      </label>
      <br />
!     <input id="imap_password" type="password" name="imap_password" value="<TMPL_VAR NAME="IMAP_password">" />
!     <br />
      <input type="submit" class="submit" name="update_imap_0_connection_details" value="<TMPL_VAR NAME="Localize_Apply">" />
      <hr width="60%" align="center" />

Index: imap-update-mailbox-list.thtml
===================================================================
RCS file: /cvsroot/popfile/engine/skins/default/imap-update-mailbox-list.thtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** imap-update-mailbox-list.thtml	15 Feb 2005 04:23:54 -0000	1.4
--- imap-update-mailbox-list.thtml	16 Mar 2005 21:49:46 -0000	1.5
***************
*** 4,29 ****
  
  <form action="<TMPL_VAR NAME="Configuration_Action">" method="post">
!     <label class="configurationLabel">
          <TMPL_VAR NAME="Localize_Imap_RefreshFolders">
      </label>
!     
!     <TMPL_IF NAME="IMAP_update_list_failed">
!     
!     <blockquote>
!         <div class="error01">
!             <TMPL_VAR NAME="IMAP_update_list_failed">
!         </div>
!     </blockquote>
!     
!     </TMPL_IF>
!     
!     <input type="submit" class="submit" name="do_imap_4_update_mailbox_list" value="<TMPL_VAR NAME="Localize_Imap_Now">" />
  </form>
! 
! <TMPL_ELSE>
! 
!     <p>
!         <TMPL_VAR NAME="Localize_Imap_NoConnectionMessage">
!     </p>
  
  </TMPL_IF>
--- 4,13 ----
  
  <form action="<TMPL_VAR NAME="Configuration_Action">" method="post">
!     <label for="update_mailbox_list" class="configurationLabel">
          <TMPL_VAR NAME="Localize_Imap_RefreshFolders">
      </label>
!     <input id="update_mailbox_list" type="submit" class="submit" name="do_imap_4_update_mailbox_list" value="<TMPL_VAR NAME="Localize_Imap_Now">" />
  </form>
! <hr width="60%" align="center" />
  
  </TMPL_IF>

Index: imap-watch-folders.thtml
===================================================================
RCS file: /cvsroot/popfile/engine/skins/default/imap-watch-folders.thtml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** imap-watch-folders.thtml	15 Feb 2005 04:23:54 -0000	1.5
--- imap-watch-folders.thtml	16 Mar 2005 21:49:46 -0000	1.6
***************
*** 7,15 ****
      <TMPL_LOOP NAME="IMAP_loop_watched_folders">
  
!     <label class="configurationLabel">
          <TMPL_VAR NAME="IMAP_WatchedFolder_Msg"><TMPL_VAR NAME="IMAP_loop_counter">
      </label>
      <br />
!     <select name="imap_folder_<TMPL_VAR NAME="IMAP_loop_counter">">
  
      <TMPL_LOOP NAME="IMAP_loop_mailboxes">
--- 7,15 ----
      <TMPL_LOOP NAME="IMAP_loop_watched_folders">
  
!     <label for="imap_folder_<TMPL_VAR NAME="IMAP_loop_counter">" class="configurationLabel">
          <TMPL_VAR NAME="IMAP_WatchedFolder_Msg"><TMPL_VAR NAME="IMAP_loop_counter">
      </label>
      <br />
!     <select id="imap_folder_<TMPL_VAR NAME="IMAP_loop_counter">" name="imap_folder_<TMPL_VAR NAME="IMAP_loop_counter">">
  
      <TMPL_LOOP NAME="IMAP_loop_mailboxes">

Index: imap-options.thtml
===================================================================
RCS file: /cvsroot/popfile/engine/skins/default/imap-options.thtml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** imap-options.thtml	15 Feb 2005 04:23:54 -0000	1.8
--- imap-options.thtml	16 Mar 2005 21:49:46 -0000	1.9
***************
*** 3,32 ****
  <form action="<TMPL_VAR NAME="Configuration_Action">" method="post">
  
!     <input type="checkbox" class="checkbox" name="imap_options_expunge" value="1" <TMPL_VAR NAME="IMAP_expunge_is_checked"> />
!     <label class="configurationLabel">
          <TMPL_VAR NAME="Localize_Imap_Expunge">
      </label>
      <p />
  
!     <label class="configurationLabel">
          <TMPL_VAR NAME="Localize_Imap_Interval">
      </label>
- 
-     <TMPL_IF NAME="IMAP_if_interval_error">
- 
-     <blockquote>
-         <div class="error01">
-             <TMPL_VAR NAME="Localize_Imap_IntervalError">
-         </div>
-     </blockquote>
- 
-     </TMPL_IF>
- 
      <br />
!     <input type="text" name="imap_options_update_interval" value="<TMPL_VAR NAME="IMAP_interval">" />
      <p />
  
      <input type="submit" class="submit" name="update_imap_5_options" value="<TMPL_VAR NAME="Localize_Apply">" />
-     <hr width="60%" align="center" />
  </form>
  
--- 3,20 ----
  <form action="<TMPL_VAR NAME="Configuration_Action">" method="post">
  
!     <input id="imap_expunge" type="checkbox" class="checkbox" name="imap_options_expunge" value="1" <TMPL_VAR NAME="IMAP_expunge_is_checked"> />
!     <label for="imap_expunge" class="configurationLabel">
          <TMPL_VAR NAME="Localize_Imap_Expunge">
      </label>
      <p />
  
!     <label for="imap_update_interval" class="configurationLabel">
          <TMPL_VAR NAME="Localize_Imap_Interval">
      </label>
      <br />
!     <input id="imap_update_interval" type="text" name="imap_options_update_interval" value="<TMPL_VAR NAME="IMAP_interval">" />
      <p />
  
      <input type="submit" class="submit" name="update_imap_5_options" value="<TMPL_VAR NAME="Localize_Apply">" />
  </form>
  

[popfile-commit] engine/languages English.msg,1.86,1.87

[Manni H. <man...@us...>]

Update of /cvsroot/popfile/engine/languages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1620/languages

Modified Files:
	English.msg 
Log Message:
Make use of the status and error message feature.

Add a couple of previously hard-coded strings to the language file(s).

Fix html labels so that they now have the 'for' attribute and let the according input widgets have the corresponding id.

Index: English.msg
===================================================================
RCS file: /cvsroot/popfile/engine/languages/English.msg,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** English.msg	16 Feb 2005 13:59:36 -0000	1.86
--- English.msg	16 Mar 2005 21:49:30 -0000	1.87
***************
*** 382,385 ****
--- 382,386 ----
  Imap_Bucket2Folder                      Mail for bucket <b>%s</b> goes to folder
  Imap_MapError                           You cannot map more than one bucket to a single folder!
+ Imap_MapUpdated                         Mapped bucket %s to folder %s.
  Imap_Server                             IMAP server hostname:
  Imap_ServerNameError                    Please enter the server's hostname!
***************
*** 390,396 ****
--- 391,399 ----
  Imap_Password                           Password for IMAP account:
  Imap_PasswordError                      Please enter a password for the server!
+ Imap_ConnectionDetailsUpdated           The IMAP connection details were updated. Please refresh the list of folders next.
  Imap_Expunge                            Expunge deleted messages from watched folders.
  Imap_Interval                           Update interval in seconds:
  Imap_IntervalError                      Please enter an interval between 10 and 3600 seconds.
+ Imap_OptionsUpdated                     IMAP options were successfully updated.
  Imap_Bytelimit                          Bytes per message to use for classification. Enter 0 (Null) for the complete message:
  Imap_BytelimitError                     Please enter a number.
***************
*** 400,406 ****
--- 403,413 ----
  Imap_UpdateError2                       Failed to connect to server. Please check the host name and port and make sure you are online.
  Imap_UpdateError3                       Please configure the connection details first.
+ Imap_UpdateOK                           Successfully read the list of mailboxes/folders on the server.
  Imap_NoConnectionMessage                Please configure the connection details first. After you have done that, more options will be available on this page.
  Imap_WatchMore                          a folder to list of watched folders
+ Imap_WatchedFolderAdded                 Another folder was added to the list of watched folders. Please choose the desired folder now.
  Imap_WatchedFolder                      Watched folder no
+ Imap_WatchedFoldersUpdated              Updated the list of watched folders
+ Imap_WatchedFolderRemoved               Removed folder %s from list of watched folders
  
  Shutdown_Message                        POPFile has shut down

[popfile-commit] engine/UI HTML.pm,1.346,1.347

[Manni H. <man...@us...>]

Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22378/UI

Modified Files:
	HTML.pm 
Log Message:
Avoid another warning message by checking whether status and error messages are defined
 separately.

Log status/error message at level 2 instead of 3.

Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.346
retrieving revision 1.347
diff -C2 -d -r1.346 -r1.347
*** HTML.pm	25 Feb 2005 21:53:52 -0000	1.346
--- HTML.pm	16 Mar 2005 20:52:31 -0000	1.347
***************
*** 1171,1177 ****
  
          # Tell the user anything the dynamic UI was interested in sharing
!         $self->log_( 3, "dynamic config UI $name had status/error $status_message/$error_message") if (defined $status_message || defined $error_message);
!         $self->status_message__($templ,$status_message) if ( defined( $status_message ));
!         $self->error_message__($templ, $error_message)  if ( defined( $error_message ));
      }
  
--- 1171,1182 ----
  
          # Tell the user anything the dynamic UI was interested in sharing
!         if ( defined( $status_message )) {
!             $self->status_message__($templ,$status_message);
!             $self->log_( 2, "dynamic config UI $name had status $status_message");
!         }
!         if ( defined( $error_message )) {
!             $self->error_message__($templ, $error_message);
!             $self->log_( 2, "dynamic config UI $name had error $error_message");
!         }
      }
  
***************
*** 2531,2540 ****
  
      if ( defined( $self->{form_}{gopage} ) ) {
!         my $destination = ( $self->{form_}{jumptopage} - 1 ) * 
                       $self->user_config_( $self->{sessions__}{$session}{user}, 'page_size' );
          my $maximum = $self->history_()->get_query_size( $self->{q__} );
!         
          if ( $destination <= $maximum && $destination > 0 ) {
!             return $self->http_redirect_( $client, "/history?start_message=$destination&" 
                   . $self->print_form_fields_(1,0,('filter','search','sort','session','negate') ), $session );
          }
--- 2536,2545 ----
  
      if ( defined( $self->{form_}{gopage} ) ) {
!         my $destination = ( $self->{form_}{jumptopage} - 1 ) *
                       $self->user_config_( $self->{sessions__}{$session}{user}, 'page_size' );
          my $maximum = $self->history_()->get_query_size( $self->{q__} );
! 
          if ( $destination <= $maximum && $destination > 0 ) {
!             return $self->http_redirect_( $client, "/history?start_message=$destination&"
                   . $self->print_form_fields_(1,0,('filter','search','sort','session','negate') ), $session );
          }

[popfile-commit] engine/Classifier MailParse.pm,1.217,1.218

[John Graham-C. <jgr...@us...>]

Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11112

Modified Files:
	MailParse.pm 
Log Message:
Fix ugly comments

Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.217
retrieving revision 1.218
diff -C2 -d -r1.217 -r1.218
*** MailParse.pm	27 Dec 2004 16:51:26 -0000	1.217
--- MailParse.pm	7 Mar 2005 22:37:14 -0000	1.218
***************
*** 54,57 ****
--- 54,58 ----
  
  # Symbols in EUC-JP chars which cannot be considered a part of words
+ 
  my $symbol_row1_euc_jp = '(?:[\xA1][\xA1-\xBB\xBD-\xFE])';
  my $symbol_row2_euc_jp = '(?:[\xA2][\xA1-\xFE])';
***************
*** 59,71 ****
  my $symbol_euc_jp = "(?:$symbol_row1_euc_jp|$symbol_row2_euc_jp|$symbol_row8_euc_jp)";
  
[...1470 lines suppressed...]
!     # mode(-w is passed to Kakasi as argument). Both input and ouput
!     # encoding are EUC-JP.
      #
      # Since Text::Kakasi is not thread-safe, we use it under the
      # control of a semaphore to avoid a crash if we are running on
!     # Windows in a forked process.  
      #
      # Note that this requires us to detect a sub-process by looking at
--- 2562,2572 ----
      require Text::Kakasi;
  
!     # Split Japanese line into words using Kakasi Wakachigaki mode(-w
!     # is passed to Kakasi as argument). Both input and ouput encoding
!     # are EUC-JP.
      #
      # Since Text::Kakasi is not thread-safe, we use it under the
      # control of a semaphore to avoid a crash if we are running on
!     # Windows in a forked process.
      #
      # Note that this requires us to detect a sub-process by looking at

[popfile-commit] windows adduser-Version.nsh,1.2,1.3 adduser.nsi,1.74,1.75

[Brian S. <xue...@us...>]

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5357

Modified Files:
	adduser-Version.nsh adduser.nsi 
Log Message:
Fix the bug that made an upgrade installation fail to use the new dynamic
"SFN Support" detection function.

Index: adduser-Version.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/adduser-Version.nsh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** adduser-Version.nsh	4 Mar 2005 02:00:30 -0000	1.2
--- adduser-Version.nsh	5 Mar 2005 14:48:24 -0000	1.3
***************
*** 7,11 ****
  #--------------------------------------------------------------------------
  
!   !define C_PFI_VERSION  "0.2.70"
  
  #--------------------------------------------------------------------------
--- 7,11 ----
  #--------------------------------------------------------------------------
  
!   !define C_PFI_VERSION  "0.2.71"
  
  #--------------------------------------------------------------------------

Index: adduser.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/adduser.nsi,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** adduser.nsi	4 Mar 2005 02:00:31 -0000	1.74
--- adduser.nsi	5 Mar 2005 14:48:25 -0000	1.75
***************
*** 1930,1933 ****
--- 1930,1962 ----
        $(PFI_LANG_DIRSELECT_MBWARN_2)" IDNO offer_default
    StrCpy $G_USERDIR $INSTDIR
+ 
+   ; Assume SFN support is enabled (the default setting for Windows)
+ 
+   StrCpy $G_SFN_DISABLED "0"
+ 
+   Push ${L_RESULT}
+ 
+   Push $G_USERDIR
+   Call PFI_GetSFNStatus
+   Pop ${L_RESULT}
+   StrCmp ${L_RESULT} "1" check_config_data
+   StrCpy $G_SFN_DISABLED "1"
+ 
+   ; Short file names are not supported here, so we cannot accept any path containing spaces.
+ 
+   Push $G_USERDIR
+   Push ' '
+   Call PFI_StrStr
+   Pop ${L_RESULT}
+   StrCmp ${L_RESULT} "" check_config_data
+   Push $G_USERDIR
+   Call PFI_GetRoot
+   Pop $G_PLS_FIELD_1
+   MessageBox MB_OK|MB_ICONEXCLAMATION "$(PFI_LANG_DIRSELECT_MBNOSFN)"
+   Pop ${L_RESULT}
+   Goto offer_default
+ 
+ check_config_data:
+   Pop ${L_RESULT}
    Call CheckExistingConfigData
    Abort

[popfile-commit] engine/skins/default common-javascript.thtml,NONE,1.1 common-middle.thtml,1.11,1.12 history-javascript.thtml,1.2,1.3 history-page.thtml,1.56,1.57

[Joseph C. <tex...@us...>]

Update of /cvsroot/popfile/engine/skins/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26484/skins/default

Modified Files:
	common-middle.thtml history-javascript.thtml 
	history-page.thtml 
Added Files:
	common-javascript.thtml 
Log Message:
Trying out confirmation dialog on history page remove buttons.  And move focus to Search box on history page load.

Index: common-middle.thtml
===================================================================
RCS file: /cvsroot/popfile/engine/skins/default/common-middle.thtml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** common-middle.thtml	25 Feb 2005 04:14:04 -0000	1.11
--- common-middle.thtml	4 Mar 2005 23:40:38 -0000	1.12
***************
*** 1,2 ****
--- 1,4 ----
+ <TMPL_INCLUDE NAME="common-javascript.thtml">
+ 
  <body dir="<TMPL_VAR NAME="Localize_LanguageDirection">" onLoad="OnLoadHandler()">
      <table class="shellTop" align="center" width="100%" summary="">

Index: history-page.thtml
===================================================================
RCS file: /cvsroot/popfile/engine/skins/default/history-page.thtml,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** history-page.thtml	16 Feb 2005 23:15:55 -0000	1.56
--- history-page.thtml	4 Mar 2005 23:40:38 -0000	1.57
***************
*** 235,241 ****
          <tr>
              <td colspan="<TMPL_VAR NAME="History_Colspan">">
!                 <input type="submit" class="submit removeButton" name="clearchecked" value="<TMPL_VAR NAME="Localize_History_RemoveChecked">" />
!                 <input type="submit" class="submit removeButton" name="clearpage" value="<TMPL_VAR NAME="Localize_History_RemovePage">" />
!                 <input type="submit" class="submit removeButton" name="clearall" value="<TMPL_VAR NAME="Localize_History_RemoveAll"> (<TMPL_VAR NAME="History_Count">)" />
              </td>
              <td>
--- 235,241 ----
          <tr>
              <td colspan="<TMPL_VAR NAME="History_Colspan">">
!                 <input type="submit" class="submit removeButton" name="clearchecked" onClick="return confirmClick(this)" value="<TMPL_VAR NAME="Localize_History_RemoveChecked">" />
!                 <input type="submit" class="submit removeButton" name="clearpage" onClick="return confirmClick(this)" value="<TMPL_VAR NAME="Localize_History_RemovePage">" />
!                 <input type="submit" class="submit removeButton" name="clearall" onClick="return confirmClick(this)" value="<TMPL_VAR NAME="Localize_History_RemoveAll"> (<TMPL_VAR NAME="History_Count">)" />
              </td>
              <td>

Index: history-javascript.thtml
===================================================================
RCS file: /cvsroot/popfile/engine/skins/default/history-javascript.thtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** history-javascript.thtml	25 Feb 2005 04:14:04 -0000	1.2
--- history-javascript.thtml	4 Mar 2005 23:40:38 -0000	1.3
***************
*** 4,7 ****
--- 4,9 ----
      if (document.getElementById("removeChecks"))
           document.getElementById("removeChecks").innerHTML = "<input type='checkbox' class='checkbox' onclick='javascript:toggleChecks(this);' title='Select All' />"
+ 
+     document.getElementById("historySearch").focus();
  }
  

--- NEW FILE: common-javascript.thtml ---
<script language="JavaScript">
<!--
warnings = 1; // this will be replaced with an Advanced variable that the Template will insert here

function confirmClick(x) {
    if(warnings)
         return confirm ("Are you sure you want to do this?");
    else return 0;
}
-->
</script>

[popfile-commit] windows getssl.nsh,1.4,1.5

[Brian S. <xue...@us...>]

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12931

Modified Files:
	getssl.nsh 
Log Message:
If the main installer has not been able to download all of the files
there is no point in trying to install SSL support for POPFile.

Index: getssl.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/getssl.nsh,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** getssl.nsh	2 Mar 2005 19:59:57 -0000	1.4
--- getssl.nsh	4 Mar 2005 19:06:25 -0000	1.5
***************
*** 150,153 ****
--- 150,160 ----
    Call GetSSLFile
  
+   !ifdef INSTALLER
+       IfFileExists "$PLUGINSDIR\IO-Socket-SSL.tar.gz" 0 installer_error_exit
+       IfFileExists "$PLUGINSDIR\Net_SSLeay.pm.tar.gz" 0 installer_error_exit
+       IfFileExists "$PLUGINSDIR\ssleay32.dll" 0 installer_error_exit
+       IfFileExists "$PLUGINSDIR\libeay32.dll" 0 installer_error_exit
+   !endif
+ 
    ; Now install the files required for SSL support
  

[popfile-commit] windows installer.nsi,1.256,1.257

[Brian S. <xue...@us...>]

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26629

Modified Files:
	installer.nsi 
Log Message:
Remove some whitespace from the summary page to make it less ambiguous
when the vertical scrollbar is enabled.

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.256
retrieving revision 1.257
diff -C2 -d -r1.256 -r1.257
*** installer.nsi	4 Mar 2005 02:00:31 -0000	1.256
--- installer.nsi	4 Mar 2005 14:44:23 -0000	1.257
***************
*** 1501,1505 ****
  start_summary:
    StrCpy $G_PLS_FIELD_1 "${L_TEMP}${IO_NL}${IO_NL}\
!       $(PFI_LANG_SUMMARY_BASICLIST)${IO_NL}"
    StrCpy ${L_TEMP} "${C_NLT}$(PFI_LANG_SUMMARY_NONE)"
  
--- 1501,1505 ----
  start_summary:
    StrCpy $G_PLS_FIELD_1 "${L_TEMP}${IO_NL}${IO_NL}\
!       $(PFI_LANG_SUMMARY_BASICLIST)"
    StrCpy ${L_TEMP} "${C_NLT}$(PFI_LANG_SUMMARY_NONE)"
  
***************
*** 1535,1543 ****
    !endif
    StrCpy $G_PLS_FIELD_1 "$G_PLS_FIELD_1${L_TEMP}${IO_NL}${IO_NL}\
!       $(PFI_LANG_SUMMARY_OPTIONLIST)${IO_NL}"
  
    ; Check the optional components in alphabetic order
  
!   StrCpy ${L_TEMP} "\t$(PFI_LANG_SUMMARY_NONE)"
  
    !insertmacro PFI_SectionNotSelected ${SecIMAP} check_nntp
--- 1535,1543 ----
    !endif
    StrCpy $G_PLS_FIELD_1 "$G_PLS_FIELD_1${L_TEMP}${IO_NL}${IO_NL}\
!       $(PFI_LANG_SUMMARY_OPTIONLIST)"
  
    ; Check the optional components in alphabetic order
  
!   StrCpy ${L_TEMP} "${C_NLT}$(PFI_LANG_SUMMARY_NONE)"
  
    !insertmacro PFI_SectionNotSelected ${SecIMAP} check_nntp

[popfile-commit] windows adduser-Version.nsh,1.1,1.2 adduser.nsi,1.73,1.74 installer.nsi,1.255,1.256

[Brian S. <xue...@us...>]

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29679

Modified Files:
	adduser-Version.nsh adduser.nsi installer.nsi 
Log Message:
No need for the DIRECTORY page's "leave" function to explicitly strip
any trailing slashes from the installation path selected by the user
(NSIS does this automatically when $INSTDIR is used for this page).

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.255
retrieving revision 1.256
diff -C2 -d -r1.255 -r1.256
*** installer.nsi	2 Mar 2005 19:53:41 -0000	1.255
--- installer.nsi	4 Mar 2005 02:00:31 -0000	1.256
***************
*** 1735,1740 ****
  # (the "leave" function for the POPFile PROGRAM DIRECTORY selection page)
  #
! # Now that we are overriding the default InstallDir behaviour, we really need to check
! # that the main 'Program Files' folder has not been selected for the installation.
  #
  # This function is used to check if a previous POPFile installation exists in the directory
--- 1735,1744 ----
  # (the "leave" function for the POPFile PROGRAM DIRECTORY selection page)
  #
! # The POPFile PROGRAM DIRECTORY page uses the standard $INSTDIR variable so NSIS
! # automatically strips any trailing backslashes from the path selected by the user.
! #
! # Now that we are overriding the default 'InstallDir' behaviour it is easier for the
! # user to select the main 'Program Files' folder so we check for this case and refuse
! # to accept this path.
  #
  # This function is used to check if a previous POPFile installation exists in the directory
***************
*** 1750,1758 ****
    Push ${L_RESULT}
  
-   ; Strip trailing slashes (if any) from the path selected by the user
- 
-   Push $INSTDIR
-   Pop $INSTDIR
- 
    ; We do not permit POPFile to be installed in the target system's 'Program Files' folder
    ; (i.e. we do not allow 'popfile.pl' etc to be stored there)
--- 1754,1757 ----

Index: adduser-Version.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/adduser-Version.nsh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** adduser-Version.nsh	2 Mar 2005 19:50:18 -0000	1.1
--- adduser-Version.nsh	4 Mar 2005 02:00:30 -0000	1.2
***************
*** 7,11 ****
  #--------------------------------------------------------------------------
  
!   !define C_PFI_VERSION  "0.2.69"
  
  #--------------------------------------------------------------------------
--- 7,11 ----
  #--------------------------------------------------------------------------
  
!   !define C_PFI_VERSION  "0.2.70"
  
  #--------------------------------------------------------------------------

Index: adduser.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/adduser.nsi,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** adduser.nsi	2 Mar 2005 19:50:18 -0000	1.73
--- adduser.nsi	4 Mar 2005 02:00:31 -0000	1.74
***************
*** 1999,2004 ****
  # (the "leave" function for the DIRECTORY page)
  #
! # Now that we are overriding the default InstallDir behaviour, we really need to check
! # that the main 'Program Files' folder has not been selected for the 'User Data' folder.
  #
  # POPFile currently does not support paths containing spaces in POPFILE_ROOT and POPFILE_USER
--- 1999,2008 ----
  # (the "leave" function for the DIRECTORY page)
  #
! # The DIRECTORY page uses the standard $INSTDIR variable so NSIS automatically strips
! # any trailing backslashes from the path selected by the user.
! #
! # Now that we are overriding the default 'InstallDir' behaviour it is easier for the
! # user to select the main 'Program Files' folder so we check for this case and refuse
! # to accept this path.
  #
  # POPFile currently does not support paths containing spaces in POPFILE_ROOT and POPFILE_USER
***************
*** 2015,2022 ****
    Push ${L_RESULT}
  
!   ; Strip trailing slashes (if any) from the path selected by the user
  
-   Push $INSTDIR
-   Pop $INSTDIR
    StrCpy $G_USERDIR "$INSTDIR"
  
--- 2019,2024 ----
    Push ${L_RESULT}
  
!   ; Get the 'clean' version of the path selected by the user (no trailing backslashes)
  
    StrCpy $G_USERDIR "$INSTDIR"
  

[popfile-commit] windows/add-ons addssl.nsi,1.7,1.8

[Brian S. <xue...@us...>]

Update of /cvsroot/popfile/windows/add-ons
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29590

Modified Files:
	addssl.nsi 
Log Message:
Script now issues a warning if used with a compiler which has not been
tested yet. Sometimes compilers fail to compile scripts developed with
older versions and even if the script can be compiled the installer's
behaviour may differ significantly.

Library items now use the "PFI_" prefix to help identify them.

Index: addssl.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/add-ons/addssl.nsi,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** addssl.nsi	10 Feb 2005 23:04:56 -0000	1.7
--- addssl.nsi	2 Mar 2005 20:03:17 -0000	1.8
***************
*** 33,38 ****
  #--------------------------------------------------------------------------
  
! ; This version of the script has been tested with the "NSIS 2" compiler (final),
! ; released 7 February 2004, with no "official" NSIS patches applied.
  
    ;------------------------------------------------
--- 33,55 ----
  #--------------------------------------------------------------------------
  
!   ; 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***\
!           $\r$\n***   The resulting 'installer' program should be tested carefully!\
!           $\r$\n$\r$\n"
!   !endif
! 
!   !undef  ${NSIS_VERSION}_found
  
    ;------------------------------------------------
***************
*** 109,113 ****
    Name                   "POPFile SSL Setup"
  
!   !define C_PFI_VERSION  "0.0.14"
  
    ; Mention the wizard's version number in the window title
--- 126,130 ----
    Name                   "POPFile SSL Setup"
  
!   !define C_PFI_VERSION  "0.0.15"
  
    ; Mention the wizard's version number in the window title
***************
*** 517,521 ****
    StrCmp $G_PLS_FIELD_1 "No suitable patches were found" close_log
    StrCmp $G_PLS_FIELD_1 "OK" 0 show_status
!   !insertmacro BACKUP_123_DP "$G_ROOTDIR\POPFile" "Module.pm"
    SetDetailsPrint none
    Rename "$PLUGINSDIR\Module.ssl" "$G_ROOTDIR\POPFile\Module.pm"
--- 534,538 ----
    StrCmp $G_PLS_FIELD_1 "No suitable patches were found" close_log
    StrCmp $G_PLS_FIELD_1 "OK" 0 show_status
!   !insertmacro PFI_BACKUP_123_DP "$G_ROOTDIR\POPFile" "Module.pm"
    SetDetailsPrint none
    Rename "$PLUGINSDIR\Module.ssl" "$G_ROOTDIR\POPFile\Module.pm"
***************
*** 528,532 ****
    SetDetailsPrint listonly
    DetailPrint ""
!   Call GetDateTimeStamp
    Pop $G_PLS_FIELD_1
    DetailPrint "----------------------------------------------------"
--- 545,549 ----
    SetDetailsPrint listonly
    DetailPrint ""
!   Call PFI_GetDateTimeStamp
    Pop $G_PLS_FIELD_1
    DetailPrint "----------------------------------------------------"
***************
*** 548,552 ****
    SetDetailsPrint listonly
    DetailPrint ""
!   Call GetDateTimeStamp
    Pop $G_PLS_FIELD_1
    DetailPrint "----------------------------------------------------"
--- 565,569 ----
    SetDetailsPrint listonly
    DetailPrint ""
!   Call PFI_GetDateTimeStamp
    Pop $G_PLS_FIELD_1
    DetailPrint "----------------------------------------------------"
***************
*** 560,566 ****
    DetailPrint "$(PFI_LANG_PROG_SAVELOG)"
    SetDetailsPrint none
!   !insertmacro BACKUP_123 "$G_ROOTDIR" "addssl.log"
    Push "$G_ROOTDIR\addssl.log"
!   Call DumpLog
  
    SetDetailsPrint both
--- 577,583 ----
    DetailPrint "$(PFI_LANG_PROG_SAVELOG)"
    SetDetailsPrint none
!   !insertmacro PFI_BACKUP_123 "$G_ROOTDIR" "addssl.log"
    Push "$G_ROOTDIR\addssl.log"
!   Call PFI_DumpLog
  
    SetDetailsPrint both
***************
*** 668,672 ****
  
    Push "POPFile"
!   Call ServiceRunning
    Pop ${L_RESULT}
    StrCmp ${L_RESULT} "true" manual_shutdown
--- 685,689 ----
  
    Push "POPFile"
!   Call PFI_ServiceRunning
    Pop ${L_RESULT}
    StrCmp ${L_RESULT} "true" manual_shutdown
***************
*** 681,685 ****
  
    Push $G_ROOTDIR
!   Call FindLockedPFE
    Pop ${L_EXE}
    StrCmp ${L_EXE} "" exit
--- 698,702 ----
  
    Push $G_ROOTDIR
!   Call PFI_FindLockedPFE
    Pop ${L_EXE}
    StrCmp ${L_EXE} "" exit
***************
*** 733,737 ****
  
    Push ${L_NEW_GUI}
!   Call TrimNewlines
    Pop ${L_NEW_GUI}
  
--- 750,754 ----
  
    Push ${L_NEW_GUI}
!   Call PFI_TrimNewlines
    Pop ${L_NEW_GUI}
  
***************
*** 740,744 ****
    DetailPrint "$(PFI_LANG_TAKE_A_FEW_SECONDS)"
    Push ${L_NEW_GUI}
!   Call ShutdownViaUI
    Pop ${L_RESULT}
    StrCmp ${L_RESULT} "success" check_exe
--- 757,761 ----
    DetailPrint "$(PFI_LANG_TAKE_A_FEW_SECONDS)"
    Push ${L_NEW_GUI}
!   Call PFI_ShutdownViaUI
    Pop ${L_RESULT}
    StrCmp ${L_RESULT} "success" check_exe
***************
*** 749,756 ****
    DetailPrint "Please be patient, this may take more than 30 seconds"
    Push ${L_EXE}
!   Call WaitUntilUnlocked
    DetailPrint "Checking if '${L_EXE}' is still locked after NSISdl request..."
    Push ${L_EXE}
!   Call CheckIfLocked
    Pop ${L_EXE}
    StrCmp ${L_EXE} "" unlocked_now
--- 766,773 ----
    DetailPrint "Please be patient, this may take more than 30 seconds"
    Push ${L_EXE}
!   Call PFI_WaitUntilUnlocked
    DetailPrint "Checking if '${L_EXE}' is still locked after NSISdl request..."
    Push ${L_EXE}
!   Call PFI_CheckIfLocked
    Pop ${L_EXE}
    StrCmp ${L_EXE} "" unlocked_now

[popfile-commit] windows/test pfidiag.nsi,1.9,1.10

[Brian S. <xue...@us...>]

Update of /cvsroot/popfile/windows/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29179

Modified Files:
	pfidiag.nsi 
Log Message:
Script now issues a warning if used with a compiler which has not been
tested yet. Sometimes compilers fail to compile scripts developed with
older versions and even if the script can be compiled the installer's
behaviour may differ significantly.

Library items now use the "PFI_" prefix to help identify them.

Index: pfidiag.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/test/pfidiag.nsi,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** pfidiag.nsi	8 Jan 2005 15:00:06 -0000	1.9
--- pfidiag.nsi	2 Mar 2005 20:02:33 -0000	1.10
***************
*** 25,30 ****
  #--------------------------------------------------------------------------
  
! ; This version of the script has been tested with the "NSIS 2" compiler (final),
! ; released 7 February 2004, with no "official" NSIS patches/CVS updates applied.
  
  #--------------------------------------------------------------------------
--- 25,47 ----
  #--------------------------------------------------------------------------
  
!   ; 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***\
!           $\r$\n***   The resulting 'installer' program should be tested carefully!\
!           $\r$\n$\r$\n"
!   !endif
! 
!   !undef  ${NSIS_VERSION}_found
  
  #--------------------------------------------------------------------------
***************
*** 61,65 ****
    ;--------------------------------------------------------------------------
  
!   !define C_VERSION   "0.0.51"
  
    !define C_OUTFILE   "pfidiag.exe"
--- 78,82 ----
    ;--------------------------------------------------------------------------
  
!   !define C_VERSION   "0.0.52"
  
    !define C_OUTFILE   "pfidiag.exe"
***************
*** 350,354 ****
    ; (for convenience the leading slash is stripped from the value used internally)
  
!   Call GetParameters
    Pop ${L_DIAG_MODE}
    StrCpy ${L_TEMP} ${L_DIAG_MODE} 1
--- 367,371 ----
    ; (for convenience the leading slash is stripped from the value used internally)
  
!   Call PFI_GetParameters
    Pop ${L_DIAG_MODE}
    StrCpy ${L_TEMP} ${L_DIAG_MODE} 1
***************
*** 414,418 ****
    DetailPrint "IsNT return code  = ${L_WIN_OS_TYPE}"
  
!   Call GetIEVersion
    Pop ${L_TEMP}
    DetailPrint "Internet Explorer = ${L_TEMP}"
--- 431,435 ----
    DetailPrint "IsNT return code  = ${L_WIN_OS_TYPE}"
  
!   Call PFI_GetIEVersion
    Pop ${L_TEMP}
    DetailPrint "Internet Explorer = ${L_TEMP}"
***************
*** 800,804 ****
    Push ${L_EXPECTED_ROOT}
    Push " "
!   Call StrStr
    Pop ${L_TEMP}
    StrCmp ${L_TEMP} "" 0 check_user
--- 817,821 ----
    Push ${L_EXPECTED_ROOT}
    Push " "
!   Call PFI_StrStr
    Pop ${L_TEMP}
    StrCmp ${L_TEMP} "" 0 check_user
***************
*** 820,824 ****
    Push ${L_EXPECTED_USER}
    Push " "
!   Call StrStr
    Pop ${L_TEMP}
    StrCmp ${L_TEMP} "" 0 check_vars
--- 837,841 ----
    Push ${L_EXPECTED_USER}
    Push " "
!   Call PFI_StrStr
    Pop ${L_TEMP}
    StrCmp ${L_TEMP} "" 0 check_vars
***************
*** 892,896 ****
  
  exit:
!   Call GetDateTimeStamp
    Pop ${L_TEMP}
    DetailPrint "------------------------------------------------------------"
--- 909,913 ----
  
  exit:
!   Call PFI_GetDateTimeStamp
    Pop ${L_TEMP}
    DetailPrint "------------------------------------------------------------"
***************
*** 988,992 ****
    Push ${L_TEMP}
    Push " "
!   Call StrStr
    Pop ${L_TEMP}
    StrCmp ${L_TEMP} "" exit
--- 1005,1009 ----
    Push ${L_TEMP}
    Push " "
!   Call PFI_StrStr
    Pop ${L_TEMP}
    StrCmp ${L_TEMP} "" exit

[popfile-commit] windows msgcapture.nsi,1.10,1.11 runpopfile.nsi,1.12,1.13 runsqlite.nsi,1.2,1.3 stop_popfile.nsi,1.15,1.16

[Brian S. <xue...@us...>]

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28598

Modified Files:
	msgcapture.nsi runpopfile.nsi runsqlite.nsi stop_popfile.nsi 
Log Message:
Script now issues a warning if used with a compiler which has not been
tested yet. Sometimes compilers fail to compile scripts developed with
older versions and even if the script can be compiled the installer's
behaviour may differ significantly.

Library items now use the "PFI_" prefix to help identify them.

Index: stop_popfile.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/stop_popfile.nsi,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** stop_popfile.nsi	8 Jan 2005 14:49:05 -0000	1.15
--- stop_popfile.nsi	2 Mar 2005 20:01:32 -0000	1.16
***************
*** 82,87 ****
  # The '/WAIT' parameter is important, otherwise the 'failed' case will not be detected.
  #-------------------------------------------------------------------------------------------
! #  This version was tested using "NSIS 2 Release Candidate 2" released 5 January 2004
! #-------------------------------------------------------------------------------------------
  
    ;--------------------------------------------------------------------------
--- 82,105 ----
  # The '/WAIT' parameter is important, otherwise the 'failed' case will not be detected.
  #-------------------------------------------------------------------------------------------
! 
!   ; 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***\
!           $\r$\n***   The resulting 'installer' program should be tested carefully!\
!           $\r$\n$\r$\n"
!   !endif
! 
!   !undef  ${NSIS_VERSION}_found
  
    ;--------------------------------------------------------------------------
***************
*** 106,110 ****
    Caption "POPFile Silent Shutdown Utility"
  
!   !define C_VERSION     "0.5.10"       ; see 'VIProductVersion' comment below for format details
  
    !define C_OUTFILE     "stop_pf.exe"
--- 124,128 ----
    Caption "POPFile Silent Shutdown Utility"
  
!   !define C_VERSION     "0.5.11"     ; see 'VIProductVersion' comment below for format details
  
    !define C_OUTFILE     "stop_pf.exe"
***************
*** 182,186 ****
    ; It does not matter if the first command-line parameter uses uppercase or lowercase
  
!   Call GetParameters
    Pop ${L_PARAMS}
    StrCmp ${L_PARAMS} "" usage
--- 200,204 ----
    ; It does not matter if the first command-line parameter uses uppercase or lowercase
  
!   Call PFI_GetParameters
    Pop ${L_PARAMS}
    StrCmp ${L_PARAMS} "" usage
***************
*** 199,203 ****
    StrCpy ${L_TEMP} ${L_RESULT} 1
    Push ${L_TEMP}
!   Call StrCheckDecimal
    Pop ${L_TEMP}
    StrCmp ${L_TEMP} "" 0 port_checks
--- 217,221 ----
    StrCpy ${L_TEMP} ${L_RESULT} 1
    Push ${L_TEMP}
!   Call PFI_StrCheckDecimal
    Pop ${L_TEMP}
    StrCmp ${L_TEMP} "" 0 port_checks
***************
*** 211,215 ****
  usage:
    MessageBox MB_OK "POPFile Silent Shutdown Utility v${C_VERSION}            \
!     Copyright (c) 2004  John Graham-Cumming\
      ${MB_NL}${MB_NL}\
      This command-line utility shuts POPFile down silently, without opening a browser window.\
--- 229,233 ----
  usage:
    MessageBox MB_OK "POPFile Silent Shutdown Utility v${C_VERSION}            \
!     Copyright (c) 2005  John Graham-Cumming\
      ${MB_NL}${MB_NL}\
      This command-line utility shuts POPFile down silently, without opening a browser window.\
***************
*** 259,263 ****
    StrCmp ${L_RESULT} "" no_port_supplied
    Push ${L_RESULT}
!   Call StrCheckDecimal
    Pop ${L_GUI}
    StrCmp ${L_GUI} "" integer_error
--- 277,281 ----
    StrCmp ${L_RESULT} "" no_port_supplied
    Push ${L_RESULT}
!   Call PFI_StrCheckDecimal
    Pop ${L_GUI}
    StrCmp ${L_GUI} "" integer_error
***************
*** 298,302 ****
    StrCmp ${L_RESULT} "success" 0 password_ok
    Push "$PLUGINSDIR\shutdown_2.htm"
!   Call GetFileSize
    Pop ${L_RESULT}
    StrCmp ${L_RESULT} 0 password_ok
--- 316,320 ----
    StrCmp ${L_RESULT} "success" 0 password_ok
    Push "$PLUGINSDIR\shutdown_2.htm"
!   Call PFI_GetFileSize
    Pop ${L_RESULT}
    StrCmp ${L_RESULT} 0 password_ok
***************
*** 339,343 ****
    StrCmp ${L_RESULT} "success" 0 shutdown_ok
    Push "$PLUGINSDIR\shutdown_2.htm"
!   Call GetFileSize
    Pop ${L_RESULT}
    StrCmp ${L_RESULT} 0 shutdown_ok
--- 357,361 ----
    StrCmp ${L_RESULT} "success" 0 shutdown_ok
    Push "$PLUGINSDIR\shutdown_2.htm"
!   Call PFI_GetFileSize
    Pop ${L_RESULT}
    StrCmp ${L_RESULT} 0 shutdown_ok

Index: runpopfile.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/runpopfile.nsi,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** runpopfile.nsi	8 Jan 2005 14:49:05 -0000	1.12
--- runpopfile.nsi	2 Mar 2005 20:01:32 -0000	1.13
***************
*** 29,36 ****
  #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  #-------------------------------------------------------------------------------------------
! #
! # This version of the script has been tested with the "NSIS 2" compiler (final),
! # released 7 February 2004, with no "official" NSIS patches/CVS updates applied.
! #
  #--------------------------------------------------------------------------
  # Optional run-time command-line switches (used by 'runpopfile.exe')
--- 29,53 ----
  #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  #-------------------------------------------------------------------------------------------
! 
!   ; 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***\
!           $\r$\n***   The resulting 'installer' program should be tested carefully!\
!           $\r$\n$\r$\n"
!   !endif
! 
!   !undef  ${NSIS_VERSION}_found
! 
  #--------------------------------------------------------------------------
  # Optional run-time command-line switches (used by 'runpopfile.exe')
***************
*** 90,94 ****
    ;--------------------------------------------------------------------------
  
!   !define C_PFI_VERSION   "0.1.14"
  
    !define C_OUTFILE       "runpopfile.exe"
--- 107,111 ----
    ;--------------------------------------------------------------------------
  
!   !define C_PFI_VERSION   "0.1.15"
  
    !define C_OUTFILE       "runpopfile.exe"
***************
*** 197,201 ****
  
  found_popfile:
!   Call GetParameters
    Pop ${L_PARAMS}
    StrCmp ${L_PARAMS} "" use_reg_dirdata
--- 214,218 ----
  
  found_popfile:
!   Call PFI_GetParameters
    Pop ${L_PARAMS}
    StrCmp ${L_PARAMS} "" use_reg_dirdata
***************
*** 230,234 ****
    Push ${L_EXEFILE}
    Push ${L_PARAMS}
!   Call GetDataPath
    Pop ${L_PFI_USER}
    IfFileExists "${L_PFI_USER}\popfile.cfg" config_found
--- 247,251 ----
    Push ${L_EXEFILE}
    Push ${L_PARAMS}
!   Call PFI_GetDataPath
    Pop ${L_PFI_USER}
    IfFileExists "${L_PFI_USER}\popfile.cfg" config_found
***************
*** 271,275 ****
    Push ${L_PFI_USER}
    Push ' '
!   Call StrStr
    Pop ${L_TEMP}
    StrCmp ${L_TEMP} "" config_is_valid
--- 288,292 ----
    Push ${L_PFI_USER}
    Push ' '
!   Call PFI_StrStr
    Pop ${L_TEMP}
    StrCmp ${L_TEMP} "" config_is_valid

Index: msgcapture.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/msgcapture.nsi,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** msgcapture.nsi	18 Feb 2005 17:06:08 -0000	1.10
--- msgcapture.nsi	2 Mar 2005 20:01:32 -0000	1.11
***************
*** 27,32 ****
  #--------------------------------------------------------------------------
  
! ; This version of the script has been tested with the "NSIS 2" compiler (final),
! ; released 7 February 2004, with no "official" NSIS patches/CVS updates applied.
  
  #--------------------------------------------------------------------------
--- 27,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***\
!           $\r$\n***   The resulting 'installer' program should be tested carefully!\
!           $\r$\n$\r$\n"
!   !endif
! 
!   !undef  ${NSIS_VERSION}_found
  
  #--------------------------------------------------------------------------
***************
*** 94,98 ****
    ;--------------------------------------------------------------------------
  
!   !define C_VERSION             "0.0.60"
  
    !define C_OUTFILE             "msgcapture.exe"
--- 111,115 ----
    ;--------------------------------------------------------------------------
  
!   !define C_VERSION             "0.0.61"
  
    !define C_OUTFILE             "msgcapture.exe"
***************
*** 293,297 ****
    StrCpy $G_MODE_FLAG ""      ; select 'normal' mode by default
  
!   Call GetParameters
    Pop $G_TIMEOUT
    StrCmp $G_TIMEOUT "" default
--- 310,314 ----
    StrCpy $G_MODE_FLAG ""      ; select 'normal' mode by default
  
!   Call PFI_GetParameters
    Pop $G_TIMEOUT
    StrCmp $G_TIMEOUT "" default
***************
*** 301,305 ****
    StrCmp ${L_TEMP} "PFI" installer_mode
    Push ${L_TEMP}
!   Call StrCheckDecimal
    Pop ${L_TEMP}
    StrCmp ${L_TEMP} "" usage_error
--- 318,322 ----
    StrCmp ${L_TEMP} "PFI" installer_mode
    Push ${L_TEMP}
!   Call PFI_StrCheckDecimal
    Pop ${L_TEMP}
    StrCmp ${L_TEMP} "" usage_error
***************
*** 452,456 ****
    DetailPrint "------------------------------------------------------------"
  
!   Call GetDateTimeStamp
    Pop ${L_TEMP}
    DetailPrint "(report started ${L_TEMP})"
--- 469,473 ----
    DetailPrint "------------------------------------------------------------"
  
!   Call PFI_GetDateTimeStamp
    Pop ${L_TEMP}
    DetailPrint "(report started ${L_TEMP})"
***************
*** 476,480 ****
    DetailPrint "Status code: ${L_RESULT}"
  
!   Call GetDateTimeStamp
    Pop ${L_TEMP}
    DetailPrint "------------------------------------------------------------"
--- 493,497 ----
    DetailPrint "Status code: ${L_RESULT}"
  
!   Call PFI_GetDateTimeStamp
    Pop ${L_TEMP}
    DetailPrint "------------------------------------------------------------"

Index: runsqlite.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/runsqlite.nsi,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** runsqlite.nsi	8 Jan 2005 14:49:05 -0000	1.2
--- runsqlite.nsi	2 Mar 2005 20:01:32 -0000	1.3
***************
*** 40,45 ****
  #-------------------------------------------------------------------------------------------
  
! ; This version of the script has been tested with the "NSIS 2" compiler (final),
! ; released 7 February 2004, with no "official" NSIS patches/CVS updates applied.
  
    ;--------------------------------------------------------------------------
--- 40,62 ----
  #-------------------------------------------------------------------------------------------
  
!   ; 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***\
!           $\r$\n***   The resulting 'installer' program should be tested carefully!\
!           $\r$\n$\r$\n"
!   !endif
! 
!   !undef  ${NSIS_VERSION}_found
  
    ;--------------------------------------------------------------------------
***************
*** 59,63 ****
    ;--------------------------------------------------------------------------
  
!   !define C_VERSION   "0.0.2"     ; see 'VIProductVersion' comment below for format details
    !define C_OUTFILE   "runsqlite.exe"
  
--- 76,80 ----
    ;--------------------------------------------------------------------------
  
!   !define C_VERSION   "0.0.3"     ; see 'VIProductVersion' comment below for format details
    !define C_OUTFILE   "runsqlite.exe"
  
***************
*** 156,160 ****
    SetOutPath "${L_TEMP}"
  
!   Call GetParameters
    Pop $G_DATABASE
    StrCmp $G_DATABASE "" no_file_supplied
--- 173,177 ----
    SetOutPath "${L_TEMP}"
  
!   Call PFI_GetParameters
    Pop $G_DATABASE
    StrCmp $G_DATABASE "" no_file_supplied
***************
*** 170,174 ****
  continue:
    Push $G_DATABASE
!   Call GetSQLiteFormat
    Pop $G_DBFORMAT
    StrCpy $G_SQLITEUTIL "sqlite.exe"
--- 187,191 ----
  continue:
    Push $G_DATABASE
!   Call PFI_GetSQLiteFormat
    Pop $G_DBFORMAT
    StrCpy $G_SQLITEUTIL "sqlite.exe"

[popfile-commit] windows getssl.nsh,1.3,1.4

[Brian S. <xue...@us...>]

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28137

Modified Files:
	getssl.nsh 
Log Message:
Improved reporting of SSL download problems when running the main installer.

Library items now use the "PFI_" prefix to help identify them.

Index: getssl.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/getssl.nsh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** getssl.nsh	10 Feb 2005 23:03:41 -0000	1.3
--- getssl.nsh	2 Mar 2005 19:59:57 -0000	1.4
***************
*** 129,133 ****
    DetailPrint "InternetCheckConnection: cancelled by user"
    !ifdef INSTALLER
!       Goto exit
    !else
        Goto error_exit
--- 129,133 ----
    DetailPrint "InternetCheckConnection: cancelled by user"
    !ifdef INSTALLER
!       Goto installer_error_exit
    !else
        Goto error_exit
***************
*** 214,220 ****
  
    !ifdef INSTALLER
        Goto exit
    !else
!       Call GetDateTimeStamp
        Pop $G_PLS_FIELD_1
        DetailPrint "----------------------------------------------------"
--- 214,232 ----
  
    !ifdef INSTALLER
+     installer_error_exit:
+       Push $R1    ; No need to preserve $R0 here as it is known as ${L_RESULT} in this 'Section'
+ 
+       ; The first system call gets the full pathname (returned in $R0) and the second call
+       ; extracts the filename (and possibly the extension) part (returned in $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
+       MessageBox MB_OK|MB_ICONEXCLAMATION "$(PFI_LANG_MB_REPEATSSL)"
+ 
+       Pop $R1
        Goto exit
    !else
!       Call PFI_GetDateTimeStamp
        Pop $G_PLS_FIELD_1
        DetailPrint "----------------------------------------------------"
***************
*** 268,273 ****
    StrCpy $G_PLS_FIELD_1 $G_SSL_FILEURL
    Push $G_PLS_FIELD_1
!   Call StrBackSlash
!   Call GetParent
    Pop $G_PLS_FIELD_2
    StrLen $G_PLS_FIELD_2 $G_PLS_FIELD_2
--- 280,285 ----
    StrCpy $G_PLS_FIELD_1 $G_SSL_FILEURL
    Push $G_PLS_FIELD_1
!   Call PFI_StrBackSlash
!   Call PFI_GetParent
    Pop $G_PLS_FIELD_2
    StrLen $G_PLS_FIELD_2 $G_PLS_FIELD_2
***************
*** 288,292 ****
    DetailPrint ""
    !ifdef ADDSSL
!       Call GetDateTimeStamp
        Pop $G_PLS_FIELD_1
        DetailPrint "----------------------------------------------------"
--- 300,304 ----
    DetailPrint ""
    !ifdef ADDSSL
!       Call PFI_GetDateTimeStamp
        Pop $G_PLS_FIELD_1
        DetailPrint "----------------------------------------------------"

[popfile-commit] windows MonitorCC.nsi,1.20,1.21

[Brian S. <xue...@us...>]

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27694

Modified Files:
	MonitorCC.nsi 
Log Message:
Script now issues a warning if used with a compiler which has not been
tested yet. Sometimes compilers fail to compile scripts developed with
older versions and even if the script can be compiled the installer's
behaviour may differ significantly.

Index: MonitorCC.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/MonitorCC.nsi,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** MonitorCC.nsi	8 Jan 2005 14:48:57 -0000	1.20
--- MonitorCC.nsi	2 Mar 2005 19:59:18 -0000	1.21
***************
*** 25,31 ****
  #--------------------------------------------------------------------------
  
! ; This version of the script has been tested with the "NSIS 2" compiler (final),
! ; released 7 February 2004, with no patches applied.
! ;
  ; Expect 3 compiler warnings, all related to standard NSIS language files which are out-of-date.
  
--- 25,48 ----
  #--------------------------------------------------------------------------
  
!   ; 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***\
!           $\r$\n***   The resulting 'installer' program should be tested carefully!\
!           $\r$\n$\r$\n"
!   !endif
! 
!   !undef  ${NSIS_VERSION}_found
! 
  ; Expect 3 compiler warnings, all related to standard NSIS language files which are out-of-date.
  
***************
*** 97,101 ****
    Name                   "${C_PFI_PRODUCT}"
  
!   !define C_PFI_VERSION  "0.1.18"
  
    !define C_OUTFILE      "monitorcc.exe"
--- 114,118 ----
    Name                   "${C_PFI_PRODUCT}"
  
!   !define C_PFI_VERSION  "0.1.19"
  
    !define C_OUTFILE      "monitorcc.exe"