diff --git a/db/migrations/20240718093800_suppression_accreditation_presse.php b/db/migrations/20240718093800_suppression_accreditation_presse.php new file mode 100644 index 000000000..9c566c9d2 --- /dev/null +++ b/db/migrations/20240718093800_suppression_accreditation_presse.php @@ -0,0 +1,11 @@ +execute('DROP TABLE IF EXISTS afup_accreditation_presse'); + } +} diff --git a/db/migrations/20240720122300_suppression_blacklist.php b/db/migrations/20240720122300_suppression_blacklist.php new file mode 100644 index 000000000..5138db2c0 --- /dev/null +++ b/db/migrations/20240720122300_suppression_blacklist.php @@ -0,0 +1,11 @@ +execute('DROP TABLE IF EXISTS afup_blacklist'); + } +} diff --git a/db/seeds/Compta.php b/db/seeds/Compta.php index 5157e08f4..9a7c9ec5a 100644 --- a/db/seeds/Compta.php +++ b/db/seeds/Compta.php @@ -30,7 +30,10 @@ public function run() 'description' => 'Une recette qui rapporte', 'attachment_filename' => $path.'/test_file1.pdf', 'idevenement' => 5, - 'idcompte' => 1 + 'idclef' => '', + 'idcompte' => 1, + 'numero' => '', + 'obs_regl' => '', ], [ 'id' => '2', @@ -44,7 +47,11 @@ public function run() 'date_ecriture' => date('Y-10-18'), 'description' => 'Une dépense très utile', 'idevenement' => 5, - 'idcompte' => 1 + + 'idcompte' => 1, + 'idclef' => 2, + 'numero' => '', + 'obs_regl' => '', ], [ 'id' => '3', @@ -56,6 +63,14 @@ public function run() 'comment' => null, 'attachment_required' => 1, 'idcompte' => 1, + 'idclef' => 3, + 'numero' => '', + 'obs_regl' => '', + 'idoperation' => 0, + 'idcategorie' => 0, + 'idmode_regl' => 0, + 'date_regl' => '0000-00-00', + 'idevenement' => 0, ], [ 'id' => '4', @@ -68,6 +83,14 @@ public function run() 'attachment_required' => 1, 'idcompte' => 1, 'montant_ht_soumis_tva_20' => 13, + 'idclef' => 4, + 'numero' => '', + 'obs_regl' => '', + 'idoperation' => 0, + 'idcategorie' => 0, + 'idmode_regl' => 0, + 'date_regl' => '0000-00-00', + 'idevenement' => 0, ], ]; diff --git a/db/seeds/Event.php b/db/seeds/Event.php index e660df919..c414a3acb 100644 --- a/db/seeds/Event.php +++ b/db/seeds/Event.php @@ -40,7 +40,7 @@ public function run() 'date_fin_saisie_nuites_hotel' => $event - $oneDayInSeconds * 7, 'place_name' => 'Paris', 'place_address' => 'Marriott Rive Gauche', - 'date_annonce_planning' => date('Y-m-d', $event), + 'date_annonce_planning' => date('Y-m-d H:i:s', $now - $oneMonthInSeconds), 'transport_information_enabled' => 1, 'has_prices_defined_with_vat' => 1, ], diff --git a/db/seeds/Facture.php b/db/seeds/Facture.php index 0b81279e6..4efd297f8 100644 --- a/db/seeds/Facture.php +++ b/db/seeds/Facture.php @@ -24,7 +24,12 @@ public function run() 'prenom' => 'Yan', 'etat_paiement' => 1, 'devise_facture' => 'EUR', - 'ref_clt1' => 'Forum PHP 2023' + 'ref_clt1' => 'Forum PHP 2023', + 'service' => '', + 'observation' => '', + 'ref_clt2' => '', + 'ref_clt3' => '', + 'tel' => '', ], [ 'id' => '2', @@ -43,7 +48,13 @@ public function run() 'prenom' => 'Yan', 'etat_paiement' => 1, 'devise_facture' => 'EUR', - 'ref_clt1' => 'Forum PHP 2024' + 'ref_clt1' => 'Forum PHP 2024', + 'service' => '', + 'observation' => '', + 'ref_clt2' => '', + 'ref_clt3' => '', + 'tel' => '', + ], ]; diff --git a/db/seeds/Feuilles.php b/db/seeds/Feuilles.php index 696f41fcc..33006d3a9 100644 --- a/db/seeds/Feuilles.php +++ b/db/seeds/Feuilles.php @@ -180,10 +180,14 @@ private function prepareFeuilles(array $items, $parentId, &$baseId = null) $preparedFeuiles = []; foreach ($items as $item) { + $lien = null; + if (isset($item['lien'])) { + $lien = $item['lien']; + } $preparedFeuiles[$currentId] = [ 'id' => ($currentId = ++$baseId), 'nom' => $item['nom'], - 'lien' => $item['lien'], + 'lien' => $item['lien'] ?? null, 'id_parent' => $parentId, 'etat' => 1, ]; diff --git a/db/seeds/Session.php b/db/seeds/Session.php index d49adbe83..4bc61b65e 100644 --- a/db/seeds/Session.php +++ b/db/seeds/Session.php @@ -35,7 +35,8 @@ public function run() 'language_code' => 'fr', 'markdown' => 1, 'joindin' => 24041, - 'date_publication' => null + 'date_publication' => null, + 'has_allowed_to_sharing_with_local_offices' => 1, ], [ 'session_id' => self::ID_SESSIONS[1], @@ -59,7 +60,8 @@ public function run() 'language_code' => 'fr', 'markdown' => 0, 'joindin' => 24138, - 'date_publication' => (new \DateTime())->modify('-1 days')->format('Y-m-d H:i:s') + 'date_publication' => (new \DateTime())->modify('-1 days')->format('Y-m-d H:i:s'), + 'has_allowed_to_sharing_with_local_offices' => 1, ], [ 'session_id' => 3, @@ -81,7 +83,8 @@ public function run() 'language_code' => 'fr', 'markdown' => 1, 'joindin' => 24041, - 'date_publication' => (new \DateTime())->modify('+5 days')->format('Y-m-d H:i:s') + 'date_publication' => (new \DateTime())->modify('+5 days')->format('Y-m-d H:i:s'), + 'has_allowed_to_sharing_with_local_offices' => 1, ], ]; @@ -132,7 +135,7 @@ public function run() 'fin' => $date->format('U'), 'id_salle' => 1, 'id_forum' => Event::ID_FORUM, - 'keynote' => '' + 'keynote' => 0, ]; ++$i; } diff --git a/db/seeds/Tarif.php b/db/seeds/Tarif.php index ad31a216a..c717cf28c 100644 --- a/db/seeds/Tarif.php +++ b/db/seeds/Tarif.php @@ -12,55 +12,55 @@ public function run() 'technical_name' => 'AFUP_FORUM_DEUXIEME_JOURNEE', 'pretty_name' => 'Deuxième journée', 'public' => true, - 'members_only' => false, + 'members_only' => 0, 'default_price' => 150, 'active' => true, 'day' => 'two', - 'cfp_submitter_only' => false, + 'cfp_submitter_only' => 0, ], [ 'id' => 2, 'technical_name' => 'AFUP_FORUM_2_JOURNEES', 'pretty_name' => '2 Jours', 'public' => true, - 'members_only' => false, + 'members_only' => 0, 'default_price' => 250, 'active' => true, 'day' => 'one,two', - 'cfp_submitter_only' => false, + 'cfp_submitter_only' => 0, ], [ 'id' => 3, 'technical_name' => 'AFUP_FORUM_2_JOURNEES_AFUP', 'pretty_name' => '2 Jours AFUP', 'public' => true, - 'members_only' => true, + 'members_only' => 1, 'default_price' => 150, 'active' => true, 'day' => 'one,two', - 'cfp_submitter_only' => false, + 'cfp_submitter_only' => 0, ], [ 'id' => 4, 'technical_name' => 'AFUP_TEST', 'pretty_name' => 'Pour les tests', 'public' => true, - 'members_only' => true, + 'members_only' => 1, 'default_price' => 100, 'active' => true, 'day' => 'one,two', - 'cfp_submitter_only' => false, + 'cfp_submitter_only' => 0, ], [ 'id' => 5, 'technical_name' => 'AFUP_CFP', 'pretty_name' => 'Spécial CFP', 'public' => true, - 'members_only' => false, + 'members_only' => 0, 'default_price' => 2, 'active' => true, 'day' => 'one,two', - 'cfp_submitter_only' => true, + 'cfp_submitter_only' => 1, ], ]; diff --git a/db/seeds/TechletterSubscriptions.php b/db/seeds/TechletterSubscriptions.php index 4bc03bae0..8cf46ecea 100644 --- a/db/seeds/TechletterSubscriptions.php +++ b/db/seeds/TechletterSubscriptions.php @@ -6,7 +6,7 @@ class TechletterSubscriptions extends AbstractSeed { public function run() { - $subscriptionDate = (new DateTime())->format(DateTime::ATOM); + $subscriptionDate = (new DateTime())->format('Y-m-d H:i:s'); $data = [ [ 'user_id' => Users::ID_USER_ADMIN, diff --git a/db/seeds/Users.php b/db/seeds/Users.php index f3e1085c7..de984df97 100644 --- a/db/seeds/Users.php +++ b/db/seeds/Users.php @@ -72,7 +72,9 @@ public function run() 'niveau' => 2, // AFUP_DROITS_NIVEAU_ADMINISTRATEUR, 'prenom' => 'Admin', 'email' => 'admin@admin.fr', - 'niveau_modules' => '00000' + 'niveau_modules' => '00000', + 'roles' => '', + 'adresse' => '', ], // utilisateur ayant expiré, avec une date de cotisation fixe, utile pour les tests [ @@ -84,6 +86,8 @@ public function run() 'prenom' => 'Jean', 'email' => 'userexpire@yahoo.fr', 'niveau_modules' => '00000', + 'roles' => '', + 'adresse' => '', ], // utilisateurs avec des cotisations à dates fixes pour les tests [ @@ -97,7 +101,8 @@ public function run() 'niveau_modules' => '00000', 'adresse' => '15, main road', 'code_postal' => '93501-1100', - 'ville' => 'Mojave, CA' + 'ville' => 'Mojave, CA', + 'roles' => '', ], [ 'id' => self::ID_USER_PERSONNE_LIE_PERSONNE_MORALE_FIXED_COTISATIONS, @@ -110,6 +115,7 @@ public function run() 'roles' => '["ROLE_COMPANY_MANAGER"]', 'id_personne_morale' => self::ID_PERSONNE_MORALE_HELIOS_AEROSPACE, 'niveau_modules' => '00000', + 'adresse' => '', ], [ 'id' => self::ID_USER_PERSONNE_MORALE, @@ -122,6 +128,7 @@ public function run() 'roles' => '["ROLE_COMPANY_MANAGER"]', 'id_personne_morale' => self::ID_PERSONNE_MORALE_MY_CORP, 'niveau_modules' => '00000', + 'adresse' => '', ], [ 'id' => self::ID_USER_PERSONNE_MORALE_NON_MANAGER, @@ -134,7 +141,8 @@ public function run() 'roles' => '[]', 'id_personne_morale' => self::ID_PERSONNE_MORALE_MY_CORP, 'niveau_modules' => '00000', - 'etat' => 1 + 'etat' => 1, + 'adresse' => '', ], [ 'id' => self::ID_USER_PERSONNE_PHYSIQUE, @@ -147,6 +155,7 @@ public function run() 'roles' => '[]', 'etat' => User::STATUS_ACTIVE, 'niveau_modules' => '00000', + 'adresse' => '', ], ]; diff --git a/htdocs/.htaccess b/htdocs/.htaccess index 442ba94a8..891ef8b99 100644 --- a/htdocs/.htaccess +++ b/htdocs/.htaccess @@ -39,8 +39,6 @@ RewriteRule ^enquete$ "https://docs.google.com/forms/d/e/1FAIpQLSdtPRqp7AL73RhUS # If the requested filename exists, simply serve it. # We only want to let Apache serve files and not directories. -RewriteCond %{HTTPS} off -RewriteRule .* https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301] RewriteCond %{HTTP_HOST} ^www\.(.*)$ [NC] RewriteRule ^(.*)$ https://%1/$1 [R=301,L] @@ -51,6 +49,9 @@ RewriteRule ^ - [END] RewriteRule ^m/ /event/latest/calendar [R=301,L] RewriteRule ^calendrier/?(index.php)? /event/latest/calendar [R=301,L] RewriteRule ^forumphp/? https://event.afup.org [R=301,L] +RewriteRule ^ask/barometre/? https://barometre.afup.org [R=301,L] +RewriteRule ^ask/forum/? https://event.afup.org [R=301,L] +RewriteRule ^ask/? / [R=301,L] ## This url are handled by symfony RewriteRule (event|connect|_|association|talks|meetups|blog|admin|p|home|news|techno_watch|member|rss.xml)/? /app.php [END] diff --git a/htdocs/ask/barometre/2013.html b/htdocs/ask/barometre/2013.html deleted file mode 100644 index 4528537a7..000000000 --- a/htdocs/ask/barometre/2013.html +++ /dev/null @@ -1,56 +0,0 @@ - - - - Baromètre AFUP / Agence-e : les salaires du PHP - - - - -
-
- -
- - -
- -

-Le baromètre est clos. Rendez vous les 21 et 22 Novembre pour le forum PHP à Paris. -

- - - -
-
- -
- - - - - - - diff --git a/htdocs/ask/barometre/2014.html b/htdocs/ask/barometre/2014.html deleted file mode 100644 index c6b8ce5f4..000000000 --- a/htdocs/ask/barometre/2014.html +++ /dev/null @@ -1,53 +0,0 @@ - - - - Baromètre AFUP / Agence-e : les salaires du PHP - - - - -
-
- -
- - -
- - - - -
-
- -
- - - - - - - diff --git a/htdocs/ask/barometre/AFUP_LOGO.png b/htdocs/ask/barometre/AFUP_LOGO.png deleted file mode 100644 index e7f8b6d1a..000000000 Binary files a/htdocs/ask/barometre/AFUP_LOGO.png and /dev/null differ diff --git a/htdocs/ask/barometre/agence-e-01new.jpg b/htdocs/ask/barometre/agence-e-01new.jpg deleted file mode 100644 index 97179236b..000000000 Binary files a/htdocs/ask/barometre/agence-e-01new.jpg and /dev/null differ diff --git a/htdocs/ask/barometre/elephpant.jpg b/htdocs/ask/barometre/elephpant.jpg deleted file mode 100644 index a3d9196b6..000000000 Binary files a/htdocs/ask/barometre/elephpant.jpg and /dev/null differ diff --git a/htdocs/ask/barometre/index.php b/htdocs/ask/barometre/index.php deleted file mode 100644 index 2604ec0f9..000000000 --- a/htdocs/ask/barometre/index.php +++ /dev/null @@ -1,4 +0,0 @@ - \ No newline at end of file diff --git a/htdocs/ask/barometre/logo_agence-e.png b/htdocs/ask/barometre/logo_agence-e.png deleted file mode 100644 index 2d921e3d9..000000000 Binary files a/htdocs/ask/barometre/logo_agence-e.png and /dev/null differ diff --git a/htdocs/ask/dotscale/index.php b/htdocs/ask/dotscale/index.php deleted file mode 100644 index 626faf094..000000000 --- a/htdocs/ask/dotscale/index.php +++ /dev/null @@ -1,4 +0,0 @@ - \ No newline at end of file diff --git a/htdocs/ask/dotscale/index_old.html b/htdocs/ask/dotscale/index_old.html deleted file mode 100644 index 75bb825a3..000000000 --- a/htdocs/ask/dotscale/index_old.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - Gagnez votre place pour dotScale - - - - - - -
- - -
-
- - - - - - - \ No newline at end of file diff --git a/htdocs/ask/dotscale/logo-fondblanc.png b/htdocs/ask/dotscale/logo-fondblanc.png deleted file mode 100644 index f9009307c..000000000 Binary files a/htdocs/ask/dotscale/logo-fondblanc.png and /dev/null differ diff --git a/htdocs/ask/forum/2013.html b/htdocs/ask/forum/2013.html deleted file mode 100644 index a83b40426..000000000 --- a/htdocs/ask/forum/2013.html +++ /dev/null @@ -1,55 +0,0 @@ - - - - Forum PHP 2013 : votre feedback - - - - -
-
- - -
- -

-L'AFUP vous remercie d'avoir assisté au Forum PHP 2013. Nous vous invitons à donner un feedback sur les conférences auquelles vous avez assisté sur joind.in et sur le forum dans ce formulaire.
-Merci, le bureau 2013. -

- - - -
-
- -
- - - - - - - diff --git a/htdocs/ask/forum/AFUP_LOGO.png b/htdocs/ask/forum/AFUP_LOGO.png deleted file mode 100644 index e7f8b6d1a..000000000 Binary files a/htdocs/ask/forum/AFUP_LOGO.png and /dev/null differ diff --git a/htdocs/ask/forum/elephpant.jpg b/htdocs/ask/forum/elephpant.jpg deleted file mode 100644 index a3d9196b6..000000000 Binary files a/htdocs/ask/forum/elephpant.jpg and /dev/null differ diff --git a/htdocs/ask/forum/index.php b/htdocs/ask/forum/index.php deleted file mode 100644 index 626faf094..000000000 --- a/htdocs/ask/forum/index.php +++ /dev/null @@ -1,4 +0,0 @@ - \ No newline at end of file diff --git a/htdocs/ask/index.php b/htdocs/ask/index.php deleted file mode 100644 index 626faf094..000000000 --- a/htdocs/ask/index.php +++ /dev/null @@ -1,4 +0,0 @@ - \ No newline at end of file diff --git a/htdocs/include/prepend.inc.php b/htdocs/include/prepend.inc.php deleted file mode 100644 index e69de29bb..000000000 diff --git a/htdocs/pages/.htaccess b/htdocs/pages/.htaccess index bb9463587..5b465c53e 100644 --- a/htdocs/pages/.htaccess +++ b/htdocs/pages/.htaccess @@ -1,8 +1,5 @@ RewriteEngine On -RewriteCond %{HTTPS} off -RewriteRule .* https://%{HTTP_HOST}%{REQUEST_URI} [L,R=302] - RewriteCond %{HTTP_HOST} ^www\.(.*)$ [NC] RewriteRule ^(.*)$ https://%1/$1 [R=301,L] diff --git a/htdocs/pages/administration/site_articles.php b/htdocs/pages/administration/site_articles.php index 969b7206d..51555adac 100755 --- a/htdocs/pages/administration/site_articles.php +++ b/htdocs/pages/administration/site_articles.php @@ -31,6 +31,11 @@ $forumLabelsById[$forum['id']] = $forum['titre']; } +function checkNoSpace($value): bool +{ + return !preg_match('/(\s)/', $value); +} + if ($action == 'lister') { $list_champs = '*'; $list_ordre = 'date'; @@ -122,6 +127,10 @@ $formulaire->addRule('contenu' , 'Contenu manquant' , 'required'); $formulaire->addRule('raccourci' , 'Raccourci manquant' , 'required'); + $formulaire->registerRule('checkNoSpace', 'callback', 'checkNoSpace'); + $formulaire->addRule('raccourci', 'Ne doit pas contenir d\'espace', 'checkNoSpace', true); + + if ($formulaire->validate()) { $article->id_site_rubrique = $formulaire->exportValue('id_site_rubrique'); $article->id_personne_physique = $formulaire->exportValue('id_personne_physique'); diff --git a/htdocs/pages/partenaires/.htaccess b/htdocs/pages/partenaires/.htaccess deleted file mode 100644 index 8bfcd8b92..000000000 --- a/htdocs/pages/partenaires/.htaccess +++ /dev/null @@ -1,4 +0,0 @@ -AuthType Basic -AuthName "Partenaires AFUP" -AuthUserFile /var/www/afup.org/htdocs/pages/partenaires/.htpasswd -Require valid-user diff --git a/htdocs/pages/partenaires/.htpasswd b/htdocs/pages/partenaires/.htpasswd deleted file mode 100644 index a9c21321f..000000000 --- a/htdocs/pages/partenaires/.htpasswd +++ /dev/null @@ -1,4 +0,0 @@ -alterway:$apr1$2a8J3HAX$4871R6n11qd7kisSOkZDs0 -linagora:$apr1$EWqYxbZl$ahWsjhBgyOr69VUgwjDRi/ -noparking:$apr1$woi2mZ2n$wuOpJHNoY5d2DOzskiVin/ -smile:$apr1$Ps6ANwH7$EF17iEtaCe240IMIphJ63/ diff --git a/htdocs/pages/partenaires/index.php b/htdocs/pages/partenaires/index.php deleted file mode 100755 index c765a6cdb..000000000 --- a/htdocs/pages/partenaires/index.php +++ /dev/null @@ -1,36 +0,0 @@ -addElement('header' , '' , 'Vérifier l\'existence d\'un membre'); -$formulaire->addElement('text', 'nom', 'Nom'); -$formulaire->addElement('text', 'prenom', 'Prénom'); -$formulaire->addElement('header' , 'boutons' , ''); -$formulaire->addElement('submit' , 'verifier' , 'Vérifier'); -$formulaire->addRule('nom' , 'Nom manquant' , 'required'); -$formulaire->addRule('prenom' , 'Prénom manquant' , 'required'); - -if ($formulaire->validate()) { - Logs::log('Vérification par un partenaire de : '.$formulaire->exportValue('nom').' - '.$formulaire->exportValue('prenom')); - $smarty->assign( - 'resultat', - $partenariat->verifierMembre( - $formulaire->exportValue('nom'), - $formulaire->exportValue('prenom') - ) - ); -} - -$smarty->assign('formulaire', genererFormulaire($formulaire)); -$smarty->display('membre.html'); diff --git a/htdocs/templates/partenaires/entete.html b/htdocs/templates/partenaires/entete.html deleted file mode 100755 index b3a3e828b..000000000 --- a/htdocs/templates/partenaires/entete.html +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - Outil pour les partenaires de l'AFUP - - -
- - -
-

Outil pour les partenaires de l'AFUP

diff --git a/htdocs/templates/partenaires/medias/css/style.css b/htdocs/templates/partenaires/medias/css/style.css deleted file mode 100755 index 7870f6e28..000000000 --- a/htdocs/templates/partenaires/medias/css/style.css +++ /dev/null @@ -1,17 +0,0 @@ -body { background-color: #4682DB; padding: 0px; margin: 0px; font-family: verdana; } -#container { width : 960px; border: 0px; margin: 0px auto; background-color: #ffffff; padding: 20px; min-height: 3333331px; border-left: #333333 8px solid; border-right: #333333 8px solid; } -#header { text-align: center; } -#content h1 { text-align: center; color: #333333; } -#footer { text-align: center; } - -form { margin: 0 auto; } -input[type=submit] { font-size: 25px; } -fieldset { border: 0px; border-top: 1px solid #333333; margin: 0.5em 0; padding-bottom: 0.5em; } -legend { background: #333333; color: #FFFFFF; font-weight: bold; padding: 4px 35px; } -fieldset.boutons { border: 0 none; margin: 0; text-align: center; } -form div.rangee { clear: both; padding-top: 5px; } -form div.rangee label.libelle { float: left; font-weight: bold; text-align: right; width: 20%; } -form div.rangee span.element { float: right; text-align: left; width: 78%; } -form span.obligatoire { color: #FF0000; } -form p.erreur { border: 1px solid #A6A6A6; color: #FF0000; font-weight: bold; padding: 5px 5px 5px 30px; } -form span.element p.erreur { border: 0 none; padding: 0; text-align: left; } diff --git a/htdocs/templates/partenaires/medias/images/afup.gif b/htdocs/templates/partenaires/medias/images/afup.gif deleted file mode 100755 index f1d70ffc3..000000000 Binary files a/htdocs/templates/partenaires/medias/images/afup.gif and /dev/null differ diff --git a/htdocs/templates/partenaires/membre.html b/htdocs/templates/partenaires/membre.html deleted file mode 100755 index b009d29d6..000000000 --- a/htdocs/templates/partenaires/membre.html +++ /dev/null @@ -1,7 +0,0 @@ -{include file="entete.html"} - -{include file="formulaire.html"} - -
{$resultat}
- -{include file="pied_de_page.html"} diff --git a/htdocs/templates/partenaires/pied_de_page.html b/htdocs/templates/partenaires/pied_de_page.html deleted file mode 100755 index 843f3aabc..000000000 --- a/htdocs/templates/partenaires/pied_de_page.html +++ /dev/null @@ -1,8 +0,0 @@ -
- - -
- - \ No newline at end of file diff --git a/htdocs/templates/partenaires/style.css b/htdocs/templates/partenaires/style.css deleted file mode 100755 index b6f31c003..000000000 --- a/htdocs/templates/partenaires/style.css +++ /dev/null @@ -1 +0,0 @@ -div#conteneur { width: 960px; margin: 30px auto; } diff --git a/sources/Afup/Association/Antenne.php b/sources/Afup/Association/Antenne.php deleted file mode 100644 index 491367ea0..000000000 --- a/sources/Afup/Association/Antenne.php +++ /dev/null @@ -1,78 +0,0 @@ -_bdd = $bdd; - } - - - function obtenirListAntennes($filtre = '', $where = '') - { - $requete = 'SELECT '; - $requete .= 'id, ville '; - $requete .= 'FROM '; - $requete .= 'afup_antenne '; - if ($where) $requete .= 'WHERE id=' . $where . ' '; - - $requete .= 'ORDER BY '; - $requete .= 'ville '; - - if ($where) { - return $this->_bdd->obtenirEnregistrement($requete); - } elseif ($filtre) { - return $this->_bdd->obtenirTous($requete); - } else { - $data = $this->_bdd->obtenirTous($requete); - $result[] = ""; - foreach ($data as $row) { - $result[$row['id']] = $row['ville']; - } - - return $result; - } - } - - - function ajouter($table, $champ, $valeur) - { - $requete = 'INSERT INTO '; - $requete .= '' . $table . ' ('; - $requete .= '' . $champ . ') '; - $requete .= 'VALUES ('; - $requete .= $this->_bdd->echapper($valeur) . ' '; - $requete .= ');'; - - return $this->_bdd->executer($requete); - } - - function modifier($table, $id, $champ, $valeur) - { - - $requete = 'UPDATE '; - $requete .= '' . $table . ' '; - $requete .= 'SET '; - $requete .= '' . $champ . ' = ' . $this->_bdd->echapper($valeur) . ' '; - $requete .= 'WHERE '; - $requete .= 'id = ' . $id . ' '; - - return $this->_bdd->executer($requete); - } - - -} - -?> diff --git a/sources/Afup/Association/Cotisations.php b/sources/Afup/Association/Cotisations.php index 2dfbb01b8..c2d62d786 100644 --- a/sources/Afup/Association/Cotisations.php +++ b/sources/Afup/Association/Cotisations.php @@ -1,6 +1,7 @@ _bdd = $bdd; - } - - function _clean($mot) - { - $mot = strtr($mot, - array('Š' => 'S', 'š' => 's', 'Ð' => 'Dj', 'Ž' => 'Z', 'ž' => 'z', 'À' => 'A', 'Á' => 'A', 'Â' => 'A', 'Ã' => 'A', 'Ä' => 'A', - 'Å' => 'A', 'Æ' => 'A', 'Ç' => 'C', 'È' => 'E', 'É' => 'E', 'Ê' => 'E', 'Ë' => 'E', 'Ì' => 'I', 'Í' => 'I', 'Î' => 'I', - 'Ï' => 'I', 'Ñ' => 'N', 'Ò' => 'O', 'Ó' => 'O', 'Ô' => 'O', 'Õ' => 'O', 'Ö' => 'O', 'Ø' => 'O', 'Ù' => 'U', 'Ú' => 'U', - 'Û' => 'U', 'Ü' => 'U', 'Ý' => 'Y', 'Þ' => 'B', 'ß' => 'Ss', 'à' => 'a', 'á' => 'a', 'â' => 'a', 'ã' => 'a', 'ä' => 'a', - 'å' => 'a', 'æ' => 'a', 'ç' => 'c', 'è' => 'e', 'é' => 'e', 'ê' => 'e', 'ë' => 'e', 'ì' => 'i', 'í' => 'i', 'î' => 'i', - 'ï' => 'i', 'ð' => 'o', 'ñ' => 'n', 'ò' => 'o', 'ó' => 'o', 'ô' => 'o', 'õ' => 'o', 'ö' => 'o', 'ø' => 'o', 'ù' => 'u', - 'ú' => 'u', 'û' => 'u', 'ý' => 'y', 'y', 'þ' => 'b', 'ÿ' => 'y', 'ƒ' => 'f')); - $mot = strtolower($mot); - $mot = str_replace(array('-', ' ', "'"), - array('', '', ''), - $mot); - return $mot; - - } - - function _hash($nom, $prenom) - { - return $this->_clean($nom) . '#' . $this->_clean($prenom); - } - - function verifierMembre($nom, $prenom) - { - $hashPersonne = $this->_hash($nom, $prenom); - $personnesActives = $this->_bdd->obtenirTous(' - SELECT nom, prenom - FROM afup_personnes_physiques - WHERE etat = 1' - ); - foreach ($personnesActives as $p) { - if ($this->_hash($p['nom'], $p['prenom']) == $hashPersonne) { - return '
Cette personne est membre actif de l\'AFUP
'; - } - } - return '
Cette personne n\'est pas membre de l\'AFUP
'; - } -} diff --git a/sources/Afup/Association/Personnes_Morales.php b/sources/Afup/Association/Personnes_Morales.php index f73d17c30..e670d849b 100644 --- a/sources/Afup/Association/Personnes_Morales.php +++ b/sources/Afup/Association/Personnes_Morales.php @@ -16,7 +16,7 @@ class Personnes_Morales * @var Base_De_Donnees * @access private */ - var $_bdd; + private $_bdd; /** * Constructeur. diff --git a/sources/Afup/BlackList.php b/sources/Afup/BlackList.php deleted file mode 100644 index 7a71c5d62..000000000 --- a/sources/Afup/BlackList.php +++ /dev/null @@ -1,34 +0,0 @@ -_bdd = $bdd; - } - - function blackList($mail) - { - if (filter_var($mail, FILTER_VALIDATE_EMAIL)) { - $requete = 'INSERT INTO afup_blacklist VALUES (NULL, '; - $requete .= $this->_bdd->echapper($mail) . ')'; - $this->_bdd->executer($requete); - } - } - - function obtenirListe() - { - $requete = 'SELECT'; - $requete .= ' id, email'; - $requete .= ' FROM'; - $requete .= ' afup_blacklist'; - return $this->_bdd->obtenirAssociatif($requete); - } -} \ No newline at end of file diff --git a/sources/Afup/Comptabilite/Facture.php b/sources/Afup/Comptabilite/Facture.php index dd92ed3c3..68d1b5aa6 100644 --- a/sources/Afup/Comptabilite/Facture.php +++ b/sources/Afup/Comptabilite/Facture.php @@ -1,6 +1,5 @@ obtenirNom($coordonnees['id_pays']))); + utf8_decode($pays->obtenirNom($coordonnees['id_pays'])) . + ($coordonnees['tva_intra'] ? ("\n" . utf8_decode('N° TVA Intracommunautaire : ' . $coordonnees['tva_intra'])) : null) + ); $pdf->Ln(10); $pdf->SetFont('Arial', 'BU', 10); diff --git a/sources/Afup/Forum/Accreditation_Presse.php b/sources/Afup/Forum/Accreditation_Presse.php deleted file mode 100644 index 33f83f007..000000000 --- a/sources/Afup/Forum/Accreditation_Presse.php +++ /dev/null @@ -1,172 +0,0 @@ -_bdd = $bdd; - } - - /** - * Renvoit les informations concernant une accreditation - * - * @param string $reference Id de l'accréditation - * @param string $champs Champs à renvoyer - * @access public - * @return array - */ - function obtenir($reference, $champs = '*') - { - $requete = 'SELECT'; - $requete .= ' ' . $champs . ' '; - $requete .= 'FROM'; - $requete .= ' afup_accreditation_presse '; - $requete .= 'WHERE id=' . $this->_bdd->echapper($reference); - return $this->_bdd->obtenirEnregistrement($requete); - } - - function obtenirListe($ordre = 'date DESC', $associatif = false) - { - $requete = 'SELECT'; - $requete .= ' afup_accreditation_presse.*, afup_forum.titre as nom_forum'; - $requete .= ' FROM'; - $requete .= ' afup_accreditation_presse'; - $requete .= ' INNER JOIN'; - $requete .= ' afup_forum ON afup_forum.id=afup_accreditation_presse.id_forum'; - $requete .= ' ORDER BY ' . $ordre; - - if ($associatif) { - return $this->_bdd->obtenirAssociatif($requete); - } else { - return $this->_bdd->obtenirTous($requete); - } - } - - /** - * Ajout d'une demande d'accréditation presse - * - * @param int $id - * @param string $date - * @param string $titre_revue - * @param string $civilite - * @param string $nom - * @param string $prenom - * @param string $carte_presse - * @param string $adresse - * @param string $code_postal - * @param string $ville - * @param int $id_pays - * @param string $telephone - * @param string $email - * @param string $commentaires - * @param int $id_forum - * @param int $valide - * @return boolean - */ - function ajouter($id, $date, $titre_revue, $civilite, $nom, $prenom, $carte_presse, - $adresse, $code_postal, $ville, $id_pays, $telephone, $email, - $commentaires, $id_forum, $valide) - { - $erreur = false; - - $erreur = $erreur || !$this->_controleExistancePays($id_pays); - - if (!$erreur) { - $requete = 'INSERT INTO '; - $requete .= ' afup_accreditation_presse (id, date, titre_revue, civilite, nom, prenom,'; - $requete .= ' carte_presse, adresse, code_postal, ville, id_pays, telephone, email,'; - $requete .= ' commentaires, id_forum, valide) '; - $requete .= 'VALUES ('; - $requete .= $this->_bdd->echapper($id) . ','; - $requete .= $this->_bdd->echapper($date) . ','; - $requete .= $this->_bdd->echapper($titre_revue) . ','; - $requete .= $this->_bdd->echapper($civilite) . ','; - $requete .= $this->_bdd->echapper($nom) . ','; - $requete .= $this->_bdd->echapper($prenom) . ','; - $requete .= $this->_bdd->echapper($carte_presse) . ','; - $requete .= $this->_bdd->echapper($adresse) . ','; - $requete .= $this->_bdd->echapper($code_postal) . ','; - $requete .= $this->_bdd->echapper($ville) . ','; - $requete .= $this->_bdd->echapper($id_pays) . ','; - $requete .= $this->_bdd->echapper($telephone) . ','; - $requete .= $this->_bdd->echapper($email) . ','; - $requete .= $this->_bdd->echapper($commentaires) . ','; - $requete .= (int)$id_forum . ','; - $requete .= (int)$valide . ')'; - - return $this->_bdd->executer($requete); - } - - return false; - } - - function modifier($id, $titre_revue, $civilite, $nom, $prenom, $carte_presse, - $adresse, $code_postal, $ville, $id_pays, $telephone, $email, - $commentaires, $id_forum, $valide) - { - $requete = 'UPDATE '; - $requete .= ' afup_accreditation_presse '; - $requete .= 'SET'; - $requete .= ' titre_revue=' . $this->_bdd->echapper($titre_revue) . ','; - $requete .= ' civilite=' . $this->_bdd->echapper($civilite) . ','; - $requete .= ' nom=' . $this->_bdd->echapper($nom) . ','; - $requete .= ' prenom=' . $this->_bdd->echapper($prenom) . ','; - $requete .= ' carte_presse=' . $this->_bdd->echapper($carte_presse) . ','; - $requete .= ' adresse=' . $this->_bdd->echapper($adresse) . ','; - $requete .= ' code_postal=' . $this->_bdd->echapper($code_postal) . ','; - $requete .= ' ville=' . $this->_bdd->echapper($ville) . ','; - $requete .= ' id_pays=' . $this->_bdd->echapper($id_pays) . ','; - $requete .= ' telephone=' . $this->_bdd->echapper($telephone) . ','; - $requete .= ' email=' . $this->_bdd->echapper($email) . ','; - $requete .= ' commentaires=' . $this->_bdd->echapper($commentaires) . ','; - $requete .= ' id_forum=' . $this->_bdd->echapper($id_forum) . ','; - $requete .= ' valide=' . $this->_bdd->echapper($valide) . ' '; - $requete .= 'WHERE'; - $requete .= ' id=' . $id; - - return $this->_bdd->executer($requete); - } - - function supprimer($id) - { - $requete = 'DELETE FROM afup_accreditation_presse WHERE id=' . $id; - return $this->_bdd->executer($requete); - } - - /** - * Contrôle si l'id_pays existe - * morale. - * - * @param int $id_pays Identifiant du pays - * @access public - * @return bool login non utilisé - */ - function _controleExistancePays($id_pays) - { - if ($id_pays == 0) { - return true; - } - - $requete = 'SELECT 1 '; - $requete .= 'FROM afup_pays '; - $requete .= 'WHERE id = ' . intval($id_pays); - - return ($this->_bdd->obtenirUn($requete) !== false); - } -} \ No newline at end of file diff --git a/sources/Afup/Forum/AppelConferencier.php b/sources/Afup/Forum/AppelConferencier.php index c4b930535..74ce6b207 100644 --- a/sources/Afup/Forum/AppelConferencier.php +++ b/sources/Afup/Forum/AppelConferencier.php @@ -2,12 +2,7 @@ namespace Afup\Site\Forum; -use Afup\Site\Utils\Configuration; -use Afup\Site\Utils\Mailing; -use AppBundle\Email\Mailer\MailUser; -use AppBundle\Email\Mailer\Message; use AppBundle\Event\Model\Talk; -use Symfony\Component\Translation\Translator; class AppelConferencier { @@ -16,7 +11,7 @@ class AppelConferencier * @var \Afup\Site\Utils\Base_De_Donnees * @access private */ - var $_bdd; + private $_bdd; const DEFAULT_JOURNEE = 0; diff --git a/sources/Afup/Forum/Coupon.php b/sources/Afup/Forum/Coupon.php index 801135b14..d586c33ec 100644 --- a/sources/Afup/Forum/Coupon.php +++ b/sources/Afup/Forum/Coupon.php @@ -1,5 +1,7 @@ _bdd->executer($requete); } -} \ No newline at end of file +} diff --git a/sources/Afup/Forum/Facturation.php b/sources/Afup/Forum/Facturation.php index 835f763fc..771adbe7c 100644 --- a/sources/Afup/Forum/Facturation.php +++ b/sources/Afup/Forum/Facturation.php @@ -1,6 +1,7 @@ _bdd->echapperSqlDateFromQuickForm($date_fin_appel_projet, true) . ','; $requete .= $this->_bdd->echapperSqlDateFromQuickForm($date_fin_appel_conferencier, true) . ','; - $requete .= $this->_bdd->echapperSqlDateFromQuickForm($date_fin_vote, true) . ','; + $requete .= $this->_bdd->echapperSqlDateFromQuickForm($date_fin_vote, false) . ','; $requete .= $this->_bdd->echapperSqlDateFromQuickForm($date_fin_prevente, true) . ','; $requete .= $this->_bdd->echapperSqlDateFromQuickForm($date_fin_vente, true) . ','; $requete .= $this->_bdd->echapperSqlDateFromQuickForm($date_fin_vente_token_sponsor, true) . ','; diff --git a/sources/Afup/Forum/Inscriptions.php b/sources/Afup/Forum/Inscriptions.php index 6c53381d9..e316f7e0f 100644 --- a/sources/Afup/Forum/Inscriptions.php +++ b/sources/Afup/Forum/Inscriptions.php @@ -1,4 +1,5 @@ _bdd->executer($requete); } -} \ No newline at end of file +} diff --git a/sources/Afup/Niveau_Partenariat.php b/sources/Afup/Niveau_Partenariat.php index 95bcaa4c9..a3e29b034 100644 --- a/sources/Afup/Niveau_Partenariat.php +++ b/sources/Afup/Niveau_Partenariat.php @@ -1,5 +1,7 @@ _bdd->obtenirAssociatif($requete); } -} \ No newline at end of file +} diff --git a/sources/Afup/Tags.php b/sources/Afup/Tags.php deleted file mode 100644 index 5568fd28c..000000000 --- a/sources/Afup/Tags.php +++ /dev/null @@ -1,181 +0,0 @@ -_bdd = $bdd; - } - - function extraireTags($chaine) - { - $regex = <<_bdd->echapper($id_personne_physique); - return $this->obtenirListe($champs, $order, $associatif, $where); - } - - /** - * - * @deprecated Use obtenirPersonnesPhysiquesTagues() - */ - function obtenirPersonnesPhysisquesTagues($tag) - { - return $this->obtenirPersonnesPhysiquesTagues($tag); - } - - function obtenirPersonnesPhysiquesTagues($tag) - { - $requete = ' SELECT '; - $requete .= ' t.*, '; - $requete .= ' p.* '; - $requete .= ' FROM '; - $requete .= ' afup_personnes_physiques p '; - $requete .= ' INNER JOIN '; - $requete .= ' afup_tags t '; - $requete .= ' ON '; - $requete .= ' t.source = \'afup_personnes_physiques\' '; - $requete .= ' AND '; - $requete .= ' t.id_source = p.id '; - $requete .= ' WHERE '; - $requete .= ' t.tag = ' . $this->_bdd->echapper($tag); - - return $this->_bdd->obtenirTous($requete); - } - - function obtenirListeUnique($champs = '*') - { - $tags = $this->obtenirListe($champs); - $tags_uniques = array(); - foreach ($tags as $tag) { - if (!isset($tags_uniques[$tag['tag']])) { - $tags_uniques[$tag['tag']] = $tag; - } - } - - return $tags_uniques; - } - - function obtenirNoeudsTags() - { - $requete = ' SELECT'; - $requete .= ' tag as noeud, '; - $requete .= ' id_source as lien '; - $requete .= ' FROM'; - $requete .= ' afup_tags '; - - return $this->_bdd->obtenirTous($requete); - } - - function obtenirNoeudsPersonnesPhysiques() - { - $requete = ' SELECT '; - $requete .= ' pp.login as noeud, '; - $requete .= ' t.tag as lien '; - $requete .= ' FROM '; - $requete .= ' afup_personnes_physiques pp '; - $requete .= ' INNER JOIN '; - $requete .= ' afup_tags t '; - $requete .= ' ON '; - $requete .= ' pp.id = t.id_source '; - $requete .= ' AND '; - $requete .= ' t.source = \'afup_personnes_physiques\''; - - return $this->_bdd->obtenirTous($requete); - } - - function obtenirListe($champs = '*', - $ordre = 'date DESC', - $associatif = false, - $where = '') - { - $requete = ' SELECT'; - $requete .= ' ' . $champs . ' '; - $requete .= ' FROM'; - $requete .= ' afup_tags '; - $requete .= ' WHERE 1 = 1 '; - $requete .= $where; - $requete .= ' ORDER BY ' . $ordre; - if ($associatif) { - return $this->_bdd->obtenirAssociatif($requete); - } else { - return $this->_bdd->obtenirTous($requete); - } - } - - function supprimer($id) - { - $requete = 'DELETE FROM afup_tags WHERE id=' . $id; - return $this->_bdd->executer($requete); - } - - function supprimerParPersonnesPhysiques($id) - { - $requete = 'DELETE FROM afup_tags WHERE id_personne_physique=' . $id; - return $this->_bdd->executer($requete); - } - - function enregistrerTags($formulaire, $id_personne_physique, $date) - { - $ok = true; - $tags = $this->extraireTags($formulaire->exportValue('tag')); - foreach ($tags as $tag) { - $ok += (bool)$this->enregistrer($formulaire->exportValue('source'), - $formulaire->exportValue('id_source'), - $tag, - $id_personne_physique, - $date, - $formulaire->exportValue('id')); - } - - return $ok; - } - - function enregistrer($source, $id_source, $tag, $id_personne_physique, $date, $id) - { - if ($id > 0) { - $requete = ' UPDATE afup_tags '; - } else { - $requete = ' INSERT INTO afup_tags '; - } - $requete .= ' SET '; - $requete .= ' source = ' . $this->_bdd->echapper($source) . ','; - $requete .= ' id_source = ' . $this->_bdd->echapper($id_source) . ','; - $requete .= ' tag = ' . $this->_bdd->echapper($tag) . ','; - $requete .= ' id_personne_physique = ' . $this->_bdd->echapper($id_personne_physique) . ','; - $requete .= ' date = ' . $this->_bdd->echapper($date); - if ($id > 0) { - $requete .= ' WHERE id = ' . $id; - } - - return $this->_bdd->executer($requete); - } -} diff --git a/sources/Afup/Utils/Logs.php b/sources/Afup/Utils/Logs.php index 267b6d894..3fa999d14 100644 --- a/sources/Afup/Utils/Logs.php +++ b/sources/Afup/Utils/Logs.php @@ -1,6 +1,7 @@ \ No newline at end of file +?> diff --git a/sources/Afup/Utils/Pays.php b/sources/Afup/Utils/Pays.php index e816f7741..45eb9015d 100644 --- a/sources/Afup/Utils/Pays.php +++ b/sources/Afup/Utils/Pays.php @@ -1,6 +1,7 @@