diff --git a/htdocs/adherents/pre.inc.php b/htdocs/adherents/pre.inc.php index 9200fbe19ef..6af4d2fb9f8 100644 --- a/htdocs/adherents/pre.inc.php +++ b/htdocs/adherents/pre.inc.php @@ -15,15 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ - * $Source$ */ /** \file htdocs/adherents/pre.inc.php \ingroup adherent \brief Fichier de gestion du menu gauche du module adherent - \version $Revision$ + \version $Id$ */ require("../main.inc.php"); @@ -48,7 +45,7 @@ function llxHeader($head = "") $menu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=1&filter=uptodate",$langs->trans("MenuMembersUpToDate")); $menu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=0",$langs->trans("MenuMembersResiliated")); - $menu->add(DOL_URL_ROOT."/public/adherents/index.php?leftmenu=member_public",$langs->trans("MemberPublicLinks")); + $menu->add(DOL_URL_ROOT."/adherents/public.php?leftmenu=member_public",$langs->trans("MemberPublicLinks")); $menu->add(DOL_URL_ROOT."/adherents/index.php",$langs->trans("Exports")); $menu->add_submenu(DOL_URL_ROOT."/exports/index.php?leftmenu=export",$langs->trans("Datas")); diff --git a/htdocs/public/adherents/index.php b/htdocs/adherents/public.php similarity index 100% rename from htdocs/public/adherents/index.php rename to htdocs/adherents/public.php diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php index a91935cbb8b..7a98e0b6765 100644 --- a/htdocs/includes/menus/barre_left/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php @@ -870,7 +870,7 @@ class MenuLeft { if ($leftmenu=="export") $newmenu->add_submenu(DOL_URL_ROOT."/adherents/cartes/carte.php?leftmenu=export",$langs->trans("MembersCards"),1,$user->rights->adherent->export,'_blank'); if ($leftmenu=="export") $newmenu->add_submenu(DOL_URL_ROOT."/adherents/cartes/etiquette.php?leftmenu=export",$langs->trans("MembersTickets"),1,$user->rights->adherent->export,'_blank'); - $newmenu->add(DOL_URL_ROOT."/public/adherents/index.php?leftmenu=member_public",$langs->trans("MemberPublicLinks")); + $newmenu->add(DOL_URL_ROOT."/adherents/public.php?leftmenu=member_public",$langs->trans("MemberPublicLinks")); /* if ($leftmenu=="member_public") $newmenu->add(DOL_URL_ROOT."/public/adherents/","Non adherent"); if ($leftmenu=="member_public") $newmenu->add_submenu("new.php","Inscription"); diff --git a/htdocs/includes/menus/barre_left/eldy_frontoffice.php b/htdocs/includes/menus/barre_left/eldy_frontoffice.php index ef82d592fbc..456645da57d 100644 --- a/htdocs/includes/menus/barre_left/eldy_frontoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_frontoffice.php @@ -829,7 +829,7 @@ class MenuLeft { if ($leftmenu=="export") $newmenu->add_submenu(DOL_URL_ROOT."/adherents/cartes/carte.php?leftmenu=export",$langs->trans("MembersCards"),1,$user->rights->adherent->export,'_blank'); if ($leftmenu=="export") $newmenu->add_submenu(DOL_URL_ROOT."/adherents/cartes/etiquette.php?leftmenu=export",$langs->trans("MembersTickets"),1,$user->rights->adherent->export,'_blank'); - $newmenu->add(DOL_URL_ROOT."/public/adherents/index.php?leftmenu=member_public",$langs->trans("MemberPublicLinks")); + $newmenu->add(DOL_URL_ROOT."/adherents/public.php?leftmenu=member_public",$langs->trans("MemberPublicLinks")); /* if ($leftmenu=="member_public") $newmenu->add(DOL_URL_ROOT."/public/adherents/","Non adherent"); if ($leftmenu=="member_public") $newmenu->add_submenu("new.php","Inscription"); diff --git a/htdocs/includes/menus/init_menu_auguria.sql b/htdocs/includes/menus/init_menu_auguria.sql index 9151ea059a3..587d7da8e15 100644 --- a/htdocs/includes/menus/init_menu_auguria.sql +++ b/htdocs/includes/menus/init_menu_auguria.sql @@ -277,7 +277,7 @@ insert into `llx_menu` (`menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, insert into `llx_menu` (`menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position) values ('auguria', 'left', 4502__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/htpasswd.php?leftmenu=export', 'Filehtpasswd', 1, 'members', '$user->rights->adherent->export', '', 2, 1); insert into `llx_menu` (`menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position) values ('auguria', 'left', 4503__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/cartes/carte.php?leftmenu=export', 'MembersCards', 1, 'members', '$user->rights->adherent->export', '_blank', 2, 2); insert into `llx_menu` (`menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position) values ('auguria', 'left', 4504__+MAX_llx_menu__, 'members', '', 4500__+MAX_llx_menu__, '/adherents/cartes/etiquette.php?leftmenu=export', 'Etiquettes d''adhérents', 1, 'members', '$user->rights->adherent->export', '_blank', 2, 3); -insert into `llx_menu` (`menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position) values ('auguria', 'left', 4600__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/public/adherents/index.php?leftmenu=member_public', 'MemberPublicLinks', 0, 'members', '$user->rights->adherent->export', '', 2, 4); +insert into `llx_menu` (`menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position) values ('auguria', 'left', 4600__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/public.php?leftmenu=member_public', 'MemberPublicLinks', 0, 'members', '$user->rights->adherent->export', '', 2, 4); insert into `llx_menu` (`menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position) values ('auguria', 'left', 4700__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/index.php?leftmenu=setup&mainmenu=members', 'Setup', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5); insert into `llx_menu` (`menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position) values ('auguria', 'left', 4701__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup', 'MembersTypes', 1, 'members', '$user->rights->adherent->configurer', '', 2, 0); insert into `llx_menu` (`menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position) values ('auguria', 'left', 4702__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/options.php?leftmenu=setup', 'MembersAttributes', 1, 'members', '$user->rights->adherent->configurer', '', 2, 1); diff --git a/htdocs/public/adherents/new.php b/htdocs/public/adherents/new.php index 5cbbf275118..23119c01838 100644 --- a/htdocs/public/adherents/new.php +++ b/htdocs/public/adherents/new.php @@ -19,11 +19,11 @@ */ /** - \file htdocs/public/adherents/new.php - \ingroup adherent - \brief Form example to add a new member - \version $Id$ -*/ + \file htdocs/public/adherents/new.php + \ingroup adherent + \brief Form example to add a new member + \version $Id$ + */ require("../../master.inc.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); @@ -31,22 +31,29 @@ require_once(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/adherent_options.class.php"); require_once(DOL_DOCUMENT_ROOT."/html.form.class.php"); +$langs->setDefaultLang('auto'); + +$langs->load("main"); +$langs->load("members"); +$langs->load("companies"); + + function llxHeaderVierge($title, $head = "") { global $user, $conf, $langs; - print "\n"; - print "\n"; - print "".$title."\n"; - if ($head) print $head."\n"; - print "\n"; + print "\n"; + print "\n"; + print "".$title."\n"; + if ($head) print $head."\n"; + print "\n"; print "\n"; } function llxFooter() { - print "\n"; - print "\n"; + print "\n"; + print "\n"; } @@ -58,13 +65,14 @@ $error=0; /* -* Actions -*/ -if ($_POST["action"] == 'add') + * Actions + */ +if ($_POST["action"] == 'add') { // test si le login existe deja $login=$_POST["login"]; - if(!isset($_POST["login"]) || $_POST["login"]=''){ + if(!isset($_POST["login"]) || $_POST["login"]='') + { $error+=1; $errmsg .="Login $login vide. Veuillez en positionner un
\n"; } @@ -100,7 +108,7 @@ if ($_POST["action"] == 'add') }else{ $public=0; } - + if (! $error) { // email a peu pres correct et le login n'existe pas @@ -108,7 +116,7 @@ if ($_POST["action"] == 'add') $adh->statut = -1; $adh->public = $_POST["public"]; $adh->prenom = $_POST["prenom"]; - $adh->nom = $_POST["nom"]; + $adh->nom = $_POST["nom"]; $adh->societe = $_POST["societe"]; $adh->adresse = $_POST["adresse"]; $adh->cp = $_POST["cp"]; @@ -123,18 +131,18 @@ if ($_POST["action"] == 'add') $adh->typeid = $_POST["type"]; $adh->note = $_POST["comment"]; $adh->morphy = $_POST["morphy"]; - + foreach($_POST as $key => $value){ if (ereg("^options_",$key)){ $adh->array_options[$key]=$_POST[$key]; } } - + $result=$adh->create($user->id); - if ($result > 0) - { + if ($result > 0) + { if ($cotisation > 0) - { + { $adh->cotisation(mktime(12, 0 , 0, $remonth, $reday, $reyear), $cotisation); } @@ -159,13 +167,13 @@ if (isset($_GET["action"]) && $_GET["action"] == 'added' && $conf->global->MEMBE llxHeaderVierge("New member form"); $html = new Form($db); -print_titre("Nouvel adhérent"); +print_titre($langs->trans("NewMember")); /* ************************************************************************** */ /* */ -/* Création d'une fiche */ -/* */ +/* Creation d'une fiche + /* */ /* ************************************************************************** */ $adht = new AdherentType($db); @@ -175,10 +183,10 @@ $adho->fetch_optionals(); if (isset($_GET["action"]) && $_GET["action"] == 'added') { - // Si on a pas été redirigé + // Si on a pas ete redirige print '
'; print ''; - print "\n"; + print "\n"; print '
Nouvel Adhérent ajouté. En attente de validation
Nouvel Adherent ajoute. En attente de validation
'; } @@ -187,7 +195,7 @@ if ($errmsg != '') print '
'; print ''; print ''; - print "\n"; + print "\n"; // print "$errmsg\n"; print '
Erreur dans le formulaire
$errmsg
'.$errmsg.'
'; } @@ -199,8 +207,7 @@ if (defined("ADH_TEXT_NEW_ADH") && ADH_TEXT_NEW_ADH !='') } print '
\n"; print "
\n"; @@ -216,29 +223,28 @@ print ''.$langs->trans("Comments").' :'; $morphys["phy"] = "Physique"; $morphys["mor"] = "Morale"; - -print "Personne\n"; +print ''.$langs->trans("MorPhy")."\n"; $html->select_array("morphy", $morphys); print "\n"; print ''; -print '* * Prénom'; +print '* * '.$langs->trans("Surname").''; -print '* * Nom'; -print 'Societe'; -print 'Adresse'; +print '* * '.$langs->trans("Name").''; +print ''.$langs->trans("ThirdParty").''; +print ''.$langs->trans("Address").''; print ''; -print 'CP Ville '; -print 'Pays'; +print ''.$langs->trans("Zip").'/'.$langs->trans("Town").' '; +print ''.$langs->trans("Country").''; print '* * Email'; -print '* Login'; -print '* Password (a entrer 2 fois)
'; +print '* '.$langs->trans("Login").''; +print '* '.$langs->trans("Password").'
'; print 'Date de naissance
Format AAAA-MM-JJ'; print '* URL Photo'; print 'Profil public ?'; foreach($adho->attribute_label as $key=>$value){ - print "$value\n"; + print "$value\n"; } print ''; print "\n"; diff --git a/htdocs/public/adherents/pre.inc.php b/htdocs/public/adherents/pre.inc.php deleted file mode 100644 index 09d4f897dcf..00000000000 --- a/htdocs/public/adherents/pre.inc.php +++ /dev/null @@ -1,45 +0,0 @@ - - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -/** - \file htdocs/lib/datepicker.php - \brief Fichier de gestion de la popup de selection de date eldy - \version $Id$ -*/ - -require("../../main.inc.php"); - - -function llxHeader($head = "") -{ - global $user, $conf, $langs; - - top_menu($head); - - $menu = new Menu(); - - $menu->add(DOL_URL_ROOT."/public/adherents/","Non adherent"); - $menu->add_submenu("new.php","Inscription"); - $menu->add(DOL_URL_ROOT."/public/adherents/","Adherents"); - $menu->add_submenu("priv_edit.php","Edition de sa fiche"); - $menu->add_submenu("priv_liste.php","Liste des adherents"); - - left_menu($menu->liste); -} - -?> diff --git a/htdocs/public/adherents/priv_fiche.php b/htdocs/public/adherents/priv_fiche.php index 3108c641cd8..f772da9c085 100644 --- a/htdocs/public/adherents/priv_fiche.php +++ b/htdocs/public/adherents/priv_fiche.php @@ -31,6 +31,8 @@ require_once(DOL_DOCUMENT_ROOT."/adherents/cotisation.class.php"); require_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/adherent_options.class.php"); +$langs->setDefaultLang('auto'); + $langs->load("main"); $langs->load("members"); $langs->load("companies"); diff --git a/htdocs/public/adherents/priv_liste.php b/htdocs/public/adherents/priv_liste.php index 6257005460b..56a9b2521f2 100644 --- a/htdocs/public/adherents/priv_liste.php +++ b/htdocs/public/adherents/priv_liste.php @@ -26,6 +26,8 @@ require("../../master.inc.php"); +$langs->setDefaultLang('auto'); + $langs->load("main"); $langs->load("members"); $langs->load("companies"); @@ -92,7 +94,7 @@ if ($result) print ""; print ''; - print "\n"; + print "\n"; print_liste_field_titre($langs->trans("Birthdate"),"priv_liste.php","naiss","",$param,$sortfield,$sortorder); print_liste_field_titre($langs->trans("EMail"),"priv_liste.php","email","",$param,$sortfield,$sortorder); print_liste_field_titre($langs->trans("Zip"),"priv_liste.php","cp","",$param,$sortfield,$sortorder); diff --git a/htdocs/public/bplc/cyberpaiement.class.php b/htdocs/public/bplc/cyberpaiement.class.php index aec213a851b..d8d804eb948 100644 --- a/htdocs/public/bplc/cyberpaiement.class.php +++ b/htdocs/public/bplc/cyberpaiement.class.php @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ - * $Source$ */ -/* Classe de gestion du système de paiement de la banque Populaire +/** + * \version $Id$ + */ + +/* Classe de gestion du systeme de paiement de la banque Populaire * de Lorraine et Champagne * http://www.cyberpaiement.tm.fr/ - * */ class Cyberpaiement @@ -30,19 +30,19 @@ class Cyberpaiement function Cyberpaiement($conf) /* - * Initialisation des valeurs par défaut + * Initialisation des valeurs par d�faut */ { - /* Numéro abonné Internet : 6 chiffres */ + /* Num�ro abonn� Internet : 6 chiffres */ $this->champ000 = $conf->bplc->numabonne; - /* Code activité commercant : 4 chiffres */ + /* Code activit� commercant : 4 chiffres */ $this->champ001 = $conf->bplc->code_activite; - /* Numéro de contrat : 10 chiffres */ + /* Num�ro de contrat : 10 chiffres */ $this->champ002 = $conf->bplc->num_contrat; @@ -74,13 +74,13 @@ class Cyberpaiement $this->champ202 = $conf->bplc->devise; - /* Adhérent : 01 */ + /* Adh�rent : 01 */ $this->champ900 = $conf->bplc->adherent; /* *********************************************** */ - /* Initialisation à vide des valeurs qui ne seront */ + /* Initialisation � vide des valeurs qui ne seront */ /* pas transmises */ /* *********************************************** */ @@ -114,12 +114,12 @@ class Cyberpaiement $this->champ101 = $prenom; - /* Société */ + /* Soci�t� */ if (strlen(trim($societe))) { $this->champ102 = $societe; } - /* Téléphone */ + /* T�l�phone */ if (strlen(trim($telephone))) { $this->champ103 = $telephone; @@ -135,7 +135,7 @@ class Cyberpaiement $this->champ106 = $fax; } - /* Adresse numéro et rue */ + /* Adresse num�ro et rue */ if (strlen(trim($adresse))) { $this->champ107 = $adresse; @@ -167,7 +167,7 @@ class Cyberpaiement function set_commande($ref, $montant) { - /* Référence */ + /* R�f�rence */ $this->champ200 = $ref; diff --git a/htdocs/public/bplc/merci_code.php b/htdocs/public/bplc/merci_code.php index c54965697fd..1c3e383003e 100644 --- a/htdocs/public/bplc/merci_code.php +++ b/htdocs/public/bplc/merci_code.php @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ - * $Source$ - * + */ + +/** + * \version $Id$ */ if ($conf->don->onlinepayment) diff --git a/htdocs/public/bplc/retourbplc.class.php b/htdocs/public/bplc/retourbplc.class.php index c7d6081db71..c40615db286 100644 --- a/htdocs/public/bplc/retourbplc.class.php +++ b/htdocs/public/bplc/retourbplc.class.php @@ -15,13 +15,15 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id$ - * * Classe de gestion du retour RSTS du systeme de paiement en ligne * CyberPaiement (TM) de la Banque Populaire de Lorraine * - * Certaine fonction de cette classe existe de base dans PHP4 mais ont �t� - * r�-�crites ici pour le support de PHP3 + * Certaine fonction de cette classe existe de base dans PHP4 mais ont ete + * re-ecrites ici pour le support de PHP3 + */ + +/** + * \version $Id$ */ class Retourbplc diff --git a/htdocs/public/bplc/testretour.php b/htdocs/public/bplc/testretour.php index b9fcce1a600..67175f74b65 100644 --- a/htdocs/public/bplc/testretour.php +++ b/htdocs/public/bplc/testretour.php @@ -14,11 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ - * $Source$ - * */ + +/** + * \version $Id$ + */ + ?> diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php index 09e14addf92..e2b1aac6be3 100644 --- a/htdocs/public/demo/index.php +++ b/htdocs/public/demo/index.php @@ -26,6 +26,7 @@ */ require("../../master.inc.php"); + $langs->setDefaultLang('auto'); $langs->load("main"); diff --git a/htdocs/public/dons/donateurs_code.php b/htdocs/public/dons/donateurs_code.php index 14153259f65..d1ddc7b2bbe 100644 --- a/htdocs/public/dons/donateurs_code.php +++ b/htdocs/public/dons/donateurs_code.php @@ -14,13 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ + */ + +/** + * \version $Id$ */ require("../../master.inc.php"); require_once(DOL_DOCUMENT_ROOT ."/don.class.php"); +$langs->setDefaultLang('auto'); + $langs->load("donations"); $sql = "SELECT ".$db->pdate("d.datedon")." as datedon, d.nom, d.prenom, d.amount, d.public, d.societe"; diff --git a/htdocs/public/dons/therm.php b/htdocs/public/dons/therm.php index 4102e8b4d96..f9ddcc5dda3 100644 --- a/htdocs/public/dons/therm.php +++ b/htdocs/public/dons/therm.php @@ -28,9 +28,11 @@ require("../../master.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/don.class.php"); +$langs->setDefaultLang('auto'); + /* -* Read Values +* View */ $dontherm = new Don($db);
Prenom Nom / SociétéPrenom Nom / Soci�t�