Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,17 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [6.0.0](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v5.4.3...v6.0.0) (2026-09-04)


### ⚠ BREAKING CHANGES

* Might break some convenience logins, but it's for the sake of safety.

### Security

* Fixed authentication to be a bit better than before. ([20a1a5e](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/20a1a5e14fde227f515674063129554936e375e6))

### [5.4.3](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v5.4.2...v5.4.3) (2026-09-02)


Expand Down
2 changes: 1 addition & 1 deletion PLUGIN-CHECKSUM
Original file line number Diff line number Diff line change
@@ -1 +1 @@
e0c928c4d26838ef036a5067b4f081b4
188e5f8585cc516db62baaa220f2587a
1 change: 1 addition & 0 deletions class/class-eduadmin-loginhandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ public function process_login() {

if ( 200 === $login_result['@curl']['http_code'] ) {
$user = $this->get_login_user( $login_result['PersonId'], $login_result['CustomerId'] );
EDU()->session['eduadmin-authenticated'] = true;
}
}

Expand Down
7 changes: 6 additions & 1 deletion content/template/bookingTemplate/-login-handler.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
if ( 'checkEmail' === $_POST['eduformloginaction'] && ! empty( $_POST['eduadminloginEmail'] ) ) {
$selected_login_field = EDU()->get_option( 'eduadmin-loginField', 'Email' );
$allow_customer_registration = EDU()->is_checked( 'eduadmin-allowCustomerRegistration', true );
$use_login = EDU()->is_checked( 'eduadmin-useLogin', false );

$login_field = EDU()->get_option( 'eduadmin-loginField', 'Email' );

Expand All @@ -13,7 +14,7 @@
'CustomFields($filter=ShowOnWeb;)'
)['value'];

EDU()->session['needsLogin'] = false;
EDU()->session['needsLogin'] = $use_login;
EDU()->session['checkEmail'] = true;
if ( ! empty( $possible_persons ) ) {
foreach ( $possible_persons as $con ) {
Expand All @@ -39,6 +40,10 @@

return;
} else {
if ( $use_login ) {
return;
}

EDU()->session['needsLogin'] = false;
}

Expand Down
6 changes: 5 additions & 1 deletion content/template/myPagesTemplate/login.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@
if ( ! EDU()->api_connection ) {
echo esc_html_x( 'EduAdmin Booking could not connect to the API', 'frontend', 'eduadmin-booking' );
} else {
if ( ! empty( EDU()->session['eduadmin-loginUser'] ) && ! empty( EDU()->session['eduadmin-loginUser']->Contact ) && ! empty( EDU()->session['eduadmin-loginUser']->Contact->PersonId ) && 0 !== EDU()->session['eduadmin-loginUser']->Contact->PersonId ) {
if ( ! empty( EDU()->session['eduadmin-loginUser'] )
&& ! empty( EDU()->session['eduadmin-loginUser']->Contact )
&& ! empty( EDU()->session['eduadmin-loginUser']->Contact->PersonId )
&& 0 !== EDU()->session['eduadmin-loginUser']->Contact->PersonId
&& isset( EDU()->session['eduadmin-authenticated'] ) ) {
if ( isset( $q['edu-login'] ) || isset( $q['edu-profile'] ) ) {
require_once 'profile.php';
} elseif ( isset( $q['edu-bookings'] ) ) {
Expand Down
2 changes: 1 addition & 1 deletion eduadmin.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* Plugin URI: https://www.eduadmin.com
* Description: EduAdmin plugin to allow visitors to book courses at your website
* Tags: booking, participants, courses, events, eduadmin
* Version: 5.4.3
* Version: 6.0.0
* GitHub Plugin URI: multinetinteractive/eduadmin-wordpress
* GitHub Plugin URI: https://github.com/multinetinteractive/eduadmin-wordpress
* Requires at least: 6.0
Expand Down
2 changes: 2 additions & 0 deletions includes/edu-login-functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ function edu_logout_user() {
unset( EDU()->session['eduadmin-loginUser'] );
unset( EDU()->session['needsLogin'] );
unset( EDU()->session['checkEmail'] );
unset( EDU()->session['eduadmin-authenticated'] );

EDU()->session->regenerate_id( true );
wp_redirect( $base_url . edu_get_query_string() );
EDU()->stop_timer( $t );
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "eduadmin-wordpress-plugin",
"private": true,
"version": "5.4.3",
"version": "6.0.0",
"repository": "https://github.com/MultinetInteractive/EduAdmin-WordPress.git",
"author": "Chris Gårdenberg <chga@multinet.se>",
"license": "MIT",
Expand Down
30 changes: 12 additions & 18 deletions readme.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# EduAdmin Booking
- Requires at least: 6.0
- Tested up to: 7.0
- Stable tag: 5.4.3
- Stable tag: 6.0.0
- Requires PHP: 8.1
- License: GPL3
- License URI: https://www.gnu.org/licenses/gpl-3.0.en.html
Expand Down Expand Up @@ -44,6 +44,17 @@ If you notice that your API key doesn't work any more, you have to contact us.

The full changelog available on [GitHub](https://github.com/MultinetInteractive/EduAdmin-WordPress/blob/production/CHANGELOG.md)

### [6.0.0](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v5.4.3...v6.0.0) (2026-09-04)


#### ⚠ BREAKING CHANGES

* Might break some convenience logins, but it's for the sake of safety.

#### Security

* Fixed authentication to be a bit better than before. ([20a1a5e](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/20a1a5e14fde227f515674063129554936e375e6))

### [5.4.3](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v5.4.2...v5.4.3) (2026-09-02)


Expand All @@ -65,22 +76,5 @@ The full changelog available on [GitHub](https://github.com/MultinetInteractive/

* Update links to EduAdmin from https://www.eduadmin.se to https://www.eduadmin.com instead to cater to the international website instead of the swedish one. ([c58f56e](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/c58f56e807f6904360685ba0af4a6316e0f8232d))

### [5.4.0](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v5.3.1...v5.4.0) (2025-02-25)


#### Features

* Added VoucherTemplate OData-endpoint ([9a6c631](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/9a6c6310fb4876ab4e1413e83d17491ffc018d6a))


#### Bug Fixes

* Custom course detail views will no longer require an attribute to show on demand events. ([6f90e87](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/6f90e875845d78a44ab32dda817284ad8b8b82ca))


#### Documentation

* Remove ondemand-attribute from detailinfo ([dfa3f59](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/dfa3f59c5bea11c8da99d5067e415d6859475a34))



30 changes: 12 additions & 18 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Contributors: mnchga
Tags: booking, participants, courses, events, eduadmin
Requires at least: 6.0
Tested up to: 7.0
Stable tag: 5.4.3
Stable tag: 6.0.0
Requires PHP: 8.1
License: GPL3
License URI: https://www.gnu.org/licenses/gpl-3.0.en.html
Expand Down Expand Up @@ -49,6 +49,17 @@ If you notice that your API key doesn't work any more, you have to contact us.

The full changelog available on [GitHub](https://github.com/MultinetInteractive/EduAdmin-WordPress/blob/production/CHANGELOG.md)

### [6.0.0](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v5.4.3...v6.0.0) (2026-09-04)


#### ⚠ BREAKING CHANGES

* Might break some convenience logins, but it's for the sake of safety.

#### Security

* Fixed authentication to be a bit better than before. ([20a1a5e](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/20a1a5e14fde227f515674063129554936e375e6))

### [5.4.3](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v5.4.2...v5.4.3) (2026-09-02)


Expand All @@ -70,22 +81,5 @@ The full changelog available on [GitHub](https://github.com/MultinetInteractive/

* Update links to EduAdmin from https://www.eduadmin.se to https://www.eduadmin.com instead to cater to the international website instead of the swedish one. ([c58f56e](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/c58f56e807f6904360685ba0af4a6316e0f8232d))

### [5.4.0](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v5.3.1...v5.4.0) (2025-02-25)


#### Features

* Added VoucherTemplate OData-endpoint ([9a6c631](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/9a6c6310fb4876ab4e1413e83d17491ffc018d6a))


#### Bug Fixes

* Custom course detail views will no longer require an attribute to show on demand events. ([6f90e87](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/6f90e875845d78a44ab32dda817284ad8b8b82ca))


#### Documentation

* Remove ondemand-attribute from detailinfo ([dfa3f59](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/dfa3f59c5bea11c8da99d5067e415d6859475a34))



Loading