Changeset 3390564
- Timestamp:
- 11/05/2025 03:31:37 PM (5 months ago)
- Location:
- helloasso
- Files:
-
- 10 edited
- 1 copied
-
tags/1.1.23 (copied) (copied from helloasso/trunk)
-
tags/1.1.23/README.txt (modified) (2 diffs)
-
tags/1.1.23/admin/class-hello-asso-admin.php (modified) (5 diffs)
-
tags/1.1.23/admin/css/hello-asso-admin.css (modified) (1 diff)
-
tags/1.1.23/admin/view/dashboard.php (modified) (1 diff)
-
tags/1.1.23/hello-asso.php (modified) (2 diffs)
-
trunk/README.txt (modified) (2 diffs)
-
trunk/admin/class-hello-asso-admin.php (modified) (5 diffs)
-
trunk/admin/css/hello-asso-admin.css (modified) (1 diff)
-
trunk/admin/view/dashboard.php (modified) (1 diff)
-
trunk/hello-asso.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
helloasso/tags/1.1.23/README.txt
r3387717 r3390564 6 6 Tested up to: 6.8 7 7 Requires PHP: 7.2.34 8 Stable tag: 1.1.2 28 Stable tag: 1.1.23 9 9 License: GPLv2 or later 10 10 License URI: http://www.gnu.org/licenses/gpl-2.0.html … … 81 81 82 82 == Changelog == 83 = 1.1.22 = 84 * Synchronisation avec organizationSlug seulement 85 83 86 = 1.1.22 = 84 87 * Correction bug nom association non reconnu -
helloasso/tags/1.1.23/admin/class-hello-asso-admin.php
r3387717 r3390564 478 478 } 479 479 480 $url = parse_url($value);481 480 $sandbox = false; 482 $nameAsso = ''; 483 484 if ($url !== false && isset($url['host'])) { 485 $domain = $url['host']; 486 487 if ($domain == 'helloasso-sandbox.com' || $domain == 'www.helloasso-sandbox.com') { 488 $sandbox = true; 489 } 490 491 if ($domain != 'helloasso.com' && $domain != 'www.helloasso.com' && $domain != 'helloasso-sandbox.com' && $domain != 'www.helloasso-sandbox.com') { 492 $nameAsso = ''; 493 } else { 494 $slug = explode('/', $value); 495 $nameAsso = isset($slug[4]) ? $slug[4] : ''; 496 } 497 } else { 498 $nameAsso = sanitize_title_with_dashes($value); 499 } 500 501 if (empty($nameAsso)) { 502 wp_send_json_error('URL ou nom d\'association invalide.'); 481 $organizationSlug = ''; 482 483 $organizationSlug = sanitize_title_with_dashes($value); 484 485 if (empty($organizationSlug)) { 486 wp_send_json_error('Slug d\'association invalide.'); 503 487 return; 504 488 } … … 527 511 $bearer_token = $token_data['access_token']; 528 512 529 $org_response = ha_curl_get($apiUrl . '/v5/organizations/' . $ nameAsso, $bearer_token);513 $org_response = ha_curl_get($apiUrl . '/v5/organizations/' . $organizationSlug, $bearer_token); 530 514 531 515 if ($org_response === false) { 532 wp_send_json_error('Erreur lors de la récupération des informations de l\' organisation.');516 wp_send_json_error('Erreur lors de la récupération des informations de l\'association.'); 533 517 return; 534 518 } … … 537 521 538 522 if (!isset($org_data['name'])) { 539 wp_send_json_error(' Organisation non trouvée.');523 wp_send_json_error('Association non trouvée.'); 540 524 return; 541 525 } … … 546 530 547 531 for ($i = 1; $i <= 5; $i++) { 548 $campaign_response = ha_curl_get($apiUrl . '/v5/organizations/' . $ nameAsso. '/forms?pageSize=20&pageIndex=' . $i, $bearer_token);532 $campaign_response = ha_curl_get($apiUrl . '/v5/organizations/' . $organizationSlug . '/forms?pageSize=20&pageIndex=' . $i, $bearer_token); 549 533 550 534 if ($campaign_response === false) { … … 577 561 'campaigns' => $all_campaigns, 578 562 'total_count' => $total_count, 579 'slug' => $ nameAsso563 'slug' => $organizationSlug 580 564 ); 581 565 -
helloasso/tags/1.1.23/admin/css/hello-asso-admin.css
r2813465 r3390564 575 575 color: #2E2F5E; 576 576 font-size: 20px; 577 text-align: center;577 text-align: left; 578 578 } 579 579 -
helloasso/tags/1.1.23/admin/view/dashboard.php
r3053289 r3390564 57 57 <div class="ha-blocks"> 58 58 <div class="ha-block-white"> 59 <div class="ha-description"> 59 60 <h3 class="ha-title-block">Récupérez toutes vos campagnes en 1 clic</h3> 61 <p>Coller le slug de votre association qui se trouve dans l'URL de votre association</p> 62 <p>Exemple : <b>https://admin.helloasso.com/club-de-judo/accueil</b> le slug ici est <b>club-de-judo</b></p> 63 </div> 60 64 <div class="ha-search-glob"> 61 <input type="search" class="ha-search" onkeyup="haCheckInput()" value="<?= esc_html(get_option('ha-slug')); ?>" placeholder=" Nom ou URL de mon organisme">65 <input type="search" class="ha-search" onkeyup="haCheckInput()" value="<?= esc_html(get_option('ha-slug')); ?>" placeholder="Slug de mon association"> 62 66 <span onclick="haResetInput()" class="ha-search-delete"> 63 67 <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg"> -
helloasso/tags/1.1.23/hello-asso.php
r3387717 r3390564 17 17 * Plugin URI: https://centredaide.helloasso.com/s/article/paiement-en-ligne-wordpress-integrer-vos-campagnes-helloasso 18 18 * Description: HelloAsso est la solution gratuite des associations pour collecter des paiements et des dons sur internet. 19 * Version: 1.1.2 219 * Version: 1.1.23 20 20 * Author: HelloAsso 21 21 * Author URI: https://helloasso.com … … 37 37 * Rename this for your plugin and update it as you release new versions. 38 38 */ 39 define('HELLO_ASSO_VERSION', '1.1.2 2');39 define('HELLO_ASSO_VERSION', '1.1.23'); 40 40 41 41 /** -
helloasso/trunk/README.txt
r3387717 r3390564 6 6 Tested up to: 6.8 7 7 Requires PHP: 7.2.34 8 Stable tag: 1.1.2 28 Stable tag: 1.1.23 9 9 License: GPLv2 or later 10 10 License URI: http://www.gnu.org/licenses/gpl-2.0.html … … 81 81 82 82 == Changelog == 83 = 1.1.22 = 84 * Synchronisation avec organizationSlug seulement 85 83 86 = 1.1.22 = 84 87 * Correction bug nom association non reconnu -
helloasso/trunk/admin/class-hello-asso-admin.php
r3387717 r3390564 478 478 } 479 479 480 $url = parse_url($value);481 480 $sandbox = false; 482 $nameAsso = ''; 483 484 if ($url !== false && isset($url['host'])) { 485 $domain = $url['host']; 486 487 if ($domain == 'helloasso-sandbox.com' || $domain == 'www.helloasso-sandbox.com') { 488 $sandbox = true; 489 } 490 491 if ($domain != 'helloasso.com' && $domain != 'www.helloasso.com' && $domain != 'helloasso-sandbox.com' && $domain != 'www.helloasso-sandbox.com') { 492 $nameAsso = ''; 493 } else { 494 $slug = explode('/', $value); 495 $nameAsso = isset($slug[4]) ? $slug[4] : ''; 496 } 497 } else { 498 $nameAsso = sanitize_title_with_dashes($value); 499 } 500 501 if (empty($nameAsso)) { 502 wp_send_json_error('URL ou nom d\'association invalide.'); 481 $organizationSlug = ''; 482 483 $organizationSlug = sanitize_title_with_dashes($value); 484 485 if (empty($organizationSlug)) { 486 wp_send_json_error('Slug d\'association invalide.'); 503 487 return; 504 488 } … … 527 511 $bearer_token = $token_data['access_token']; 528 512 529 $org_response = ha_curl_get($apiUrl . '/v5/organizations/' . $ nameAsso, $bearer_token);513 $org_response = ha_curl_get($apiUrl . '/v5/organizations/' . $organizationSlug, $bearer_token); 530 514 531 515 if ($org_response === false) { 532 wp_send_json_error('Erreur lors de la récupération des informations de l\' organisation.');516 wp_send_json_error('Erreur lors de la récupération des informations de l\'association.'); 533 517 return; 534 518 } … … 537 521 538 522 if (!isset($org_data['name'])) { 539 wp_send_json_error(' Organisation non trouvée.');523 wp_send_json_error('Association non trouvée.'); 540 524 return; 541 525 } … … 546 530 547 531 for ($i = 1; $i <= 5; $i++) { 548 $campaign_response = ha_curl_get($apiUrl . '/v5/organizations/' . $ nameAsso. '/forms?pageSize=20&pageIndex=' . $i, $bearer_token);532 $campaign_response = ha_curl_get($apiUrl . '/v5/organizations/' . $organizationSlug . '/forms?pageSize=20&pageIndex=' . $i, $bearer_token); 549 533 550 534 if ($campaign_response === false) { … … 577 561 'campaigns' => $all_campaigns, 578 562 'total_count' => $total_count, 579 'slug' => $ nameAsso563 'slug' => $organizationSlug 580 564 ); 581 565 -
helloasso/trunk/admin/css/hello-asso-admin.css
r2813465 r3390564 575 575 color: #2E2F5E; 576 576 font-size: 20px; 577 text-align: center;577 text-align: left; 578 578 } 579 579 -
helloasso/trunk/admin/view/dashboard.php
r3053289 r3390564 57 57 <div class="ha-blocks"> 58 58 <div class="ha-block-white"> 59 <div class="ha-description"> 59 60 <h3 class="ha-title-block">Récupérez toutes vos campagnes en 1 clic</h3> 61 <p>Coller le slug de votre association qui se trouve dans l'URL de votre association</p> 62 <p>Exemple : <b>https://admin.helloasso.com/club-de-judo/accueil</b> le slug ici est <b>club-de-judo</b></p> 63 </div> 60 64 <div class="ha-search-glob"> 61 <input type="search" class="ha-search" onkeyup="haCheckInput()" value="<?= esc_html(get_option('ha-slug')); ?>" placeholder=" Nom ou URL de mon organisme">65 <input type="search" class="ha-search" onkeyup="haCheckInput()" value="<?= esc_html(get_option('ha-slug')); ?>" placeholder="Slug de mon association"> 62 66 <span onclick="haResetInput()" class="ha-search-delete"> 63 67 <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg"> -
helloasso/trunk/hello-asso.php
r3387717 r3390564 17 17 * Plugin URI: https://centredaide.helloasso.com/s/article/paiement-en-ligne-wordpress-integrer-vos-campagnes-helloasso 18 18 * Description: HelloAsso est la solution gratuite des associations pour collecter des paiements et des dons sur internet. 19 * Version: 1.1.2 219 * Version: 1.1.23 20 20 * Author: HelloAsso 21 21 * Author URI: https://helloasso.com … … 37 37 * Rename this for your plugin and update it as you release new versions. 38 38 */ 39 define('HELLO_ASSO_VERSION', '1.1.2 2');39 define('HELLO_ASSO_VERSION', '1.1.23'); 40 40 41 41 /**
Note: See TracChangeset
for help on using the changeset viewer.