From b00e7468e3b1266a614c2f85765866c775f51706 Mon Sep 17 00:00:00 2001 From: "jisangs (iMac)" Date: Sun, 1 May 2022 23:31:49 +0900 Subject: [PATCH] Fix: send_naver_email include error --- src/web/server/admin/extension_maestro.php | 5 ++++- src/web/server/admin/register_maestro.php | 11 +++++++---- src/web/server/admin/upgrade_maestro.php | 6 ++++-- src/web/server/maestro/add_maestro.php | 6 ++++-- src/web/server/maestro/request_extension_maestro.php | 7 ++++--- src/web/server/maestro/request_upgrade_maestro.php | 7 ++++--- src/web/server/maestro/update_maestro_info.php | 7 ++++--- src/web/server/mail/send_mail_test.php | 6 ++++-- src/web/server/mail/send_naver_mail.php | 3 --- src/web/server/mail/test_naver_mail.php | 6 ++++-- 10 files changed, 39 insertions(+), 25 deletions(-) diff --git a/src/web/server/admin/extension_maestro.php b/src/web/server/admin/extension_maestro.php index 06c1b46..3f604d1 100644 --- a/src/web/server/admin/extension_maestro.php +++ b/src/web/server/admin/extension_maestro.php @@ -5,9 +5,12 @@ include "./../setup/connect_db.php"; include "./../lib/send_reply_json.php"; include "./../lib/db_maestro.php"; include "./../lib/maestro_log.php"; -include "./../lib/maestro_account_info.php"; // include "./../mail/mail_setting.php"; // include "./../mail/send_mail.php"; + +include './../mail/mail_setting.php'; +include './../mail/mail_contents.php'; +include './../lib/maestro_account_info.php'; include "./../mail/send_naver_mail.php"; $maestro_extension_id = $_POST["maestro_extension_id"]; diff --git a/src/web/server/admin/register_maestro.php b/src/web/server/admin/register_maestro.php index 62c6fb7..39a019c 100644 --- a/src/web/server/admin/register_maestro.php +++ b/src/web/server/admin/register_maestro.php @@ -1,13 +1,17 @@ prepare($query); - $stmt->bind_param("i", $maestroID); $stmt->execute(); $stmt->bind_result($appID); diff --git a/src/web/server/admin/upgrade_maestro.php b/src/web/server/admin/upgrade_maestro.php index 3064b58..6a81dee 100644 --- a/src/web/server/admin/upgrade_maestro.php +++ b/src/web/server/admin/upgrade_maestro.php @@ -5,9 +5,11 @@ include "./../setup/connect_db.php"; include "./../lib/send_reply_json.php"; include "./../lib/db_maestro.php"; include "./../lib/maestro_log.php"; -include "./../lib/maestro_account_info.php"; include "./../mail/mail_setting.php"; -// include "./../mail/send_mail.php"; + +include './../mail/mail_setting.php'; +include './../mail/mail_contents.php'; +include './../lib/maestro_account_info.php'; include "./../mail/send_naver_mail.php"; $maestro_upgrade_id = $_POST["maestro_upgrade_id"]; diff --git a/src/web/server/maestro/add_maestro.php b/src/web/server/maestro/add_maestro.php index d40db64..5e95f70 100644 --- a/src/web/server/maestro/add_maestro.php +++ b/src/web/server/maestro/add_maestro.php @@ -6,10 +6,12 @@ ini_set( "display_errors", 1 ); include "./../setup/connect_db.php"; include "./../lib/send_reply_json.php"; -// include "./../lib/maestro_account_info.php"; include "./../lib/db_maestro.php"; include "./../lib/maestro_log.php"; -// include "./../mail/mail_setting.php"; + +include './../mail/mail_setting.php'; +include './../mail/mail_contents.php'; +include './../lib/maestro_account_info.php'; include "./../mail/send_naver_mail.php"; diff --git a/src/web/server/maestro/request_extension_maestro.php b/src/web/server/maestro/request_extension_maestro.php index 666029f..2664cc4 100644 --- a/src/web/server/maestro/request_extension_maestro.php +++ b/src/web/server/maestro/request_extension_maestro.php @@ -4,9 +4,10 @@ header("Content-Type: application/json"); include "./../setup/connect_db.php"; include "./../lib/send_reply_json.php"; include "./../lib/db_maestro.php"; -include "./../lib/maestro_account_info.php"; -// include "./../mail/mail_setting.php"; -// include "./../mail/send_mail.php"; + +include './../mail/mail_setting.php'; +include './../mail/mail_contents.php'; +include './../lib/maestro_account_info.php'; include "./../mail/send_naver_mail.php"; $maestro_id = $_POST["maestro_id"]; diff --git a/src/web/server/maestro/request_upgrade_maestro.php b/src/web/server/maestro/request_upgrade_maestro.php index 28954a5..ae46bca 100644 --- a/src/web/server/maestro/request_upgrade_maestro.php +++ b/src/web/server/maestro/request_upgrade_maestro.php @@ -4,9 +4,10 @@ header("Content-Type: application/json"); include "./../setup/connect_db.php"; include "./../lib/send_reply_json.php"; include "./../lib/db_maestro.php"; -include "./../lib/maestro_account_info.php"; -// include "./../mail/mail_setting.php"; -// include "./../mail/send_mail.php"; + +include './../mail/mail_setting.php'; +include './../mail/mail_contents.php'; +include './../lib/maestro_account_info.php'; include "./../mail/send_naver_mail.php"; $maestro_id = $_POST["maestro_id"]; diff --git a/src/web/server/maestro/update_maestro_info.php b/src/web/server/maestro/update_maestro_info.php index fbcf1e9..44cae02 100644 --- a/src/web/server/maestro/update_maestro_info.php +++ b/src/web/server/maestro/update_maestro_info.php @@ -3,11 +3,12 @@ header("Content-Type: application/json"); include "./../lib/send_reply_json.php"; include "./../setup/connect_db.php"; -include "./../lib/maestro_account_info.php"; include "./../lib/db_maestro.php"; include "./../lib/maestro_log.php"; -// include "./../mail/mail_setting.php"; -// include "./../mail/send_mail.php"; + +include './../mail/mail_setting.php'; +include './../mail/mail_contents.php'; +include './../lib/maestro_account_info.php'; include "./../mail/send_naver_mail.php"; $maestroID = $_POST["maestro_id"]; diff --git a/src/web/server/mail/send_mail_test.php b/src/web/server/mail/send_mail_test.php index c3ca9f3..f851043 100644 --- a/src/web/server/mail/send_mail_test.php +++ b/src/web/server/mail/send_mail_test.php @@ -4,8 +4,10 @@ header("Content-Type: application/json"); include "./../lib/send_reply_json.php"; include "./../setup/connect_db.php"; include "./../lib/db_maestro.php"; -// include "./mail_setting.php"; -// include "./send_mail.php"; + +include './mail_setting.php'; +include './mail_contents.php'; +include './../lib/maestro_account_info.php'; include "./send_naver_mail.php"; $type = $_POST["type"]; diff --git a/src/web/server/mail/send_naver_mail.php b/src/web/server/mail/send_naver_mail.php index 31cb73e..396ed62 100644 --- a/src/web/server/mail/send_naver_mail.php +++ b/src/web/server/mail/send_naver_mail.php @@ -11,9 +11,6 @@ require './../PHPMailer/src/Exception.php'; require './../PHPMailer/src/PHPMailer.php'; require './../PHPMailer/src/SMTP.php'; -include './mail_setting.php'; -include './mail_contents.php'; -include './../lib/maestro_account_info.php'; // include_once "./../lib/send_reply_json.php"; // Register diff --git a/src/web/server/mail/test_naver_mail.php b/src/web/server/mail/test_naver_mail.php index ad43a66..0bc11ec 100644 --- a/src/web/server/mail/test_naver_mail.php +++ b/src/web/server/mail/test_naver_mail.php @@ -1,8 +1,10 @@ ";