Merge branch 'debug_routes'

This commit is contained in:
asus
2024-03-14 13:48:37 +01:00
12 changed files with 87 additions and 55 deletions

View File

@@ -37,7 +37,7 @@ include_once(PLGNTLS_class::root_path() . 'php/admin_menu/example_menu.php');
include_once(PLGNTLS_class::root_path() . 'php/paypal/paypal.php');
include_once(PLGNTLS_class::root_path() . '/php/user_infos.php');
include_once(PLGNTLS_class::root_path() . '/php/hide_admin.php');
//include_once(PLGNTLS_class::root_path() . '/php/hide_admin.php');
//include_once(PLGNTLS_class::root_path() . '/php/menus.php');
include_once(PLGNTLS_class::root_path() . 'php/register_partenaires.php');
include_once(PLGNTLS_class::root_path() . 'php/redirections.php');
@@ -55,8 +55,8 @@ include_once(PLGNTLS_class::root_path() . 'php/admin_modif_prof.php');
/*
include_once(PLGNTLS_class::root_path() . 'php/form_builder_patch/url_validation.php');
include_once(PLGNTLS_class::root_path() . 'php/form_builder_patch/multiple_modals.php');
*/
include_once(PLGNTLS_class::root_path() . 'php/form_builder_patch/form_calculation.php');
*/

View File

@@ -13,8 +13,8 @@ if (!defined('ABSPATH')) {
/*
* menu plugin
*/
function cipfcard_plugin_menu()
{
function cipfcard_plugin_menu() {
PLGNTLS_class::debug_infos();
add_menu_page
(
'cipf_card', // webpage title
@@ -28,14 +28,9 @@ add_action('admin_menu', 'cipfcard_plugin_menu');
/**
* it means someone outside wp is accessing the file, in this case kill it.
*/
if (!defined('ABSPATH')) {
die('You can not access this file!');
}
function cipfcard_plugin_content() {
PLGNTLS_class::debug_infos();
$cipfcard = new PLGNTLS_class();
$my_css = '
@@ -66,12 +61,12 @@ ajax
- to access the content of the data object properties of the ajax call :
use $_POST['property_name']
*/
function cipfcard_menu_fetch_handler()
{
function cipfcard_menu_fetch_handler() {
PLGNTLS_class::debug_infos();
return new WP_REST_Response('hello', 200);
}
function cipfcard_menu_endpoint()
{
function cipfcard_menu_endpoint() {
PLGNTLS_class::debug_infos();
register_rest_route('plgntls', '/get_data', array(
'methods' => 'POST',
'callback' => 'cipfcard_menu_fetch_handler',

View File

@@ -10,13 +10,28 @@ if (!defined('ABSPATH')) {
/*
* custom action in php on custom form submission
* custom forms are not processed by divi form builder
* so they don't change between hooks before and after process
*
*/
function admin_validate_prof_CIPF($form_id, $post_array, $form_type) {
function admin_validate_prof_CIPF() {
PLGNTLS_class::debug_infos();
}
/*
* calling the action to validate from the FormBuilder hook
*
*/
function custom_form_admin_validate_prof_CIPF($form_id, $post_array, $form_type) {
PLGNTLS_class::debug_infos();
$admin_validate_prof_field = PLGNTLS_class::ADMIN_VALIDATE_PROF_FIELD;
@@ -36,9 +51,29 @@ function admin_validate_prof_CIPF($form_id, $post_array, $form_type) {
if ($contains_id === false)
return;
/* custom action */
admin_validate_prof_CIPF();
}
add_action('df_before_process', 'admin_validate_prof_CIPF', 10, 3);
add_action('df_before_process', 'custom_form_admin_validate_prof_CIPF', 10, 3);
/*
* calling the action to validate from the
*
function custom_link_intercept() {
PLGNTLS_class::debug_infos();
$query_page_redirection = PLGNTLS_class::QUERY_REDIRECTION_PROFIL;
// Check if the request contains ?QUERY_REDIRECTION_PROFIL
if(isset($_GET[$query_page_redirection])) {
admin_validate_prof_CIPF();
}
}
add_action('init', 'custom_link_intercept');
*/
/*

View File

@@ -12,6 +12,7 @@ if (!defined('ABSPATH')) {
/*
*/
function add_form_calculation_patch_CIPF() {
PLGNTLS_class::debug_infos();
$handle = 'form_calculation_patch';
$url = PLGNTLS_class::root_url() . 'js/form_builder_patch/form_calculation.js';
$dependencies = array('de_fb_calc');

View File

@@ -10,6 +10,7 @@ if (!defined('ABSPATH')) {
function test_modal_PLGNTLS() {
PLGNTLS_class::debug_infos();
$cipf_modal = new PLGNTLS_class();
$cipf_modal->add_to_front(
array(

View File

@@ -15,8 +15,8 @@ if (!defined('ABSPATH')) {
* - Undefined variable: min_length in /var/www/html/wp-content/plugins/divi-form-builder/includes/modules/FormField/FormField.php on line 5933
* - Undefined variable: use_icon in /var/www/html/wp-content/plugins/divi-form-builder/includes/modules/FormField/FormField.php on line 5984
*/
function add_my_jquery_patch()
{
function add_my_jquery_patch() {
PLGNTLS_class::debug_infos();
$handle = 'jquery_validator_url_patch';
$url = PLGNTLS_class::root_url() . 'js/form_builder_patch/url_validation.js';
$dependencies = array('de_fb_validate');

View File

@@ -114,6 +114,7 @@ function show_prof_paiement_messages_CIPF($user_id) {
*/
function check_prof_page_CIPF() {
PLGNTLS_class::debug_infos();
// is an author page
if (!is_author())
return;

View File

@@ -21,28 +21,21 @@ function redirection_profil_page_CIPF(){
$base_url = home_url();
$current_user_id = get_current_user_id();
// Set up nocache headers before redirecting : https://developer.wordpress.org/reference/functions/wp_safe_redirect/#user-contributed-notes
nocache_headers();
error_log("--- inside redirection profil page");
if (!is_user_logged_in()) {
foreach ($_COOKIE as $name => $value) {
error_log(json_encode("$name: $value"));
}
error_log("is not logged in");
wp_redirect($base_url, 301);
exit;
}
if (current_user_can($role_prof)) {
error_log("is prof");
$user_page = get_author_posts_url($current_user_id);
wp_redirect($user_page, 301);
exit;
}
else if (current_user_can($role_partner)) {
error_log("is partenaire");
$args = array(
'post_type' => 'post',
'author' => $current_user_id,
@@ -60,7 +53,6 @@ function redirection_profil_page_CIPF(){
exit;
}
else {
error_log("is else");
wp_redirect($base_url, 301);
exit;
}
@@ -77,8 +69,6 @@ function redirection_profil_page_CIPF(){
function redirection_page_CIPF(){
PLGNTLS_class::debug_infos();
$slug_page_redirection = PLGNTLS_class::SLUG_PAGE_REDIRECTION;
$role_prof = PLGNTLS_class::ROLE_PROF;
$role_partner = PLGNTLS_class::ROLE_PARTNER;
if (!is_page($slug_page_redirection))
return;
@@ -91,6 +81,25 @@ add_action('template_redirect', 'redirection_page_CIPF');
/*
* redirects when someone reaches the page with query ?QUERY_REDIRECTION_PROFIL
*
*/
function redirection_query_CIPF() {
PLGNTLS_class::debug_infos();
$query_redirection = PLGNTLS_class::QUERY_REDIRECTION_PROFIL;
// Check if the request contains ?QUERY_REDIRECTION_PROFIL
if(isset($_GET[$query_redirection])) {
redirection_profil_page_CIPF();
}
}
add_action('init', 'redirection_query_CIPF');
/*
* DOES NOT WORK so far
* because to use is_user_logged_in() in redirection_profil_page_CIPF
@@ -115,23 +124,4 @@ add_action('rest_api_init', 'endpoint_for_redirection_CIPF');
/*
*
*
*/
function custom_link_intercept() {
PLGNTLS_class::debug_infos();
$query_page_redirection = PLGNTLS_class::QUERY_REDIRECTION_PROFIL;
// Check if the request contains ?QUERY_REDIRECTION_PROFIL
if(isset($_GET[$query_page_redirection])) {
redirection_profil_page_CIPF();
}
}
add_action('init', 'custom_link_intercept');
?>

View File

@@ -32,15 +32,22 @@ function renew_page_restrictions_CIPF(){
$base_url = home_url();
if (!is_page($slug_renew_card))
wp_reset_query();
if (!is_page('commande'))
return;
/*
* is it good ?
* -> dont' redirect if user not logged in, because new users need to acces this page
*
if (!is_user_logged_in()) {
// Set up nocache headers before redirecting : https://developer.wordpress.org/reference/functions/wp_safe_redirect/#user-contributed-notes
nocache_headers();
wp_redirect($base_url, 301);
exit;
}
*/
$current_user_id = get_current_user_id();
$current_user = wp_get_current_user();
@@ -51,10 +58,10 @@ function renew_page_restrictions_CIPF(){
* check multiple user roles
* https://developer.wordpress.org/reference/functions/current_user_can/#div-comment-4083
*
*/
$allowed_roles = array($role_admin, $role_fipf, $role_prof);
if (!array_intersect($allowed_roles, $current_user->roles))
return;
*/
/*
* if prof, check card state

View File

@@ -12,6 +12,7 @@ if (!defined('ABSPATH')) {
https://stackify.com/how-to-log-to-console-in-php/
*/
function console_log(...$outputs) {
PLGNTLS_class::debug_infos();
if (CIPF_CONSOLE_OFF)
return;
foreach($outputs as $output)

View File

@@ -86,6 +86,7 @@ class PLGNTLS_class
const SLUG_PAYPAL_REDIRECTION_FAILURE = '?'.self::QUERY_REDIRECTION_PROFIL;
const URL_BASE_REST_ROUTE = 'cipf_plugin/api/v1'; // for routes, in php/paypal/routes.php && php/admin_modif_prof.php
const QUERY_REDIRECTION_PROFIL = 'redirection_cipf';
const QUERY_ADMIN_VALIDATE_PROF = 'admin_activate_prof_cipf'; // for admin_modif_prof.php
// PAYPAL
const PAYPAL_CLIENT_ID = "AfcmwxIXlG2ZxaMdjazX57I70BXz__aEqNWaTnqfSCI34a0V7nMbytswx7EViUjlpHs7opyrRwaH9YLl";
@@ -104,11 +105,11 @@ class PLGNTLS_class
const CARD_RENEW_PERIOD = 31; // int : number of days before expiration when renew card start to be possible
const CARD_VALIDITY_TIME = '1 year'; // string : time of validity of the card (ex: '1 month' or '1 year' or '60 days')
const USER_INFO_DATE_FORMAT = 'd/m/Y'; // for user_infos.php (date format : https://www.php.net/manual/fr/datetime.format.php)
const ADMIN_VALIDATE_PROF_FIELD = 'cipf_admin_activate_prof'; // for admin_modif_prof.php
const ADMIN_VALIDATE_PROF_FIELD = 'admin_activate_prof_cipf'; // for admin_modif_prof.php
private static $_DEBUG_INFOS = false;
private static $_DEBUG_INFOS = true;
private static $_plugin_dir_path;
private static $_plugin_name;
private static $_file_dir_path;
@@ -196,7 +197,7 @@ class PLGNTLS_class
$function = $trace[1]['function'];
$file = $trace[0]['file'];
$line = $trace[0]['line'];
error_log("-debug: function '".$function."' (in ".$file.", line ".$line);
error_log("-debug: function '".$function."' (in ".$file.", line ".$line .')');
}

Submodule private updated: e9929b6f8f...a86a33b46e