jakevan/jvb.git

			@@ -43,7 +43,7 @@
			$this->cache = Cache::for('login');
			$this->cache->flush();
			// Initialize magic link support if enabled
			if (Site::has('magicLink')) {
			if (Site::has('magic_link')) {
			$this->initMagicLinkSupport();
			}

			@@ -65,8 +65,8 @@
			add_filter( 'logout_url', [$this, 'logoutUrl'], 10, 2 );
			// Allow other features to register handlers
			do_action('jvbLoginManagerInit', $this);
			add_action('user_register', array($this, 'saveRegistrationFields'), 999, 2);
			add_filter('the_seo_framework_sitemap_exclude_ids', [$this, 'excludeLoginSitemap'], 10, 1);
			add_action('user_register', [$this, 'saveRegistrationFields'], 50, 2);
			add_filter('the_seo_framework_sitemap_exclude_ids', [$this, 'excludeLoginSitemap'], 8, 1);
			}
			public static function getInstance():self
			{
			@@ -75,7 +75,10 @@

			public function excludeLoginSitemap(array $ids): array
			{
			$ids[] = $this->getLoginPage();
			$loginPage = $this->getLoginPage();
			if (!empty($loginPage)) {
			$ids = array_merge($ids, [$loginPage]);
			}
			return $ids;
			}
			/**************************************************************************
			@@ -140,7 +143,7 @@
			'hint' => 'Have a referral code? Paste it here!'
			];
			}
			$canRegister = Registrar::getFeatured('can_register', 'user');
			$canRegister = Registrar::withFeature('can_register', 'user');
			if (!empty($canRegister)) {
			foreach ($canRegister as $role) {
			$registrar = Registrar::getInstance($role);
			@@ -354,7 +357,7 @@

			protected function initMagicLinkSupport(): void
			{
			if (!Site::has('magicLink')) {
			if (!Site::has('magic_link')) {
			return;
			}
			}
			@@ -453,6 +456,7 @@
			protected function customStyles():void
			{
			$logo = get_theme_mod('custom_logo');
			$small = $large = '';
			if ($logo) {
			$small = wp_get_attachment_image_src($logo, 'medium')[0]??'';
			$large = wp_get_attachment_image_src($logo, 'large')[0]??'';
			@@ -549,7 +553,7 @@
			{
			$form = $this->action.'form';
			?>
			<section class="login-box col btw">
			<section class="login-box col y-btw">
			<h1><?=$this->labels['title']?></h1>
			<?= $this->labels['description'] ?>

			@@ -568,7 +572,7 @@
			}
			?>

			<div class="options row btw">
			<div class="options row x-btw">
			<?php
			switch ($this->action) {
			case 'login': ?>
			@@ -593,7 +597,7 @@

			</div>
			</section>
			<div class="navigation row btw">
			<div class="navigation row x-btw">
			<a href="<?= get_home_url() ?>">Home</a>
			<?php
			$privacy = get_privacy_policy_url();
			@@ -626,7 +630,7 @@
			$redirect = !empty($redirect) ? $redirect : esc_attr($_GET['redirect_to'] ?? '');

			return sprintf(
			'<form name="%sform" method="post" data-action="jvb_%s">
			'<form name="%sform" method="post" data-action="jvb_%s" data-save="auth/login">
			%s%s%s
			<input type="hidden" name="action" value="jvb_%s">
			<input type="hidden" name="redirect_to" value="%s">
			@@ -635,7 +639,7 @@
			%s
			%s
			%s
			<div class="row btw nowrap">
			<div class="row x-btw nowrap">
			<button type="submit" class="button button-primary button-large">%s</button>
			%s
			</div>
			@@ -652,7 +656,7 @@
			$additionalInputs,
			$fields,
			$turnstile,
			$this->labels['submit'],
			$this->labels['submit']??'Login',
			$magicLink
			);
			}
			@@ -873,6 +877,7 @@

			$this->maybeTurnstileScripts();
			wp_enqueue_script('jvb-form');
			wp_enqueue_script('jvb-login');
			$action = $this->getAction();

			$redirect_to = isset($_GET['redirect_to']) ? esc_url_raw($_GET['redirect_to']) : '';