Browse code
charset correct fix
Jimako authored on 2019/10/30 06:48:07
Showing 2 changed files
| ... | ... |
@@ -1,5 +1,4 @@ |
| 1 | 1 |
<?php |
| 2 |
-header('Content-type: text/html; charset=UTF-8');
|
|
| 3 | 2 |
// ---------------------------------------------------------------------- |
| 4 | 3 |
// Copyright (c) 2007 by Tammy Keefer |
| 5 | 4 |
// Based on eFiction 1.1 |
| ... | ... |
@@ -38,6 +37,9 @@ if(get_magic_quotes_gpc()){
|
| 38 | 37 |
} |
| 39 | 38 |
} |
| 40 | 39 |
|
| 40 |
+// Defines the character set for your language/location |
|
| 41 |
+define ("_CHARSET", "UTF-8");
|
|
| 42 |
+ |
|
| 41 | 43 |
// Prevent possible XSS attacks via $_GET. |
| 42 | 44 |
foreach ($_GET as $v) {
|
| 43 | 45 |
if(preg_match('@<script[^>]*?>.*?</script>@si', $v) ||
|
| ... | ... |
@@ -60,11 +62,12 @@ if(ini_get('register_globals')) {
|
| 60 | 62 |
foreach($arrayList as $k => $v) {
|
| 61 | 63 |
unset($GLOBALS[$k]); |
| 62 | 64 |
} |
| 63 |
-} |
|
| 64 |
- |
|
| 65 |
+} |
|
| 66 |
+ |
|
| 65 | 67 |
Header('Cache-Control: private, no-cache, must-revalidate, max_age=0, post-check=0, pre-check=0');
|
| 66 | 68 |
header ("Pragma: no-cache");
|
| 67 | 69 |
header ("Expires: 0");
|
| 70 |
+header("Content-Type: text/html; charset="._CHARSET);
|
|
| 68 | 71 |
|
| 69 | 72 |
// Locate config.php and set the basedir path |
| 70 | 73 |
$folder_level = ""; |
| ... | ... |
@@ -216,9 +219,20 @@ if($current == "viewuser" && isNumber($uid)) {
|
| 216 | 219 |
echo _DOCTYPE."<html><head>"; |
| 217 | 220 |
if(!isset($titleinfo)) $titleinfo = "$sitename :: $slogan"; |
| 218 | 221 |
if(isset($metaDesc)) echo "<meta name='description' content='$metaDesc'>"; |
| 219 |
-echo "<title>$titleinfo</title> |
|
| 220 |
-<link rel=\"shortcut icon\" type=\"image/ico\" href=\"skins/Snow White/images/favicon.ico\" /> |
|
| 221 |
-<meta http-equiv=\"Content-Type\" content=\"text/html; charset=\"UTF-8\">"; |
|
| 222 |
+echo "<title>$titleinfo</title>"; |
|
| 223 |
+ |
|
| 224 |
+// ---------- Favicon --------- |
|
| 225 |
+if (file_exists($skindir."/images/favicon.ico")) |
|
| 226 |
+{
|
|
| 227 |
+ echo "<link rel='icon' href='".THEME_ABS."favicon.ico' type='image/x-icon' />\n<link rel='shortcut icon' href='".THEME_ABS."favicon.ico' type='image/xicon' />\n"; |
|
| 228 |
+} |
|
| 229 |
+elseif (file_exists(_BASEDIR."favicon.ico")) |
|
| 230 |
+{
|
|
| 231 |
+ echo "<link rel='icon' href='"._BASEDIR."favicon.ico' type='image/x-icon' />\n<link rel='shortcut icon' href='"._BASEDIR."favicon.ico' type='image/xicon' />\n"; |
|
| 232 |
+} |
|
| 233 |
+ |
|
| 234 |
+ |
|
| 235 |
+echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset="._CHARSET."\">"; |
|
| 222 | 236 |
if(!isset($_GET['action']) || $_GET['action'] != "printable") {
|
| 223 | 237 |
echo "<script language=\"javascript\" type=\"text/javascript\" src=\""._BASEDIR."includes/javascript.js\"></script> |
| 224 | 238 |
<link rel=\"alternate\" type=\"application/rss+xml\" title=\"$sitename RSS Feed\" href=\""._BASEDIR."rss.php\">"; |
| ... | ... |
@@ -420,7 +434,9 @@ a.pophelp:hover span{ /*the span will display just on :hover state*/
|
| 420 | 434 |
} |
| 421 | 435 |
|
| 422 | 436 |
</style> |
| 423 |
-<link rel=\"stylesheet\" type=\"text/css\" href='$skindir/style.css'>"; |
|
| 437 |
+<link rel='stylesheet' type='text/css' href='$skindir/style.css' /> \n |
|
| 438 |
+<meta name='viewport' content='width=device-width, initial-scale=1.0' /> |
|
| 439 |
+"; |
|
| 424 | 440 |
} |
| 425 | 441 |
echo "</head>"; |
| 426 | 442 |
$headerSent = true; |
| ... | ... |
@@ -431,4 +447,4 @@ if($debug == 1) {
|
| 431 | 447 |
echo "\n<!-- \$_COOKIE \n"; print_r($_COOKIE); echo " -->"; |
| 432 | 448 |
echo "\n<!-- \$_POST \n"; print_r($_POST); echo " -->"; |
| 433 | 449 |
} |
| 434 |
-?> |
|
| 435 | 450 |
\ No newline at end of file |
| 451 |
+?> |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
<?php |
| 2 |
-// Defines the character set for your language/location |
|
| 3 | 2 |
|
| 4 |
-define ("_CHARSET", "ISO-8859-1");
|
|
| 3 |
+ |
|
| 4 |
+ |
|
| 5 | 5 |
|
| 6 | 6 |
// Defines the doc type. Most people will not need to change this. |
| 7 | 7 |
define ("_DOCTYPE", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">");
|