lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Regis Houssin 2012-07-29 16:12:05 +02:00
commit 30ca31de6c
4 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/adherents/admin/mailman.php
View File

@ -22,9 +22,9 @@
*/ */
/** /**
* \file htdocs/adherents/admin/adherent.php * \file htdocs/adherents/admin/mailman.php
* \ingroup member * \ingroup mailmanspip
* \brief Page to setup the module Foundation * \brief Page to setup the module MailmanSpip (Mailman)
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
@ -219,12 +219,12 @@ if ($conf->global->ADHERENT_USE_MAILMAN)
print '<form action="'.$_SERVER["PHP_SELF"].'">'; print '<form action="'.$_SERVER["PHP_SELF"].'">';
print '<input type="hidden" name="action" value="testsubscribe">'; print '<input type="hidden" name="action" value="testsubscribe">';
print $langs->trans("TestSubscribe").'<br>'; print $langs->trans("TestSubscribe").'<br>';
print $langs->trans("EMail").' <input type="text" name="testsubscribeemail" value="'.GETPOST('testsubscribeemail').'"> <input class="button" type="submit" value="'.$langs->trans("Test").'"><br>'; print $langs->trans("EMail").' <input type="email" name="testsubscribeemail" value="'.GETPOST('testsubscribeemail').'"> <input class="button" type="submit" value="'.$langs->trans("Test").'"><br>';
print '</form>'; print '</form>';
print '<form action="'.$_SERVER["PHP_SELF"].'">'; print '<form action="'.$_SERVER["PHP_SELF"].'">';
print '<input type="hidden" name="action" value="testunsubscribe">'; print '<input type="hidden" name="action" value="testunsubscribe">';
print $langs->trans("TestUnSubscribe").'<br>'; print $langs->trans("TestUnSubscribe").'<br>';
print $langs->trans("EMail").' <input type="text" name="testunsubscribeemail" value="'.GETPOST('testunsubscribeemail').'"> <input class="button" type="submit" value="'.$langs->trans("Test").'"><br>'; print $langs->trans("EMail").' <input type="email" name="testunsubscribeemail" value="'.GETPOST('testunsubscribeemail').'"> <input class="button" type="submit" value="'.$langs->trans("Test").'"><br>';
print '</form>'; print '</form>';
} }

9
htdocs/adherents/admin/spip.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org> * Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org>
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org> * Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be> * Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
@ -22,9 +22,9 @@
*/ */
/** /**
* \file htdocs/adherents/admin/adherent.php * \file htdocs/adherents/admin/spip.php
* \ingroup member * \ingroup mailmanspip
* \brief Page to setup the module Foundation * \brief Page to setup the module MailmanSpip (SPIP)
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
@ -33,6 +33,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/lib/mailmanspip.lib.php");
$langs->load("admin"); $langs->load("admin");
$langs->load("members"); $langs->load("members");
$langs->load("mailmanspip");
if (! $user->admin) accessforbidden(); if (! $user->admin) accessforbidden();

19
htdocs/langs/en_US/mailmanspip.lang
View File

@ -1,8 +1,13 @@
# Dolibarr language file - fr_FR - mailmanspip # Dolibarr language file - en_US - mailmanspip
CHARSET=UTF-8 CHARSET=UTF-8
TestSubscribe=Pour tester l'inscription aux listes mailman TestSubscribe=To test subscription to mailman lists
TestUnSubscribe=Pour tester la désincritpion aux listes mailman TestUnSubscribe=To test unsubscribe from mailman lists
MailmanCreationSuccess=Appel de l'url de création dans mailman avec succès MailmanCreationSuccess=Calling URL to create into mailman sit success
MailmanDeletionSuccess=Appel de l'url de suppression de mailman avec succès MailmanDeletionSuccess=Calling URL to remove subscription from mailman with success
SynchroMailManEnabled=Une alimentation de Mailman sera réalisée SynchroMailManEnabled=A Mailman update will be performed
SynchroSpipEnabled=Une alimentation de Spip sera réalisée SynchroSpipEnabled=A Spip update will be performed
DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password
DescADHERENT_SPIP_SERVEUR=SPIP Server
DescADHERENT_SPIP_DB=SPIP database name
DescADHERENT_SPIP_USER=SPIP database login
DescADHERENT_SPIP_PASS=SPIP database password

9
htdocs/langs/fr_FR/mailmanspip.lang
View File

@ -5,4 +5,11 @@ TestUnSubscribe=Pour tester la désincritpion aux listes mailman
MailmanCreationSuccess=Appel de l'url de création dans mailman avec succès MailmanCreationSuccess=Appel de l'url de création dans mailman avec succès
MailmanDeletionSuccess=Appel de l'url de suppression de mailman avec succès MailmanDeletionSuccess=Appel de l'url de suppression de mailman avec succès
SynchroMailManEnabled=Une alimentation de Mailman sera réalisée SynchroMailManEnabled=Une alimentation de Mailman sera réalisée
SynchroSpipEnabled=Une alimentation de Spip sera réalisée SynchroSpipEnabled=Une alimentation de Spip sera réalisée
DescADHERENT_MAILMAN_ADMINPW=Mot de passe administrateur Mailman
DescADHERENT_MAILMAN_URL=URL d'inscription aux listes Mailman
DescADHERENT_MAILMAN_UNSUB_URL de désinscription aux listes Mailman
DescADHERENT_SPIP_SERVEUR=Serveur SPIP
DescADHERENT_SPIP_DB=Nom base SPIP
DescADHERENT_SPIP_USER=Login connexion base SPIP
DescADHERENT_SPIP_PASS=Mot de passe connexion base SPIP