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

Merge pull request #352 from marcosgdf/mailmanspip

Browse Source 
Fixes to MailmanSPIP module
This commit is contained in:
Regis Houssin 2012-08-27 22:53:33 -07:00
commit 84a634f7f0
4 changed files with 45 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
htdocs/adherents/fiche.php
View File

@ -3,6 +3,7 @@
* Copyright (C) 2002-2003 Jean-Louis Bergamo <jlb@j1b.org>
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2012 Marcos García <marcosgdf@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -40,7 +41,7 @@ $langs->load("companies");
$langs->load("bills");
$langs->load("members");
$langs->load("users");
$langs->load('other');
$action=GETPOST('action','alpha');
$backtopage=GETPOST('backtopage','alpha');
@ -53,6 +54,15 @@ $socid=GETPOST('socid','int');
// Security check
$result=restrictedArea($user,'adherent',$rowid);
if ($conf->mailmanspip->enabled)
{
include_once DOL_DOCUMENT_ROOT.'/mailmanspip/class/mailmanspip.class.php';
$langs->load('mailmanspip');
$mailmanspip = new MailmanSpip($db);
}
$object = new Adherent($db);
$extrafields = new ExtraFields($db);
@ -632,9 +642,9 @@ if ($user->rights->adherent->supprimer && $action == 'confirm_del_spip' && $conf
{
if (! count($object->errors))
{
if(!$object->del_to_spip())
if (!$mailmanspip->del_to_spip($object))
{
$errmsg.="Echec de la suppression de l'utilisateur dans spip: ".$object->error."<BR>\n";
$errmsg.= $langs->trans('DeleteIntoSpipError').': '.$mailmanspip->error."<BR>\n";
}
}
}
@ -643,9 +653,9 @@ if ($user->rights->adherent->creer && $action == 'confirm_add_spip' && $confirm
{
if (! count($object->errors))
{
if (!$object->add_to_spip())
if (!$mailmanspip->add_to_spip($object))
{
$errmsg.="Echec du rajout de l'utilisateur dans spip: ".$object->error."<BR>\n";
$errmsg.= $langs->trans('AddIntoSpipError').': '.$mailmanspip->error."<BR>\n";
}
}
}
@ -1194,8 +1204,8 @@ if ($rowid && $action != 'edit')
// Cree un tableau formulaire
$formquestion=array();
if ($object->email) $formquestion[]=array('type' => 'checkbox', 'name' => 'send_mail', 'label' => $label, 'value' => ($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL?true:false));
if ($conf->global->ADHERENT_USE_MAILMAN) { $langs->load("mailmanspip"); $formquestion[]=array('type'=>'other','label'=>$langs->transnoentitiesnoconv("SynchroMailManEnabled"),'value'=>''); }
if ($conf->global->ADHERENT_USE_SPIP) { $langs->load("mailmanspip"); $formquestion[]=array('type'=>'other','label'=>$langs->transnoentitiesnoconv("SynchroSpipEnabled"),'value'=>''); }
if ($conf->global->ADHERENT_USE_MAILMAN) { $formquestion[]=array('type'=>'other','label'=>$langs->transnoentitiesnoconv("SynchroMailManEnabled"),'value'=>''); }
if ($conf->global->ADHERENT_USE_SPIP) { $formquestion[]=array('type'=>'other','label'=>$langs->transnoentitiesnoconv("SynchroSpipEnabled"),'value'=>''); }
print $form->formconfirm("fiche.php?rowid=".$rowid,$langs->trans("ValidateMember"),$langs->trans("ConfirmValidateMember"),"confirm_valid",$formquestion,1);
}
@ -1251,8 +1261,7 @@ if ($rowid && $action != 'edit')
*/
if ($action == 'add_spip')
{
$langs->load("mailmanspip");
$ret=$form->form_confirm("fiche.php?rowid=".$rowid,"Add to spip","Etes-vous sur de vouloir ajouter cet adherent dans spip ? (serveur : ".ADHERENT_SPIP_SERVEUR.")","confirm_add_spip");
$ret=$form->form_confirm("fiche.php?rowid=".$rowid, $langs->trans('AddIntoSpip'), $langs->trans('AddIntoSpipConfirmation'), 'confirm_add_spip');
if ($ret == 'html') print '<br>';
}
@ -1261,8 +1270,7 @@ if ($rowid && $action != 'edit')
*/
if ($action == 'del_spip')
{
$langs->load("mailmanspip");
$ret=$form->form_confirm("fiche.php?rowid=$rowid","Supprimer dans spip","Etes-vous sur de vouloir effacer cet adherent dans spip ? (serveur : ".ADHERENT_SPIP_SERVEUR.")","confirm_del_spip");
$ret=$form->form_confirm("fiche.php?rowid=$rowid", $langs->trans('DeleteIntoSpip'), $langs->trans('DeleteIntoSpipConfirmation'), 'confirm_del_spip');
if ($ret == 'html') print '<br>';
}
@ -1564,10 +1572,8 @@ if ($rowid && $action != 'edit')
// Action SPIP
if ($conf->mailmanspip->enabled && $conf->global->ADHERENT_USE_SPIP)
{
include_once DOL_DOCUMENT_ROOT.'/mailmanspip/class/mailmanspip.class.php';
$mailmanspip=new MailmanSpip($db);
$isinspip = $mailmanspip->is_in_spip($object);
$isinspip=$mailmanspip->is_in_spip($object);
if ($isinspip == 1)
{
print "<a class=\"butAction\" href=\"fiche.php?rowid=$object->id&action=del_spip\">".$langs->trans("DeleteIntoSpip")."</a>\n";
@ -1578,7 +1584,7 @@ if ($rowid && $action != 'edit')
}
if ($isinspip == -1)
{
print '<br><br><font class="error">Failed to connect to SPIP: '.$object->error.'</font>';
print '<br><br><font class="error">'.$langs->trans('SPIPConnectionFailed').': '.$mailmanspip->error.'</font>';
}
}

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

@ -16,4 +16,11 @@ SPIPTitle=SPIP Content Management System
DescADHERENT_SPIP_SERVEUR=SPIP Server
DescADHERENT_SPIP_DB=SPIP database name
DescADHERENT_SPIP_USER=SPIP database login
DescADHERENT_SPIP_PASS=SPIP database password
DescADHERENT_SPIP_PASS=SPIP database password
AddIntoSpip=Add into SPIP
AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP?
AddIntoSpipError=Failed to add the user in SPIP
DeleteIntoSpip=Remove from SPIP
DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP?
DeleteIntoSpipError=Failed to suppress the user from SPIP
SPIPConnectionFailed=Failed to connect to SPIP

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

@ -16,4 +16,11 @@ SPIPTitle=Sistema de gestión de contenidos SPIP
DescADHERENT_SPIP_SERVEUR=Servidor SPIP
DescADHERENT_SPIP_DB=Nombre de la base de datos de SPIP
DescADHERENT_SPIP_USER=Usuario de la base de datos de SPIP
DescADHERENT_SPIP_PASS=Contraseña de la base de datos de SPIP
DescADHERENT_SPIP_PASS=Contraseña de la base de datos de SPIP
AddIntoSpip=Añadir a SPIP
AddIntoSpipConfirmation=¿Está seguro de querer añadir este miembro a SPIP?
AddIntoSpipError=Ha ocurrido un error al añadir el miembro a SPIP
DeleteIntoSpip=Borrar de SPIP
DeleteIntoSpipConfirmation=¿Está seguro de querer borrar este miembro de SPIP?
DeleteIntoSpipError=Ha ocurrido un error al borrar el miembro de SPIP
SPIPConnectionFailed=Error al conectar con SPIP

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

@ -15,4 +15,11 @@ SPIPTitle=Gestion de contenu SPIP
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
DescADHERENT_SPIP_PASS=Mot de passe connexion base SPIP
AddIntoSpip=Ajouter dans SPIP
AddIntoSpipConfirmation=Êtes-vous sur de vouloir ajouter cet adhérent dans SPIP?
AddIntoSpipError=Echec du rajout de l'utilisateur dans SPIP
DeleteIntoSpip=Supprimer de spip
DeleteIntoSpipConfirmation=Êtes-vous sur de vouloir effacer cet adhérent de SPIP?
DeleteIntoSpipError=Échec de la suppression de l'utilisateur de SPIP
SPIPConnectionFailed=Échec de connexion à SPIP