diff --git a/.env.example b/.env.example index 445b2c84..960e127e 100644 --- a/.env.example +++ b/.env.example @@ -37,6 +37,7 @@ SMTP_SECURE= MAIL_FROM_NAME= MAIL_FROM_ADDRESS= MAIL_ADMIN= +MAIL_CONTACT_RGPD= # ADMIN SECURE LDCWEB_API_TOKEN= diff --git a/composer.json b/composer.json index 72c4d223..5b067360 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "roots/wordpress": "6.7.2", "roots/wp-config": "1.0.0", "roots/wp-password-bcrypt": "1.2.0", - "uwil/ldc-theme": "^1.1", + "uwil/ldc-theme": "^1.2", "ldc/ldccrmv4client": "^4.0", "wpackagist-plugin/breadcrumb-navxt": "^7.4", "wpengine/advanced-custom-fields-pro": "^6.3", diff --git a/composer.lock b/composer.lock index 6266303c..dbcf8f52 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "18e8af366c29fa60c54eb4cef3391e63", + "content-hash": "0d4b8b767598683658bab741b95340e0", "packages": [ { "name": "composer/installers", @@ -1893,16 +1893,16 @@ }, { "name": "uwil/ldc-theme", - "version": "1.1.4", + "version": "1.2.0", "source": { "type": "git", "url": "git@lab.s-web.fr:ldc-web/projets/ldc-theme.git", - "reference": "d35b22db38597e635f1c1717af902e7d0825d57f" + "reference": "3fb2413b466101e5d2bce8716358be70b1ca870e" }, "dist": { "type": "zip", - "url": "https://lab.s-web.fr/api/v4/projects/232/packages/composer/archives/uwil/ldc-theme.zip?sha=d35b22db38597e635f1c1717af902e7d0825d57f", - "reference": "d35b22db38597e635f1c1717af902e7d0825d57f", + "url": "https://lab.s-web.fr/api/v4/projects/232/packages/composer/archives/uwil/ldc-theme.zip?sha=3fb2413b466101e5d2bce8716358be70b1ca870e", + "reference": "3fb2413b466101e5d2bce8716358be70b1ca870e", "shasum": "" }, "type": "wordpress-theme", diff --git a/config/custom.php b/config/custom.php index e8b98044..f98b0454 100644 --- a/config/custom.php +++ b/config/custom.php @@ -31,6 +31,7 @@ Config::define('SMTP_SECURE', env('SMTP_SECURE')); Config::define('MAIL_FROM_NAME', env('MAIL_FROM_NAME')); Config::define('MAIL_FROM_ADDRESS', env('MAIL_FROM_ADDRESS')); Config::define('MAIL_ADMIN', env('MAIL_ADMIN')); +Config::define('MAIL_CONTACT_RGPD', env('MAIL_CONTACT_RGPD')); /** * MATOMO ANALYTICS diff --git a/crons/CalliopeExport.php b/crons/CalliopeExport.php index a326c8de..d92c3f9c 100644 --- a/crons/CalliopeExport.php +++ b/crons/CalliopeExport.php @@ -1,6 +1,6 @@ get_row("SELECT name FROM wp01_terms WHERE term_id = $data->meta_value"); - $result['filiere'] = $filiere->name; + if ($data->meta_value) { + $filiere = $wpdb->get_row("SELECT name FROM wp01_terms WHERE term_id = $data->meta_value"); + $result['filiere'] = $filiere->name; + } break; } } diff --git a/crons/DeleteLDCMessages.php b/crons/DeleteLDCMessages.php index 603b3146..b235a101 100644 --- a/crons/DeleteLDCMessages.php +++ b/crons/DeleteLDCMessages.php @@ -1,6 +1,6 @@
"; + if ($sSiteweb != "") { + $sBody .= "Source : " . $sSource . " (via le site web " . $sSiteweb . ")