From 8afe325c5a3d447df9fcca3d36e9b8db4050a0bd Mon Sep 17 00:00:00 2001 From: Marco Milesi Date: Thu, 30 Dec 2021 11:17:41 +0100 Subject: [PATCH] v2.3 --- README.md | 3 ++- admin/settings.php | 32 +++++++++++++++++++------------- readme.txt | 14 +++++++++++--- wp-spid-italia.php | 30 +++++++++++++++++++++--------- 4 files changed, 53 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 0e92c5a..0743b6a 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,8 @@ Plugin WordPress per l'interfacciamento con il Sistema Pubblico di Identità Dig ## Credits -Copyright © 2017-2022 **Marco Milesi** - www.marcomilesi.com - www.wpgov.it +Copyright © 2017-2022 **Marco Milesi** +www.marcomilesi.com - www.wpgov.it ### Ringraziamenti * **Christian Ghellere, Andrea Smith**: attività di software testing diff --git a/admin/settings.php b/admin/settings.php index 51e9d10..8a23678 100644 --- a/admin/settings.php +++ b/admin/settings.php @@ -9,8 +9,10 @@ function spid_get_tabs( $id ) { break; case 1: $id1 = ' nav-tab-active'; + break; case 2: $id2 = ' nav-tab-active'; + break; } $r = '

Home @@ -21,7 +23,6 @@ function spid_get_tabs( $id ) { } function spid_menu_func() { - echo '
@@ -38,6 +39,9 @@ function spid_menu_func() { $options = get_option( 'spid' ); ?> +

+ Hai bisogno di aiuto? Consulta la documentazione o contattaci per una consulenza. +

@@ -60,7 +65,7 @@ function spid_menu_func() { @@ -69,7 +74,7 @@ function spid_menu_func() { @@ -77,7 +82,7 @@ function spid_menu_func() { @@ -85,7 +90,7 @@ function spid_menu_func() { @@ -93,7 +98,7 @@ function spid_menu_func() { @@ -101,7 +106,7 @@ function spid_menu_func() { @@ -109,7 +114,7 @@ function spid_menu_func() { @@ -117,7 +122,7 @@ function spid_menu_func() { @@ -125,7 +130,7 @@ function spid_menu_func() { @@ -133,7 +138,7 @@ function spid_menu_func() { @@ -141,15 +146,16 @@ function spid_menu_func() {
@@ -53,6 +57,7 @@ function spid_menu_func() { /> + Lasciare questa opzione disattiva quando non sono in corso test
- + Codice ISO 3166-1 α-2 del Paese ove è situata la sede legale del SP (esempio: IT)
- +
- +
- +
- +
- your organization full name + your organization full name
- your organization display name + your organization display name
- +
- +
- +
- +
'; - } else if ( $_GET['spid_action'] == 'metadata' ) { + } else if ( isset($_GET['spid_action']) && $_GET['spid_action'] == 'metadata' ) { echo spid_get_tabs( 2 ); + echo 'Attenzione! Questo URL è riservato e deve essere conservato con cura. Non comunicarlo a terzi e non indicarlo su siti o forum di supporto.

'; echo '

URL metadata: '.spid_get_metadata_url().'

'; } else { echo spid_get_tabs( 0 ); diff --git a/readme.txt b/readme.txt index 2f3db1b..d98e6a5 100644 --- a/readme.txt +++ b/readme.txt @@ -5,8 +5,8 @@ Tags: spid, italia, sistema, pubblico, identità, digitale, login, sistema pubbl Requires at least: 4.8 Requires PHP: 7 Tested up to: 5.9 -Version: 2.2.4 -Stable tag: 2.2.4 +Version: 2.3 +Stable tag: 2.3 License: GPLv3 License URI: http://www.gnu.org/licenses/gpl-3.0.html @@ -25,7 +25,8 @@ https://www.youtube.com/watch?v=w5Z5EBG1R1M https://www.youtube.com/watch?v=i2eTL_Q2xfM -Copyright © 2017-2022 **Marco Milesi** - [www.marcomilesi.com](https://www.marcomilesi.com) - [www.wpgov.it](https://www.wpgov.it) +Copyright © 2017-2022 **Marco Milesi** +[www.marcomilesi.com](https://www.marcomilesi.com) - [www.wpgov.it](https://www.wpgov.it) ### Ringraziamenti * **Christian Ghellere, Andrea Smith**: attività di software testing @@ -50,6 +51,13 @@ https://www.youtube.com/watch?v=2UNAtVjFFAs == Changelog == > Backup your data before upgrade. += 2.3 20211230 = +* [NEW] Added compatibility with third party login URL modifiers and custom filters - check [wiki](https://github.com/WPGov/wp-spid-italia/wiki) +* [IMPROVEMENT] Performance boost +* [IMPROVEMENT] Settings page changes +* [IMPROVEMENT] Readme and doc changes +* [BUGFIX] Removed some warnings + = 2.2.4 20211201 = * [BUGFIX] Minor bugfix - https://github.com/WPGov/wp-spid-italia/releases diff --git a/wp-spid-italia.php b/wp-spid-italia.php index d05fdb7..0d681e7 100644 --- a/wp-spid-italia.php +++ b/wp-spid-italia.php @@ -3,7 +3,7 @@ Plugin Name: WP SPID Italia Description: SPID - Sistema Pubblico di Identità Digitale Author: Marco Milesi -Version: 2.2.4 +Version: 2.3 Author URI: http://www.marcomilesi.com */ @@ -132,7 +132,7 @@ function() { include( plugin_dir_path( __FILE__ ) . 'admin/settings.php'); spid_ try { $sp = spid_load(); if ( $sp && $sp->isAuthenticated() ) { - return get_site_url() . '/wp-login.php?spid_sso=out'; + return wp_spid_italia_get_login_url( 'out' ) .'?spid_sso=out'; } } catch ( Exception $e) { @@ -221,8 +221,7 @@ function spid_errors( $errorMsg2 ){ wp_clear_auth_cookie(); remove_action('login_footer', 'wp_shake_js', 12); add_filter( 'login_errors', function() { return 'Disconnesso da SPID'; } ); - $sp->logout( 0, get_site_url() . '/wp-login.php?spid_sso=out' ); - //$sp->logout( 0, wp_logout_url() ); + $sp->logout( 0, wp_spid_italia_get_login_url( 'out' ) .'?spid_sso=out' ); } else if (isset($_POST) && isset($_POST['selected_idp'])) { $idp = $_POST['selected_idp']; } else if ( isset( $_GET['spid_sso'] ) && $_GET['spid_sso'] == 'in' ) { @@ -234,8 +233,7 @@ function spid_errors( $errorMsg2 ){ if ( isset( $_GET['spid_idp'] ) && $_GET['spid_idp'] != '' ) { if ( $sp->isAuthenticated() ) { session_destroy(); - $_SESSION = NULL; - #$sp->logout( 0, get_site_url() . '/wp-login.php?spid_sso=out&' ); + $_SESSION = NULL; } $assertId = 0; // index of assertion consumer service as per the SP metadata (sp_assertionconsumerservice in settings array) $attrId = 0; // index of attribute consuming service as per the SP metadata (sp_attributeconsumingservice in settings array) @@ -282,7 +280,7 @@ function spid_errors( $errorMsg2 ){ $attributes = $sp->getAttributes(); echo 'Gentile '.$attributes['name'].',
il tuo account non è abilitato su questo sito.'; - echo '

Disconnetti SPID'; + echo '

Disconnetti SPID'; echo '

'; die(); } @@ -333,6 +331,19 @@ function spid_update_user( $user, $attributes ) { wp_enqueue_script( 'spid-js-loginform', plugins_url( 'js/spid-sp-loginform.js', __FILE__ ), array( 'jquery' ) ); }, 1 ); +function wp_spid_italia_get_login_url( $dir = 'default' ) { + $default_url = wp_login_url(); + + if ( $default_url != apply_filters( 'spid_filter_login_url_dir_default', $default_url ) ) { + return apply_filters( 'spid_filter_login_url_dir_default', $default_url ); + } else if ( $dir == 'in' ) { + return apply_filters( 'spid_filter_login_url_dir_in', $default_url ); + } else if ( $dir == 'out' ) { + return apply_filters( 'spid_filter_login_url_dir_out', $default_url ); + } + return $default_url; +} + function is_spid_enabled() { return spid_option('enabled'); } @@ -363,9 +374,9 @@ function spid_load() { 'sp_cert_file' => SPID__CERT_DIR.'sp.crt', 'sp_comparison' => 'minimum', // one of: "exact", "minimum", "better" or "maximum" 'sp_assertionconsumerservice' => [ - get_site_url() . '/wp-login.php?spid_sso=in', // Servizio standard + wp_spid_italia_get_login_url( 'in' ) .'?spid_sso=in', // Servizio standard ], - 'sp_singlelogoutservice' => [ [ get_site_url() . '/wp-login.php?spid_sso=out', '' ] ], + 'sp_singlelogoutservice' => [ [ wp_spid_italia_get_login_url( 'out' ) .'?spid_sso=out', '' ] ], 'sp_org_name' => spid_option( 'sp_org_name' ), 'sp_org_display_name' => spid_option( 'sp_org_display_name' ), 'sp_contact_ipa_code' => spid_option( 'sp_contact_ipa_code' ), @@ -412,6 +423,7 @@ function spid_fs() { 'has_paid_plans' => false, 'menu' => array( 'slug' => 'spid_menu', + 'account' => false, 'contact' => false, 'support' => false, 'parent' => array(