mediawiki-el

Merge lp:~rayslava/mediawiki-el/domain into lp:mediawiki-el

  1. domain
  2. Merge into trunk
Proposed by Slava Barinov
Status: Needs review
Proposed branch: lp:~rayslava/mediawiki-el/domain
Merge into: lp:mediawiki-el
Diff against target: 52 lines (+13/-3)
1 file modified
mediawiki.el (+13/-3)
To merge this branch: bzr merge lp:~rayslava/mediawiki-el/domain
Reviewer Review Type Date Requested Status
Mark A. Hershberger Pending
Review via email: mp+218552@code.launchpad.net

Description of the change

Simple domain login support.

Added Domain parameter to mediawiki-site-alist, if it's set for site it's passed through lgdomain parameter during login. If it's not set nothing changes.

To post a comment you must log in.

Unmerged revisions

43. By Slava Barinov

Add domain login support

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mediawiki.el'
2--- mediawiki.el 2013-02-23 19:41:34 +0000
3+++ mediawiki.el 2014-05-07 06:17:55 +0000
4@@ -519,6 +519,7 @@
5 "http://en.wikipedia.org/w/"
6 "username"
7 "password"
8+ ""
9 "Main Page"))
10 "A list of MediaWiki websites."
11 :group 'mediawiki
12@@ -528,6 +529,7 @@
13 (string :tag "URL")
14 (string :tag "Username")
15 (string :tag "Password")
16+ (string :tag "Domain")
17 (string :tag "First Page"
18 :description "First page to open when `mediawiki-site' is called for this site"))))
19
20@@ -1238,11 +1240,15 @@
21 (or (mediawiki-site-extract sitename 3)
22 (url-password-for-url (mediawiki-site-url sitename))))
23
24+(defun mediawiki-site-domain (sitename)
25+ "Get the domain for a given site."
26+ (mediawiki-site-extract sitename 4))
27+
28 (defun mediawiki-site-first-page (sitename)
29 "Get the password for a given site."
30- (mediawiki-site-extract sitename 4))
31+ (mediawiki-site-extract sitename 5))
32
33-(defun mediawiki-do-login (&optional sitename username password)
34+(defun mediawiki-do-login (&optional sitename username password domain)
35 "Use USERNAME and PASSWORD to log into the MediaWiki site and
36 get a cookie."
37 (interactive)
38@@ -1259,9 +1265,13 @@
39 (pass (or (mediawiki-site-password sitename)
40 password
41 (read-passwd "Password: ")))
42+ (domain (or (mediawiki-site-domain sitename)
43+ nil))
44 (sitename sitename)
45 (args (list (cons "lgname" user)
46- (cons "lgpassword" pass)))
47+ (cons "lgpassword" pass)
48+ (when domain
49+ (cons "lgdomain" domain))))
50 (result (cadr (mediawiki-api-call sitename "login" args))))
51 (when (string= (cdr (assq 'result result)) "NeedToken")
52 (setq result

Subscribers

People subscribed via source and target branches