Merge branch 'master' of github.com:gnuboard/g5 into renewal10

This commit is contained in:
thisgun
2017-08-14 17:31:05 +09:00
2 changed files with 5 additions and 2 deletions
+4 -1
View File
@@ -76,7 +76,10 @@ if(is_file($skin_file)) {
$content .= get_text($write['qa_content'], 0);
} else {
$content = get_text($write['qa_content'], 0);
//$content = get_text($write['qa_content'], 0);
// KISA 취약점 권고사항 Stored XSS
$content = get_text(html_purifier($write['qa_content']), 0);
}
$editor_html = editor_html('qa_content', $content, $is_dhtml_editor);
+1 -1
View File
@@ -34,7 +34,7 @@ function g5_path()
$document_root = str_replace($tilde_remove, '', $_SERVER['SCRIPT_FILENAME']);
$pattern = '/' . preg_quote($document_root, '/') . '/i';
$root = preg_replace($pattern, '', $result['path']);
$port = $_SERVER['SERVER_PORT'] != 80 ? ':'.$_SERVER['SERVER_PORT'] : '';
$port = ($_SERVER['SERVER_PORT'] == 80 || $_SERVER['SERVER_PORT'] == 443) ? '' : ':'.$_SERVER['SERVER_PORT'];
$http = 'http' . ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']=='on') ? 's' : '') . '://';
$user = str_replace(preg_replace($pattern, '', $_SERVER['SCRIPT_FILENAME']), '', $_SERVER['SCRIPT_NAME']);
$host = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME'];