불필요한 코드 수정 및 불필요한 파일 삭제

bbs/write_update.php

@@ -222,7 +222,7 @@ if (!isset($_POST['wr_subject']) || !trim($_POST['wr_subject']))
 $wr_seo_title = exist_seo_title_recursive('bbs', generate_seo_title($wr_subject), $write_table, $wr_id);
 
 $options = array($html,$secret,$mail);
-$wr_option = implode(',', array_filter($options, function($v) { return trim($v); }));
+$wr_option = implode(',', array_filter(array_map('trim', $options)));
 
 if ($w == '' || $w == 'r') {
 

common.php

@@ -251,8 +251,18 @@ chrome_domain_session_name();
 if( ! class_exists('XenoPostToForm') ){
     class XenoPostToForm
     {
+        public static function g5_session_name(){
+            return (defined('G5_SESSION_NAME') && G5_SESSION_NAME) ? G5_SESSION_NAME : 'PHPSESSID';
+        }
+
+        public static function php52_request_check(){
+            $cookie_session_name = self::g5_session_name();
+            if (isset($_REQUEST[$cookie_session_name]) && $_REQUEST[$cookie_session_name] != session_id())
+                goto_url(G5_BBS_URL.'/logout.php');
+        }
+
         public static function check() {
-            $cookie_session_name = (defined('G5_SESSION_NAME') && G5_SESSION_NAME) ? G5_SESSION_NAME : 'PHPSESSID'; 
+            $cookie_session_name = self::g5_session_name(); 
 
             return !isset($_COOKIE[$cookie_session_name]) && count($_POST) && ((isset($_SERVER['HTTP_REFERER']) && !preg_match('~^https://'.preg_quote($_SERVER['HTTP_HOST'], '~').'/~', $_SERVER['HTTP_REFERER']) || ! isset($_SERVER['HTTP_REFERER']) ));
         }
@@ -359,8 +369,9 @@ if( $config['cf_cert_use'] || (defined('G5_YOUNGCART_VER') && G5_YOUNGCART_VER)
 
             $headers = headers_list();
             krsort($headers);
+            $cookie_session_name = method_exists('XenoPostToForm', 'g5_session_name') ? XenoPostToForm::g5_session_name() : 'PHPSESSID'; 
             foreach ($headers as $header) {
-                if (!preg_match('~^Set-Cookie: PHPSESSID=~', $header)) continue;
+                if (!preg_match('~^Set-Cookie: '.$cookie_session_name.'=~', $header)) continue;
                 $header = preg_replace('~; secure(; HttpOnly)?$~', '', $header) . '; secure; SameSite=None';
                 header($header, false);
                 $g5['session_cookie_samesite'] = 'none';
@@ -383,9 +394,8 @@ define('G5_CAPTCHA_DIR',    !empty($config['cf_captcha']) ? $config['cf_captcha'
 define('G5_CAPTCHA_URL',    G5_PLUGIN_URL.'/'.G5_CAPTCHA_DIR);
 define('G5_CAPTCHA_PATH',   G5_PLUGIN_PATH.'/'.G5_CAPTCHA_DIR);
 
-// 4.00.03 : [보안관련] PHPSESSID 가 틀리면 로그아웃한다.
-if (isset($_REQUEST['PHPSESSID']) && $_REQUEST['PHPSESSID'] != session_id())
-    goto_url(G5_BBS_URL.'/logout.php');
+// 4.00.03 : [보안관련] PHPSESSID 가 틀리면 로그아웃한다. php5.2 버전 이하에서만 해당되는 코드이며, 오히려 무한리다이렉트 오류가 일어날수 있으므로 주석처리합니다.
+// if( method_exists('XenoPostToForm', 'php52_request_check') ) XenoPostToForm::php52_request_check();
 
 // QUERY_STRING
 $qstr = '';

plugin/PHPMailer/composer.json

@@ -1,61 +0,0 @@
-{
-    "name": "phpmailer/phpmailer",
-    "type": "library",
-    "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
-    "authors": [
-        {
-            "name": "Marcus Bointon",
-            "email": "phpmailer@synchromedia.co.uk"
-        },
-        {
-            "name": "Jim Jagielski",
-            "email": "jimjag@gmail.com"
-        },
-        {
-            "name": "Andy Prevost",
-            "email": "codeworxtech@users.sourceforge.net"
-        },
-        {
-            "name": "Brent R. Matzelle"
-        }
-    ],
-    "require": {
-        "ext-ctype": "*",
-        "php": ">=5.0.0"
-    },
-    "require-dev": {
-        "doctrine/annotations": "1.2.*",
-        "jms/serializer": "0.16.*",
-        "phpdocumentor/phpdocumentor": "2.*",
-        "phpunit/phpunit": "4.8.*",
-        "symfony/debug": "2.8.*",
-        "symfony/filesystem": "2.8.*",
-        "symfony/translation": "2.8.*",
-        "symfony/yaml": "2.8.*",
-        "zendframework/zend-cache": "2.5.1",
-        "zendframework/zend-config": "2.5.1",
-        "zendframework/zend-eventmanager": "2.5.1",
-        "zendframework/zend-filter": "2.5.1",
-        "zendframework/zend-i18n": "2.5.1",
-        "zendframework/zend-json": "2.5.1",
-        "zendframework/zend-math": "2.5.1",
-        "zendframework/zend-serializer": "2.5.*",
-        "zendframework/zend-servicemanager": "2.5.*",
-        "zendframework/zend-stdlib": "2.5.1"
-    },
-    "suggest": {
-        "league/oauth2-google": "Needed for Google XOAUTH2 authentication"
-    },
-    "autoload": {
-        "classmap": [
-            "class.phpmailer.php",
-            "class.phpmaileroauth.php",
-            "class.phpmaileroauthgoogle.php",
-            "class.smtp.php",
-            "class.pop3.php",
-            "extras/EasyPeasyICS.php",
-            "extras/ntlm_sasl_client.php"
-        ]
-    },
-    "license": "LGPL-2.1"
-}