Menu
▾
▴
popfile-commit — CVS commit list messages
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
(160) |
Mar
(119) |
Apr
(111) |
May
(118) |
Jun
(101) |
Jul
(304) |
Aug
(113) |
Sep
(140) |
Oct
(137) |
Nov
(87) |
Dec
(122) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(78) |
Feb
(125) |
Mar
(131) |
Apr
(59) |
May
(121) |
Jun
(166) |
Jul
(150) |
Aug
(137) |
Sep
(73) |
Oct
(58) |
Nov
(27) |
Dec
(60) |
| 2005 |
Jan
(131) |
Feb
(84) |
Mar
(36) |
Apr
(8) |
May
(28) |
Jun
(20) |
Jul
(10) |
Aug
(72) |
Sep
(76) |
Oct
(34) |
Nov
(3) |
Dec
(29) |
| 2006 |
Jan
(13) |
Feb
(92) |
Mar
(7) |
Apr
(1) |
May
(1) |
Jun
(2) |
Jul
(4) |
Aug
(17) |
Sep
(5) |
Oct
(2) |
Nov
(8) |
Dec
(12) |
| 2007 |
Jan
(28) |
Feb
(15) |
Mar
|
Apr
|
May
(8) |
Jun
(4) |
Jul
(5) |
Aug
(8) |
Sep
(20) |
Oct
(38) |
Nov
(65) |
Dec
(92) |
| 2008 |
Jan
(21) |
Feb
(56) |
Mar
(27) |
Apr
(174) |
May
(25) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: John Graham-C. <jgr...@us...> - 2005-02-13 02:16:42
|
Update of /cvsroot/popfile/engine/POPFile In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25558/POPFile Modified Files: Module.pm Log Message: More work on v0.23.0 (Multi-user Support) Add the 'Users' tab that is available only to administrators and allows them to create, remove and edit users. Users can be created as a clone of an existing user and the complete list of user parameters can be edited by the administrator. There is currently no way to use this information in POPFile (that's for my next commit); POPFile is still hard-wired to use any information related to user 1 (admin). ---- Classifier/Bayes.pm: Make the cache of user parameter values have entries for whether the value is default or not and also keep track of the last time that the cache entry was read or written so that later we can implementing culling of the cache to save space. New APIs added that are accessible by authenticated administrators: create_user (with optional cloning of another user), remove_user, get_user_list (returns a list of all users), get_user_parameter_list (returns the list of all parameters a user can have), get_user_id (returns the database ID for a named user). Add get_user_parameter as way to get a user parameter for the authenticated user. Change signature of get_user_parameter_from_id so that it returns both the value and whether the value is the default or not. POPFile/Module.pm: Update user_module_config_ because of the change in the signature of get_user_parameter_from_id. UI/HTML.pm: Add support for the users_page (using the users-page.thtml template) and handle create, remove and edit of users. New functions status_message__ and error_message__ are used to set a status or error message using the common-middle.thtml bars at the top of the UI. The intention is that all status and error messages are displayed in a standard place. languages/English.msg: Add strings needed by the new Users page. skins/default/style.css: New styles shellStatusMessage and shellErrorMessage for styling the display of status and error messages. The HTML for this is in common-middle.thtml. Remove DOS-style line endings. skins/default/common-middle.thtml: Add bars at the top of the screen above the tabs that can be used to display status and error messages. skins/default/advanced-page.thtml: Left justify the column headers on the list of user parameters because it looks better. skins/default/history-bar.thtml: Remove error messages that are now handled in HTML.pm by calling error_message__ with the appropriate error string. skins/default/users-page.thtml: Add HTML to handle the Users page. ---- TODO: Go through code and make all errors and status message use the new status_message__ and error_message__ functions in HTML. TODO: Cache flushing of user parameters in Bayes. TODO: New Bayes API functions need tests Index: Module.pm =================================================================== RCS file: /cvsroot/popfile/engine/POPFile/Module.pm,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** Module.pm 11 Feb 2005 00:18:22 -0000 1.49 --- Module.pm 13 Feb 2005 02:16:34 -0000 1.50 *************** *** 544,549 **** $module . "_" . $name, $value ); } else { ! return $self->classifier_()->get_user_parameter_from_id( $user, ! $module . "_" . $name ); } } --- 544,550 ---- $module . "_" . $name, $value ); } else { ! my ( $val, $def ) = $self->classifier_()->get_user_parameter_from_id( ! $user, $module . "_" . $name ); ! return $val; } } |
|
From: John Graham-C. <jgr...@us...> - 2005-02-13 02:16:42
|
Update of /cvsroot/popfile/engine/Classifier In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25558/Classifier Modified Files: Bayes.pm Log Message: More work on v0.23.0 (Multi-user Support) Add the 'Users' tab that is available only to administrators and allows them to create, remove and edit users. Users can be created as a clone of an existing user and the complete list of user parameters can be edited by the administrator. There is currently no way to use this information in POPFile (that's for my next commit); POPFile is still hard-wired to use any information related to user 1 (admin). ---- Classifier/Bayes.pm: Make the cache of user parameter values have entries for whether the value is default or not and also keep track of the last time that the cache entry was read or written so that later we can implementing culling of the cache to save space. New APIs added that are accessible by authenticated administrators: create_user (with optional cloning of another user), remove_user, get_user_list (returns a list of all users), get_user_parameter_list (returns the list of all parameters a user can have), get_user_id (returns the database ID for a named user). Add get_user_parameter as way to get a user parameter for the authenticated user. Change signature of get_user_parameter_from_id so that it returns both the value and whether the value is the default or not. POPFile/Module.pm: Update user_module_config_ because of the change in the signature of get_user_parameter_from_id. UI/HTML.pm: Add support for the users_page (using the users-page.thtml template) and handle create, remove and edit of users. New functions status_message__ and error_message__ are used to set a status or error message using the common-middle.thtml bars at the top of the UI. The intention is that all status and error messages are displayed in a standard place. languages/English.msg: Add strings needed by the new Users page. skins/default/style.css: New styles shellStatusMessage and shellErrorMessage for styling the display of status and error messages. The HTML for this is in common-middle.thtml. Remove DOS-style line endings. skins/default/common-middle.thtml: Add bars at the top of the screen above the tabs that can be used to display status and error messages. skins/default/advanced-page.thtml: Left justify the column headers on the list of user parameters because it looks better. skins/default/history-bar.thtml: Remove error messages that are now handled in HTML.pm by calling error_message__ with the appropriate error string. skins/default/users-page.thtml: Add HTML to handle the Users page. ---- TODO: Go through code and make all errors and status message use the new status_message__ and error_message__ functions in HTML. TODO: Cache flushing of user parameters in Bayes. TODO: New Bayes API functions need tests Index: Bayes.pm =================================================================== RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v retrieving revision 1.339 retrieving revision 1.340 diff -C2 -d -r1.339 -r1.340 *** Bayes.pm 11 Feb 2005 00:33:18 -0000 1.339 --- Bayes.pm 13 Feb 2005 02:16:33 -0000 1.340 *************** *** 100,103 **** --- 100,104 ---- $self->{db_get_buckets_with_magnets__} = 0; $self->{db_delete_zero_words__} = 0; + $self->{db_get_user_list__} = 0; # Caches the name of each bucket and relates it to both the bucket *************** *** 124,129 **** # Caches looked up user parameter values on a per user basis ! $self->{db_user_parameters__} = {}; # Used to parse mail messages --- 125,135 ---- # Caches looked up user parameter values on a per user basis + # Subkeys are: + # + # lastused Time the cache entry was last used + # value The value for the parameter + # default Whether the value is the default or not ! $self->{cached_user_parameters__} = {}; # Used to parse mail messages *************** *** 690,697 **** and matrix.bucketid = ?;' ); # PROFILE BLOCK STOP # Get the mapping from parameter names to ids into a local hash my $h = $self->db_()->prepare( "select name, id from bucket_template;" ); ! $h->execute; while ( my $row = $h->fetchrow_arrayref ) { $self->{db_parameterid__}{$row->[0]} = $row->[1]; --- 696,706 ---- and matrix.bucketid = ?;' ); # PROFILE BLOCK STOP + $self->{db_get_user_list__} = $self->db_()->prepare( + 'select id, name from users order by name;' ); + # Get the mapping from parameter names to ids into a local hash my $h = $self->db_()->prepare( "select name, id from bucket_template;" ); ! $h->execute(); while ( my $row = $h->fetchrow_arrayref ) { $self->{db_parameterid__}{$row->[0]} = $row->[1]; *************** *** 739,742 **** --- 748,752 ---- $self->{db_get_buckets_with_magnets__}->finish; $self->{db_delete_zero_words__}->finish; + $self->{db_get_user_list__}->finish; } *************** *** 3035,3042 **** #---------------------------------------------------------------------------- # ! # get_user_parameter_from_id # # Returns the value of a per user parameter # # $user The ID of the user # $parameter The name of the parameter --- 3045,3281 ---- #---------------------------------------------------------------------------- # ! # create_user (ADMIN ONLY) ! # ! # Creates a new user with a given name and optionally copies the ! # configuration of another user. ! # ! # $session A valid session ID for an administrator ! # $new_user The name for the new user ! # $clone (optional) Name of user to clone ! # ! # Returns 0 for success, 1 for user already exists, 2 for other error, ! # 3 for clone failure and undef if caller isn't an admin. ! # ! # ---------------------------------------------------------------------------- ! sub create_user ! { ! my ( $self, $session, $new_user, $clone ) = @_; ! ! my $userid = $self->valid_session_key__( $session ); ! return undef if ( !defined( $userid ) ); ! ! # Check that this user is an administrator ! ! my $can_admin = $self->get_user_parameter( $session, 'GLOBAL_can_admin' ); ! ! if ( $can_admin != 1 ) { ! return undef; ! } ! ! # Check to see if we already have a user with that name ! ! if ( defined( $self->get_user_id( $session, $new_user ) ) ) { ! return 1; ! } ! ! $self->db_()->do( "insert into users ( name ) values ( '$new_user' );" ); ! ! my $id = $self->get_user_id( $session, $new_user ); ! ! if ( !defined( $id ) ) { ! return 2; ! } ! ! # See if we need to clone the configuration of another user and ! # only clone non-default values ! ! if ( defined( $clone ) && ( $clone ne '' ) ) { ! my $clid = $self->get_user_id( $session, $clone ); ! if ( !defined( $clid ) ) { ! return 3; ! } ! my $h = $self->db_()->prepare( "select utid, val from user_params where userid = $clid;" ); ! $h->execute; ! my %add; ! while ( my $row = $h->fetchrow_arrayref ) { ! $add{$row->[0]} = $row->[1]; ! } ! $h->finish; ! foreach my $utid (keys %add) { ! $self->db_()->do( "insert into user_params ( userid, utid, val ) values ( $id, $utid, '$add{$utid}' );" ); ! } ! } ! ! return 0; ! } ! ! #---------------------------------------------------------------------------- ! # ! # remove_user (ADMIN ONLY) ! # ! # Removes an existing user ! # ! # $session A valid session ID for an administrator ! # $user The name for the new to remove ! # ! # Returns 0 for success, undef for wrong permissions and 1 for user ! # does not exist, 2 means tried to delete admin ! # ! # ---------------------------------------------------------------------------- ! sub remove_user ! { ! my ( $self, $session, $user ) = @_; ! ! my $userid = $self->valid_session_key__( $session ); ! return undef if ( !defined( $userid ) ); ! ! # Check that this user is an administrator ! ! my $can_admin = $self->get_user_parameter( $session, 'GLOBAL_can_admin' ); ! ! if ( $can_admin != 1 ) { ! return undef; ! } ! ! # Check that the named user is not an administrator ! ! my $id = $self->get_user_id( $session, $user ); ! ! if ( defined( $id ) ) { ! my ( $val, $def ) = $self->get_user_parameter_from_id( $id,'GLOBAL_can_admin' ); ! if ( $val == 0 ) { ! $self->db_()->do( "delete from users where name = '$user';" ); ! } else { ! return 2; ! } ! } ! ! return 0; ! } ! ! #---------------------------------------------------------------------------- ! # ! # get_user_list (ADMIN ONLY) ! # ! # Returns a list of all users in the system ! # ! # $session A valid session ID for an administrator ! # ! #---------------------------------------------------------------------------- ! sub get_user_list ! { ! my ( $self, $session ) = @_; ! ! my $userid = $self->valid_session_key__( $session ); ! return undef if ( !defined( $userid ) ); ! ! # Check that this user is an administrator ! ! my $can_admin = $self->get_user_parameter( $session, 'GLOBAL_can_admin' ); ! ! if ( $can_admin != 1 ) { ! return undef; ! } ! ! my @users; ! $self->{db_get_user_list__}->execute(); ! while ( my $row = $self->{db_get_user_list__}->fetchrow_arrayref ) { ! push @users, $row->[1]; ! } ! ! return \@users; ! } ! ! #---------------------------------------------------------------------------- ! # ! # get_user_parameter_list (ADMIN ONLY) ! # ! # Returns a list of all parameters a user can have ! # ! # $session A valid session ID for an administrator ! # ! #---------------------------------------------------------------------------- ! sub get_user_parameter_list ! { ! my ( $self, $session ) = @_; ! ! my $userid = $self->valid_session_key__( $session ); ! return undef if ( !defined( $userid ) ); ! ! # Check that this user is an administrator ! ! my $can_admin = $self->get_user_parameter( $session, 'GLOBAL_can_admin' ); ! ! if ( $can_admin != 1 ) { ! return undef; ! } ! ! return keys %{$self->{db_user_parameterid__}}; ! } ! ! #---------------------------------------------------------------------------- ! # ! # get_user_parameter # # Returns the value of a per user parameter # + # $session A valid session ID + # $parameter The name of the parameter + # + #---------------------------------------------------------------------------- + sub get_user_parameter + { + my ( $self, $session, $parameter ) = @_; + + my $userid = $self->valid_session_key__( $session ); + return undef if ( !defined( $userid ) ); + + my ( $val, $def)= $self->get_user_parameter_from_id( $userid, $parameter ); + + return $val; + } + + #---------------------------------------------------------------------------- + # + # get_user_id (ADMIN ONLY) + # + # Returns the database ID of a named used + # + # $session A valid session ID + # $user The name of the user + # + #---------------------------------------------------------------------------- + sub get_user_id + { + my ( $self, $session, $user ) = @_; + + my $userid = $self->valid_session_key__( $session ); + return undef if ( !defined( $userid ) ); + + # Check that this user is an administrator + + my $can_admin = $self->get_user_parameter( $session, 'GLOBAL_can_admin' ); + + if ( $can_admin != 1 ) { + return undef; + } + + my $h = $self->db_()->prepare( "select id from users where name = '$user';" ); + $h->execute; + if ( my $row = $h->fetchrow_arrayref ) { + $h->finish; + return $row->[0]; + } else { + return undef; + } + } + + #---------------------------------------------------------------------------- + # + # get_user_parameter_from_id + # + # Returns the value of a per user parameter (and a boolean that + # indicates whether this is the default value or not) + # # $user The ID of the user # $parameter The name of the parameter *************** *** 3049,3054 **** # See if there's a cached value ! if ( defined( $self->{db_user_parameters__}{$user}{$parameter} ) ) { ! return $self->{db_user_parameters__}{$user}{$parameter}; } --- 3288,3295 ---- # See if there's a cached value ! if ( exists( $self->{cached_user_parameters__}{$user}{$parameter} ) ) { ! $self->{cache_user_parameters__}{$user}{$parameter}{lastused} = time; ! return ($self->{cached_user_parameters__}{$user}{$parameter}{value}, ! $self->{cached_user_parameters__}{$user}{$parameter}{default}); } *************** *** 3061,3075 **** # get the default value if ( !defined( $result ) ) { $self->{db_get_user_parameter_default__}->execute( # PROFILE BLOCK START $self->{db_user_parameterid__}{$parameter} ); # PROFILE BLOCK STOP $result = $self->{db_get_user_parameter_default__}->fetchrow_arrayref; } if ( defined( $result ) ) { ! $self->{db_user_parameters__}{$user}{$parameter} = $result->[0]; ! return $result->[0]; } else { ! return undef; } } --- 3302,3323 ---- # get the default value + my $default = 0; if ( !defined( $result ) ) { $self->{db_get_user_parameter_default__}->execute( # PROFILE BLOCK START $self->{db_user_parameterid__}{$parameter} ); # PROFILE BLOCK STOP $result = $self->{db_get_user_parameter_default__}->fetchrow_arrayref; + $default = 1; } if ( defined( $result ) ) { ! $self->{cached_user_parameters__}{$user}{$parameter}{value} = ! $result->[0]; ! $self->{cached_user_parameters__}{$user}{$parameter}{default} = ! $default; ! $self->{cached_user_parameters__}{$user}{$parameter}{lastused} = ! time; ! return ( $result->[0], $default ); } else { ! return ( undef, undef ); } } *************** *** 3129,3140 **** my ( $self, $user, $parameter, $value ) = @_; my $utid = $self->{db_user_parameterid__}{$parameter}; ! # Exactly one row should be affected by this statement ! $self->{db_set_user_parameter__}->execute( $user, $utid, $value ); ! if ( defined( $self->{db_user_parameters__}{$user}{$parameter} ) ) { ! $self->{db_user_parameters__}{$user}{$parameter} = $value; } --- 3377,3408 ---- my ( $self, $user, $parameter, $value ) = @_; + # Prevent user 1 from stopping being an admin + + if ( ( $user == 1 ) && + ( $parameter eq 'GLOBAL_can_admin' ) && + ( $value != 1 ) ) { + return 0; + } + my $utid = $self->{db_user_parameterid__}{$parameter}; ! # Check to see if the parameter is being set to the default value ! # if it is then remove the entry because it is a waste of space ! my $default = 0; ! $self->{db_get_user_parameter_default__}->execute( $utid ); ! my $result = $self->{db_get_user_parameter_default__}->fetchrow_arrayref; ! if ( $result->[0] eq $value ) { ! $default = 1; ! $self->db_()->do( "delete from user_params where userid = $user and utid = $utid;" ); ! } else { ! $self->{db_set_user_parameter__}->execute( $user, $utid, $value ); ! } ! ! if ( exists( $self->{cached_user_parameters__}{$user}{$parameter} ) ) { ! $self->{cached_user_parameters__}{$user}{$parameter}{lastused}= time; ! $self->{cached_user_parameters__}{$user}{$parameter}{value} = $value; ! $self->{cached_user_parameters__}{$user}{$parameter}{default}=$default; } |
|
From: Brian S. <xue...@us...> - 2005-02-11 16:02:14
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2808 Modified Files: adduser.nsi Log Message: When displaying the list of detected email clients, set the focus to the 'Next' button to avoid the annoying flashing cursor. Index: adduser.nsi =================================================================== RCS file: /cvsroot/popfile/windows/adduser.nsi,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** adduser.nsi 6 Feb 2005 23:08:44 -0000 1.69 --- adduser.nsi 11 Feb 2005 16:02:02 -0000 1.70 *************** *** 181,185 **** Name "POPFile User" ! !define C_PFI_VERSION "0.2.65" ; Mention the wizard's version number in the titles of the installer & uninstaller windows --- 181,185 ---- Name "POPFile User" ! !define C_PFI_VERSION "0.2.66" ; Mention the wizard's version number in the titles of the installer & uninstaller windows *************** *** 2854,2858 **** Banner::destroy ! !insertmacro MUI_INSTALLOPTIONS_DISPLAY_RETURN "ioF.ini" Pop ${L_TEMP} StrCmp ${L_TEMP} "back" 0 exit --- 2854,2865 ---- Banner::destroy ! ; Set focus to the "Next" button (instead of the list of detected clients, ! ; to avoid the annoying flashing cursor at the start of the list) ! ! !insertmacro MUI_INSTALLOPTIONS_INITDIALOG "ioF.ini" ! Pop ${L_TEMP} ! GetDlgItem $G_DLGITEM $HWNDPARENT 1 ! SendMessage $HWNDPARENT ${WM_NEXTDLGCTL} $G_DLGITEM 1 ! !insertmacro MUI_INSTALLOPTIONS_SHOW_RETURN Pop ${L_TEMP} StrCmp ${L_TEMP} "back" 0 exit |
|
From: Sam S. <ssc...@us...> - 2005-02-11 00:34:45
|
Update of /cvsroot/popfile/engine/POPFile In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1224/POPFile Modified Files: API.pm Log Message: final cleanup Index: API.pm =================================================================== RCS file: /cvsroot/popfile/engine/POPFile/API.pm,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** API.pm 10 Feb 2005 22:03:56 -0000 1.10 --- API.pm 11 Feb 2005 00:34:36 -0000 1.11 *************** *** 136,141 **** open IN, "<$in" or return undef; open OUT, ">$out" or return undef; - - $self->log_() my @result = $self->{c}->classify_and_modify( --- 136,139 ---- |
|
From: Sam S. <ssc...@us...> - 2005-02-11 00:33:41
|
Update of /cvsroot/popfile/engine/Classifier In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv827/Classifier Modified Files: Bayes.pm Log Message: more cleanup Index: Bayes.pm =================================================================== RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v retrieving revision 1.338 retrieving revision 1.339 diff -C2 -d -r1.338 -r1.339 *** Bayes.pm 11 Feb 2005 00:19:22 -0000 1.338 --- Bayes.pm 11 Feb 2005 00:33:18 -0000 1.339 *************** *** 1560,1564 **** select( undef, undef, undef, 1 ); return undef; ! }s my $session = $self->generate_unique_session_key__(); --- 1560,1564 ---- select( undef, undef, undef, 1 ); return undef; ! } my $session = $self->generate_unique_session_key__(); |
|
From: Sam S. <ssc...@us...> - 2005-02-11 00:19:34
|
Update of /cvsroot/popfile/engine/Classifier In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28378/Classifier Modified Files: Bayes.pm Log Message: Classifier::Bayes is no longer called directly by UI::XMLRPC, removing caller constraint on valid_session_key__. 1-second delay on bad sessions is sufficient. If someone is calling valid_session_key__ from within POPFile there are bigger problems to worry about. Index: Bayes.pm =================================================================== RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v retrieving revision 1.337 retrieving revision 1.338 diff -C2 -d -r1.337 -r1.338 *** Bayes.pm 10 Feb 2005 22:03:46 -0000 1.337 --- Bayes.pm 11 Feb 2005 00:19:22 -0000 1.338 *************** *** 1492,1501 **** my ( $self, $session ) = @_; - # This provides protection against someone using the XML-RPC - # interface and calling this API directly to fish for session - # keys, this must be called from within this module - - return undef if ( caller ne 'Classifier::Bayes' ); - # If the session key is invalid then wait 1 second. This is done # to prevent people from calling a POPFile API such as --- 1492,1495 ---- |
|
From: Sam S. <ssc...@us...> - 2005-02-11 00:18:35
|
Update of /cvsroot/popfile/engine/POPFile In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27919/POPFile Modified Files: Module.pm Log Message: Another extraneous commit. Index: Module.pm =================================================================== RCS file: /cvsroot/popfile/engine/POPFile/Module.pm,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** Module.pm 10 Feb 2005 22:03:58 -0000 1.48 --- Module.pm 11 Feb 2005 00:18:22 -0000 1.49 *************** *** 656,660 **** my $c; my $retcode = sysread( $handle, $c, 1 ); - $self->log_(2, "Slurp from $handle single character $c"); if ( $retcode == 1 ) { if ( $c eq "\012" ) { --- 656,659 ---- *************** *** 766,770 **** $slurp_data__{"$handle"}{data} .= $c; ! $self->log_( 2, "Read slurp data from $handle: $c" ); $result = $self->flush_slurp_data__( $handle ); --- 765,769 ---- $slurp_data__{"$handle"}{data} .= $c; ! $self->log_( 2, "Read slurp data: $c" ); $result = $self->flush_slurp_data__( $handle ); |
|
From: Brian S. <xue...@us...> - 2005-02-10 23:17:37
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4574 Modified Files: French-pfi.nsh Log Message: Oops! Previous version had some debug strings in it. _This_ version is what should have been checked in! Index: French-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/French-pfi.nsh,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** French-pfi.nsh 10 Feb 2005 22:51:05 -0000 1.49 --- French-pfi.nsh 10 Feb 2005 23:17:13 -0000 1.50 *************** *** 504,524 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ;!insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_DOWNLOADING "Downloading %s" ! ;!insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_CONNECTING "Connecting ..." ! ;!insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_SECOND "second" ! ;!insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_MINUTE "minute" ! ;!insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_HOUR "hour" ! ;!insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_PLURAL "s" ! ;!insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_PROGRESS "%dkB (%d%%) of %dkB @ %d.%01dkB/s" ! ;!insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_REMAINING " (%d %s%s remaining)" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_DOWNLOADING "Downloading %s from the Internet" ! !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_CONNECTING "Connecting to the web site..." ! !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_SECOND "SECOND" ! !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_MINUTE "MINUTE" ! !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_HOUR "HOUR" ! !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_PLURAL "S" ! !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_PROGRESS "%d kilbobyte (%d%%) of %dkilobyte @ %d.%01dkB/s" ! !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_REMAINING " (%d %s%s to go for this file)" ########################################################################### --- 504,515 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_DOWNLOADING "Downloading %s" ! !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_CONNECTING "Connecting ..." ! !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_SECOND "second" ! !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_MINUTE "minute" ! !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_HOUR "hour" ! !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_PLURAL "s" ! !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_PROGRESS "%dkB (%d%%) of %dkB @ %d.%01dkB/s" ! !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_REMAINING " (%d %s%s remaining)" ########################################################################### |
|
From: Brian S. <xue...@us...> - 2005-02-10 23:05:06
|
Update of /cvsroot/popfile/windows/add-ons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32469 Modified Files: addssl.nsi Log Message: Use the new 'DumpLog' library function instead of an in-line one. Index: addssl.nsi =================================================================== RCS file: /cvsroot/popfile/windows/add-ons/addssl.nsi,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** addssl.nsi 8 Feb 2005 15:12:00 -0000 1.6 --- addssl.nsi 10 Feb 2005 23:04:56 -0000 1.7 *************** *** 109,113 **** Name "POPFile SSL Setup" ! !define C_PFI_VERSION "0.0.13" ; Mention the wizard's version number in the window title --- 109,113 ---- Name "POPFile SSL Setup" ! !define C_PFI_VERSION "0.0.14" ; Mention the wizard's version number in the window title *************** *** 558,562 **** SetDetailsPrint textonly ! DetailPrint "$(PSS_LANG_PROG_SAVELOG)" SetDetailsPrint none !insertmacro BACKUP_123 "$G_ROOTDIR" "addssl.log" --- 558,562 ---- SetDetailsPrint textonly ! DetailPrint "$(PFI_LANG_PROG_SAVELOG)" SetDetailsPrint none !insertmacro BACKUP_123 "$G_ROOTDIR" "addssl.log" *************** *** 789,854 **** FunctionEnd - - #-------------------------------------------------------------------------- - # Installer Function: DumpLog - # - # This function saves the contents of the install log (from INSTPAGE) in a file. - # The stack is used to pass the full pathname of the file to be used. - #-------------------------------------------------------------------------- - - !define LVM_GETITEMCOUNT 0x1004 - !define LVM_GETITEMTEXT 0x102D - - Function DumpLog - Exch $5 - Push $0 - Push $1 - Push $2 - Push $3 - Push $4 - Push $6 - - FindWindow $0 "#32770" "" $HWNDPARENT - GetDlgItem $0 $0 1016 - StrCmp $0 0 error - FileOpen $5 $5 "w" - StrCmp $5 "" error - SendMessage $0 ${LVM_GETITEMCOUNT} 0 0 $6 - System::Alloc ${NSIS_MAX_STRLEN} - Pop $3 - StrCpy $2 0 - System::Call "*(i, i, i, i, i, i, i, i, i) i \ - (0, 0, 0, 0, 0, r3, ${NSIS_MAX_STRLEN}) .r1" - - loop: - StrCmp $2 $6 done - System::Call "User32::SendMessageA(i, i, i, i) i \ - ($0, ${LVM_GETITEMTEXT}, $2, r1)" - System::Call "*$3(&t${NSIS_MAX_STRLEN} .r4)" - FileWrite $5 "$4${MB_NL}" - IntOp $2 $2 + 1 - Goto loop - - done: - FileClose $5 - System::Free $1 - System::Free $3 - Goto exit - - error: - MessageBox MB_OK|MB_ICONEXCLAMATION "Error: problem detected when saving the log file" - - exit: - Pop $6 - Pop $4 - Pop $3 - Pop $2 - Pop $1 - Pop $0 - Exch $5 - - FunctionEnd - - #-------------------------------------------------------------------------- # End of 'addssl.nsi' --- 789,792 ---- |
|
From: Brian S. <xue...@us...> - 2005-02-10 23:04:09
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31751 Modified Files: getssl.nsh installer.nsi Log Message: Create a new command-line switch to make the main installer act like the "SSL Setup" wizard (this makes it easier to recover from any SSL download problems encountered during installation of POPFile). The main setup*.exe installer now saves the installation log in the installation folder. Index: installer.nsi =================================================================== RCS file: /cvsroot/popfile/windows/installer.nsi,v retrieving revision 1.251 retrieving revision 1.252 diff -C2 -d -r1.251 -r1.252 *** installer.nsi 6 Feb 2005 23:16:53 -0000 1.251 --- installer.nsi 10 Feb 2005 23:03:41 -0000 1.252 *************** *** 98,102 **** #-------------------------------------------------------------------------- ! # Run-time command-line switch (used by 'setup.exe') #-------------------------------------------------------------------------- # --- 98,102 ---- #-------------------------------------------------------------------------- ! # Run-time command-line switches (used by 'setup.exe') #-------------------------------------------------------------------------- # *************** *** 114,117 **** --- 114,128 ---- # paths which do not contain spaces. The switch can use uppercase or lowercase. # + # + # /SSL + # + # If there are problems downloading the optional SSL support files from the Internet, the + # installer will skip this part of the installation. If SSL support is required, the SSL + # files can be added by re-running the installer with the /SSL command-line switch to make + # it skip everything except the downloading and installation of the SSL support files. + # + # The /SSL switch can use uppercase or lowercase. + # + # NOTE: If both command-line switches are supplied, they will both be ignored. #-------------------------------------------------------------------------- *************** *** 263,266 **** --- 274,278 ---- Var G_SFN_DISABLED ; 1 = short file names not supported, 0 = short file names available + Var G_SSL_ONLY ; 1 = SSL-only installation, 0 = normal installation Var G_PLS_FIELD_1 ; used to customize translated text strings *************** *** 301,304 **** --- 313,335 ---- !include "WriteEnvStr.nsh" + ; Macros used for entries in the installation log file + + !macro SECTIONLOG_ENTER NAME + SetDetailsPrint listonly + DetailPrint "----------------------------------------" + DetailPrint "Enter the $\"${NAME}$\" Section" + DetailPrint "----------------------------------------" + DetailPrint "" + !macroend + + !macro SECTIONLOG_EXIT NAME + SetDetailsPrint listonly + DetailPrint "" + DetailPrint "----------------------------------------" + DetailPrint "Exit from $\"${NAME}$\" Section" + DetailPrint "----------------------------------------" + DetailPrint "" + !macroend + #-------------------------------------------------------------------------- # Version Information settings (for the installer EXE and uninstaller EXE) *************** *** 474,477 **** --- 505,512 ---- ;--------------------------------------------------- + ; Use a "pre" function to check if only the SSL Support files are to be installed + + !define MUI_PAGE_CUSTOMFUNCTION_PRE "CheckSSLOnlyFlag" + !insertmacro MUI_PAGE_COMPONENTS *************** *** 497,501 **** ;--------------------------------------------------- ; Installer Page - Show user what we are about to do and get permission to proceed ! ; (this is the last page shown before the installation starts) ;--------------------------------------------------- --- 532,537 ---- ;--------------------------------------------------- ; Installer Page - Show user what we are about to do and get permission to proceed ! ; ! ; This page must come immediately before the INSTFILES page ('MUI_PAGE_INSTFILES') ;--------------------------------------------------- *************** *** 741,744 **** --- 777,782 ---- !endif + StrCpy $G_SSL_ONLY "0" ; assume a full installation is required + ; At present (14 March 2004) POPFile does not work properly if POPFILE_ROOT or POPFILE_USER ; are set to values containing spaces. A simple workaround is to use short file name format *************** *** 756,763 **** Call GetParameters Pop ${L_RESERVED} ! StrCmp ${L_RESERVED} "/nospaces" 0 check_registry StrCpy $G_SFN_DISABLED "1" Goto exit check_registry: ReadRegDWORD $G_SFN_DISABLED \ --- 794,805 ---- Call GetParameters Pop ${L_RESERVED} ! StrCmp ${L_RESERVED} "/nospaces" 0 check_ssl StrCpy $G_SFN_DISABLED "1" Goto exit + check_ssl: + StrCmp ${L_RESERVED} "/SSL" 0 check_registry + StrCpy $G_SSL_ONLY "1" ; just download and install the SSL support files + check_registry: ReadRegDWORD $G_SFN_DISABLED \ *************** *** 804,807 **** --- 846,874 ---- #-------------------------------------------------------------------------- + # Installer Section: StartLog (this must be the very first section) + # + # Creates the log header with information about this installation + #-------------------------------------------------------------------------- + + Section "-StartLog" + + SetDetailsPrint listonly + + DetailPrint "------------------------------------------------------------" + DetailPrint "$(^Name) v${C_PFI_VERSION}" + DetailPrint "------------------------------------------------------------" + DetailPrint "Command-line: $CMDLINE" + DetailPrint "User Details: $G_WINUSERNAME ($G_WINUSERTYPE)" + DetailPrint "PFI Language: $LANGUAGE" + DetailPrint "------------------------------------------------------------" + Call GetDateTimeStamp + Pop $G_PLS_FIELD_1 + DetailPrint "Installation started $G_PLS_FIELD_1" + DetailPrint "------------------------------------------------------------" + DetailPrint "" + + SectionEnd + + #-------------------------------------------------------------------------- # Installer Section: POPFile component (always installed) # *************** *** 816,819 **** --- 883,888 ---- Section "POPFile" SecPOPFile + !insertmacro SECTIONLOG_ENTER "POPFile" + ; Make this section mandatory (i.e. it is always installed) *************** *** 1387,1390 **** --- 1456,1461 ---- SetDetailsPrint listonly + !insertmacro SECTIONLOG_EXIT "POPFile" + Pop ${L_TEMP} Pop ${L_RESULT} *************** *** 1405,1408 **** --- 1476,1481 ---- Section "Skins" SecSkins + !insertmacro SECTIONLOG_ENTER "Skins" + SetDetailsPrint textonly DetailPrint "$(PFI_LANG_INST_PROG_SKINS)" *************** *** 1500,1503 **** --- 1573,1578 ---- SetDetailsPrint listonly + !insertmacro SECTIONLOG_EXIT "Skins" + SectionEnd *************** *** 1508,1511 **** --- 1583,1588 ---- Section "Languages" SecLangs + !insertmacro SECTIONLOG_ENTER "Languages" + SetDetailsPrint textonly DetailPrint "$(PFI_LANG_INST_PROG_LANGS)" *************** *** 1519,1522 **** --- 1596,1601 ---- SetDetailsPrint listonly + !insertmacro SECTIONLOG_EXIT "Languages" + SectionEnd *************** *** 1533,1536 **** --- 1612,1617 ---- Section "Kakasi" SecKakasi + !insertmacro SECTIONLOG_ENTER "Kakasi" + !define L_RESERVED $0 ; used in system.dll call *************** *** 1619,1622 **** --- 1700,1705 ---- !undef L_RESERVED + !insertmacro SECTIONLOG_EXIT "Kakasi" + SectionEnd !endif *************** *** 1632,1638 **** --- 1715,1725 ---- Section /o "NNTP proxy" SecNNTP + !insertmacro SECTIONLOG_ENTER "NNTP Proxy" + SetOutPath "$G_ROOTDIR\Proxy" File "..\engine\Proxy\NNTP.pm" + !insertmacro SECTIONLOG_EXIT "NNTP Proxy" + SectionEnd *************** *** 1645,1651 **** --- 1732,1742 ---- Section /o "SMTP proxy" SecSMTP + !insertmacro SECTIONLOG_ENTER "SMTP Proxy" + SetOutPath "$G_ROOTDIR\Proxy" File "..\engine\Proxy\SMTP.pm" + !insertmacro SECTIONLOG_EXIT "SMTP Proxy" + SectionEnd *************** *** 1660,1663 **** --- 1751,1756 ---- Section /o "XMLRPC" SecXMLRPC + !insertmacro SECTIONLOG_ENTER "XMLRPC" + SetDetailsPrint textonly DetailPrint "$(PFI_LANG_INST_PROG_XMLRPC)" *************** *** 1712,1715 **** --- 1805,1810 ---- SetDetailsPrint listonly + !insertmacro SECTIONLOG_EXIT "XMLRPC" + SectionEnd *************** *** 1722,1725 **** --- 1817,1822 ---- Section /o "IMAP" SecIMAP + !insertmacro SECTIONLOG_ENTER "IMAP" + SetDetailsPrint textonly DetailPrint "Installing IMAP module..." *************** *** 1741,1744 **** --- 1838,1843 ---- SetDetailsPrint listonly + !insertmacro SECTIONLOG_EXIT "IMAP" + SectionEnd *************** *** 1752,1758 **** --- 1851,1861 ---- Section /o "SOCKS" SecSOCKS + !insertmacro SECTIONLOG_ENTER "SOCKS" + SetOutPath "$G_MPLIBDIR\IO\Socket" File "${C_PERL_DIR}\site\lib\IO\Socket\Socks.pm" + !insertmacro SECTIONLOG_EXIT "SOCKS" + SectionEnd *************** *** 1780,1783 **** --- 1883,1930 ---- #-------------------------------------------------------------------------- + # Installer Section: StopLog (this must be the very last section) + # + # Finishes the log file and saves it (making backups of up to 3 previous logs) + #-------------------------------------------------------------------------- + + Section "-StopLog" + + SetDetailsPrint textonly + DetailPrint "$(PFI_LANG_PROG_SAVELOG) $(PFI_LANG_TAKE_SEVERAL_SECONDS)" + SetDetailsPrint listonly + Call GetDateTimeStamp + Pop $G_PLS_FIELD_1 + StrCmp $G_SSL_ONLY "0" normal_log + DetailPrint "------------------------------------------------------------" + DetailPrint "SSL Support installation finished $G_PLS_FIELD_1" + DetailPrint "------------------------------------------------------------" + Goto save_log + + normal_log: + DetailPrint "------------------------------------------------------------" + DetailPrint "'Add POPFile User' will be called to configure POPFile" + IfRebootFlag 0 close_log + DetailPrint "(a reboot is required to complete the Kakasi installation)" + + close_log: + DetailPrint "------------------------------------------------------------" + DetailPrint "Main program installation finished $G_PLS_FIELD_1" + DetailPrint "------------------------------------------------------------" + + save_log: + + ; Save a log showing what was installed + + !insertmacro BACKUP_123_DP "$G_ROOTDIR" "install.log" + Push "$G_ROOTDIR\install.log" + Call DumpLog + DetailPrint "Log report saved in '$G_ROOTDIR\install.log'" + SetDetailsPrint textonly + DetailPrint "$(PFI_LANG_INST_PROG_ENDSEC)" + SetDetailsPrint listonly + + SectionEnd + + #-------------------------------------------------------------------------- # Component-selection page descriptions # *************** *** 1912,1916 **** !insertmacro MUI_HEADER_TEXT "$(PFI_LANG_SUMMARY_TITLE)" "$(PFI_LANG_SUMMARY_SUBTITLE)" ! ; The entires in the "Basic" and "Optional" component lists are indented a little !define C_NLT "${IO_NL}\t" --- 2059,2063 ---- !insertmacro MUI_HEADER_TEXT "$(PFI_LANG_SUMMARY_TITLE)" "$(PFI_LANG_SUMMARY_SUBTITLE)" ! ; The entries in the "Basic" and "Optional" component lists are indented a little !define C_NLT "${IO_NL}\t" *************** *** 1929,1933 **** start_summary: StrCpy $G_PLS_FIELD_1 "${L_TEMP}${IO_NL}${IO_NL}\ ! $(PFI_LANG_SUMMARY_BASICLIST)${IO_NL}${C_NLT}\ $(PFI_LANG_SUMMARY_POPFILECORE)${C_NLT}\ $(PFI_LANG_SUMMARY_MINPERL)${C_NLT}\ --- 2076,2085 ---- 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)" ! ! !insertmacro SectionNotSelected ${SecPOPFile} check_skins ! StrCpy ${L_TEMP} "" ! StrCpy $G_PLS_FIELD_1 "$G_PLS_FIELD_1${C_NLT}\ $(PFI_LANG_SUMMARY_POPFILECORE)${C_NLT}\ $(PFI_LANG_SUMMARY_MINPERL)${C_NLT}\ *************** *** 1935,1945 **** $(PFI_LANG_SUMMARY_DEFAULTLANG)" ! ; Now use the current component selections to update the data we will display, ! !insertmacro SectionNotSelected ${SecSkins} check_langs StrCpy $G_PLS_FIELD_1 "$G_PLS_FIELD_1${C_NLT}$(PFI_LANG_SUMMARY_EXTRASKINS)" check_langs: !insertmacro SectionNotSelected ${SecLangs} check_kakasi StrCpy $G_PLS_FIELD_1 "$G_PLS_FIELD_1${C_NLT}$(PFI_LANG_SUMMARY_EXTRALANGS)" --- 2087,2098 ---- $(PFI_LANG_SUMMARY_DEFAULTLANG)" ! check_skins: !insertmacro SectionNotSelected ${SecSkins} check_langs + StrCpy ${L_TEMP} "" StrCpy $G_PLS_FIELD_1 "$G_PLS_FIELD_1${C_NLT}$(PFI_LANG_SUMMARY_EXTRASKINS)" check_langs: !insertmacro SectionNotSelected ${SecLangs} check_kakasi + StrCpy ${L_TEMP} "" StrCpy $G_PLS_FIELD_1 "$G_PLS_FIELD_1${C_NLT}$(PFI_LANG_SUMMARY_EXTRALANGS)" *************** *** 1947,1955 **** !ifndef NO_KAKASI !insertmacro SectionNotSelected ${SecKakasi} end_basic StrCpy $G_PLS_FIELD_1 "$G_PLS_FIELD_1${C_NLT}$(PFI_LANG_SUMMARY_KAKASI)" end_basic: !endif ! StrCpy $G_PLS_FIELD_1 "$G_PLS_FIELD_1${IO_NL}${IO_NL}\ $(PFI_LANG_SUMMARY_OPTIONLIST)${IO_NL}" --- 2100,2109 ---- !ifndef NO_KAKASI !insertmacro SectionNotSelected ${SecKakasi} end_basic + StrCpy ${L_TEMP} "" StrCpy $G_PLS_FIELD_1 "$G_PLS_FIELD_1${C_NLT}$(PFI_LANG_SUMMARY_KAKASI)" end_basic: !endif ! StrCpy $G_PLS_FIELD_1 "$G_PLS_FIELD_1${L_TEMP}${IO_NL}${IO_NL}\ $(PFI_LANG_SUMMARY_OPTIONLIST)${IO_NL}" *************** *** 1992,1996 **** !insertmacro MUI_INSTALLOPTIONS_WRITE "ioData.ini" "Field 1" "State" $G_PLS_FIELD_1 ! ; Set focus to the button labelled "Install" or "Upgrade" (instead of the "Summary" data) --- 2146,2150 ---- !insertmacro MUI_INSTALLOPTIONS_WRITE "ioData.ini" "Field 1" "State" $G_PLS_FIELD_1 ! ; Set focus to the button labelled "Install" or "Upgrade" (instead of the "Summary" data) *************** *** 2441,2444 **** --- 2595,2632 ---- #-------------------------------------------------------------------------- + # Installer Function: CheckSSLOnlyFlag + # (the "pre" function for the COMPONENTS selection page) + # + # If only the SSL Support files are to be installed, disable the other + # POPFile-component sections and skip the COMPONENTS page + #-------------------------------------------------------------------------- + + Function CheckSSLOnlyFlag + + StrCmp $G_SSL_ONLY "0" exit + + !insertmacro UnselectSection ${SecPOPFile} + !insertmacro UnselectSection ${SecSkins} + !insertmacro UnselectSection ${SecLangs} + !insertmacro UnselectSection ${SecKakasi} + !insertmacro UnselectSection ${SecNNTP} + !insertmacro UnselectSection ${SecSMTP} + !insertmacro UnselectSection ${SecXMLRPC} + !insertmacro UnselectSection ${SecIMAP} + !insertmacro UnselectSection ${SecSOCKS} + + !insertmacro SelectSection ${SecSSL} + + ; Do not display the COMPONENTS page + + Abort + + exit: + + ; Display the COMPONENTS page + + FunctionEnd + + #-------------------------------------------------------------------------- # Installer Function: CheckForExistingLocation # (the "pre" function for the POPFile PROGRAM DIRECTORY selection page) *************** *** 2493,2499 **** Push ${L_RESULT} ! ; Strip trailing slashes (if any) from the path selected by the user ! Push $INSTDIR Pop $INSTDIR --- 2681,2687 ---- Push ${L_RESULT} ! ; Strip trailing slashes (if any) from the path selected by the user ! Push $INSTDIR Pop $INSTDIR *************** *** 2561,2564 **** --- 2749,2756 ---- check_options: + ; If we are only installing the SSL support files, there is no need to check the options + + StrCmp $G_SSL_ONLY "1" continue + ; If user has NOT selected a program component on the COMPONENTS page and we find that the ; version we are about to upgrade includes that program component then the user is asked for *************** *** 2714,2719 **** Function InstallUserData ! ; For this build we skip our own FINISH page and disable the wizard's language selection ! ; dialog to make the wizard appear as an extension of the main 'setup.exe' installer. ; [Future builds may pass more than just a command-line switch to the wizard] --- 2906,2916 ---- Function InstallUserData ! ; If we are only downloading and installing the SSL support files, display the FINISH page ! ! StrCmp $G_SSL_ONLY "1" exit ! ! ; For normal installations, skip our own FINISH page and disable the "Add POPFile User" ! ; wizard's language selection dialog to make the wizard appear as an extension of the main ! ; 'setup.exe' installer. ; [Future builds may pass more than just a command-line switch to the wizard] *************** *** 2726,2729 **** --- 2923,2930 ---- Abort + exit: + + ; Display the FINISH page + FunctionEnd *************** *** 3462,3465 **** --- 3663,3668 ---- Section "un.Uninstall End" UnSecEnd + Delete "$G_ROOTDIR\install.log.*" + Delete "$G_ROOTDIR\install.log" Delete "$G_ROOTDIR\Uninstall.exe" RMDir "$G_ROOTDIR" Index: getssl.nsh =================================================================== RCS file: /cvsroot/popfile/windows/getssl.nsh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** getssl.nsh 8 Feb 2005 13:28:50 -0000 1.2 --- getssl.nsh 10 Feb 2005 23:03:41 -0000 1.3 *************** *** 86,89 **** --- 86,90 ---- !ifdef INSTALLER Section /o "SSL Support" SecSSL + !insertmacro SECTIONLOG_ENTER "SSL Support" !else Section "SSL Support" SecSSL *************** *** 240,243 **** --- 241,245 ---- DetailPrint "$(PFI_LANG_INST_PROG_ENDSEC)" SetDetailsPrint listonly + !insertmacro SECTIONLOG_EXIT "SSL Support" !endif |
|
From: Brian S. <xue...@us...> - 2005-02-10 23:01:55
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30923 Modified Files: pfi-library.nsh Log Message: Created a new macro-based function to save the installation log. Index: pfi-library.nsh =================================================================== RCS file: /cvsroot/popfile/windows/pfi-library.nsh,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** pfi-library.nsh 8 Feb 2005 15:11:13 -0000 1.60 --- pfi-library.nsh 10 Feb 2005 23:01:30 -0000 1.61 *************** *** 57,61 **** #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.1.5" #-------------------------------------------------------------------------- --- 57,61 ---- #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.1.6" #-------------------------------------------------------------------------- *************** *** 814,817 **** --- 814,821 ---- # Uninstaller Function: un.CheckSQLiteIntegrity # + # Macro: DumpLog + # Installer Function: DumpLog + # Uninstaller Function: un.DumpLog + # # Macro: FindLockedPFE # Installer Function: FindLockedPFE *************** *** 1064,1067 **** --- 1068,1175 ---- #-------------------------------------------------------------------------- + # Macro: DumpLog + # + # The installation process and the uninstall process may both need a function which dumps the + # log using a filename supplied via the stack. This macro makes maintenance easier by ensuring + # that both processes use identical functions, with the only difference being their names. + # + # NOTE: + # The !insertmacro DumpLog "" and !insertmacro DumpLog "un." commands are included in this file + # so NSIS scripts can use 'Call DumpLog' and 'Call un.DumpLog' without additional preparation. + # + # Inputs: + # (top of stack) - the full path of the file where the log will be dumped + # + # Outputs: + # (none) + # + # Usage (after macro has been 'inserted'): + # + # Push "$G_ROOTDIR\install.log" + # Call DumpLog + # + # (the log contents will be saved in the "$G_ROOTDIR\install.log" file) + #-------------------------------------------------------------------------- + + !macro DumpLog UN + Function ${UN}DumpLog + + !ifndef LVM_GETITEMCOUNT + !define LVM_GETITEMCOUNT 0x1004 + !endif + !ifndef LVM_GETITEMTEXT + !define LVM_GETITEMTEXT 0x102D + !endif + + Exch $5 + Push $0 + Push $1 + Push $2 + Push $3 + Push $4 + Push $6 + + FindWindow $0 "#32770" "" $HWNDPARENT + GetDlgItem $0 $0 1016 + StrCmp $0 0 error + FileOpen $5 $5 "w" + StrCmp $5 "" error + SendMessage $0 ${LVM_GETITEMCOUNT} 0 0 $6 + System::Alloc ${NSIS_MAX_STRLEN} + Pop $3 + StrCpy $2 0 + System::Call "*(i, i, i, i, i, i, i, i, i) i \ + (0, 0, 0, 0, 0, r3, ${NSIS_MAX_STRLEN}) .r1" + + loop: + StrCmp $2 $6 done + System::Call "User32::SendMessageA(i, i, i, i) i \ + ($0, ${LVM_GETITEMTEXT}, $2, r1)" + System::Call "*$3(&t${NSIS_MAX_STRLEN} .r4)" + FileWrite $5 "$4${MB_NL}" + IntOp $2 $2 + 1 + Goto loop + + done: + FileClose $5 + System::Free $1 + System::Free $3 + Goto exit + + error: + MessageBox MB_OK|MB_ICONEXCLAMATION "$(PFI_LANG_MB_SAVELOG_ERROR)" + + exit: + Pop $6 + Pop $4 + Pop $3 + Pop $2 + Pop $1 + Pop $0 + Pop $5 + + FunctionEnd + !macroend + + !ifdef ADDSSL | BACKUP | INSTALLER | RESTORE + #-------------------------------------------------------------------------- + # Installer Function: DumpLog + # + # This function is used during the installation process + #-------------------------------------------------------------------------- + + !insertmacro DumpLog "" + !endif + + #-------------------------------------------------------------------------- + # Uninstaller Function: un.DumpLog + # + # This function is used during the uninstall process + #-------------------------------------------------------------------------- + + ;!insertmacro DumpLog "un." + + + #-------------------------------------------------------------------------- # Macro: FindLockedPFE # *************** *** 2008,2012 **** !macroend ! !ifdef ADDSSL | ADDUSER | BACKUP | MSGCAPTURE | PFIDIAG | RESTORE | TRANSLATOR_AUW #-------------------------------------------------------------------------- # Installer Function: GetDateTimeStamp --- 2116,2120 ---- !macroend ! !ifdef ADDSSL | ADDUSER | BACKUP | INSTALLER | MSGCAPTURE | PFIDIAG | RESTORE | TRANSLATOR_AUW #-------------------------------------------------------------------------- # Installer Function: GetDateTimeStamp *************** *** 2205,2209 **** !macroend ! !ifdef ADDSSL | ADDUSER | BACKUP | MSGCAPTURE | PFIDIAG | RESTORE | TRANSLATOR_AUW #-------------------------------------------------------------------------- # Installer Function: GetLocalTime --- 2313,2317 ---- !macroend ! !ifdef ADDSSL | ADDUSER | BACKUP | INSTALLER | MSGCAPTURE | PFIDIAG | RESTORE | TRANSLATOR_AUW #-------------------------------------------------------------------------- # Installer Function: GetLocalTime |
|
From: Brian S. <xue...@us...> - 2005-02-10 23:00:14
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29172 Modified Files: Russian-pfi.nsh SimpChinese-pfi.nsh Slovak-pfi.nsh Spanish-pfi.nsh Swedish-pfi.nsh TradChinese-pfi.nsh Turkish-pfi.nsh Ukrainian-pfi.nsh Log Message: Created a new macro-based function to save the installation log. Index: Swedish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Swedish-pfi.nsh,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** Swedish-pfi.nsh 6 Feb 2005 23:04:13 -0000 1.46 --- Swedish-pfi.nsh 10 Feb 2005 23:00:01 -0000 1.47 *************** *** 155,162 **** !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Klicka Nästa för att fortsätta" ! ; Installation Log Messages [installer.nis, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] --- 155,166 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Klicka Nästa för att fortsätta" ! ; Installation Log Messages [installer.nsi, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" + ; Installation Log Messages [installer.nsi, addssl.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_SAVELOG "Saving install log file..." + ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] *************** *** 166,169 **** --- 170,179 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Shared: Message box shown if problem detected when trying to save the log file [installer.nsi, addssl.nsi, backup.nsi, restore.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_MB_SAVELOG_ERROR "Error: problem detected when saving the log file" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Shared: Message boxes shown if uninstallation is not straightforward [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 399,403 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SAVELOG "Saving install log file..." ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 409,412 ---- Index: Slovak-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Slovak-pfi.nsh,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** Slovak-pfi.nsh 6 Feb 2005 23:04:12 -0000 1.46 --- Slovak-pfi.nsh 10 Feb 2005 23:00:01 -0000 1.47 *************** *** 155,162 **** !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Kliknite na Ïalej pre pokraèovanie" ! ; Installation Log Messages [installer.nis, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] --- 155,166 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Kliknite na Ïalej pre pokraèovanie" ! ; Installation Log Messages [installer.nsi, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" + ; Installation Log Messages [installer.nsi, addssl.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_SAVELOG "Saving install log file..." + ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] *************** *** 166,169 **** --- 170,179 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Shared: Message box shown if problem detected when trying to save the log file [installer.nsi, addssl.nsi, backup.nsi, restore.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_MB_SAVELOG_ERROR "Error: problem detected when saving the log file" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Shared: Message boxes shown if uninstallation is not straightforward [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 399,403 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SAVELOG "Saving install log file..." ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 409,412 ---- Index: TradChinese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/TradChinese-pfi.nsh,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** TradChinese-pfi.nsh 6 Feb 2005 23:04:13 -0000 1.47 --- TradChinese-pfi.nsh 10 Feb 2005 23:00:01 -0000 1.48 *************** *** 155,162 **** !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Click Next to continue" ! ; Installation Log Messages [installer.nis, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] --- 155,166 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Click Next to continue" ! ; Installation Log Messages [installer.nsi, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" + ; Installation Log Messages [installer.nsi, addssl.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_SAVELOG "Saving install log file..." + ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] *************** *** 166,169 **** --- 170,179 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Shared: Message box shown if problem detected when trying to save the log file [installer.nsi, addssl.nsi, backup.nsi, restore.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_MB_SAVELOG_ERROR "Error: problem detected when saving the log file" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Shared: Message boxes shown if uninstallation is not straightforward [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 403,407 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SAVELOG "Saving install log file..." ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 413,416 ---- Index: Russian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Russian-pfi.nsh,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** Russian-pfi.nsh 6 Feb 2005 23:04:12 -0000 1.46 --- Russian-pfi.nsh 10 Feb 2005 23:00:00 -0000 1.47 *************** *** 155,162 **** !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Íàæìèòå Äàëåå äëÿ ïðîäîëæåíèÿ óñòàíîâêè." ! ; Installation Log Messages [installer.nis, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] --- 155,166 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Íàæìèòå Äàëåå äëÿ ïðîäîëæåíèÿ óñòàíîâêè." ! ; Installation Log Messages [installer.nsi, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" + ; Installation Log Messages [installer.nsi, addssl.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_SAVELOG "Saving install log file..." + ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] *************** *** 166,169 **** --- 170,179 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Shared: Message box shown if problem detected when trying to save the log file [installer.nsi, addssl.nsi, backup.nsi, restore.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_MB_SAVELOG_ERROR "Error: problem detected when saving the log file" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Shared: Message boxes shown if uninstallation is not straightforward [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 399,403 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SAVELOG "Saving install log file..." ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 409,412 ---- Index: Ukrainian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Ukrainian-pfi.nsh,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** Ukrainian-pfi.nsh 6 Feb 2005 23:04:29 -0000 1.46 --- Ukrainian-pfi.nsh 10 Feb 2005 23:00:02 -0000 1.47 *************** *** 155,162 **** !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Íàòèñí³òü Äàë³ äëÿ ïðîäîâæåííÿ" ! ; Installation Log Messages [installer.nis, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] --- 155,166 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Íàòèñí³òü Äàë³ äëÿ ïðîäîâæåííÿ" ! ; Installation Log Messages [installer.nsi, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" + ; Installation Log Messages [installer.nsi, addssl.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_SAVELOG "Saving install log file..." + ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] *************** *** 166,169 **** --- 170,179 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Shared: Message box shown if problem detected when trying to save the log file [installer.nsi, addssl.nsi, backup.nsi, restore.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_MB_SAVELOG_ERROR "Error: problem detected when saving the log file" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Shared: Message boxes shown if uninstallation is not straightforward [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 399,403 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SAVELOG "Saving install log file..." ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 409,412 ---- Index: Turkish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Turkish-pfi.nsh,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** Turkish-pfi.nsh 6 Feb 2005 23:04:29 -0000 1.35 --- Turkish-pfi.nsh 10 Feb 2005 23:00:02 -0000 1.36 *************** *** 155,162 **** !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Devam'a tiklayin." ! ; Installation Log Messages [installer.nis, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] --- 155,166 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Devam'a tiklayin." ! ; Installation Log Messages [installer.nsi, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" + ; Installation Log Messages [installer.nsi, addssl.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_SAVELOG "Saving install log file..." + ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] *************** *** 166,169 **** --- 170,179 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Shared: Message box shown if problem detected when trying to save the log file [installer.nsi, addssl.nsi, backup.nsi, restore.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_MB_SAVELOG_ERROR "Error: problem detected when saving the log file" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Shared: Message boxes shown if uninstallation is not straightforward [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 399,403 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SAVELOG "Saving install log file..." ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 409,412 ---- Index: Spanish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Spanish-pfi.nsh,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** Spanish-pfi.nsh 6 Feb 2005 23:04:13 -0000 1.51 --- Spanish-pfi.nsh 10 Feb 2005 23:00:01 -0000 1.52 *************** *** 155,162 **** !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Presione Siguiente para continuar" ! ; Installation Log Messages [installer.nis, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Cerrando versión anterior de POPFile usando puerto" ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] --- 155,166 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Presione Siguiente para continuar" ! ; Installation Log Messages [installer.nsi, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Cerrando versión anterior de POPFile usando puerto" + ; Installation Log Messages [installer.nsi, addssl.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_SAVELOG "Saving install log file..." + ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] *************** *** 166,169 **** --- 170,179 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Shared: Message box shown if problem detected when trying to save the log file [installer.nsi, addssl.nsi, backup.nsi, restore.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_MB_SAVELOG_ERROR "Error: problem detected when saving the log file" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Shared: Message boxes shown if uninstallation is not straightforward [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 408,412 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SAVELOG "Saving install log file..." ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 418,421 ---- Index: SimpChinese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/SimpChinese-pfi.nsh,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** SimpChinese-pfi.nsh 6 Feb 2005 23:04:12 -0000 1.46 --- SimpChinese-pfi.nsh 10 Feb 2005 23:00:00 -0000 1.47 *************** *** 155,162 **** !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Click Next to continue" ! ; Installation Log Messages [installer.nis, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] --- 155,166 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Click Next to continue" ! ; Installation Log Messages [installer.nsi, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" + ; Installation Log Messages [installer.nsi, addssl.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_SAVELOG "Saving install log file..." + ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] *************** *** 166,169 **** --- 170,179 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Shared: Message box shown if problem detected when trying to save the log file [installer.nsi, addssl.nsi, backup.nsi, restore.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_MB_SAVELOG_ERROR "Error: problem detected when saving the log file" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Shared: Message boxes shown if uninstallation is not straightforward [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 403,407 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SAVELOG "Saving install log file..." ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 413,416 ---- |
|
From: Brian S. <xue...@us...> - 2005-02-10 22:55:53
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27173 Modified Files: Greek-pfi.nsh Hungarian-pfi.nsh Italian-pfi.nsh Japanese-pfi.nsh Korean-pfi.nsh Norwegian-pfi.nsh Polish-pfi.nsh Portuguese-pfi.nsh PortugueseBR-pfi.nsh Log Message: Created a new macro-based function to save the installation log. Index: Portuguese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Portuguese-pfi.nsh,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** Portuguese-pfi.nsh 6 Feb 2005 22:59:53 -0000 1.46 --- Portuguese-pfi.nsh 10 Feb 2005 22:55:32 -0000 1.47 *************** *** 155,162 **** !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Clique em Seguinte para continuar" ! ; Installation Log Messages [installer.nis, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] --- 155,166 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Clique em Seguinte para continuar" ! ; Installation Log Messages [installer.nsi, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" + ; Installation Log Messages [installer.nsi, addssl.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_SAVELOG "Saving install log file..." + ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] *************** *** 166,169 **** --- 170,179 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Shared: Message box shown if problem detected when trying to save the log file [installer.nsi, addssl.nsi, backup.nsi, restore.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_MB_SAVELOG_ERROR "Error: problem detected when saving the log file" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Shared: Message boxes shown if uninstallation is not straightforward [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 399,403 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SAVELOG "Saving install log file..." ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 409,412 ---- Index: Italian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Italian-pfi.nsh,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** Italian-pfi.nsh 6 Feb 2005 22:59:53 -0000 1.36 --- Italian-pfi.nsh 10 Feb 2005 22:55:31 -0000 1.37 *************** *** 155,162 **** !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Seleziona Seguente per continuare" ! ; Installation Log Messages [installer.nis, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] --- 155,166 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Seleziona Seguente per continuare" ! ; Installation Log Messages [installer.nsi, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" + ; Installation Log Messages [installer.nsi, addssl.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_SAVELOG "Saving install log file..." + ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] *************** *** 166,169 **** --- 170,179 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Shared: Message box shown if problem detected when trying to save the log file [installer.nsi, addssl.nsi, backup.nsi, restore.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_MB_SAVELOG_ERROR "Error: problem detected when saving the log file" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Shared: Message boxes shown if uninstallation is not straightforward [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 399,403 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SAVELOG "Saving install log file..." ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 409,412 ---- Index: Japanese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Japanese-pfi.nsh,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** Japanese-pfi.nsh 6 Feb 2005 22:59:53 -0000 1.57 --- Japanese-pfi.nsh 10 Feb 2005 22:55:31 -0000 1.58 *************** *** 155,162 **** !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "uÖvðNbNµÄ±sµÄº³¢B" ! ; Installation Log Messages [installer.nis, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] --- 155,166 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "uÖvðNbNµÄ±sµÄº³¢B" ! ; Installation Log Messages [installer.nsi, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" + ; Installation Log Messages [installer.nsi, addssl.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_SAVELOG "Saving install log file..." + ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] *************** *** 166,169 **** --- 170,179 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Shared: Message box shown if problem detected when trying to save the log file [installer.nsi, addssl.nsi, backup.nsi, restore.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_MB_SAVELOG_ERROR "Error: problem detected when saving the log file" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Shared: Message boxes shown if uninstallation is not straightforward [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 409,413 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SAVELOG "Saving install log file..." ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 419,422 ---- Index: PortugueseBR-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/PortugueseBR-pfi.nsh,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** PortugueseBR-pfi.nsh 6 Feb 2005 22:59:53 -0000 1.63 --- PortugueseBR-pfi.nsh 10 Feb 2005 22:55:33 -0000 1.64 *************** *** 155,162 **** !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Clique em Avançar para continuar" ! ; Installation Log Messages [installer.nis, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Desligando a versão anterior do POPFile usando a porta" ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] --- 155,166 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Clique em Avançar para continuar" ! ; Installation Log Messages [installer.nsi, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Desligando a versão anterior do POPFile usando a porta" + ; Installation Log Messages [installer.nsi, addssl.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_SAVELOG "Saving install log file..." + ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] *************** *** 166,169 **** --- 170,179 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Shared: Message box shown if problem detected when trying to save the log file [installer.nsi, addssl.nsi, backup.nsi, restore.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_MB_SAVELOG_ERROR "Error: problem detected when saving the log file" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Shared: Message boxes shown if uninstallation is not straightforward [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 408,412 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SAVELOG "Saving install log file..." ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 418,421 ---- Index: Hungarian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Hungarian-pfi.nsh,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** Hungarian-pfi.nsh 6 Feb 2005 22:59:53 -0000 1.46 --- Hungarian-pfi.nsh 10 Feb 2005 22:55:30 -0000 1.47 *************** *** 155,162 **** !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "A folytatáshoz nyomja meg a Tovább gombot" ! ; Installation Log Messages [installer.nis, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] --- 155,166 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "A folytatáshoz nyomja meg a Tovább gombot" ! ; Installation Log Messages [installer.nsi, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" + ; Installation Log Messages [installer.nsi, addssl.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_SAVELOG "Saving install log file..." + ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] *************** *** 166,169 **** --- 170,179 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Shared: Message box shown if problem detected when trying to save the log file [installer.nsi, addssl.nsi, backup.nsi, restore.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_MB_SAVELOG_ERROR "Error: problem detected when saving the log file" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Shared: Message boxes shown if uninstallation is not straightforward [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 399,403 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SAVELOG "Saving install log file..." ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 409,412 ---- Index: Polish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Polish-pfi.nsh,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** Polish-pfi.nsh 6 Feb 2005 22:59:53 -0000 1.39 --- Polish-pfi.nsh 10 Feb 2005 22:55:32 -0000 1.40 *************** *** 155,162 **** !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Kliknij Dalej aby kontynuowaæ" ! ; Installation Log Messages [installer.nis, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] --- 155,166 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Kliknij Dalej aby kontynuowaæ" ! ; Installation Log Messages [installer.nsi, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" + ; Installation Log Messages [installer.nsi, addssl.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_SAVELOG "Saving install log file..." + ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] *************** *** 166,169 **** --- 170,179 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Shared: Message box shown if problem detected when trying to save the log file [installer.nsi, addssl.nsi, backup.nsi, restore.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_MB_SAVELOG_ERROR "Error: problem detected when saving the log file" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Shared: Message boxes shown if uninstallation is not straightforward [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 399,403 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SAVELOG "Saving install log file..." ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 409,412 ---- Index: Greek-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Greek-pfi.nsh,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** Greek-pfi.nsh 6 Feb 2005 22:59:53 -0000 1.38 --- Greek-pfi.nsh 10 Feb 2005 22:55:30 -0000 1.39 *************** *** 155,162 **** !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "ÊÜíôå êëéê óôï Åðüìåíï ãéá íá óõíå÷ßóåôå" ! ; Installation Log Messages [installer.nis, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] --- 155,166 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "ÊÜíôå êëéê óôï Åðüìåíï ãéá íá óõíå÷ßóåôå" ! ; Installation Log Messages [installer.nsi, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" + ; Installation Log Messages [installer.nsi, addssl.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_SAVELOG "Saving install log file..." + ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] *************** *** 166,169 **** --- 170,179 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Shared: Message box shown if problem detected when trying to save the log file [installer.nsi, addssl.nsi, backup.nsi, restore.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_MB_SAVELOG_ERROR "Error: problem detected when saving the log file" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Shared: Message boxes shown if uninstallation is not straightforward [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 399,403 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SAVELOG "Saving install log file..." ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 409,412 ---- Index: Norwegian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Norwegian-pfi.nsh,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** Norwegian-pfi.nsh 6 Feb 2005 22:59:53 -0000 1.32 --- Norwegian-pfi.nsh 10 Feb 2005 22:55:32 -0000 1.33 *************** *** 155,162 **** !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Trykk Neste for å begyne" ! ; Installation Log Messages [installer.nis, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] --- 155,166 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Trykk Neste for å begyne" ! ; Installation Log Messages [installer.nsi, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" + ; Installation Log Messages [installer.nsi, addssl.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_SAVELOG "Saving install log file..." + ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] *************** *** 166,169 **** --- 170,179 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Shared: Message box shown if problem detected when trying to save the log file [installer.nsi, addssl.nsi, backup.nsi, restore.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_MB_SAVELOG_ERROR "Error: problem detected when saving the log file" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Shared: Message boxes shown if uninstallation is not straightforward [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 399,403 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SAVELOG "Saving install log file..." ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 409,412 ---- Index: Korean-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Korean-pfi.nsh,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** Korean-pfi.nsh 6 Feb 2005 22:59:53 -0000 1.47 --- Korean-pfi.nsh 10 Feb 2005 22:55:32 -0000 1.48 *************** *** 155,162 **** !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "°è¼Ó ÁøÇàÇϱâ À§ÇØ '´ÙÀ½'À» ´©¸£½Ê½Ã¿À." ! ; Installation Log Messages [installer.nis, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "ÀÌÀü ¹öÀüÀÇ POPFileÀ» Á¾·á Áß - Æ÷Æ®:" ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] --- 155,166 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "°è¼Ó ÁøÇàÇϱâ À§ÇØ '´ÙÀ½'À» ´©¸£½Ê½Ã¿À." ! ; Installation Log Messages [installer.nsi, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "ÀÌÀü ¹öÀüÀÇ POPFileÀ» Á¾·á Áß - Æ÷Æ®:" + ; Installation Log Messages [installer.nsi, addssl.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_SAVELOG "Saving install log file..." + ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] *************** *** 166,169 **** --- 170,179 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Shared: Message box shown if problem detected when trying to save the log file [installer.nsi, addssl.nsi, backup.nsi, restore.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_MB_SAVELOG_ERROR "Error: problem detected when saving the log file" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Shared: Message boxes shown if uninstallation is not straightforward [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 409,413 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SAVELOG "Saving install log file..." ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 419,422 ---- |
|
From: Brian S. <xue...@us...> - 2005-02-10 22:51:16
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25427 Modified Files: Arabic-pfi.nsh Bulgarian-pfi.nsh Czech-pfi.nsh Danish-pfi.nsh Dutch-pfi.nsh English-pfi.nsh Finnish-pfi.nsh French-pfi.nsh German-pfi.nsh Log Message: Created a new macro-based function to save the installation log. Index: Danish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Danish-pfi.nsh,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** Danish-pfi.nsh 6 Feb 2005 22:55:32 -0000 1.46 --- Danish-pfi.nsh 10 Feb 2005 22:51:03 -0000 1.47 *************** *** 155,162 **** !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Tryk næste for at fortsætte" ! ; Installation Log Messages [installer.nis, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] --- 155,166 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Tryk næste for at fortsætte" ! ; Installation Log Messages [installer.nsi, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" + ; Installation Log Messages [installer.nsi, addssl.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_SAVELOG "Saving install log file..." + ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] *************** *** 166,169 **** --- 170,179 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Shared: Message box shown if problem detected when trying to save the log file [installer.nsi, addssl.nsi, backup.nsi, restore.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_MB_SAVELOG_ERROR "Error: problem detected when saving the log file" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Shared: Message boxes shown if uninstallation is not straightforward [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 399,403 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SAVELOG "Saving install log file..." ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 409,412 ---- Index: Czech-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Czech-pfi.nsh,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** Czech-pfi.nsh 6 Feb 2005 22:55:32 -0000 1.41 --- Czech-pfi.nsh 10 Feb 2005 22:51:03 -0000 1.42 *************** *** 155,162 **** !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Kliknìte na Dalí pro pokraèování" ! ; Installation Log Messages [installer.nis, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] --- 155,166 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Kliknìte na Dalí pro pokraèování" ! ; Installation Log Messages [installer.nsi, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" + ; Installation Log Messages [installer.nsi, addssl.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_SAVELOG "Saving install log file..." + ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] *************** *** 166,169 **** --- 170,179 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Shared: Message box shown if problem detected when trying to save the log file [installer.nsi, addssl.nsi, backup.nsi, restore.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_MB_SAVELOG_ERROR "Error: problem detected when saving the log file" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Shared: Message boxes shown if uninstallation is not straightforward [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 399,403 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SAVELOG "Saving install log file..." ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 409,412 ---- Index: Dutch-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Dutch-pfi.nsh,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** Dutch-pfi.nsh 6 Feb 2005 22:55:33 -0000 1.46 --- Dutch-pfi.nsh 10 Feb 2005 22:51:04 -0000 1.47 *************** *** 155,162 **** !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Klik op Volgende om verder te gaan" ! ; Installation Log Messages [installer.nis, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] --- 155,166 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Klik op Volgende om verder te gaan" ! ; Installation Log Messages [installer.nsi, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" + ; Installation Log Messages [installer.nsi, addssl.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_SAVELOG "Saving install log file..." + ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] *************** *** 166,169 **** --- 170,179 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Shared: Message box shown if problem detected when trying to save the log file [installer.nsi, addssl.nsi, backup.nsi, restore.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_MB_SAVELOG_ERROR "Error: problem detected when saving the log file" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Shared: Message boxes shown if uninstallation is not straightforward [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 399,403 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SAVELOG "Saving install log file..." ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 409,412 ---- Index: French-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/French-pfi.nsh,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** French-pfi.nsh 6 Feb 2005 22:55:33 -0000 1.48 --- French-pfi.nsh 10 Feb 2005 22:51:05 -0000 1.49 *************** *** 155,162 **** !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Cliquez sur 'Suivant' pour continuer" ! ; Installation Log Messages [installer.nis, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Fermeture de la version précédente de POPFile en utilisant le port" ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] --- 155,166 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Cliquez sur 'Suivant' pour continuer" ! ; Installation Log Messages [installer.nsi, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Fermeture de la version précédente de POPFile en utilisant le port" + ; Installation Log Messages [installer.nsi, addssl.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_SAVELOG "Saving install log file..." + ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] *************** *** 166,169 **** --- 170,179 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Shared: Message box shown if problem detected when trying to save the log file [installer.nsi, addssl.nsi, backup.nsi, restore.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_MB_SAVELOG_ERROR "Error: problem detected when saving the log file" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Shared: Message boxes shown if uninstallation is not straightforward [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 409,413 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SAVELOG "Saving install log file..." ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 419,422 ---- *************** *** 495,506 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_DOWNLOADING "Downloading %s" ! !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_CONNECTING "Connecting ..." ! !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_SECOND "second" ! !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_MINUTE "minute" ! !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_HOUR "hour" ! !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_PLURAL "s" ! !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_PROGRESS "%dkB (%d%%) of %dkB @ %d.%01dkB/s" ! !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_REMAINING " (%d %s%s remaining)" ########################################################################### --- 504,524 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! ;!insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_DOWNLOADING "Downloading %s" ! ;!insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_CONNECTING "Connecting ..." ! ;!insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_SECOND "second" ! ;!insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_MINUTE "minute" ! ;!insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_HOUR "hour" ! ;!insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_PLURAL "s" ! ;!insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_PROGRESS "%dkB (%d%%) of %dkB @ %d.%01dkB/s" ! ;!insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_REMAINING " (%d %s%s remaining)" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_DOWNLOADING "Downloading %s from the Internet" ! !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_CONNECTING "Connecting to the web site..." ! !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_SECOND "SECOND" ! !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_MINUTE "MINUTE" ! !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_HOUR "HOUR" ! !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_PLURAL "S" ! !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_PROGRESS "%d kilbobyte (%d%%) of %dkilobyte @ %d.%01dkB/s" ! !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_REMAINING " (%d %s%s to go for this file)" ########################################################################### Index: German-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/German-pfi.nsh,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** German-pfi.nsh 6 Feb 2005 22:55:34 -0000 1.51 --- German-pfi.nsh 10 Feb 2005 22:51:05 -0000 1.52 *************** *** 157,164 **** !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Klicken Sie auf Weiter um fortzufahren" ! ; Installation Log Messages [installer.nis, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Beende ältere POPFile Version am Port" ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] --- 157,168 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Klicken Sie auf Weiter um fortzufahren" ! ; Installation Log Messages [installer.nsi, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Beende ältere POPFile Version am Port" + ; Installation Log Messages [installer.nsi, addssl.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_SAVELOG "Saving install log file..." + ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] *************** *** 168,171 **** --- 172,181 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Shared: Message box shown if problem detected when trying to save the log file [installer.nsi, addssl.nsi, backup.nsi, restore.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_MB_SAVELOG_ERROR "Error: problem detected when saving the log file" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Shared: Message boxes shown if uninstallation is not straightforward [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 411,415 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SAVELOG "Saving install log file..." ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 421,424 ---- Index: Arabic-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Arabic-pfi.nsh,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Arabic-pfi.nsh 6 Feb 2005 22:55:32 -0000 1.19 --- Arabic-pfi.nsh 10 Feb 2005 22:51:02 -0000 1.20 *************** *** 155,162 **** !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "ÅÖÛØ ÇáÊÇáí ááãÊÇÈÚÉ" ! ; Installation Log Messages [installer.nis, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "ÅÛáÇÞ ÇáäÓÎÉ ÇáÓÇÈÞÉ ãä POPFile Úä ØÑíÞ ÇáãäÝÐ" ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] --- 155,166 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "ÅÖÛØ ÇáÊÇáí ááãÊÇÈÚÉ" ! ; Installation Log Messages [installer.nsi, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "ÅÛáÇÞ ÇáäÓÎÉ ÇáÓÇÈÞÉ ãä POPFile Úä ØÑíÞ ÇáãäÝÐ" + ; Installation Log Messages [installer.nsi, addssl.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_SAVELOG "Saving install log file..." + ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] *************** *** 166,169 **** --- 170,179 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Shared: Message box shown if problem detected when trying to save the log file [installer.nsi, addssl.nsi, backup.nsi, restore.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_MB_SAVELOG_ERROR "Error: problem detected when saving the log file" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Shared: Message boxes shown if uninstallation is not straightforward [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 408,412 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SAVELOG "Saving install log file..." ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 418,421 ---- Index: English-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/English-pfi.nsh,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** English-pfi.nsh 6 Feb 2005 22:55:33 -0000 1.48 --- English-pfi.nsh 10 Feb 2005 22:51:04 -0000 1.49 *************** *** 150,157 **** !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Click Next to continue" ! ; Installation Log Messages [installer.nis, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] --- 150,161 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Click Next to continue" ! ; Installation Log Messages [installer.nsi, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" + ; Installation Log Messages [installer.nsi, addssl.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_SAVELOG "Saving install log file..." + ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] *************** *** 161,164 **** --- 165,174 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Shared: Message box shown if problem detected when trying to save the log file [installer.nsi, addssl.nsi, backup.nsi, restore.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_MB_SAVELOG_ERROR "Error: problem detected when saving the log file" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Shared: Message boxes shown if uninstallation is not straightforward [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 394,398 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SAVELOG "Saving install log file..." ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 404,407 ---- Index: Bulgarian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Bulgarian-pfi.nsh,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** Bulgarian-pfi.nsh 6 Feb 2005 22:55:32 -0000 1.46 --- Bulgarian-pfi.nsh 10 Feb 2005 22:51:02 -0000 1.47 *************** *** 155,162 **** !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Íàòèñíåòå 'Íàïðåä', çà äà ïðîäúëæèòå." ! ; Installation Log Messages [installer.nis, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] --- 155,166 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Íàòèñíåòå 'Íàïðåä', çà äà ïðîäúëæèòå." ! ; Installation Log Messages [installer.nsi, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" + ; Installation Log Messages [installer.nsi, addssl.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_SAVELOG "Saving install log file..." + ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] *************** *** 166,169 **** --- 170,179 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Shared: Message box shown if problem detected when trying to save the log file [installer.nsi, addssl.nsi, backup.nsi, restore.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_MB_SAVELOG_ERROR "Error: problem detected when saving the log file" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Shared: Message boxes shown if uninstallation is not straightforward [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 399,403 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SAVELOG "Saving install log file..." ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 409,412 ---- Index: Finnish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Finnish-pfi.nsh,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** Finnish-pfi.nsh 6 Feb 2005 22:55:33 -0000 1.46 --- Finnish-pfi.nsh 10 Feb 2005 22:51:04 -0000 1.47 *************** *** 155,162 **** !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Klikkaa Seuraava jatkaaksesi" ! ; Installation Log Messages [installer.nis, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] --- 155,166 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Klikkaa Seuraava jatkaaksesi" ! ; Installation Log Messages [installer.nsi, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" + ; Installation Log Messages [installer.nsi, addssl.nsi] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_SAVELOG "Saving install log file..." + ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] *************** *** 166,169 **** --- 170,179 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Shared: Message box shown if problem detected when trying to save the log file [installer.nsi, addssl.nsi, backup.nsi, restore.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_MB_SAVELOG_ERROR "Error: problem detected when saving the log file" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Shared: Message boxes shown if uninstallation is not straightforward [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 399,403 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SAVELOG "Saving install log file..." ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 409,412 ---- |
|
From: Sam S. <ssc...@us...> - 2005-02-10 22:04:52
|
Update of /cvsroot/popfile/engine/POPFile In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7175/POPFile Modified Files: API.pm Module.pm Log Message: Classifier::Bayes is no longer called directly by UI::XMLRPC, removing caller constraint on valid_session_key__. 1-second delay on bad sessions is sufficient. If someone is calling valid_session_key__ from within POPFile there are bigger problems to worry about. Index: Module.pm =================================================================== RCS file: /cvsroot/popfile/engine/POPFile/Module.pm,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** Module.pm 10 Jan 2005 12:59:16 -0000 1.47 --- Module.pm 10 Feb 2005 22:03:58 -0000 1.48 *************** *** 656,659 **** --- 656,660 ---- my $c; my $retcode = sysread( $handle, $c, 1 ); + $self->log_(2, "Slurp from $handle single character $c"); if ( $retcode == 1 ) { if ( $c eq "\012" ) { *************** *** 661,668 **** } else { $slurp_data__{"$handle"}{data} = $c; ! } ! } ! } ! } return $cr; --- 662,669 ---- } else { $slurp_data__{"$handle"}{data} = $c; ! } ! } ! } ! } return $cr; *************** *** 765,769 **** $slurp_data__{"$handle"}{data} .= $c; ! $self->log_( 2, "Read slurp data $c" ); $result = $self->flush_slurp_data__( $handle ); --- 766,770 ---- $slurp_data__{"$handle"}{data} .= $c; ! $self->log_( 2, "Read slurp data from $handle: $c" ); $result = $self->flush_slurp_data__( $handle ); Index: API.pm =================================================================== RCS file: /cvsroot/popfile/engine/POPFile/API.pm,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** API.pm 22 Jan 2005 03:01:32 -0000 1.9 --- API.pm 10 Feb 2005 22:03:56 -0000 1.10 *************** *** 132,138 **** --- 132,141 ---- # Convert the two files into streams that can be passed to the # classifier + open IN, "<$in" or return undef; open OUT, ">$out" or return undef; + + $self->log_() my @result = $self->{c}->classify_and_modify( |
|
From: Sam S. <ssc...@us...> - 2005-02-10 22:04:44
|
Update of /cvsroot/popfile/engine/Classifier In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7175/Classifier Modified Files: Bayes.pm Log Message: Classifier::Bayes is no longer called directly by UI::XMLRPC, removing caller constraint on valid_session_key__. 1-second delay on bad sessions is sufficient. If someone is calling valid_session_key__ from within POPFile there are bigger problems to worry about. Index: Bayes.pm =================================================================== RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v retrieving revision 1.336 retrieving revision 1.337 diff -C2 -d -r1.336 -r1.337 *** Bayes.pm 22 Jan 2005 03:01:30 -0000 1.336 --- Bayes.pm 10 Feb 2005 22:03:46 -0000 1.337 *************** *** 1566,1570 **** select( undef, undef, undef, 1 ); return undef; ! } my $session = $self->generate_unique_session_key__(); --- 1566,1570 ---- select( undef, undef, undef, 1 ); return undef; ! }s my $session = $self->generate_unique_session_key__(); *************** *** 1581,1585 **** #---------------------------------------------------------------------------- # ! # release_session_key # # $session A session key previously returned by get_session_key --- 1581,1585 ---- #---------------------------------------------------------------------------- # ! # release_sessionss_key # # $session A session key previously returned by get_session_key *************** *** 1593,1596 **** --- 1593,1598 ---- $self->mq_post_( "RELSE", $session ); + + return undef; } |
|
From: Joseph C. <tex...@us...> - 2005-02-10 19:44:52
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15234/skins/default Modified Files: style.css Log Message: Box style config bar options. Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/style.css,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** style.css 7 Feb 2005 08:05:51 -0000 1.12 --- style.css 10 Feb 2005 19:44:40 -0000 1.13 *************** *** 250,256 **** margin: 0.3em; padding: 0.3em; - white-space: nowrap; display: inline; float: left; } --- 250,256 ---- margin: 0.3em; padding: 0.3em; display: inline; float: left; + min-height: 3em; } *************** *** 262,264 **** --- 262,273 ---- .checkLabel { border: 1px solid #CCCC99; + white-space: nowrap; + } + + .configBar input.submit { + margin-top: 4px; + } + + .configBar label.configurationLabel { + display: block; } |
|
From: Manni H. <man...@us...> - 2005-02-10 10:12:53
|
Update of /cvsroot/popfile/engine/UI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7903/UI Modified Files: HTML.pm Log Message: Fixed CC column once again. Again, it displayed the subject instead of the CC. I have no idea why it needed fixing twice. Guess the first fix was not a fix at all? Index: HTML.pm =================================================================== RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v retrieving revision 1.335 retrieving revision 1.336 diff -C2 -d -r1.335 -r1.336 *** HTML.pm 9 Feb 2005 11:25:01 -0000 1.335 --- HTML.pm 10 Feb 2005 10:12:43 -0000 1.336 *************** *** 2480,2484 **** } ! my %addresses = ( 'from' => 1, 'to' => 2 , 'cc' => 4 ); if ( defined( $addresses{$header} ) ) { --- 2480,2484 ---- } ! my %addresses = ( 'from' => 1, 'to' => 2 , 'cc' => 3 ); if ( defined( $addresses{$header} ) ) { |
|
From: Manni H. <man...@us...> - 2005-02-09 21:25:16
|
Update of /cvsroot/popfile/engine/Services In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22164/Services Modified Files: IMAP.pm Log Message: Make the IMAP module issue a LOGIN message to mq so that the footer in the UI will show a login. Index: IMAP.pm =================================================================== RCS file: /cvsroot/popfile/engine/Services/IMAP.pm,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** IMAP.pm 5 Jan 2005 12:23:27 -0000 1.14 --- IMAP.pm 9 Feb 2005 21:25:06 -0000 1.15 *************** *** 964,967 **** --- 964,968 ---- if ( $self->get_response__( $imap ) == 1 ) { + $self->mq_post_( 'LOGIN', $login ); return 1; } |
|
From: Manni H. <man...@us...> - 2005-02-09 11:25:22
|
Update of /cvsroot/popfile/engine/UI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18688/UI Modified Files: HTML.pm Log Message: Fix the wrong language string used for the formatting of the message size. Take care of entities coming in from the language files so that HTML::Template won't escape them. Index: HTML.pm =================================================================== RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v retrieving revision 1.334 retrieving revision 1.335 diff -C2 -d -r1.334 -r1.335 *** HTML.pm 26 Jan 2005 11:50:57 -0000 1.334 --- HTML.pm 9 Feb 2005 11:25:01 -0000 1.335 *************** *** 2510,2520 **** if ( defined $size ) { if ( $size >= 1024 * 1024 ) { ! $v = sprintf $self->{language__}{History_Cell_Value_MegaBytes}, $size / ( 1024 * 1024 ); } elsif ( $size >= 1024 ) { ! $v = sprintf $self->{language__}{History_Cell_Value_KiloBytes}, $size / 1024; } else { ! $v =sprintf $self->{language__}{History_Cell_Value_Bytes}, $size; } } $col_data{History_Cell_Value} = $v; $col_data{History_Cell_Title} = --- 2510,2525 ---- if ( defined $size ) { if ( $size >= 1024 * 1024 ) { ! $v = sprintf $self->{language__}{History_Size_MegaBytes}, $size / ( 1024 * 1024 ); } elsif ( $size >= 1024 ) { ! $v = sprintf $self->{language__}{History_Size_KiloBytes}, $size / 1024; } else { ! $v =sprintf $self->{language__}{History_Size_Bytes}, $size; } } + # Replace any entities from the language files with + # the corresponding character (\xa0). Otherwise HTML::Template + # would escape the & with & + $v =~ s/ /\xA0/g; + $col_data{History_Cell_Value} = $v; $col_data{History_Cell_Title} = |
|
From: Manni H. <man...@us...> - 2005-02-09 10:45:44
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2532/skins/default Modified Files: configuration-bar.thtml history-bar.thtml history-page.thtml Log Message: Supply hidden input field containing the current history page number so the current page will not change when clicking on a submit button on the history or the configuration bar. Index: configuration-bar.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/configuration-bar.thtml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** configuration-bar.thtml 7 Feb 2005 03:44:59 -0000 1.8 --- configuration-bar.thtml 9 Feb 2005 10:45:35 -0000 1.9 *************** *** 8,11 **** --- 8,12 ---- <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> + <input type="hidden" name="start_message" value="<TMPL_VAR NAME="History_Start_Message">" /> <select name="skin" id="configSkin"> <optgroup label="<TMPL_VAR NAME="Localize_Configuration_GeneralSkins">"> *************** *** 66,70 **** <input type="submit" class="submit" name="change_language" value="<TMPL_VAR NAME="Localize_Apply">" /> </div> ! <div class="configBarOption toggleConfigBar"> <input type="submit" class="submit" name="hide_configbar" value="<TMPL_VAR NAME="Localize_Configuration_Hide_Bar">" /> --- 67,71 ---- <input type="submit" class="submit" name="change_language" value="<TMPL_VAR NAME="Localize_Apply">" /> </div> ! <div class="configBarOption toggleConfigBar"> <input type="submit" class="submit" name="hide_configbar" value="<TMPL_VAR NAME="Localize_Configuration_Hide_Bar">" /> Index: history-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/history-page.thtml,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** history-page.thtml 7 Feb 2005 08:05:51 -0000 1.53 --- history-page.thtml 9 Feb 2005 10:45:35 -0000 1.54 *************** *** 299,303 **** <p> </td> ! </tr> </table> --- 299,303 ---- <p> </td> ! </tr> </table> *************** *** 317,320 **** --- 317,321 ---- <input type="submit" class="submit" name="show_configbar" value="<TMPL_VAR NAME="Localize_Configuration_Show_Bar">" /> <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> + <input type="hidden" name="start_message" value="<TMPL_VAR NAME="History_Start_Message">" /> </div> </form> Index: history-bar.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/history-bar.thtml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** history-bar.thtml 7 Feb 2005 03:44:59 -0000 1.10 --- history-bar.thtml 9 Feb 2005 10:45:35 -0000 1.11 *************** *** 21,25 **** <TMPL_IF NAME="Configuration_Field_Visible"> ! <span class="checkLabel"><input type="checkbox" id="<TMPL_VAR NAME="Configuration_Field_Name">" class="checkbox" name="<TMPL_VAR NAME="Configuration_Field_Name">"> <TMPL_VAR NAME="Configuration_Localized_Field_Name"> </span> <TMPL_ELSE> --- 21,25 ---- <TMPL_IF NAME="Configuration_Field_Visible"> ! <span class="checkLabel"><input type="checkbox" id="<TMPL_VAR NAME="Configuration_Field_Name">" class="checkbox" name="<TMPL_VAR NAME="Configuration_Field_Name">"> <TMPL_VAR NAME="Configuration_Localized_Field_Name"> </span> <TMPL_ELSE> *************** *** 32,35 **** --- 32,36 ---- <input type="submit" class="submit" name="update_fields" value="<TMPL_VAR NAME="Localize_Apply">" /> <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> + <input type="hidden" name="start_message" value="<TMPL_VAR NAME="History_Start_Message">" /> </div> |
|
From: Brian S. <xue...@us...> - 2005-02-08 15:12:13
|
Update of /cvsroot/popfile/windows/add-ons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19723 Modified Files: addssl.nsi Log Message: Updated to use the same 'include' file as the main POPFile installer. Index: addssl.nsi =================================================================== RCS file: /cvsroot/popfile/windows/add-ons/addssl.nsi,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** addssl.nsi 8 Jan 2005 14:58:40 -0000 1.5 --- addssl.nsi 8 Feb 2005 15:12:00 -0000 1.6 *************** *** 10,13 **** --- 10,16 ---- # A patch status message is always displayed. # + # An 'include' file is used to ensure this utility and the main POPFile + # installer download and install the same SSL support files. + # # Copyright (c) 2004-2005 John Graham-Cumming # *************** *** 48,51 **** --- 51,56 ---- ; (${NSISDIR}\Plugins\). The 'untgz' source and example files can be unzipped to the ; ${NSISDIR}\Contrib\untgz\ folder if you wish, but this step is entirely optional. + ; + ; Tested with versions 1.0.5, 1.0.6 and 1.0.7 of the 'untgz' plugin. ;------------------------------------------------ *************** *** 58,61 **** --- 63,78 ---- ; where Module.pm was CVS version 1.40 and Module_ssl.pm was CVS version 1.41. + #-------------------------------------------------------------------------- + # Compile-time command-line switches (used by 'makensis.exe') + #-------------------------------------------------------------------------- + # + # /DENGLISH_MODE + # + # To build an 'SSL Setup' wizard that only displays English messages (so there is no need to + # ensure all of the non-English *-pfi.nsh files are up-to-date), supply the command-line + # switch /DENGLISH_MODE when compiling this script. + # + #-------------------------------------------------------------------------- + ;------------------------------------------------ ; Define PFI_VERBOSE to get more compiler output *************** *** 92,96 **** Name "POPFile SSL Setup" ! !define C_PFI_VERSION "0.0.12" ; Mention the wizard's version number in the window title --- 109,113 ---- Name "POPFile SSL Setup" ! !define C_PFI_VERSION "0.0.13" ; Mention the wizard's version number in the window title *************** *** 104,118 **** #-------------------------------------------------------------------------- - # URLs used to download the necessary SSL support archives and files - # (all from the University of Winnipeg Repository) - #-------------------------------------------------------------------------- - - !define C_UWR_IO_SOCKET_SSL "http://theoryx5.uwinnipeg.ca/ppms/x86/IO-Socket-SSL.tar.gz" - !define C_UWR_NET_SSLEAY "http://theoryx5.uwinnipeg.ca/ppms/x86/Net_SSLeay.pm.tar.gz" - !define C_UWR_DLL_SSLEAY32 "http://theoryx5.uwinnipeg.ca/ppms/scripts/ssleay32.dll" - !define C_UWR_DLL_LIBEAY32 "http://theoryx5.uwinnipeg.ca/ppms/scripts/libeay32.dll" - - - #-------------------------------------------------------------------------- # User Registers (Global) #-------------------------------------------------------------------------- --- 121,124 ---- *************** *** 123,130 **** Var G_MPLIBDIR ; full path to the folder used for most of the minimal Perl files - Var G_SSL_FILEURL ; full URL used to download SSL file - Var G_PLS_FIELD_1 ; used to customize some language strings - Var G_PLS_FIELD_2 ; ditto ; NSIS provides 20 general purpose user registers: --- 129,133 ---- *************** *** 174,182 **** VIAddVersionKey "CompanyName" "The POPFile Project" VIAddVersionKey "LegalCopyright" "Copyright (c) 2005 John Graham-Cumming" ! VIAddVersionKey "FileDescription" "Installs SSL support for POPFile 0.22.x" VIAddVersionKey "FileVersion" "${C_PFI_VERSION}" VIAddVersionKey "OriginalFilename" "${C_OUTFILE}" ! VIAddVersionKey "Build" "English-Mode" VIAddVersionKey "Build Date/Time" "${__DATE__} @ ${__TIME__}" --- 177,189 ---- VIAddVersionKey "CompanyName" "The POPFile Project" VIAddVersionKey "LegalCopyright" "Copyright (c) 2005 John Graham-Cumming" ! VIAddVersionKey "FileDescription" "Installs SSL support for POPFile 0.22 or later" VIAddVersionKey "FileVersion" "${C_PFI_VERSION}" VIAddVersionKey "OriginalFilename" "${C_OUTFILE}" ! !ifndef ENGLISH_MODE ! VIAddVersionKey "Build" "Multi-Language" ! !else ! VIAddVersionKey "Build" "English-Mode" ! !endif VIAddVersionKey "Build Date/Time" "${__DATE__} @ ${__TIME__}" *************** *** 254,257 **** --- 261,279 ---- !define MUI_CUSTOMFUNCTION_GUIINIT PFIGUIInit + ;---------------------------------------------------------------- + ; Language Settings for MUI pages + ;---------------------------------------------------------------- + + ; Override the standard "Installer Language" title to avoid confusion. + + !define MUI_LANGDLL_WINDOWTITLE "SSL Setup" + + ; Use the language selected when POPFile was last installed or updated + ; (if the language setting is not found, the user will be asked to select a language) + + !define MUI_LANGDLL_REGISTRY_ROOT "HKCU" + !define MUI_LANGDLL_REGISTRY_KEY "SOFTWARE\POPFile Project\${C_PFI_PRODUCT}\MRI" + !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language" + #-------------------------------------------------------------------------- *************** *** 339,447 **** #-------------------------------------------------------------------------- ! !insertmacro MUI_LANGUAGE "English" ! ! ;-------------------------------------------------------------------------- ! ; Current build only supports English and uses local strings ! ; instead of language strings from languages\*-pfi.nsh files ! ;-------------------------------------------------------------------------- ! ! !macro PLS_TEXT NAME VALUE ! LangString ${NAME} ${LANG_ENGLISH} "${VALUE}" ! !macroend ! ! ;-------------------------------------------------------------------------- ! ; WELCOME page ! ;-------------------------------------------------------------------------- ! ! !insertmacro PLS_TEXT PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PLS_TEXT PSS_LANG_WELCOME_TEXT "This utility will download and install the files needed to allow POPFile to use SSL when accessing mail servers.${IO_NL}${IO_NL}This version does not configure any email accounts to use SSL, it just installs the necessary Perl components and DLLs.${IO_NL}${IO_NL}This product downloads software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/)${IO_NL}${IO_NL}~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~${IO_NL}${IO_NL} PLEASE SHUT DOWN POPFILE NOW${IO_NL}${IO_NL}~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~${IO_NL}${IO_NL}$_CLICK" ! ! ;-------------------------------------------------------------------------- ! ; LICENSE page ! ;-------------------------------------------------------------------------- ! ! !insertmacro PLS_TEXT PSS_LANG_LICENSE_SUBHDR "Please review the license terms before using $(^NameDA)." ! !insertmacro PLS_TEXT PSS_LANG_LICENSE_BOTTOM "If you accept the terms of the agreement, click the check box below. You must accept the agreement to use $(^NameDA). $_CLICK" ! ! ;-------------------------------------------------------------------------- ! ; Source DIRECTORY page ! ;-------------------------------------------------------------------------- ! ! !insertmacro PLS_TEXT PSS_LANG_DESTNDIR_TITLE "Choose existing POPFile installation" ! !insertmacro PLS_TEXT PSS_LANG_DESTNDIR_SUBTITLE "SSL support should only be added to an existing POPFile 0.22.x installation" ! !insertmacro PLS_TEXT PSS_LANG_DESTNDIR_TEXT_TOP "SSL support must be installed using the same installation folder as POPFile 0.22.x.${MB_NL}${MB_NL}This utility will add SSL support to the version of POPFile which is installed in the following folder. To install in a different POPFile 0.22.x installation, click Browse and select another folder. $_CLICK" ! !insertmacro PLS_TEXT PSS_LANG_DESTNDIR_TEXT_DESTN "Existing POPFile 0.22.x installation folder" ! ! !insertmacro PLS_TEXT PSS_LANG_DESTNDIR_MB_WARN_1 "POPFile 0.22.x does NOT seem to be installed in${MB_NL}${MB_NL}$G_PLS_FIELD_1" ! !insertmacro PLS_TEXT PSS_LANG_DESTNDIR_MB_WARN_2 "Are you sure you want to use this folder ?" ! ! ;-------------------------------------------------------------------------- ! ; INSTFILES page ! ;-------------------------------------------------------------------------- ! ! ; Initial page header ! ! !insertmacro PLS_TEXT PSS_LANG_STD_HDR "Installing SSL support (for POPFile 0.22.x)" ! !insertmacro PLS_TEXT PSS_LANG_STD_SUBHDR "Please wait while the SSL files are downloaded and installed..." ! ! ; Successful completion page header ! ! !insertmacro PLS_TEXT PSS_LANG_END_HDR "POPFile SSL Support installation completed" ! !insertmacro PLS_TEXT PSS_LANG_END_SUBHDR "SSL support for POPFile has been installed successfully" ! ! ; Unsuccessful completion page header ! ! !insertmacro PLS_TEXT PSS_LANG_ABORT_HDR "POPFile SSL Support installation failed" ! !insertmacro PLS_TEXT PSS_LANG_ABORT_SUBHDR "The attempt to add SSL support to POPFile has failed" ! ! ; Progress reports ! ! !insertmacro PLS_TEXT PSS_LANG_PROG_INITIALISE "Initializing..." ! !insertmacro PLS_TEXT PSS_LANG_PROG_STARTDOWNLOAD "Downloading $G_PLS_FIELD_1 file from $G_PLS_FIELD_2" ! !insertmacro PLS_TEXT PSS_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." ! !insertmacro PLS_TEXT PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" ! !insertmacro PLS_TEXT PSS_LANG_PROG_FILECOPY "Copying $G_PLS_FIELD_2 files..." ! !insertmacro PLS_TEXT PSS_LANG_PROG_FILEEXTRACT "Extracting files from $G_PLS_FIELD_2 archive..." ! !insertmacro PLS_TEXT PSS_LANG_PROG_SUCCESS "POPFile 0.22.x SSL support installed" ! !insertmacro PLS_TEXT PSS_LANG_PROG_SAVELOG "Saving install log file..." ! ! !insertmacro PLS_TEXT PSS_LANG_TAKE_A_FEW_SECONDS "(this may take a few seconds)" ! ! ;-------------------------------------------------------------------------- ! ; FINISH page ! ;-------------------------------------------------------------------------- ! ! !insertmacro PLS_TEXT PSS_LANG_FINISH_TITLE "Completing the $(^NameDA) Wizard" ! !insertmacro PLS_TEXT PSS_LANG_FINISH_TEXT "SSL support for POPFile 0.22.x has been installed.${IO_NL}${IO_NL}You can now start POPFile and configure POPFile and your email client to use SSL.${IO_NL}${IO_NL}Click Finish to close this wizard." ! ! !insertmacro PLS_TEXT PSS_LANG_FINISH_README "Important information" ! ! ;-------------------------------------------------------------------------- ! ; Miscellaneous strings ! ;-------------------------------------------------------------------------- ! ! !insertmacro PLS_TEXT PSS_LANG_MUTEX "Another copy of the SSL Setup wizard is running!" ! ! !insertmacro PLS_TEXT PSS_LANG_COMPAT_NOTFOUND "Warning: Cannot find compatible version of POPFile !" ! ! !insertmacro PLS_TEXT PSS_LANG_ABORT_WARNING "Are you sure you want to quit the $(^NameDA) Wizard?" ! ! !insertmacro PLS_TEXT PSS_LANG_MB_NSISDLFAIL_1 "Download of $G_PLS_FIELD_1 file failed" ! !insertmacro PLS_TEXT PSS_LANG_MB_NSISDLFAIL_2 "(error: $G_PLS_FIELD_2)" ! !insertmacro PLS_TEXT PSS_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PLS_TEXT PSS_LANG_PREPAREPATCH "Updating Module.pm (to avoid slow speed SSL downloads)" ! !insertmacro PLS_TEXT PSS_LANG_PATCHSTATUS "Module.pm patch status: $G_PLS_FIELD_1" ! !insertmacro PLS_TEXT PSS_LANG_PATCHCOMPLETED "Module.pm file has been updated" ! !insertmacro PLS_TEXT PSS_LANG_PATCHFAILED "Module.pm file has not been updated" ! ; Strings required by the PFI Library functions ! !insertmacro PLS_TEXT PFI_LANG_INST_LOG_SHUTDOWN "Shutting down POPFile using port" ! !insertmacro PLS_TEXT PFI_LANG_TAKE_A_FEW_SECONDS "This may take a few seconds..." ! !insertmacro PLS_TEXT PFI_LANG_MBMANSHUT_1 "Unable to shutdown '$G_PLS_FIELD_1' automatically." ! !insertmacro PLS_TEXT PFI_LANG_MBMANSHUT_2 "Please shutdown '$G_PLS_FIELD_1' manually now." ! !insertmacro PLS_TEXT PFI_LANG_MBMANSHUT_3 "When '$G_PLS_FIELD_1' has been shutdown, click 'OK' to continue." --- 361,377 ---- #-------------------------------------------------------------------------- ! ;----------------------------------------- ! ; Select the languages to be supported by the wizard ! ;----------------------------------------- ! ; At least one language must be specified for the wizard (the default is "English") ! !insertmacro PFI_LANG_LOAD "English" ! ; Conditional compilation: if ENGLISH_MODE is defined, support only 'English' ! !ifndef ENGLISH_MODE ! !include "..\pfi-languages.nsh" ! !endif *************** *** 472,476 **** --- 402,426 ---- ; for BZIP2 and LZMA compression) + !insertmacro MUI_RESERVEFILE_LANGDLL !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS + ReserveFile "${NSISDIR}\Plugins\NSISdl.dll" + ReserveFile "${NSISDIR}\Plugins\System.dll" + ReserveFile "${NSISDIR}\Plugins\untgz.dll" + ReserveFile "${NSISDIR}\Plugins\vpatch.dll" + + + #-------------------------------------------------------------------------- + # Installer Function: .onInit - the wizard starts by offering a choice of languages + #-------------------------------------------------------------------------- + + Function .onInit + + ; Conditional compilation: if ENGLISH_MODE is defined, support only 'English' + + !ifndef ENGLISH_MODE + !insertmacro MUI_LANGDLL_DISPLAY + !endif + + FunctionEnd *************** *** 499,508 **** mutex_ok: - - ; The wizard does not contain the SSL support files so we provide an estimate which - ; includes a slack space allowance (based upon the development system's statistics) - - SectionSetSize 0 2560 - Pop ${L_RESERVED} --- 449,452 ---- *************** *** 513,545 **** #-------------------------------------------------------------------------- ! # Installer Section: POPFile SSL Support #-------------------------------------------------------------------------- ! Section "SSL" SecSSL ! ! !define L_RESULT $R0 ; used by the 'untgz' plugin to return the result ! ! Push ${L_RESULT} SetDetailsPrint listonly DetailPrint "----------------------------------------------------" ! DetailPrint "POPFile SSL Setup wizard v${C_PFI_VERSION}" DetailPrint "----------------------------------------------------" - ; Download the archives and OpenSSL DLLs - - Push "${C_UWR_IO_SOCKET_SSL}" - Call GetSSLFile - - Push "${C_UWR_NET_SSLEAY}" - Call GetSSLFile - - Push "${C_UWR_DLL_SSLEAY32}" - Call GetSSLFile - - Push "${C_UWR_DLL_LIBEAY32}" - Call GetSSLFile - ; Make sure we do not try to add SSL support to an installation which is in use --- 457,473 ---- #-------------------------------------------------------------------------- ! # Installer Section: Prepare to download and install the SSL Support files #-------------------------------------------------------------------------- ! Section "-prepare" + SetDetailsPrint textonly + DetailPrint "$(PFI_LANG_INST_PROG_UPGRADE) $(PFI_LANG_TAKE_A_FEW_SECONDS)" SetDetailsPrint listonly DetailPrint "----------------------------------------------------" ! DetailPrint "POPFile SSL Setup v${C_PFI_VERSION}" DetailPrint "----------------------------------------------------" ; Make sure we do not try to add SSL support to an installation which is in use *************** *** 551,637 **** SetOutPath $G_ROOTDIR File "addssl.txt" - - ; Now install the files required for SSL support - - StrCpy $G_MPLIBDIR "$G_ROOTDIR\lib" - - StrCpy $G_PLS_FIELD_1 "$G_MPLIBDIR\IO\Socket" - DetailPrint "" - CreateDirectory $G_PLS_FIELD_1 - SetDetailsPrint both - StrCpy $G_PLS_FIELD_2 "IO-Socket-SSL.tar.gz" - DetailPrint "$(PSS_LANG_PROG_FILEEXTRACT)" - SetDetailsPrint listonly - untgz::extractFile -d "$G_PLS_FIELD_1" "$PLUGINSDIR\IO-Socket-SSL.tar.gz" "SSL.pm" - StrCmp ${L_RESULT} "success" label_a error_exit - - label_a: DetailPrint "" - StrCpy $G_PLS_FIELD_1 "$G_MPLIBDIR\Net" - CreateDirectory $G_PLS_FIELD_1 - SetDetailsPrint both - StrCpy $G_PLS_FIELD_2 "Net_SSLeay.pm.tar.gz" - DetailPrint "$(PSS_LANG_PROG_FILEEXTRACT)" - SetDetailsPrint listonly - untgz::extractFile -d "$G_PLS_FIELD_1" "$PLUGINSDIR\Net_SSLeay.pm.tar.gz" "SSLeay.pm" - StrCmp ${L_RESULT} "success" label_b error_exit ! label_b: ! DetailPrint "" ! StrCpy $G_PLS_FIELD_1 "$G_MPLIBDIR\Net\SSLeay" ! CreateDirectory $G_PLS_FIELD_1 ! SetDetailsPrint both ! StrCpy $G_PLS_FIELD_2 "Net_SSLeay.pm.tar.gz" ! DetailPrint "$(PSS_LANG_PROG_FILEEXTRACT)" ! SetDetailsPrint listonly ! untgz::extractFile -d "$G_PLS_FIELD_1" "$PLUGINSDIR\Net_SSLeay.pm.tar.gz" "Handle.pm" ! StrCmp ${L_RESULT} "success" label_c error_exit ! ! label_c: ! DetailPrint "" ! StrCpy $G_PLS_FIELD_1 "$G_MPLIBDIR\auto\Net\SSLeay" ! CreateDirectory $G_PLS_FIELD_1 ! SetDetailsPrint both ! StrCpy $G_PLS_FIELD_2 "OpenSSL DLL" ! DetailPrint "$(PSS_LANG_PROG_FILECOPY)" ! SetDetailsPrint listonly ! CopyFiles /SILENT "$PLUGINSDIR\ssleay32.dll" "$G_PLS_FIELD_1\ssleay32.dll" ! CopyFiles /SILENT "$PLUGINSDIR\libeay32.dll" "$G_PLS_FIELD_1\libeay32.dll" ! DetailPrint "" ! SetDetailsPrint both ! StrCpy $G_PLS_FIELD_2 "Net_SSLeay.pm.tar.gz" ! DetailPrint "$(PSS_LANG_PROG_FILEEXTRACT)" ! SetDetailsPrint listonly ! untgz::extractV -j -d "$G_PLS_FIELD_1" "$PLUGINSDIR\Net_SSLeay.pm.tar.gz" -x ".exists" "*.html" "*.pl" "*.pm" -- ! StrCmp ${L_RESULT} "success" check_bs_file - error_exit: - SetDetailsPrint listonly - DetailPrint "" - SetDetailsPrint both - DetailPrint "$(PSS_LANG_MB_UNPACKFAIL)" - SetDetailsPrint listonly - DetailPrint "" - MessageBox MB_OK|MB_ICONSTOP "$(PSS_LANG_MB_UNPACKFAIL)" ! error_timestamp: ! Call GetDateTimeStamp ! Pop $G_PLS_FIELD_1 ! DetailPrint "----------------------------------------------------" ! DetailPrint "POPFile SSL Setup failed ($G_PLS_FIELD_1)" ! DetailPrint "----------------------------------------------------" ! Abort ! check_bs_file: - ; 'untgz' versions earlier than 1.0.6 (released 28 November 2004) are unable to extract - ; empty files so this script creates the empty 'SSLeay.bs' file if necessary - ; (to ensure all of the $G_MPLIBDIR\auto\Net\SSLeay\SSLeay.* files exist) ! IfFileExists "$G_PLS_FIELD_1\SSLeay.bs" done ! File "/oname=$G_PLS_FIELD_1\SSLeay.bs" "zerobyte.file" ! done: ! DetailPrint "" ; Now patch Module.pm (if it needs to be patched) --- 479,500 ---- SetOutPath $G_ROOTDIR File "addssl.txt" DetailPrint "" ! SectionEnd ! #-------------------------------------------------------------------------- ! # Installer Section: Download and install POPFile SSL Support files ! # (the 'include' file contains more than just the 'Section' code) ! #-------------------------------------------------------------------------- ! !include "..\getssl.nsh" ! #-------------------------------------------------------------------------- ! # Installer Section: Apply the SSL speed-up patch if necessary then tidy up ! #-------------------------------------------------------------------------- ! Section "-tidyup" ; Now patch Module.pm (if it needs to be patched) *************** *** 665,669 **** SetDetailsPrint listonly DetailPrint "" ! Goto error_timestamp success: --- 528,537 ---- SetDetailsPrint listonly DetailPrint "" ! Call GetDateTimeStamp ! Pop $G_PLS_FIELD_1 ! DetailPrint "----------------------------------------------------" ! DetailPrint "POPFile SSL Setup failed ($G_PLS_FIELD_1)" ! DetailPrint "----------------------------------------------------" ! Abort success: *************** *** 700,707 **** SetDetailsPrint none - Pop ${L_RESULT} - - !undef L_RESULT - SectionEnd --- 568,571 ---- *************** *** 927,975 **** #-------------------------------------------------------------------------- - # Installer Function: GetSSLFile - # - # Inputs: - # (top of stack) - full URL used to download the SSL file - # Outputs: - # none - #-------------------------------------------------------------------------- - - Function GetSSLFile - - Pop $G_SSL_FILEURL - - 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 - IntOp $G_PLS_FIELD_2 $G_PLS_FIELD_2 + 1 - StrCpy $G_PLS_FIELD_1 "$G_PLS_FIELD_1" "" $G_PLS_FIELD_2 - StrCpy $G_PLS_FIELD_2 "$G_SSL_FILEURL" $G_PLS_FIELD_2 - DetailPrint "" - DetailPrint "$(PSS_LANG_PROG_STARTDOWNLOAD)" - NSISdl::download "$G_SSL_FILEURL" "$PLUGINSDIR\$G_PLS_FIELD_1" - Pop $G_PLS_FIELD_2 - StrCmp $G_PLS_FIELD_2 "success" file_received - SetDetailsPrint both - DetailPrint "$(PSS_LANG_MB_NSISDLFAIL_1)" - SetDetailsPrint listonly - DetailPrint "$(PSS_LANG_MB_NSISDLFAIL_2)" - MessageBox MB_OK|MB_ICONEXCLAMATION "$(PSS_LANG_MB_NSISDLFAIL_1)${MB_NL}$(PSS_LANG_MB_NSISDLFAIL_2)" - SetDetailsPrint listonly - DetailPrint "" - Call GetDateTimeStamp - Pop $G_PLS_FIELD_1 - DetailPrint "----------------------------------------------------" - DetailPrint "POPFile SSL Setup failed ($G_PLS_FIELD_1)" - DetailPrint "----------------------------------------------------" - Abort - - file_received: - FunctionEnd - - - #-------------------------------------------------------------------------- # Installer Function: DumpLog # --- 791,794 ---- |
|
From: Brian S. <xue...@us...> - 2005-02-08 15:11:27
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18736 Modified Files: pfi-library.nsh Log Message: Conditional compilation updated to cope with making the addssl.nsi script use the getssl.nsh 'include' file. Index: pfi-library.nsh =================================================================== RCS file: /cvsroot/popfile/windows/pfi-library.nsh,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** pfi-library.nsh 6 Feb 2005 23:12:35 -0000 1.59 --- pfi-library.nsh 8 Feb 2005 15:11:13 -0000 1.60 *************** *** 57,61 **** #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.1.4" #-------------------------------------------------------------------------- --- 57,61 ---- #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.1.5" #-------------------------------------------------------------------------- *************** *** 142,146 **** ; (2) '*-pfi.nsh' contains the text strings used for pages, progress reports, logs etc ! !ifdef TRANSLATOR | TRANSLATOR_AUW !macro PFI_LANG_LOAD LANG !insertmacro MUI_LANGUAGE "${LANG}" --- 142,146 ---- ; (2) '*-pfi.nsh' contains the text strings used for pages, progress reports, logs etc ! !ifdef ADDSSL | TRANSLATOR | TRANSLATOR_AUW !macro PFI_LANG_LOAD LANG !insertmacro MUI_LANGUAGE "${LANG}" *************** *** 231,234 **** --- 231,236 ---- # DeleteSkin # SectionNotSelected + # + # Note: The 'translator.nsi' script builds the utility which tests the translations. #============================================================================== *************** *** 310,313 **** --- 312,317 ---- # SkinCaseChange # Copy_HKLM_to_HKCU + # + # Note: The 'transAUW.nsi' script builds the utility which tests the translations. #============================================================================== |
|
From: Brian S. <xue...@us...> - 2005-02-08 13:29:16
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8853 Modified Files: getssl.nsh Log Message: If the optional SSL component is selected for installation, increase the "Space Required" estimate (need to do this because the SSL files are not included in the installer). Index: getssl.nsh =================================================================== RCS file: /cvsroot/popfile/windows/getssl.nsh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** getssl.nsh 6 Feb 2005 23:19:10 -0000 1.1 --- getssl.nsh 8 Feb 2005 13:28:50 -0000 1.2 *************** *** 90,93 **** --- 90,98 ---- !endif + ; The wizard does not contain the SSL support files so we provide an estimate which + ; includes a slack space allowance (based upon the development system's statistics) + + AddSize 2560 + !define L_RESULT $R0 ; used by the 'untgz' plugin to return the result |
|
From: Joseph C. <tex...@us...> - 2005-02-07 08:06:30
|
Update of /cvsroot/popfile/engine/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16543/languages Modified Files: English-UK.msg English.msg Log Message: A bunch of skin updates. Current version of config bar is now skinned on Default, Windows, and OceanBlue. Some changes may cause side effects with existing skins, those we are keeping will be fixed. Index: English-UK.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/English-UK.msg,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** English-UK.msg 6 Feb 2005 02:03:58 -0000 1.8 --- English-UK.msg 7 Feb 2005 08:05:35 -0000 1.9 *************** *** 168,172 **** Configuration_SmallSkins Small Skins Configuration_TinySkins Tiny Skins ! Configuration_CurrentLogFile <current log file> Configuration_SOCKSServer SOCKS V proxy host Configuration_SOCKSPort SOCKS V proxy port --- 168,172 ---- Configuration_SmallSkins Small Skins Configuration_TinySkins Tiny Skins ! Configuration_CurrentLogFile <View current log file> Configuration_SOCKSServer SOCKS V proxy host Configuration_SOCKSPort SOCKS V proxy port Index: English.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/English.msg,v retrieving revision 1.82 retrieving revision 1.83 diff -C2 -d -r1.82 -r1.83 *** English.msg 6 Feb 2005 02:03:58 -0000 1.82 --- English.msg 7 Feb 2005 08:05:36 -0000 1.83 *************** *** 168,172 **** Configuration_SmallSkins Small Skins Configuration_TinySkins Tiny Skins ! Configuration_CurrentLogFile <current log file> Configuration_SOCKSServer SOCKS V proxy host Configuration_SOCKSPort SOCKS V proxy port --- 168,172 ---- Configuration_SmallSkins Small Skins Configuration_TinySkins Tiny Skins ! Configuration_CurrentLogFile <View current log file> Configuration_SOCKSServer SOCKS V proxy host Configuration_SOCKSPort SOCKS V proxy port |
11 messages has been excluded from this view by a project administrator.
