From d08547121fd11892f904f4686be655240fdd022b Mon Sep 17 00:00:00 2001 From: kaetemi Date: Sun, 20 Jun 2021 13:01:13 +0800 Subject: [PATCH] Fix webig --- web/private_php/webig/template/new_mail.html | 6 +++--- web/public_php/webig/admin.php | 10 ++++++++++ web/public_php/webig/create_thread.php | 4 ++++ web/public_php/webig/forum.php | 2 ++ web/public_php/webig/mail.php | 1 + web/public_php/webig/mailbox.php | 1 + web/public_php/webig/new_mail.php | 3 +++ web/public_php/webig/new_post.php | 3 +++ web/public_php/webig/new_thread.php | 1 + web/public_php/webig/post.php | 4 ++++ web/public_php/webig/post_mail.php | 4 ++++ web/public_php/webig/remove_post.php | 2 ++ web/public_php/webig/remove_thread.php | 2 ++ web/public_php/webig/thread.php | 3 +++ web/public_php/webig/utils.php | 9 +++++++-- 15 files changed, 50 insertions(+), 5 deletions(-) diff --git a/web/private_php/webig/template/new_mail.html b/web/private_php/webig/template/new_mail.html index bdd87ddce..0d4269803 100644 --- a/web/private_php/webig/template/new_mail.html +++ b/web/private_php/webig/template/new_mail.html @@ -34,7 +34,7 @@
To
- +
@@ -42,13 +42,13 @@
uiMFSubject
- +
uiMFMailBody
- +
diff --git a/web/public_php/webig/admin.php b/web/public_php/webig/admin.php index 51d82f8b8..47812b372 100644 --- a/web/public_php/webig/admin.php +++ b/web/public_php/webig/admin.php @@ -27,6 +27,7 @@ if (true) } importParam('recover_forum'); +global $recover_forum; if ($recover_forum) { echo "recover forum $recover_forum
\n"; @@ -36,6 +37,8 @@ if ($recover_forum) importParam('recover_thread'); importParam('recover_threadthread'); +global $recover_thread; +global $recover_threadthread; if ($recover_thread && isset($recover_threadthread)) { echo "recover forum $recover_thread
\n"; @@ -45,6 +48,8 @@ if ($recover_thread && isset($recover_threadthread)) importParam('rename_forum'); importParam('into_forum'); +global $rename_forum; +global $into_forum; if ($rename_forum) { echo "rename forum $rename_forum into $into_forum
\n"; @@ -54,9 +59,12 @@ if ($rename_forum) importParam('shard'); +global $shard; importParam('mailbox'); importParam('mail'); +global $mailbox; +global $mail; if ($mail) { @@ -72,6 +80,8 @@ else if ($mailbox) importParam('forum'); importParam('thread'); +global $forum; +global $thread; if ($thread) { diff --git a/web/public_php/webig/create_thread.php b/web/public_php/webig/create_thread.php index e11bc45f1..0f19203d0 100644 --- a/web/public_php/webig/create_thread.php +++ b/web/public_php/webig/create_thread.php @@ -33,6 +33,10 @@ importParam('post_to'); importParam('post_subject'); importParam('post_content'); + global $post_from; + global $post_to; + global $post_subject; + global $post_content; check_character_belongs_to_guild($user_login, $post_to); diff --git a/web/public_php/webig/forum.php b/web/public_php/webig/forum.php index 9e154a370..a91edc141 100644 --- a/web/public_php/webig/forum.php +++ b/web/public_php/webig/forum.php @@ -28,6 +28,8 @@ importParam('forum'); importParam('page'); + global $forum; + global $page; check_character_belongs_to_guild($user_login, $forum); diff --git a/web/public_php/webig/mail.php b/web/public_php/webig/mail.php index 069a5adee..0674ddb18 100644 --- a/web/public_php/webig/mail.php +++ b/web/public_php/webig/mail.php @@ -22,6 +22,7 @@ $user = $user_login; importParam('msg'); + global $msg; $user_dir = get_user_dir($user, $shard); $fname = $user_dir."mail_$msg.html"; diff --git a/web/public_php/webig/mailbox.php b/web/public_php/webig/mailbox.php index 15207b600..2e5bcc93e 100644 --- a/web/public_php/webig/mailbox.php +++ b/web/public_php/webig/mailbox.php @@ -19,6 +19,7 @@ include_once('utils.php'); importParam('page'); + global $page; unset($user); $user = $user_login; diff --git a/web/public_php/webig/new_mail.php b/web/public_php/webig/new_mail.php index 05383a3e0..c38e371d0 100644 --- a/web/public_php/webig/new_mail.php +++ b/web/public_php/webig/new_mail.php @@ -30,6 +30,9 @@ importParam('mail_to'); importParam('mail_subject'); importParam('mail_content'); + global $mail_to; + global $mail_subject; + global $mail_content; read_template('new_mail.html', $new_mail); diff --git a/web/public_php/webig/new_post.php b/web/public_php/webig/new_post.php index 494de0733..24fd54191 100644 --- a/web/public_php/webig/new_post.php +++ b/web/public_php/webig/new_post.php @@ -30,6 +30,9 @@ importParam('forum'); importParam('thread'); importParam('subject'); + global $forum; + global $thread; + global $subject; check_character_belongs_to_guild($user_login, $forum); diff --git a/web/public_php/webig/new_thread.php b/web/public_php/webig/new_thread.php index d8ec01bc6..4bf68982a 100644 --- a/web/public_php/webig/new_thread.php +++ b/web/public_php/webig/new_thread.php @@ -26,6 +26,7 @@ // importParam('forum'); + global $forum; check_character_belongs_to_guild($user_login, $forum); diff --git a/web/public_php/webig/post.php b/web/public_php/webig/post.php index cf3529f68..521ee17ea 100644 --- a/web/public_php/webig/post.php +++ b/web/public_php/webig/post.php @@ -33,6 +33,10 @@ importParam('post_to'); importParam('post_thread'); importParam('post_content'); + global $post_from; + global $post_to; + global $post_thread; + global $post_content; check_character_belongs_to_guild($user_login, $post_to); diff --git a/web/public_php/webig/post_mail.php b/web/public_php/webig/post_mail.php index a84ade9e6..339f57c99 100644 --- a/web/public_php/webig/post_mail.php +++ b/web/public_php/webig/post_mail.php @@ -33,6 +33,10 @@ importParam('mail_to'); importParam('mail_subject'); importParam('mail_content'); + global $mail_from; + global $mail_to; + global $mail_subject; + global $mail_content; // check mail is valid //if (!isset($mail_from) || $mail_from == "" || !isset($mail_to) || $mail_to == "" || !isset($mail_subject) || $mail_subject == "" || !isset($mail_content) || $mail_content == "" ) diff --git a/web/public_php/webig/remove_post.php b/web/public_php/webig/remove_post.php index 900cbf96e..1131ce169 100644 --- a/web/public_php/webig/remove_post.php +++ b/web/public_php/webig/remove_post.php @@ -29,6 +29,8 @@ importParam('forum'); importParam('thread'); + global $forum; + global $thread; check_character_belongs_to_guild($user_login, $forum); diff --git a/web/public_php/webig/remove_thread.php b/web/public_php/webig/remove_thread.php index 47350db4e..789053478 100644 --- a/web/public_php/webig/remove_thread.php +++ b/web/public_php/webig/remove_thread.php @@ -28,6 +28,8 @@ importParam('forum'); importParam('thread'); + global $forum; + global $thread; check_character_belongs_to_guild($user_login, $forum); diff --git a/web/public_php/webig/thread.php b/web/public_php/webig/thread.php index 8cc6e2c11..7316a07f7 100644 --- a/web/public_php/webig/thread.php +++ b/web/public_php/webig/thread.php @@ -30,6 +30,9 @@ importParam('forum'); importParam('thread'); importParam('page'); + global $forum; + global $thread; + global $page; check_character_belongs_to_guild($user_login, $forum); diff --git a/web/public_php/webig/utils.php b/web/public_php/webig/utils.php index 8a1fded43..efcf9d99b 100644 --- a/web/public_php/webig/utils.php +++ b/web/public_php/webig/utils.php @@ -70,6 +70,9 @@ function exportParam($var, $value) importParam('user_login'); importParam('shard'); importParam('session_cookie'); +global $user_login; +global $shard; +global $session_cookie; if (isset($user_login)) { @@ -439,6 +442,7 @@ $remote_addr = $_SERVER['REMOTE_ADDR']; if (true) { importParam('internal_check'); + global $internal_check; if ($internal_check) { echo "INTERNAL CHECK\n"; @@ -460,13 +464,14 @@ if (false) //echo $_SERVER['REMOTE_ADDR']; //die(); importParam('translate_user_login'); + global $translate_user_login; if (isset($translate_user_login)) $user_login = $translate_user_login; } else { - if (!strstr($HTTP_SERVER_VARS['HTTP_USER_AGENT'], 'Ryzom')) - die("ERROR: Bad parameters"); + // if (!strstr($HTTP_SERVER_VARS['HTTP_USER_AGENT'], 'Ryzom')) + // die("ERROR: Bad parameters"); $udir = get_user_dir($user_login, $shard); $ufile = $udir.'session'; if (is_dir($udir) && file_exists($ufile))