X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fpop3-fma.el;h=293efe6a727831e215920302f45cb1978bf5c276;hb=dc25de85e0f7740aedad3dfe7f5c4be9db7666d8;hp=aa1a97f5012143b7fde934070e542f7ff1f9f287;hpb=a7b138a4c3d17eba86ac7487710dc9c00460a3da;p=elisp%2Fgnus.git-

diff --git a/lisp/pop3-fma.el b/lisp/pop3-fma.el
index aa1a97f..293efe6 100644
--- a/lisp/pop3-fma.el
+++ b/lisp/pop3-fma.el
@@ -3,7 +3,7 @@
 ;;                                                           Yasuo Okabe
 ;; Author: Tatsuya Ichikawa <t-ichi@po.shiojiri.ne.jp>
 ;;         Yasuo OKABE <okabe@kuis.kyoto-u.ac.jp>
-;; Version: 0.21
+;; Version: 1.16
 ;; Keywords: mail , gnus , pop3
 ;;
 ;; SPECIAL THANKS
@@ -41,12 +41,18 @@
 ;;  (require 'pop3-fma)
 ;;  (setq pop3-fma-spool-file-alist
 ;;        '(
-;;  	    "po:username0@mailhost0.your.domain0"
-;;	    "po:username1@mailhost1.your.domain1"
+;;  	    ("po:username0@mailhost0.your.domain0" pass)
+;;	    ("po:username1@mailhost1.your.domain1" apop)
 ;;                         :
 ;;                         :
 ;;	   ))
 ;;
+;;	pass means normal authentication USER/PASS.
+;;	apop means authentication using APOP.
+;;
+;; When using apop , Please set pop3-fma-movemail-type 'lisp.
+;; movemail.exe does not work on APOP protocol.
+;;
 ;; Variables
 ;;
 ;;  pop3-fma-spool-file-alist      ... Spool file alist of POP3 protocol
@@ -72,30 +78,21 @@
     (` (defvar (, symbol) (, value) (, doc))))
   )
 
-(unless (and (fboundp 'pop3-fma-encode-string)
-	     (fboundp 'pop3-fma-decode-string))
-  (require 'mel-b)
-  (fset 'pop3-fma-encode-string 'base64-encode-string)
-  (fset 'pop3-fma-decode-string 'base64-decode-string))
-
 (defgroup pop3-fma nil
   "Multile POP3 account utility for Gnus."
   :prefix "pop3-fma-"
   :group 'mail
   :group 'news)
 
-(defconst pop3-fma-version-number "0.21")
+(defconst pop3-fma-version-number "1.16")
 (defconst pop3-fma-codename
-;;  "Feel the wind"		; 0.10
-;;  "My home town"  		; 0.11
-;;  "On the road"		; 0.12
-;;  "Rock'n Roll city"		; 0.13
-;;  "Money"			; 0.20
-  "Still 19"       		; 0.21
-;;  "J boy"          		; 0.xx
-;;  "Blood line"		; 0.xx
-;;  "Star ring"			; 0.xx
-;;  "Goodbye Game"		; 0.xx
+;;  "J boy"          		; 1.00
+;;  "Blood line"		; 1.10
+;;  "Star ring"			; 1.11
+;;  "Goodbye Game"		; 1.12
+;;  "Love is Gamble"		; 1.13
+;;  "Lonely"			; 1.14
+  "Feel the wind"		; 1.16
   )
 (defconst pop3-fma-version (format "Multiple POP3 account utiliy for Gnus v%s - \"%s\""
 				       pop3-fma-version-number
@@ -105,9 +102,10 @@
   "*Spool file to get mail using pop3 protocol.
 You should specify this variable like
  '(
-   \"po:user1@mailhost1\"
-   \"po:user2@mailhost2\"
-  )"
+   (\"po:user1@mailhost1\" type)
+   (\"po:user2@mailhost2\" type)
+  )
+Type must be pass or apop."
   :group 'pop3-fma
   :type 'alist)
 
@@ -130,20 +128,57 @@ Lisp means `nnmail-movemail-program' is lisp function.
   :group 'pop3-fma
   :type '(repeat (string :tag "Argument")))
 
+(defcustom pop3-fma-save-password-information nil
+  "*If non nil , save POP Server's password information.
+============== Important notice =====================
+Please take care of your password information.
+If set to t , your pop3 password is saved in pop3-fma-password in raw text.
+So , Anybody can see this information by describe-variable.
+If there is any problem , please set this variable to nil(default).
+============== Important notice ====================="
+  :group 'pop3-fma
+  :type 'boolean)
+
 ;;; Internal variables.
 (defvar pop3-fma-password nil
   "*POP3 password , user , mailhost information for Gnus.")
 
-(defvar pop3-fma-movemail-program "movemail.exe"
-  "*External program name your movemail.
-Please do not set this valiable non-nil if you do not use Meadow.")
+(defvar pop3-fma-movemail-program
+  (if (eq system-type 'windows-nt)
+      "movemail.exe"
+    "movemail")
+  "*External program name your movemail.")
+
 
 ;; Temporary variable
 (defvar hdr nil)
 (defvar passwd nil)
 (defvar str nil)
-(defvar pop3-fma-movemail-options pop3-fma-movemail-arguments)
 (defvar spool nil)
+(defvar movemail-output-buffer " *movemail-out*")
+(defvar pop3-fma-commandline-arguments nil)
+
+;;; To silence byte compiler
+(and
+ (fboundp 'eval-when-compile)
+ (eval-when-compile
+   (save-excursion
+     (beginning-of-defun)
+     (eval-region (point-min) (point)))
+   (let (case-fold-search)
+     (mapcar
+      (function
+       (lambda (symbol)
+	 (unless (boundp symbol)
+	   (make-local-variable symbol)
+	   (eval (list 'setq symbol nil)))))
+      '(:group
+	:prefix :type
+	pop3-maildrop
+	pop3-mailhost
+	))
+     (make-local-variable 'byte-compile-warnings)
+     (setq byte-compile-warnings nil))))
 
 (defun pop3-fma-init-message-hook ()
   (add-hook 'message-send-hook 'pop3-fma-message-add-header))
@@ -167,30 +202,53 @@ Please do not set this valiable non-nil if you do not use Meadow.")
 	       (substring inbox (match-end (string-match "^po:" inbox))
 			  (- (match-end (string-match "^.*@" inbox)) 1)))
 	      (pop3-mailhost
-	       (substring inbox (match-end (string-match "^.*@" inbox)))))
-	  (let ((pop3-password
-		 (pop3-fma-read-passwd pop3-mailhost)))
-	    (message "Checking new mail user %s at %s..." pop3-maildrop pop3-mailhost)
-	    (if (and (eq system-type 'windows-nt)
-		     (eq pop3-fma-movemail-type 'exe))
-		(progn
-		  (setenv "MAILHOST" pop3-mailhost)
-		  (if (and (not (memq pop3-password pop3-fma-movemail-arguments))
-			   (not (memq (concat "po:" pop3-maildrop) pop3-fma-movemail-arguments)))
+	       (substring inbox (match-end (string-match "^.*@" inbox))))
+	      (pop3-password
+	       (if pop3-fma-save-password-information
+		   (pop3-fma-read-passwd (substring inbox (match-end (string-match "^.*@" inbox))))
+		 (pop3-fma-input-password
+		  (substring inbox (match-end (string-match "^.*@" inbox)))
+		  (substring inbox (match-end (string-match "^po:" inbox))
+			     (- (match-end (string-match "^.*@" inbox)) 1)))))
+	      (pop3-authentication-scheme
+	       (nth 1 (assoc inbox pop3-fma-spool-file-alist)))
+	      (pop3-fma-movemail-type (pop3-fma-get-movemail-type inbox)))
+	  (if (eq pop3-authentication-scheme 'pass)
+	      (message "Checking new mail user %s at %s using USER/PASS ..." pop3-maildrop pop3-mailhost)
+	    (message "Checking new mail user %s at %s using APOP ..." pop3-maildrop pop3-mailhost))
+	  (if (and (eq system-type 'windows-nt)
+		   (eq pop3-fma-movemail-type 'exe))
+	      (progn
+		(setenv "MAILHOST" pop3-mailhost)
+		(if (and (not (memq pop3-password pop3-fma-commandline-arguments))
+			 (not (memq (concat "po:" pop3-maildrop) pop3-fma-commandline-arguments)))
+		    (progn
+		      (setq pop3-fma-commandline-arguments
+			    (append
+			     pop3-fma-movemail-arguments
+				    (list
+				     (concat "po:" pop3-maildrop)
+				     crashbox
+				     pop3-password)))))
+		(if (not (get-buffer movemail-output-buffer))
+		    (get-buffer-create movemail-output-buffer))
+		(set-buffer movemail-output-buffer)
+		(erase-buffer)
+		(apply 'call-process (concat
+				      exec-directory
+				      pop3-fma-movemail-program)
+		       nil movemail-output-buffer nil
+		       pop3-fma-commandline-arguments)
+		(let ((string (buffer-string)))
+		  (if (> (length string) 0)
 		      (progn
-			(setq pop3-fma-movemail-arguments nil)
-			(setq pop3-fma-movemail-arguments
-			      (append pop3-fma-movemail-options
-				      (list
-				       (concat "po:" pop3-maildrop)
-				       crashbox
-				       pop3-password)))))
-		  (apply 'call-process (concat
-					exec-directory
-					pop3-fma-movemail-program)
-			 nil nil nil
-			 pop3-fma-movemail-arguments))
-	      (pop3-movemail crashbox)))))
+			(if (y-or-n-p
+			     (concat (substring string 0
+						(- (length string) 1))
+						" continue ??"))
+			    nil
+			  nil)))))
+	    (pop3-movemail crashbox))))
     (message "Checking new mail at %s ... " inbox)
     (call-process (concat exec-directory pop3-fma-movemail-program)
 		  nil
@@ -203,9 +261,14 @@ Please do not set this valiable non-nil if you do not use Meadow.")
 ;;
 (defun pop3-fma-read-passwd (mailhost)
   (setq passwd (nth 2 (assoc mailhost pop3-fma-password)))
-  (pop3-fma-decode-string passwd))
+  passwd)
 
-(setq pop3-read-passwd 'pop3-fma-read-passwd)
+(defun pop3-fma-input-password (mailhost maildrop)
+  (pop3-fma-read-noecho
+   (format "POP Password for %s at %s: " maildrop mailhost) t))
+
+(setq pop3-read-passwd 'pop3-fma-read-passwd
+      nnmail-read-passwd 'pop3-fma-read-passwd)
 ;;
 ;; Set multiple pop3 server's password
 (defun pop3-fma-store-password (passwd)
@@ -219,29 +282,50 @@ Please do not set this valiable non-nil if you do not use Meadow.")
 		     (list
 		      pop3-mailhost
 		      pop3-maildrop
-		      (pop3-fma-encode-string passwd)))))		      
+		      passwd)))))
     (setcar (cdr (cdr (assoc pop3-mailhost pop3-fma-password)))
-	    (pop3-fma-encode-string passwd)))
-  (message "POP password registered.")
-  (pop3-fma-encode-string passwd))
+	    passwd)
+    (message "POP password registered.")
+    passwd)
 ;;
 ;;;###autoload
 (defun pop3-fma-set-pop3-password()
   (interactive)
-  (mapcar
-   (lambda (x)
-     (let ((pop3-maildrop
-	    (substring x (match-end (string-match "^po:" x))
-		       (- (match-end (string-match "^.*@" x)) 1)))
-	   (pop3-mailhost
-	    (substring x (match-end (string-match "^.*@" x)))))
-       (call-interactively 'pop3-fma-store-password)))
-   pop3-fma-spool-file-alist)
+  (if pop3-fma-save-password-information
+      (progn
+	(mapcar
+	 (lambda (x)
+	   (let ((pop3-maildrop
+		  (substring (car x) (match-end (string-match "^po:" (car x)))
+			     (- (match-end (string-match "^.*@" (car x))) 1)))
+		 (pop3-mailhost
+		  (substring (car x) (match-end (string-match "^.*@" (car x))))))
+	     (call-interactively 'pop3-fma-store-password)))
+	 pop3-fma-spool-file-alist)))
   (setq nnmail-movemail-program 'pop3-fma-movemail)
 ;;  (setq nnmail-spool-file pop3-fma-spool-file-alist))
   (setq nnmail-spool-file (append
 			   pop3-fma-local-spool-file-alist
-			   pop3-fma-spool-file-alist)))
+			   (mapcar
+			    (lambda (spool)
+			      (car spool))
+			    pop3-fma-spool-file-alist))))
+;;
+(defmacro pop3-fma-read-char-exclusive ()
+  (cond ((featurep 'xemacs)
+	 '(let ((table (quote ((backspace . ?\C-h) (delete . ?\C-?)
+			       (left . ?\C-h))))
+		event key)
+	    (while (not
+		    (and
+		     (key-press-event-p (setq event (next-command-event)))
+		     (setq key (or (event-to-character event)
+				   (cdr (assq (event-key event) table)))))))
+	    key))
+	((fboundp 'read-char-exclusive)
+	 '(read-char-exclusive))
+	(t
+	 '(read-char))))
 ;;
 (defun pop3-fma-read-noecho (prompt &optional stars)
   "Read a single line of text from user without echoing, and return it.
@@ -261,15 +345,15 @@ Argument PROMPT ."
 	(and (> truncate 0)
 	     (setq msg (concat "$" (substring msg (1+ truncate))))))
       (message msg)
-      (setq c (read-char-exclusive))
-      (cond ((= c ?\C-g)
+      (setq c (pop3-fma-read-char-exclusive))
+      (cond ((eq ?\C-g c)
 	     (setq quit-flag t
 		   done t))
-	    ((or (= c ?\r) (= c ?\n) (= c ?\e))
+	    ((memq c '(?\r ?\n ?\e))
 	     (setq done t))
-	    ((= c ?\C-u)
+	    ((eq ?\C-u c)
 	     (setq ans ""))
-	    ((and (/= c ?\b) (/= c ?\177))
+	    ((and (/= ?\b c) (/= ?\177 c))
 	     (setq ans (concat ans (char-to-string c))))
 	    ((> (length ans) 0)
 	     (setq ans (substring ans 0 -1)))))
@@ -288,7 +372,6 @@ Argument PROMPT ."
   
 ;;
 ;; Add your custom header.
-;;
 (defun pop3-fma-add-custom-header (header string)
   (let ((delimline
 	 (progn (goto-char (point-min))
@@ -306,6 +389,14 @@ Argument PROMPT ."
 	  (setq hdr (concat str "\n"))
 	  (insert-string hdr)))))
 ;;
+;;
+(defun pop3-fma-get-movemail-type (inbox)
+  (if (eq (nth 1 (assoc inbox pop3-fma-spool-file-alist)) 'apop)
+      'lisp
+    pop3-fma-movemail-type))
+;;
 (provide 'pop3-fma)
 ;;
 ;; pop3-fma.el ends here.
+
+