Merge branch 'subscription' Pull Request #125

* subscription: (25 commits)
  link directly to subscription management in mails
  only use mailfromnobody for bulk mails
  added missing context for list mails
  readded mailfromnobody to subscription sending
  correctly escape diffs in HTML mails
  fixed lists in HTML mails
  simplified subscription->add() code a bit
  comment adjusted
  removed unused vars
  removed data parameter in subscription_handle_post()
  fixed tests
  some reformatting
  added compatibility function
  moved registration notification to subscription class
  fixed merge error in inc/auth.php
  consolidate more notification code in subscription class
  minor cleanup
  initialize new subscriptions with current time
  fixed subscription management
  correctly check if subscriptions are enabled
  ...

18 files changed, 18 insertions, 18 deletions

diff --git a/inc/lang/ar/subscr_single.txt b/inc/lang/ar/subscr_single.txt
index 5c62aeaeb..611688415 100644
--- a/inc/lang/ar/subscr_single.txt
+++ b/inc/lang/ar/subscr_single.txt
@@ -15,7 +15,7 @@
 
 لإلغاء إشعارات الصفحة,لُج الويكي في 
 @DOKUWIKIURL@ ثم زُر
-@NEWPAGE@
+@SUBSCRIBE@
 وألغ الاشتراك من تغييرات الصفحة و/أو النطاق.
 
 --
diff --git a/inc/lang/bg/subscr_single.txt b/inc/lang/bg/subscr_single.txt
index 7b26f8e96..a74a21fb8 100644
--- a/inc/lang/bg/subscr_single.txt
+++ b/inc/lang/bg/subscr_single.txt
@@ -14,7 +14,7 @@
 Нова версия: @NEWPAGE@
 
 Ако желаете да прекратите уведомяването за страницата трябва да се впишете на адрес @DOKUWIKIURL@, да посетите
-@NEWPAGE@
+@SUBSCRIBE@
 и да прекратите абонамента за промени по страницата или именното пространство.
 
 --
diff --git a/inc/lang/da/subscr_single.txt b/inc/lang/da/subscr_single.txt
index 64b14588c..cdc554513 100644
--- a/inc/lang/da/subscr_single.txt
+++ b/inc/lang/da/subscr_single.txt
@@ -15,7 +15,7 @@ Ny Revision: @NEWPAGE@
 
 For at slå side notifikationer fra, skal du logge ind på 
 @DOKUWIKIURL@ og besøge
-@NEWPAGE@
+@SUBSCRIBE@
 og slå abonnoment for side / navnerum ændringer fra.
 
 --
diff --git a/inc/lang/de-informal/subscr_single.txt b/inc/lang/de-informal/subscr_single.txt
index 3c557bc17..6e3f58b9f 100644
--- a/inc/lang/de-informal/subscr_single.txt
+++ b/inc/lang/de-informal/subscr_single.txt
@@ -15,7 +15,7 @@ Neue Revision: @NEWPAGE@
 
 Um das Abonnement für diese Seite aufzulösen, melde dich im Wiki an
 @DOKUWIKIURL@, besuche dann
-@NEWPAGE@
+@SUBSCRIBE@
 und klicke auf den Link 'Aboverwaltung'.
 
 --
diff --git a/inc/lang/de/subscr_single.txt b/inc/lang/de/subscr_single.txt
index f3e1cd393..da9914e50 100644
--- a/inc/lang/de/subscr_single.txt
+++ b/inc/lang/de/subscr_single.txt
@@ -15,7 +15,7 @@ Neue Revision: @NEWPAGE@
 
 Um das Abonnement für diese Seite aufzulösen, melden Sie sich im Wiki an
 @DOKUWIKIURL@, besuchen dann
-@NEWPAGE@
+@SUBSCRIBE@
 und klicken auf die Taste 'Aboverwaltung'.
 
 --
diff --git a/inc/lang/en/subscr_single.txt b/inc/lang/en/subscr_single.txt
index 673c4c32a..0bc310e04 100644
--- a/inc/lang/en/subscr_single.txt
+++ b/inc/lang/en/subscr_single.txt
@@ -15,7 +15,7 @@ New Revision: @NEWPAGE@
 
 To cancel the page notifications, log into the wiki at
 @DOKUWIKIURL@ then visit
-@NEWPAGE@
+@SUBSCRIBE@
 and unsubscribe page and/or namespace changes.
 
 -- 
diff --git a/inc/lang/eo/subscr_single.txt b/inc/lang/eo/subscr_single.txt
index 431fd0251..e4847e8ab 100644
--- a/inc/lang/eo/subscr_single.txt
+++ b/inc/lang/eo/subscr_single.txt
@@ -15,7 +15,7 @@ Nova versio: @NEWPAGE@
 
 Por nuligi la paĝinformojn, ensalutu la vikion ĉe
 @DOKUWIKIURL@, poste iru al
-@NEWPAGE@
+@SUBSCRIBE@
 kaj malabonu la paĝajn kaj/aŭ nomspacajn ŝanĝojn.
 
 --
diff --git a/inc/lang/he/subscr_single.txt b/inc/lang/he/subscr_single.txt
index 123b186c8..78b551e2f 100644
--- a/inc/lang/he/subscr_single.txt
+++ b/inc/lang/he/subscr_single.txt
@@ -14,7 +14,7 @@
 
 לביטול התרעות בנוגע לעמוד, יש להיכנס לאתר הוויקי בכתובת
 @DOKUWIKIURL@ ואז לבקר בדף
-@NEWPAGE@
+@SUBSCRIBE@
 ולבטל את המינוי לקבלת שינויים בדף ו/או במרחב השם.
 
 --
diff --git a/inc/lang/ia/subscr_single.txt b/inc/lang/ia/subscr_single.txt
index 3d6ef7103..445df197c 100644
--- a/inc/lang/ia/subscr_single.txt
+++ b/inc/lang/ia/subscr_single.txt
@@ -15,7 +15,7 @@ Version nove: @NEWPAGE@
 
 Pro cancellar le notificationes de paginas, aperi un session al wiki a
 @DOKUWIKIURL@ postea visita
-@NEWPAGE@
+@SUBSCRIBE@
 e cancella tu subscription al modificationes in paginas e/o spatios de nomines.
 
 --
diff --git a/inc/lang/it/subscr_single.txt b/inc/lang/it/subscr_single.txt
index 8cde8ea0f..a8649a4ef 100644
--- a/inc/lang/it/subscr_single.txt
+++ b/inc/lang/it/subscr_single.txt
@@ -15,7 +15,7 @@ Nuova revisione: @NEWPAGE@
 
 Per non ricevere più queste notifiche, collegati al 
 wiki all'indirizzo @DOKUWIKIURL@ e poi visita
-@NEWPAGE@
+@SUBSCRIBE@
 e rimuovi la sottoscrizione alle modifiche della 
 pagina o categoria.
 
diff --git a/inc/lang/ko/subscr_single.txt b/inc/lang/ko/subscr_single.txt
index 6bd1885e6..2679db393 100644
--- a/inc/lang/ko/subscr_single.txt
+++ b/inc/lang/ko/subscr_single.txt
@@ -14,7 +14,7 @@
 새 버전 : @NEWPAGE@
 
 이 문서의 알림을 취소하려면, @DOKUWIKIURL@에 로그인한 뒤
-@NEWPAGE@ 문서를 방문하여 문서나 이름공간의 구독을 취소하세요.
+@SUBSCRIBE@ 문서를 방문하여 문서나 이름공간의 구독을 취소하세요.
 
 --
 @DOKUWIKIURL@의 DokuWiki가 자동으로 만들어낸 메일입니다.
\ No newline at end of file
diff --git a/inc/lang/la/subscr_digest.txt b/inc/lang/la/subscr_digest.txt
index 629213359..32d378a7e 100644
--- a/inc/lang/la/subscr_digest.txt
+++ b/inc/lang/la/subscr_digest.txt
@@ -12,7 +12,7 @@ Noua recensio: @NEWPAGE@
 
 Ut paginae adnotationes deleas, in uicem ineas in
 @DOKUWIKIURL@, deinde uideas
-@NEWPAGE@
+@SUBSCRIBE@
 et paginarum generum optiones mutes.
 
 --
diff --git a/inc/lang/la/subscr_single.txt b/inc/lang/la/subscr_single.txt
index 7839791ea..14285014c 100644
--- a/inc/lang/la/subscr_single.txt
+++ b/inc/lang/la/subscr_single.txt
@@ -15,7 +15,7 @@ Noua recensio: @NEWPAGE@
 
 Ut paginae adnotationes deleas, in uicem ineas in
 @DOKUWIKIURL@, deinde uideas
-@NEWPAGE@
+@SUBSCRIBE@
 et paginarum et\aut generum optiones mutasa.
 
 --
diff --git a/inc/lang/no/subscr_digest.txt b/inc/lang/no/subscr_digest.txt
index 6afd0cc5c..670d39d32 100644
--- a/inc/lang/no/subscr_digest.txt
+++ b/inc/lang/no/subscr_digest.txt
@@ -12,7 +12,7 @@ Ny versjon: @NEWPAGE@
 
 For å avslutte varslingen, logg inn på
 @DOKUWIKIURL@ og gå til 
-@NEWPAGE@
+@SUBSCRIBE@
 og avslutt abonnementet på endringer av siden eller i navnerommet.
 
 --
diff --git a/inc/lang/no/subscr_list.txt b/inc/lang/no/subscr_list.txt
index 72cd307cb..860d88d2a 100644
--- a/inc/lang/no/subscr_list.txt
+++ b/inc/lang/no/subscr_list.txt
@@ -9,7 +9,7 @@ Her er endringene:
 
 For å avslutte varslinga, logg inn på
 @DOKUWIKIURL@ og gå til 
-@NEWPAGE@
+@SUBSCRIBE@
 og avslutt abonnementet på endringer av sida eller i navnerommet.
 
 --
diff --git a/inc/lang/no/subscr_single.txt b/inc/lang/no/subscr_single.txt
index 25296da58..b26b3a879 100644
--- a/inc/lang/no/subscr_single.txt
+++ b/inc/lang/no/subscr_single.txt
@@ -15,7 +15,7 @@ Ny versjon: @NEWPAGE@
 
 For å avslutte varslingen, logg inn på
 @DOKUWIKIURL@, gå til 
-@NEWPAGE@
+@SUBSCRIBE@
 og avslutt abonnementet på endringer av siden eller i navnerommet.
 
 --
diff --git a/inc/lang/pt/subscr_single.txt b/inc/lang/pt/subscr_single.txt
index 1187b5911..469c6bfb1 100644
--- a/inc/lang/pt/subscr_single.txt
+++ b/inc/lang/pt/subscr_single.txt
@@ -15,7 +15,7 @@ Revisão Nova: @NEWPAGE@
 
 Para cancelar as notificações de página, inicie sessão no wiki em
 @DOKUWIKIURL@, visite
-@NEWPAGE@
+@SUBSCRIBE@
 e des-subscreva às alterações de página e/ou espaço de nome.
 
 --
diff --git a/inc/lang/sq/subscr_single.txt b/inc/lang/sq/subscr_single.txt
index 90520be4f..df28ee176 100644
--- a/inc/lang/sq/subscr_single.txt
+++ b/inc/lang/sq/subscr_single.txt
@@ -15,7 +15,7 @@ Rishikimi i ri: @NEWPAGE@
 
 Për të fshirë lajmërimet e faqes, hyni në wiki tek
 @DOKUWIKIURL@ dhe pastaj vizitoni
-@NEWPAGE@
+@SUBSCRIBE@
 dhe fshini ndryshimet e faqes dhe/ose hapësirës së emrit.
 
 --