From 74a7b1d3de0da992d2ff33f76d694e154f0ef7a8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 2 Jan 2009 13:19:52 +0000 Subject: [PATCH] Renamed pages with priv into public to be more accurate on page goal. --- htdocs/adherents/public.php | 4 +- .../menus/barre_left/eldy_backoffice.php | 7 -- .../menus/barre_left/eldy_frontoffice.php | 7 -- .../{priv_fiche.php => public_card.php} | 69 ++++++++++--------- .../{priv_liste.php => public_list.php} | 3 +- 5 files changed, 42 insertions(+), 48 deletions(-) rename htdocs/public/adherents/{priv_fiche.php => public_card.php} (81%) rename htdocs/public/adherents/{priv_liste.php => public_list.php} (98%) diff --git a/htdocs/adherents/public.php b/htdocs/adherents/public.php index 46098f68894..4d236e4885d 100644 --- a/htdocs/adherents/public.php +++ b/htdocs/adherents/public.php @@ -48,8 +48,8 @@ print '
'; print ''; print ''; print ''; -print ''; -print ''; +print ''; +print ''; print '
'.$langs->trans("Description").''.$langs->trans("URL").'
'.$langs->trans("BlankSubscriptionForm").''.$dolibarr_main_url_root.DOL_URL_ROOT.'/public/adherents/new.php'.'
'.$langs->trans("PublicMemberList").''.$dolibarr_main_url_root.DOL_URL_ROOT.'/public/adherents/priv_liste.php'.'
'.$langs->trans("PublicMemberCard").''.$dolibarr_main_url_root.DOL_URL_ROOT.'/public/adherents/priv_fiche.php?id=xxx'.'
'.$langs->trans("PublicMemberList").''.$dolibarr_main_url_root.DOL_URL_ROOT.'/public/adherents/public_list.php'.'
'.$langs->trans("PublicMemberCard").''.$dolibarr_main_url_root.DOL_URL_ROOT.'/public/adherents/public_card.php?id=xxx'.'
'; diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php index d21599c88f6..4f80d168466 100644 --- a/htdocs/includes/menus/barre_left/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php @@ -871,13 +871,6 @@ class MenuLeft { 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."/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"); - if ($leftmenu=="member_public") $newmenu->add(DOL_URL_ROOT."/public/adherents/","Adherents"); - if ($leftmenu=="member_public") $newmenu->add_submenu("priv_edit.php",$langs->trans("EditCard")); - if ($leftmenu=="member_public") $newmenu->add_submenu("priv_liste.php",$langs->trans("List")); - */ $newmenu->add(DOL_URL_ROOT."/adherents/index.php?leftmenu=setup&mainmenu=members",$langs->trans("Setup"),0,$user->rights->adherent->configurer); $newmenu->add_submenu(DOL_URL_ROOT."/adherents/type.php?leftmenu=setup&",$langs->trans("MembersTypes"),1,$user->rights->adherent->configurer); diff --git a/htdocs/includes/menus/barre_left/eldy_frontoffice.php b/htdocs/includes/menus/barre_left/eldy_frontoffice.php index 17c842071c2..a4b961eaf3c 100644 --- a/htdocs/includes/menus/barre_left/eldy_frontoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_frontoffice.php @@ -830,13 +830,6 @@ class MenuLeft { 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."/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"); - if ($leftmenu=="member_public") $newmenu->add(DOL_URL_ROOT."/public/adherents/","Adherents"); - if ($leftmenu=="member_public") $newmenu->add_submenu("priv_edit.php",$langs->trans("EditCard")); - if ($leftmenu=="member_public") $newmenu->add_submenu("priv_liste.php",$langs->trans("List")); - */ $newmenu->add(DOL_URL_ROOT."/adherents/index.php?leftmenu=setup&mainmenu=members",$langs->trans("Setup"),0,$user->rights->adherent->configurer); $newmenu->add_submenu(DOL_URL_ROOT."/adherents/type.php?leftmenu=setup&",$langs->trans("MembersTypes"),1,$user->rights->adherent->configurer); diff --git a/htdocs/public/adherents/priv_fiche.php b/htdocs/public/adherents/public_card.php similarity index 81% rename from htdocs/public/adherents/priv_fiche.php rename to htdocs/public/adherents/public_card.php index 85ab240b503..194611c03c8 100644 --- a/htdocs/public/adherents/priv_fiche.php +++ b/htdocs/public/adherents/public_card.php @@ -19,16 +19,14 @@ */ /** - \file htdocs/public/adherents/priv_fiche.php - \brief Fichier de gestion de la popup de selection de date eldy - \version $Id$ + * \file htdocs/public/adherents/priv_fiche.php + * \brief Fichier de gestion de la popup de selection de date eldy + * \version $Id$ */ require("../../master.inc.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php"); -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'); @@ -38,24 +36,6 @@ $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"; -} - -function llxFooter() -{ - print "\n"; - print "\n"; -} - $rowid=$_GET["id"]; $adho = new AdherentOptions($db); @@ -85,31 +65,35 @@ if ($rowid > 0) { print ''; - print '\n"; - print ''; + print '\n"; - print ''; + print ''; - print ''; - - print ''; + print ''; print ''; - print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + if (isset($adh->photo) && $adh->photo !=''){ print ''; } // foreach($adho->attribute_label as $key=>$value){ // print "\n"; // } + + print ''; + print '
'.$langs->trans("Type").''.$adh->type."'.$langs->trans("Comments").'
'.$langs->trans("Type").''.$adh->type."
Personne'.$adh->morphy.' 
'.$langs->trans("Person").''.$adh->morphy.'
'; - print nl2br($adh->note).' 
'.$langs->trans("Surname").''.$adh->prenom.' 
'.$langs->trans("Surname").''.$adh->prenom.' 
'.$langs->trans("Name").''.$adh->nom.' 
'.$langs->trans("Company").''.$adh->societe.' 
'.$langs->trans("Address").''.nl2br($adh->adresse).' 
'.$langs->trans("Zip").' '.$langs->trans("Town").''.$adh->cp.' '.$adh->ville.' 
'.$langs->trans("Country").''.$adh->pays.' 
'.$langs->trans("EMail").''.$adh->email.' 
'.$langs->trans("Birthday").''.$adh->naiss.' 
URL Photo'."photo\">photo\">".' 
$value".$adh->array_options["options_$key"]." 
'.$langs->trans("Comments").''.nl2br($adh->note).'
'; } @@ -118,4 +102,27 @@ if ($rowid > 0) $db->close(); llxFooter('$Date$ - $Revision$'); + + +/* Functions header and footer */ + +function llxHeaderVierge($title, $head = "") +{ + global $user, $conf, $langs; + + header("Content-type: text/html; charset=".$conf->character_set_client); + print "\n"; + print "\n"; + print "".$title."\n"; + if ($head) print $head."\n"; + print "\n"; + print "\n"; +} + +function llxFooter() +{ + print "\n"; + print "\n"; +} + ?> diff --git a/htdocs/public/adherents/priv_liste.php b/htdocs/public/adherents/public_list.php similarity index 98% rename from htdocs/public/adherents/priv_liste.php rename to htdocs/public/adherents/public_list.php index efcf3faeff4..2db2757ed5b 100644 --- a/htdocs/public/adherents/priv_liste.php +++ b/htdocs/public/adherents/public_list.php @@ -37,7 +37,8 @@ function llxHeaderVierge($title, $head = "") { global $user, $conf, $langs; - print "\n"; + header("Content-type: text/html; charset=".$conf->character_set_client); + print "\n"; print "\n"; print "".$title."\n"; if ($head) print $head."\n";