From 125d92e718e44a99149e9d2dac1a7bf636b891e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Valenta?= <git@imaniti.org>
Date: Fri, 2 Jun 2023 22:03:55 +0200
Subject: [PATCH] finish redirect
---
assets/javascript/nastenka_sync.js | 7 +++++--
nastenka_sync.php | 8 +++++++-
styles/all/template/nastenka_sync.html | 2 +-
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/assets/javascript/nastenka_sync.js b/assets/javascript/nastenka_sync.js
index fab1f45..a6c8d0a 100644
--- a/assets/javascript/nastenka_sync.js
+++ b/assets/javascript/nastenka_sync.js
@@ -1,6 +1,7 @@
const ALLOWED_HOSTS = ["nastenka.pirati.cz", "nastenka.pir-test.eu"];
-$(window).ready(
+window.addEventListener(
+ "DOMContentLoaded",
event => {
$("#synchronize").on(
"click",
@@ -20,7 +21,9 @@ $(window).ready(
return;
}
-
+ nextUrl.searchParams.append("sid", window.SESSION_ID);
+
+ window.location = nextUrl;
}
);
}
diff --git a/nastenka_sync.php b/nastenka_sync.php
index 95dea90..6625f56 100755
--- a/nastenka_sync.php
+++ b/nastenka_sync.php
@@ -9,13 +9,19 @@ $user->session_begin();
$auth->acl($user->data);
$user->setup();
+if ($user->data['user_id'] == ANONYMOUS)
+{
+ header('Location: /ucp.php?mode=login');
+ exit;
+}
+
page_header('Synchronizace s Nástěnkou');
$template->set_filenames(array(
'body' => 'nastenka_sync.html',
));
$template->assign_vars(array(
- 'SESSION_ID' => $_SID,
+ 'SESSION_ID' => $user->data['session_id'],
));
page_footer();
diff --git a/styles/all/template/nastenka_sync.html b/styles/all/template/nastenka_sync.html
index b4a6090..8ca2ae8 100644
--- a/styles/all/template/nastenka_sync.html
+++ b/styles/all/template/nastenka_sync.html
@@ -24,7 +24,7 @@
</div>
<script>
- const SESSION_ID = {SESSION_ID};
+ window.SESSION_ID = "{SESSION_ID}";
</script>
<script src="./assets/javascript/nastenka_sync.js?v=1"></script>
--
GitLab