[popfile-commit] engine/Classifier Bayes.pm,1.327.4.5,1.327.4.6

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

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

Modified Files:
      Tag: b0_22_2
	Bayes.pm 
Log Message:
By default the UI operates in Stealth Mode and X-POPFile-Link uses
"127.0.0.1". Some email clients (e.g. Eudora 6.x and 7.x) display
an annoying warning/confirmation message when this link is clicked.

The new bayes_localhostname configuration item is only used when the
UI is operating in Stealth Mode.

By default the bayes_localhostname configuration item is empty 
so X-POPFile-Link will use "127.0.0.1"

bayes_localhostname can be used to specify a name which stops these
messages from being displayed. Eudora still displays these messages
if "localhost" is used because it expects to find at least one dot
in the name (eg it is happy with a name like "froggie.gremlin")

Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.327.4.5
retrieving revision 1.327.4.6
diff -C2 -d -r1.327.4.5 -r1.327.4.6
*** Bayes.pm	6 Feb 2006 15:15:52 -0000	1.327.4.5
--- Bayes.pm	16 Feb 2006 12:10:46 -0000	1.327.4.6
***************
*** 259,262 ****
--- 259,269 ----
      $self->config_( 'xpl_angle', 0 );
  
+     # This parameter is used when the UI is operating in Stealth Mode.
+     # If left blank (the default setting) the X-POPFile-Link will use 127.0.0.1
+     # otherwise it will use this string instead. The system's HOSTS file should
+     # map the string to 127.0.0.1
+ 
+     $self->config_( 'localhostname', '' );
+ 
      # This is a bit mask used to control options when we are using the
      # default SQLite database.  By default all the options are on.
***************
*** 2704,2709 ****
      my $xpl = $self->config_( 'xpl_angle' )?'<':'';
  
      $xpl .= "http://";
!     $xpl .= $self->module_config_( 'html', 'local' )?"127.0.0.1":$self->config_( 'hostname' );
      $xpl .= ":" . $self->module_config_( 'html', 'port' ) . "/jump_to_message?view=$slot";
  
--- 2711,2720 ----
      my $xpl = $self->config_( 'xpl_angle' )?'<':'';
  
+     my $xpl_localhost = ($self->config_( 'localhostname' ) eq '')?"127.0.0.1":$self->config_( 'localhostname' );
+ 
      $xpl .= "http://";
! 
!     $xpl .= $self->module_config_( 'html', 'local' )?$xpl_localhost:$self->config_( 'hostname' );
! 
      $xpl .= ":" . $self->module_config_( 'html', 'port' ) . "/jump_to_message?view=$slot";