diff --git a/AI.php b/AI.php
index 69fd81d5..83ab1d3b 100644
--- a/AI.php
+++ b/AI.php
@@ -10,7 +10,7 @@
if (isset($_GET['m1'])) {
define('GAME', true);
- setlocale(LC_CTYPE, "ru_RU.CP1251");
+
include_once '_incl_data/__config.php';
include_once '_incl_data/class/__db_connect.php';
@@ -22,7 +22,7 @@ if (isset($_GET['m1'])) {
} elseif (isset($_GET['bk1'])) {
define('GAME', true);
- setlocale(LC_CTYPE, "ru_RU.CP1251");
+
include('_incl_data/__config.php');
include('_incl_data/class/__db_connect.php');
@@ -149,7 +149,7 @@ if (!isset($_GET['robot']) && UserIp::get() != $_SERVER['SERVER_ADDR'] && UserIp
const GAME = true;
-setlocale(LC_CTYPE, "ru_RU.CP1251");
+
include('_incl_data/__config.php');
include('_incl_data/class/__db_connect.php');
diff --git a/_incl_data/__config.php b/_incl_data/__config.php
index d6814c39..065cadeb 100644
--- a/_incl_data/__config.php
+++ b/_incl_data/__config.php
@@ -5,7 +5,6 @@ use Insallah\Tournaments\Tournament;
error_reporting(E_ALL ^ E_NOTICE);
ini_set('display_errors', 'Off');
-//setlocale(LC_CTYPE, "ru_RU.CP1251");
date_default_timezone_set('Europe/Moscow');
header('Cache-Control: no-cache, no-store, must-revalidate');
diff --git a/_incl_data/class/Core/Config.php b/_incl_data/class/Core/Config.php
index d1043115..513655bb 100644
--- a/_incl_data/class/Core/Config.php
+++ b/_incl_data/class/Core/Config.php
@@ -8,7 +8,6 @@ class Config
private function __construct()
{
error_reporting(E_ALL ^ E_NOTICE);
- setlocale(LC_CTYPE, "ru_RU.CP1251");
ini_set('display_errors', 'Off');
ini_set('date.timezone', 'Europe/Moscow');
diff --git a/_incl_data/class/Core/Database.php b/_incl_data/class/Core/Database.php
index 83336163..b40f228d 100644
--- a/_incl_data/class/Core/Database.php
+++ b/_incl_data/class/Core/Database.php
@@ -14,7 +14,7 @@ class Database
*/
private function __construct() {
mysql_select_db(Config::get('db_name'), mysql_connect('localhost', Config::get('db_user'), Config::get('db_password')));
- mysql_query('SET NAMES cp1251');
+ mysql_query('SET NAMES utf8mb4');
}
/**
@@ -42,7 +42,7 @@ class Database
[
PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
- PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES cp1251",
+ PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES utf8mb4",
PDO::ATTR_STRINGIFY_FETCHES => false,
PDO::ATTR_EMULATE_PREPARES => false,
]
diff --git a/_incl_data/class/Core/Mail.php b/_incl_data/class/Core/Mail.php
index 71c19e74..8688382d 100644
--- a/_incl_data/class/Core/Mail.php
+++ b/_incl_data/class/Core/Mail.php
@@ -9,8 +9,6 @@ class Mail
public static function send($to, $message, $subject = 'Бойцовский клуб')
{
require dirname(__DIR__) . '/mail/class.phpmailer.php';
- $message = mb_convert_encoding($message, 'UTF-8', 'CP1251');
- $subject = mb_convert_encoding($subject, 'UTF-8', 'CP1251');
$mail = new PHPMailer;
$mail->IsSMTP(); // Set mailer to use SMTP
@@ -23,7 +21,7 @@ class Mail
$mail->CharSet = 'UTF-8';
$mail->From = 'newcombats@yahoo.com';
- $mail->FromName = mb_convert_encoding('Бойцовский Клуб', 'UTF-8', 'CP1251');
+ $mail->FromName = 'Бойцовский Клуб';
$mail->AddAddress($to); // Add a recipient
$mail->IsHTML(true); // Set email format to HTML
diff --git a/_incl_data/class/FightRequest.php b/_incl_data/class/FightRequest.php
index 7b388af8..6e103bec 100644
--- a/_incl_data/class/FightRequest.php
+++ b/_incl_data/class/FightRequest.php
@@ -603,7 +603,7 @@ class FightRequest
$nz['time_start'] = (int)$_POST['startime2'];
$nz['comment'] = substr($_POST['cmt'], 0, 40);
$nz['comment'] = str_replace('"', '"', $nz['comment']);
- $nz['comment'] = htmlspecialchars($nz['comment'], null, 'cp1251');
+ $nz['comment'] = htmlspecialchars($nz['comment'], null);
if (!in_array($nz['time_start'], [60, 180, 300])) {
$nz['time_start'] = 600;
}
@@ -871,7 +871,7 @@ class FightRequest
}
//
if ($nz['razdel'] == 2 && isset($_POST['commentfiz'])) {
- $nz['comment'] = htmlspecialchars($_POST['commentfiz'], null, 'cp1251');
+ $nz['comment'] = htmlspecialchars($_POST['commentfiz'], null);
}
//
if ($nz['razdel'] == 5) {
diff --git a/_incl_data/class/GameDealer.php b/_incl_data/class/GameDealer.php
index 5c8014eb..175284e6 100644
--- a/_incl_data/class/GameDealer.php
+++ b/_incl_data/class/GameDealer.php
@@ -16,15 +16,26 @@ class GameDealer
], $BACK = []; //Результат который возвращаем в конце
//Кодируем из ЮТФ-8 в Кирилицу
+ /**
+ * @param $text
+ * @return mixed
+ * @deprecated
+ */
public function in($text)
{
- return iconv("UTF-8", "cp1251", $text);
+ return $text;
}
//Кодируем из Кирилицу в ЮТФ-8
+
+ /**
+ * @param $text
+ * @return mixed
+ * @deprecated
+ */
public function out($text)
{
- return iconv("cp1251", "UTF-8", $text);
+ return $text;
}
//Добавляем данные в базу данных
@@ -38,7 +49,7 @@ class GameDealer
{
$db = mysql_connect($this->c['db_host'], $this->c['db_user'], $this->c['db_pass']) or die('Ошибка подключения к MySQL серверу!');
mysql_select_db($this->c['db_base'], $db) or die('Ошибка подключения к базе данных!');
- mysql_query('SET NAMES cp1251');
+ mysql_query('SET NAMES utf8mb4');
}
public function output($a, $v = null)
diff --git a/_incl_data/class/Insallah/Core/Dbold.php b/_incl_data/class/Insallah/Core/Dbold.php
index d127a02e..f4219d41 100644
--- a/_incl_data/class/Insallah/Core/Dbold.php
+++ b/_incl_data/class/Insallah/Core/Dbold.php
@@ -20,7 +20,7 @@ class DbOld
const DB_USER = 'newcom1_abk';
const DB_PASSWORD = '4nWYsIM[c?}P';
const DB_NAME = 'newcom1_abk';
- const CHARSET = 'cp1251';
+ const CHARSET = 'utf8mb4';
const DB_PREFIX = '';
/**
diff --git a/_incl_data/class/Priems.php b/_incl_data/class/Priems.php
index a30578cc..7af8851b 100644
--- a/_incl_data/class/Priems.php
+++ b/_incl_data/class/Priems.php
@@ -1418,7 +1418,6 @@ class Priems
$notr = 0;
$pl['useon_user'] = $this->u->info['enemy'];
if (isset($_POST['useon']) && $_POST['useon'] != '' && $_POST['useon'] != 'none') {
- $_POST['useon'] = iconv('UTF-8', 'windows-1251', $_POST['useon']);
$this->ue = mysql_fetch_assoc(
mysql_query(
'SELECT
diff --git a/_incl_data/class/Telegram.php b/_incl_data/class/Telegram.php
index d4c3bfa7..0b7d0acd 100644
--- a/_incl_data/class/Telegram.php
+++ b/_incl_data/class/Telegram.php
@@ -16,7 +16,7 @@ class Telegram
private function send($to, $from, $text, $fromType)
{
mysql_query('START TRANSACTION');
- $ins = mysql_query("INSERT INTO `telegram` (`uid`,`from`,`fromType`,`text`,`time`) VALUES ('" . $to . "','" . $from . "','" . $fromType . "','" . mysql_real_escape_string(AddSlashes(HtmlSpecialChars($text, null, 'cp1251'))) . "','" . time() . "')");
+ $ins = mysql_query("INSERT INTO `telegram` (`uid`,`from`,`fromType`,`text`,`time`) VALUES ('" . $to . "','" . $from . "','" . $fromType . "','" . mysql_real_escape_string(AddSlashes(HtmlSpecialChars($text, null))) . "','" . time() . "')");
mysql_query('COMMIT');
if ($ins) {
return mysql_insert_id();
diff --git a/_incl_data/class/User.php b/_incl_data/class/User.php
index a9ea43bd..33046284 100644
--- a/_incl_data/class/User.php
+++ b/_incl_data/class/User.php
@@ -2069,7 +2069,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`
);
mysql_query(
'INSERT INTO `items_text` (`item_id`,`time`,`login`,`text`,`city`,`x`) VALUES ("' . $itm['id'] . '","' . time() . '","' . $this->info['login'] . '","' . mysql_real_escape_string(
- htmlspecialchars($txt, null, 'cp1251')
+ htmlspecialchars($txt, null)
) . '","' . $this->info['city'] . '","' . $sx . '")'
);
$this->error = 'Запись успешно произведена';
@@ -2127,7 +2127,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`
} else {
$ins = mysql_query(
'INSERT INTO `transfers` (`uid1`,`uid2`,`city`,`room`,`time`,`text`,`start1`) VALUES ("' . $this->info['id'] . '","' . $t['id'] . '","' . $this->info['city'] . '","' . $this->info['room'] . '","' . time() . '","' . mysql_real_escape_string(
- htmlspecialchars($_POST['textarea'], null, 'cp1251')
+ htmlspecialchars($_POST['textarea'], null)
) . '","' . time() . '")'
);
if ($ins) {
diff --git a/_incl_data/class/__db_connect.php b/_incl_data/class/__db_connect.php
index c225cab3..eba7dba9 100644
--- a/_incl_data/class/__db_connect.php
+++ b/_incl_data/class/__db_connect.php
@@ -15,4 +15,4 @@ include_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'mysql_override.php';
$dbgo = mysql_connect($db['s'], $db['u'], $db['p']);
mysql_select_db($db['d'], $dbgo);
-mysql_query('SET NAMES cp1251');
+mysql_query('set names utf8mb4');
diff --git a/_incl_data/class/dnaction/_dungeon_replace.php b/_incl_data/class/dnaction/_dungeon_replace.php
index 97bb1c55..39dc3452 100644
--- a/_incl_data/class/dnaction/_dungeon_replace.php
+++ b/_incl_data/class/dnaction/_dungeon_replace.php
@@ -302,7 +302,6 @@ function getImg($id, $num) {
-
diff --git a/_incl_data/mails.php b/_incl_data/mails.php
index 79f521e1..62a5d713 100644
--- a/_incl_data/mails.php
+++ b/_incl_data/mails.php
@@ -4,8 +4,6 @@
function mails($to, $message, $subject = 'Бойцовский клуб')
{
require '_incl_data/class/mail/class.phpmailer.php';
- $message = mb_convert_encoding($message, 'UTF-8', 'CP1251');
- $subject = mb_convert_encoding($subject, 'UTF-8', 'CP1251');
$mail = new PHPMailer;
$mail->IsSMTP(); // Set mailer to use SMTP
@@ -18,8 +16,8 @@ function mails($to, $message, $subject = 'Бойцовский клуб')
$mail->CharSet = 'UTF-8';
$mail->From = 'newcombats@yahoo.com';
- $mail->FromName = mb_convert_encoding('Бойцовский Клуб', 'UTF-8', 'CP1251');
- $mail->AddAddress($to); // Add a recipient
+ $mail->FromName = 'Бойцовский Клуб';
+ $mail->AddAddress($to); // Add a recipient
$mail->IsHTML(true); // Set email format to HTML
diff --git a/_incl_data/mysql_override.php b/_incl_data/mysql_override.php
index 8bb9f344..752c8904 100644
--- a/_incl_data/mysql_override.php
+++ b/_incl_data/mysql_override.php
@@ -6,9 +6,6 @@
* @version 0.1
*/
-//ini_set('default_charset', 'windows-1251');
-//ini_set('date.timezone', 'Europe/Moscow');
-
// Make sure the MySQL extension is not loaded and there is no other drop in replacement active
if (!extension_loaded('mysql') && !function_exists('mysql_connect')) {
// Validate if the MySQLi extension is present
diff --git a/adminion/balance.php b/adminion/balance.php
index 42f78e65..516d6fc9 100644
--- a/adminion/balance.php
+++ b/adminion/balance.php
@@ -161,7 +161,7 @@ $plus = $plus[0];
-
+
Отчетность проекта
-
-
-
-
- |
-
-
-
-
- |
-
-
-
- echo $goLis; ?>
-
-
-
-
-
- |
- |
-
- |
-
- |
-
- |
-
-
- |
-
-
-
-
-
-
-
-
- if($re2!=''){ echo ' '.$re2.' '; }
- if(!isset($u->bank['id']))
- {
- ?>
- Мы предоставляем следующие услуги:
-
- - Открытие счета
- Возможность положить/снять кредиты/еврокредиты со счета
-
- Перевести кредиты/еврокредиты с одного счета на другой
-
- Обменный пункт. Обмен еврокредитов на кредиты
-
-
-
-
-
- |
-
-
-
- |
-
-
-
- }else{
-
-?>
-
-
-
-Сумма указанная в окне оповещения и суммы взымаемая\начисляемая могут различаться.
-
- }
-}
-?>
\ No newline at end of file
diff --git a/modules_data/location/bank.php b/modules_data/location/bank.php
index a49baa10..5d3524be 100644
--- a/modules_data/location/bank.php
+++ b/modules_data/location/bank.php
@@ -148,7 +148,7 @@ if ($u->room['file'] == 'bank') {
$re2 = 'У вас недостаточно кр.';
} elseif ($u->info['align'] != 2) {
$pass = rand(10000, 91191);
- $pass = htmlspecialchars($_POST['pass1'], null, 'cp1251');
+ $pass = htmlspecialchars($_POST['pass1'], null);
$ins = mysql_query(
'INSERT INTO `bank` (`uid`,`create`,`pass`) VALUES ("' . $u->info['id'] . '","' . time(
) . '","' . mysql_real_escape_string($pass) . '")'
diff --git a/modules_data/location/btl_.php b/modules_data/location/btl_.php
index 695ebc30..5d9d6352 100644
--- a/modules_data/location/btl_.php
+++ b/modules_data/location/btl_.php
@@ -260,14 +260,10 @@ echo '';
function ($m) {return chr(hexdec($m[1]) - 1072 + 224);},
$str
);
-// $str = preg_replace_callback(
-// '/\\\u([a-f0-9]{4})/i', create_function('$m', 'return chr(hexdec($m[1])-1072+224);'), $str
-// );
-// return $str;
}
?>
- var log_text = ;
+ var log_text = ;
var youlogin = "=$u->info['login']?>";
function looklogrep(text, vars) {
diff --git a/modules_data/location/dungeon_enter.php b/modules_data/location/dungeon_enter.php
index 57b7ace7..8980eb7e 100644
--- a/modules_data/location/dungeon_enter.php
+++ b/modules_data/location/dungeon_enter.php
@@ -462,7 +462,7 @@ while( $pl = mysql_fetch_array( $sp ) ){
$pl['dcom'] = $u->info['id'];
}
}
- $pl['com'] = htmlspecialchars($pl['com'],NULL,'cp1251');
+ $pl['com'] = htmlspecialchars($pl['com'],NULL);
if( $pl['dcom'] > 0 ) {
$dl = ' комментарий удален модератором';
}
diff --git a/modules_data/location/dungeon_enter_all.php b/modules_data/location/dungeon_enter_all.php
index 56340781..c7522b39 100644
--- a/modules_data/location/dungeon_enter_all.php
+++ b/modules_data/location/dungeon_enter_all.php
@@ -531,7 +531,7 @@ while( $pl = mysql_fetch_array( $sp ) ){
$pl['dcom'] = $u->info['id'];
}
}
- $pl['com'] = htmlspecialchars($pl['com'],NULL,'cp1251');
+ $pl['com'] = htmlspecialchars($pl['com'],NULL);
if( $pl['dcom'] > 0 ) {
$dl = ' комментарий удален модератором';
}
diff --git a/modules_data/location/elka.php b/modules_data/location/elka.php
index a3a9c0c1..b6307216 100644
--- a/modules_data/location/elka.php
+++ b/modules_data/location/elka.php
@@ -109,7 +109,7 @@ if($u->room['file']=='elka')
}
}elseif(isset($_POST['message']))
{
- $_POST['message'] = htmlspecialchars($_POST['message'],NULL,'cp1251');
+ $_POST['message'] = htmlspecialchars($_POST['message'],NULL);
if($_POST['message']!='')
{
$dy = 1;
diff --git a/modules_data/location/enterbezdna.php b/modules_data/location/enterbezdna.php
index acc1f374..71cb50f5 100644
--- a/modules_data/location/enterbezdna.php
+++ b/modules_data/location/enterbezdna.php
@@ -303,7 +303,7 @@ while($pl = mysql_fetch_array($sp))
}
}
- $pl['com'] = htmlspecialchars($pl['com'],NULL,'cp1251');
+ $pl['com'] = htmlspecialchars($pl['com'],NULL);
if($pl['dcom']>0)
{
diff --git a/modules_data/location/entercat.php b/modules_data/location/entercat.php
index 28a7a268..aeb824b6 100644
--- a/modules_data/location/entercat.php
+++ b/modules_data/location/entercat.php
@@ -229,7 +229,7 @@ while($pl = mysql_fetch_array($sp))
}
}
- $pl['com'] = htmlspecialchars($pl['com'],NULL,'cp1251');
+ $pl['com'] = htmlspecialchars($pl['com'],NULL);
if($pl['dcom']>0)
{
diff --git a/modules_data/location/enterdrago.php b/modules_data/location/enterdrago.php
index fdfdd8bc..94d38d1c 100644
--- a/modules_data/location/enterdrago.php
+++ b/modules_data/location/enterdrago.php
@@ -447,7 +447,7 @@ while( $pl = mysql_fetch_array( $sp ) ) {
$pl['dcom'] = $u->info['id'];
}
}
- $pl['com'] = htmlspecialchars($pl['com'],NULL,'cp1251');
+ $pl['com'] = htmlspecialchars($pl['com'],NULL);
if( $pl['dcom'] > 0 ) {
$dl = ' комментарий удален модератором';
}
diff --git a/modules_data/location/entergrib.php b/modules_data/location/entergrib.php
index cfb3aeb3..03a621a2 100644
--- a/modules_data/location/entergrib.php
+++ b/modules_data/location/entergrib.php
@@ -230,7 +230,7 @@ while($pl = mysql_fetch_array($sp))
}
}
- $pl['com'] = htmlspecialchars($pl['com'],NULL,'cp1251');
+ $pl['com'] = htmlspecialchars($pl['com'],NULL);
if($pl['dcom']>0)
{
diff --git a/modules_data/location/enternekro.php b/modules_data/location/enternekro.php
index f18acd2d..93e99642 100644
--- a/modules_data/location/enternekro.php
+++ b/modules_data/location/enternekro.php
@@ -230,7 +230,7 @@ while($pl = mysql_fetch_array($sp))
}
}
- $pl['com'] = htmlspecialchars($pl['com'],NULL,'cp1251');
+ $pl['com'] = htmlspecialchars($pl['com'],NULL);
if($pl['dcom']>0)
{
diff --git a/modules_data/location/enternizin.php b/modules_data/location/enternizin.php
index a57ba37a..e18f50d9 100644
--- a/modules_data/location/enternizin.php
+++ b/modules_data/location/enternizin.php
@@ -303,7 +303,7 @@ while($pl = mysql_fetch_array($sp))
}
}
- $pl['com'] = htmlspecialchars($pl['com'],NULL,'cp1251');
+ $pl['com'] = htmlspecialchars($pl['com'],NULL);
if($pl['dcom']>0)
{
diff --git a/modules_data/location/enterptp.php b/modules_data/location/enterptp.php
index d650ced3..00c21ec4 100644
--- a/modules_data/location/enterptp.php
+++ b/modules_data/location/enterptp.php
@@ -288,7 +288,7 @@ while($pl = mysql_fetch_array($sp)){
}
}
- $pl['com'] = htmlspecialchars($pl['com'],NULL,'cp1251');
+ $pl['com'] = htmlspecialchars($pl['com'],NULL);
if($pl['dcom']>0)
{
diff --git a/modules_data/location/entersnow.php b/modules_data/location/entersnow.php
index e81bec6b..4a083946 100644
--- a/modules_data/location/entersnow.php
+++ b/modules_data/location/entersnow.php
@@ -231,7 +231,7 @@ while($pl = mysql_fetch_array($sp))
}
}
- $pl['com'] = htmlspecialchars($pl['com'],NULL,'cp1251');
+ $pl['com'] = htmlspecialchars($pl['com'],NULL);
if($pl['dcom']>0)
{
diff --git a/modules_data/location/fe/shop_.php b/modules_data/location/fe/shop_.php
index 4498ad48..e996b40f 100644
--- a/modules_data/location/fe/shop_.php
+++ b/modules_data/location/fe/shop_.php
@@ -32,10 +32,10 @@ if($u->room['file']=='fe/shop_')
$itm['gtxt1'] = str_replace('\x3C','<',$itm['gtxt1']);
$itm['gtxt1'] = str_replace('\x3','>',$itm['gtxt1']);
- $itm['gtxt1'] = htmlspecialchars($itm['gtxt1'],NULL,'cp1251');
+ $itm['gtxt1'] = htmlspecialchars($itm['gtxt1'],NULL);
$itm['gtxt2'] = str_replace('\x3C','<',$itm['gtxt2']);
$itm['gtxt2'] = str_replace('\x3','>',$itm['gtxt2']);
- $itm['gtxt2'] = htmlspecialchars($itm['gtxt2'],NULL,'cp1251');
+ $itm['gtxt2'] = htmlspecialchars($itm['gtxt2'],NULL);
$upd = mysql_query('UPDATE `items_users` SET `data` = "'.$itm['data'].'",`gtxt1` = "'.mysql_real_escape_string($itm['gtxt1']).'",`gtxt2` = "'.mysql_real_escape_string($itm['gtxt2']).'",`uid` = "'.$to['id'].'",`gift` = "'.$u->info['login'].'",`time_create` = "'.time().'" WHERE `id` = "'.$itm['id'].'" LIMIT 1');
if($upd)
diff --git a/modules_data/location/fight-club.database.php b/modules_data/location/fight-club.database.php
index c608773e..08211168 100644
--- a/modules_data/location/fight-club.database.php
+++ b/modules_data/location/fight-club.database.php
@@ -3,13 +3,13 @@ if(!defined('GAME')){
die();
}
$StaticMSG = array(
- 'your-position'=>iconv("WINDOWS-1251", "UTF-8", 'Ваше местоположение'),
- 'move-bk'=>iconv("WINDOWS-1251", "UTF-8", 'Проход через "Бойцовский клуб"'),
- 'move-zalu4'=>iconv("WINDOWS-1251", "UTF-8", 'Проход через "Зал паладинов"'),
- 'move-map_halls'=>iconv("WINDOWS-1251", "UTF-8", 'Проход через "Залы"'),
- 'move-to-sek4'=>iconv("WINDOWS-1251", "UTF-8", 'Проход через "Рыцарский" или "Торговый" зал'),
- 'move-sek5'=>iconv("WINDOWS-1251", "UTF-8", 'Проход через "Торговый зал"'),
- 'move-sek6'=>iconv("WINDOWS-1251", "UTF-8", 'Проход через "Рыцарский зал"'),
+ 'your-position'=>'Ваше местоположение',
+ 'move-bk'=>'Проход через "Бойцовский клуб"',
+ 'move-zalu4'=>'Проход через "Зал паладинов"',
+ 'move-map_halls'=>'Проход через "Залы"',
+ 'move-to-sek4'=>'Проход через "Рыцарский" или "Торговый" зал',
+ 'move-sek5'=>'Проход через "Торговый зал"',
+ 'move-sek6'=>'Проход через "Рыцарский зал"',
);
$Response = array('status'=>'update');
switch($u->room['file']){
@@ -20,7 +20,7 @@ switch($u->room['file']){
'bg'=>'navig',
'left'=>'241',
'top'=>'128',
- 'name'=>iconv("WINDOWS-1251", "UTF-8", $u->room['name']),
+ 'name'=>$u->room['name'],
'tgo'=>($tmGo*10),
'tgo1'=>($tmGol*10)
),
@@ -35,11 +35,11 @@ switch($u->room['file']){
array('id'=>'map_klub7','params'=>thisInfRm('1.180.0.9', NULL, true))
),
'buttons'=>array(
- array(iconv("WINDOWS-1251", "UTF-8", 'Возврат'),'main.php?homeworld=true'),
- array(iconv("WINDOWS-1251", "UTF-8", 'Казино'),'main.php?loc=1.180.0.225'),
- array(iconv("WINDOWS-1251", "UTF-8", 'Карта клуба'),'main.php?clubmap=true'),
- array(iconv("WINDOWS-1251", "UTF-8", 'Форум'),"window.open('https://" . $c['forum'] . "/', 'forum', 'location=yes,menubar=yes,status=yes,resizable=yes,toolbar=yes,scrollbars=yes,scrollbars=yes')"),
- array(iconv("WINDOWS-1251", "UTF-8", 'Подсказка'),"window.open('/encicl/help/top1.html', 'help', 'height=300,width=500,location=no,menubar=no,status=no,toolbar=no,scrollbars=yes')")
+ array('Возврат','main.php?homeworld=true'),
+ array('Казино','main.php?loc=1.180.0.225'),
+ array('Карта клуба','main.php?clubmap=true'),
+ array('Форум',"window.open('https://" . $c['forum'] . "/', 'forum', 'location=yes,menubar=yes,status=yes,resizable=yes,toolbar=yes,scrollbars=yes,scrollbars=yes')"),
+ array('Подсказка',"window.open('/encicl/help/top1.html', 'help', 'height=300,width=500,location=no,menubar=no,status=no,toolbar=no,scrollbars=yes')")
)
);
break;
@@ -50,7 +50,7 @@ switch($u->room['file']){
'bg'=>'navig',
'left'=>'154',
'top'=>'148',
- 'name'=>iconv("WINDOWS-1251", "UTF-8", $u->room['name']),
+ 'name'=>$u->room['name'],
'tgo'=>($tmGo*10),
'tgo1'=>($tmGol*10)
),
@@ -73,7 +73,7 @@ switch($u->room['file']){
'bg'=>'navig',
'left'=>'395',
'top'=>'142',
- 'name'=>iconv("WINDOWS-1251", "UTF-8", $u->room['name']),
+ 'name'=>$u->room['name'],
'tgo'=>($tmGo*10),
'tgo1'=>($tmGol*10)
),
@@ -96,7 +96,7 @@ switch($u->room['file']){
'bg'=>'navig',
'left'=>'337',
'top'=>'79',
- 'name'=>iconv("WINDOWS-1251", "UTF-8", $u->room['name']),
+ 'name'=>$u->room['name'],
'tgo'=>($tmGo*10),
'tgo1'=>($tmGol*10)
),
@@ -119,7 +119,7 @@ switch($u->room['file']){
'bg'=>'navig',
'left'=>'139',
'top'=>'79',
- 'name'=>iconv("WINDOWS-1251", "UTF-8", $u->room['name']),
+ 'name'=>$u->room['name'],
'tgo'=>($tmGo*10),
'tgo1'=>($tmGol*10)
),
@@ -142,7 +142,7 @@ switch($u->room['file']){
'bg'=>'navig1',
'left'=>'337',
'top'=>'117',
- 'name'=>iconv("WINDOWS-1251", "UTF-8", $u->room['name']),
+ 'name'=>$u->room['name'],
'tgo'=>($tmGo*10),
'tgo1'=>($tmGol*10)
),
@@ -163,7 +163,7 @@ switch($u->room['file']){
'bg'=>'navig1',
'left'=>'163',
'top'=>'28',
- 'name'=>iconv("WINDOWS-1251", "UTF-8", $u->room['name']),
+ 'name'=>$u->room['name'],
'tgo'=>($tmGo*10),
'tgo1'=>($tmGol*10)
),
@@ -183,7 +183,7 @@ switch($u->room['file']){
'bg'=>'navig3',
'left'=>'162',
'top'=>'125',
- 'name'=>iconv("WINDOWS-1251", "UTF-8", $u->room['name']),
+ 'name'=>$u->room['name'],
'tgo'=>($tmGo*10),
'tgo1'=>($tmGol*10)
),
diff --git a/modules_data/location/house_belaun.php b/modules_data/location/house_belaun.php
index 6bfba8dd..f5efbb76 100644
--- a/modules_data/location/house_belaun.php
+++ b/modules_data/location/house_belaun.php
@@ -299,7 +299,7 @@ if( $u->room['file'] == 'house_belaun' ) {
$pl['dcom'] = $u->info['id'];
}
}
- $pl['com'] = htmlspecialchars($pl['com'],NULL,'cp1251');
+ $pl['com'] = htmlspecialchars($pl['com'],NULL);
if( $pl['dcom'] > 0 ) {
$dl = ' комментарий удален модератором';
}
@@ -835,7 +835,7 @@ while( $pl = mysql_fetch_array( $sp ) ){
$pl['dcom'] = $u->info['id'];
}
}
- $pl['com'] = htmlspecialchars($pl['com'],NULL,'cp1251');
+ $pl['com'] = htmlspecialchars($pl['com'],NULL);
if( $pl['dcom'] > 0 ) {
$dl = ' комментарий удален модератором';
}
diff --git a/modules_data/location/miloserdie.php b/modules_data/location/miloserdie.php
index 42b03d1a..300fe64b 100644
--- a/modules_data/location/miloserdie.php
+++ b/modules_data/location/miloserdie.php
@@ -65,7 +65,6 @@ elseif($_GET['get']=='10' && $is_eff[0]>0){
?>
-
diff --git a/modules_data/location/nc/shop_.php b/modules_data/location/nc/shop_.php
index 2337f35b..6b3d9a60 100644
--- a/modules_data/location/nc/shop_.php
+++ b/modules_data/location/nc/shop_.php
@@ -32,10 +32,10 @@ if($u->room['file']=='nc/shop_')
$itm['gtxt1'] = str_replace('\x3C','<',$itm['gtxt1']);
$itm['gtxt1'] = str_replace('\x3','>',$itm['gtxt1']);
- $itm['gtxt1'] = htmlspecialchars($itm['gtxt1'],NULL,'cp1251');
+ $itm['gtxt1'] = htmlspecialchars($itm['gtxt1'],NULL);
$itm['gtxt2'] = str_replace('\x3C','<',$itm['gtxt2']);
$itm['gtxt2'] = str_replace('\x3','>',$itm['gtxt2']);
- $itm['gtxt2'] = htmlspecialchars($itm['gtxt2'],NULL,'cp1251');
+ $itm['gtxt2'] = htmlspecialchars($itm['gtxt2'],NULL);
$upd = mysql_query('UPDATE `items_users` SET `data` = "'.$itm['data'].'",`gtxt1` = "'.mysql_real_escape_string($itm['gtxt1']).'",`gtxt2` = "'.mysql_real_escape_string($itm['gtxt2']).'",`uid` = "'.$to['id'].'",`gift` = "'.$u->info['login'].'",`time_create` = "'.time().'" WHERE `id` = "'.$itm['id'].'" LIMIT 1');
if($upd)
diff --git a/modules_data/location/objaga.php b/modules_data/location/objaga.php
index 57474a87..498121a6 100644
--- a/modules_data/location/objaga.php
+++ b/modules_data/location/objaga.php
@@ -164,7 +164,7 @@ if($_POST['payarenda']) {
if($u->info['money']>0 && (int)$_POST['payarenda']>0 && ((int)$_POST['payarenda']<=$u->info['money'])) {
$paytime = ($_POST['payarenda']/$objaga['weekcost'])*604800;
mysql_query("UPDATE `house`,`users` SET `house`.`endtime` = `house`.`endtime`+'".$paytime."', `house`.`balance` = `house`.`balance`+'".mysql_real_escape_string($_POST['payarenda'])."',`users`.`money`=`users`.`money`-'".mysql_real_escape_string($_POST['payarenda'])."' WHERE `house`.`owner` = `users`.`id` AND `house`.`owner` = '".mysql_real_escape_string($u->info['id'])."';");
- $err = 'Вы положили на счет '.htmlspecialchars($_POST['payarenda'],NULL,'cp1251').'.00 кр.
';
+ $err = 'Вы положили на счет '.htmlspecialchars($_POST['payarenda'],NULL).'.00 кр.
';
$u->info['money'] -=$_POST['payarenda'];
$objaga['balance'] +=$_POST['payarenda'];
$objaga['endtime'] += $paytime;
diff --git a/modules_data/location/penter.php b/modules_data/location/penter.php
index ab197fc9..3af0e6ec 100644
--- a/modules_data/location/penter.php
+++ b/modules_data/location/penter.php
@@ -240,7 +240,7 @@ while($pl = mysql_fetch_array($sp))
}
}
- $pl['com'] = htmlspecialchars($pl['com'],NULL,'cp1251');
+ $pl['com'] = htmlspecialchars($pl['com'],NULL);
if($pl['dcom']>0)
{
diff --git a/modules_data/location/post.php b/modules_data/location/post.php
index 0509eeef..a5538255 100644
--- a/modules_data/location/post.php
+++ b/modules_data/location/post.php
@@ -330,7 +330,7 @@ if(isset($pu['id'])) {
$ttest['time'] = -$ttest['time'];
}
if( !isset($ttest['id']) || ( $ttest['time']-$tmgo*60-time()+10 ) <= 0 ) {
- $_POST['snd_telegraf'] = htmlspecialchars($_POST['snd_telegraf'],NULL,'cp1251');
+ $_POST['snd_telegraf'] = htmlspecialchars($_POST['snd_telegraf'],NULL);
$_POST['snd_telegraf'] = substr($_POST['snd_telegraf'],0,100);
$_POST['snd_telegraf'] = str_replace('<','<',$_POST['snd_telegraf']);
$_POST['snd_telegraf'] = str_replace('\x3e','<',$_POST['snd_telegraf']);
@@ -360,7 +360,7 @@ if(isset($pu['id'])) {
if($u->info['money'] >= 1 && $u->info['palpro'] > time()) {
//max_text
- $_POST['snd_post'] = htmlspecialchars($_POST['snd_post'],NULL,'cp1251');
+ $_POST['snd_post'] = htmlspecialchars($_POST['snd_post'],NULL);
$_POST['snd_post'] = substr($_POST['snd_post'],0,500);
$_POST['snd_post'] = str_replace('<','<',$_POST['snd_post']);
$_POST['snd_post'] = str_replace('\x3e','<',$_POST['snd_post']);
diff --git a/modules_data/location/room_hostel.php b/modules_data/location/room_hostel.php
index 58dede04..4e9d1011 100644
--- a/modules_data/location/room_hostel.php
+++ b/modules_data/location/room_hostel.php
@@ -449,7 +449,7 @@ if( $hostel['balance'] <= 0 && $u->room['id'] != 214 && $sleep['vars'] != 'sleep
if($u->info['money']>0 && (int)$_POST['payarenda']>0 && ((int)$_POST['payarenda']<=$u->info['money'])) {
$paytime = ($_POST['payarenda']/$hostel['weekcost'])*604800;
mysql_query("UPDATE `house`,`users` SET `house`.`endtime` = `house`.`endtime`+'".$paytime."', `house`.`balance` = `house`.`balance`+'".mysql_real_escape_string($_POST['payarenda'])."' WHERE `house`.`owner` = `users`.`id` AND `house`.`owner` = '".mysql_real_escape_string($u->info['id'])."';");
- $err = 'Вы положили на счет '.htmlspecialchars($_POST['payarenda'],NULL,'cp1251').'.00 кр. ';
+ $err = 'Вы положили на счет '.htmlspecialchars($_POST['payarenda'],NULL).'.00 кр. ';
$u->info['money'] -= round((int)$_POST['payarenda']);
mysql_query('UPDATE `users` SET `money` = "'.mysql_real_escape_string($u->info['money']).'" WHERE `id` = "'.$u->info['id'].'" LIMIT 1');
$hostel['balance'] +=$_POST['payarenda'];
diff --git a/modules_data/location/shop_.php b/modules_data/location/shop_.php
index ea2fa088..1b674f1f 100644
--- a/modules_data/location/shop_.php
+++ b/modules_data/location/shop_.php
@@ -38,10 +38,10 @@ if($u->room['file']=='shop_')
$itm['gtxt1'] = str_replace('\x3C','<',$itm['gtxt1']);
$itm['gtxt1'] = str_replace('\x3','>',$itm['gtxt1']);
- $itm['gtxt1'] = htmlspecialchars($itm['gtxt1'],NULL,'cp1251');
+ $itm['gtxt1'] = htmlspecialchars($itm['gtxt1'],NULL);
$itm['gtxt2'] = str_replace('\x3C','<',$itm['gtxt2']);
$itm['gtxt2'] = str_replace('\x3','>',$itm['gtxt2']);
- $itm['gtxt2'] = htmlspecialchars($itm['gtxt2'],NULL,'cp1251');
+ $itm['gtxt2'] = htmlspecialchars($itm['gtxt2'],NULL);
$giftlogin = $u->info['login'];
@@ -103,10 +103,10 @@ if($u->room['file']=='shop_')
$itm['gtxt1'] = str_replace('\x3C','<',$itm['gtxt1']);
$itm['gtxt1'] = str_replace('\x3','>',$itm['gtxt1']);
- $itm['gtxt1'] = htmlspecialchars($itm['gtxt1'],NULL,'cp1251');
+ $itm['gtxt1'] = htmlspecialchars($itm['gtxt1'],NULL);
$itm['gtxt2'] = str_replace('\x3C','<',$itm['gtxt2']);
$itm['gtxt2'] = str_replace('\x3','>',$itm['gtxt2']);
- $itm['gtxt2'] = htmlspecialchars($itm['gtxt2'],NULL,'cp1251');
+ $itm['gtxt2'] = htmlspecialchars($itm['gtxt2'],NULL);
$fspam = $filter->spamFiltr(str_replace('точка','.',str_replace('ру','ru',$itm['gtxt1'])));
if( $fspam != '0' ) {
diff --git a/modules_data/location/spavedlivost.php b/modules_data/location/spavedlivost.php
index 7a92efd2..4410ecba 100644
--- a/modules_data/location/spavedlivost.php
+++ b/modules_data/location/spavedlivost.php
@@ -66,7 +66,6 @@ elseif($_GET['get']=='10' && $is_eff[0]>0){
?>
-
diff --git a/modules_data/stats_inv.php b/modules_data/stats_inv.php
index 9c2440ae..dc2ccb9b 100644
--- a/modules_data/stats_inv.php
+++ b/modules_data/stats_inv.php
@@ -539,7 +539,7 @@ if (!isset($u->info['noreal']) && $c['bonussocial'] == true) {
$msgtxt .= '
Если вы не имеете отношения к нашей игре и не хотите получать письма, тогда перейдите по этой ссылке: Нажмите тут (https://new-combats.com/mail/key=' . $md5mail . '&mail=' . $mail . '&cancel)
- - - - - - -
С уважением,
Администрация Легендарного Бойцовского Клуба';
//
$headers = "MIME-Version: 1.0\r\n";
- $headers .= "Content-type: text/html; charset=windows-1251\r\n";
+ $headers .= "Content-type: text/html; charset=utf-8\r\n";
$headers .= "From: Старый Бойцовский Клуб \r\n";
$to = $mail;
//
diff --git a/news_script/css/style1.css b/news_script/css/style1.css
index aa0051ac..0bcb5dfd 100644
--- a/news_script/css/style1.css
+++ b/news_script/css/style1.css
@@ -1,5 +1,4 @@
/*=Reset default browser CSS. Based on work by Eric Meyer: https://meyerweb.com/eric/tools/css/reset/index.html=*/
-@charset "windows-1251";
body, html {
height: 100%;
}
diff --git a/news_script/index.php b/news_script/index.php
index 60179940..400eee8a 100644
--- a/news_script/index.php
+++ b/news_script/index.php
@@ -155,7 +155,7 @@ if ($u['admin'] > 0 || in_array($u['align'], $pal_al) || in_array($u['align'], $
-
+
Новости браузерной онлайн игры Новый «Бойцовский клуб»
0) {
if (isset($u['id']) && $add[0] == 1 && isset($_POST['text_com']) && str_replace(
' ', '', str_replace(' ', '', $_POST['text_com'])
) != '') {
- $_POST['text_com'] = htmlspecialchars($_POST['text_com'], null, 'cp1251');
+ $_POST['text_com'] = htmlspecialchars($_POST['text_com'], null);
if ($u['admin'] == 0) {
$_POST['text_com'] = substr($_POST['text_com'], 0, 2048);
}
diff --git a/news_script/style.css b/news_script/style.css
index e98c2542..838e7863 100644
--- a/news_script/style.css
+++ b/news_script/style.css
@@ -1,5 +1,4 @@
/*=Reset default browser CSS. Based on work by Eric Meyer: https://meyerweb.com/eric/tools/css/reset/index.html=*/
-@charset "windows-1251";
body, html {
height: 99%;
}
diff --git a/ni/index.css b/ni/index.css
index ec0ee681..7c65d87e 100644
--- a/ni/index.css
+++ b/ni/index.css
@@ -1,4 +1,3 @@
-@charset "windows-1251";
@font-face {
font-family: GothicRus;
src:url("https://new-combats.com/fonts/GothicRus.ttf");
diff --git a/notgoodpay.html b/notgoodpay.html
index 5b519295..8ea72fe3 100644
--- a/notgoodpay.html
+++ b/notgoodpay.html
@@ -1,7 +1,7 @@
-
+
Браузерная игра - Новый Бойцовский Клуб
diff --git a/obraz.php b/obraz.php
index a88c3251..19502fe9 100644
--- a/obraz.php
+++ b/obraz.php
@@ -58,7 +58,7 @@ HTML;
-
+
Новый Бойцовский клуб | Библиотека образов
diff --git a/online.php b/online.php
index 2da4f12c..6eb9da01 100644
--- a/online.php
+++ b/online.php
@@ -2,7 +2,7 @@
use Core\Db;
-//header('Content-Type: text/html; charset=windows-1251');
+//
const GAME = true;
require_once '_incl_data/__config.php';
require_once '_incl_data/class/__db_connect.php';
@@ -81,7 +81,6 @@ if (isset($_POST['msg']) && str_replace(' ', '', $_POST['msg']) != '') {
$msg = [];
$_POST['msg'] = str_replace('\x3C', '<', $_POST['msg']);
$_POST['msg'] = str_replace('\x3', '>', $_POST['msg']);
- $_POST['msg'] = iconv('UTF-8', 'windows-1251', $_POST['msg']);
function tolink($buf)
{
@@ -221,7 +220,7 @@ if (isset($_POST['msg']) && str_replace(' ', '', $_POST['msg']) != '') {
$_POST['msg'] = str_replace(" ", '[s3;]TAB[s4;]', $_POST['msg']);
$_POST['msg'] = str_replace("", '[s3;]TAB[s4;]', $_POST['msg']);
- $_POST['msg'] = htmlspecialchars($_POST['msg'], null, 'cp1251');
+ $_POST['msg'] = htmlspecialchars($_POST['msg'], null);
$_POST['msg'] = str_replace('%usersmile%', '', $_POST['msg']);
$_POST['msg'] = tolink($_POST['msg']);
@@ -1126,8 +1125,8 @@ if ($r['key'] == $_GET['key']) {
//Список онлайн остается неизменным
unset($r['rn'], $r['list'], $r['key'], $r['xu']);
} elseif ($_GET['r1'] != 0) {
- $r['rn'] = iconv('cp1251', 'utf-8', $u->room['name']);
- $r['list'] = iconv('cp1251', 'utf-8', $r['list']);
+ $r['rn'] = $u->room['name'];
+ $r['list'] = $r['list'];
}
$posts = mysql_fetch_array(
@@ -1172,16 +1171,11 @@ if (isset($trf['id'])) {
}
}
-//Перекодируем строки
-if ($r['js'] != null) {
- $r['js'] = iconv('cp1251', 'utf-8', $r['js']);
-} else {
+if ($r['js'] == null) {
unset($r['js']);
}
-if ($r['msg'] != null) {
- $r['msg'] = iconv('cp1251', 'utf-8', $r['msg']);
-} else {
+if ($r['msg'] == null) {
unset($r['msg']);
}
-unset($c, $u, $db);
+unset($c, $u, $db, $r['js'], $r['msg']);
echo json_encode($r);
\ No newline at end of file
diff --git a/page/lib.php b/page/lib.php
index 2d16266b..29b3d26d 100644
--- a/page/lib.php
+++ b/page/lib.php
@@ -79,7 +79,7 @@ if( !isset($url[2]) || $url[2] == '' ) {
}
$usrs[$pl['uid']] = $usrs[$pl['uid']]['login'];
}
- $html .= '';
+ $html .= '';
}
$i++;
}
@@ -183,7 +183,7 @@ if( !isset($url[2]) || $url[2] == '' ) {
if(isset($_POST['save']) && isset($u->info['id'])) {
- $_POST['lib_title'] = htmlspecialchars($_POST['lib_title'],NULL,'cp1251');
+ $_POST['lib_title'] = htmlspecialchars($_POST['lib_title'],NULL);
$mbpage_last = mysql_fetch_array(mysql_query('SELECT `time` FROM `library_content` WHERE `uid` = "'.$u->info['id'].'" ORDER BY `id` DESC LIMIT 1'));
if( $u->info['molch1'] > time() ) {
@@ -268,7 +268,7 @@ if( !isset($url[2]) || $url[2] == '' ) {
$red500 = false;
if( isset($_POST['lib_urlname']) && $_POST['lib_urlname'] != '' && $_POST['lib_urlname'] != $mbpage['url_name'] ) {
mysql_query('UPDATE `library_content` SET `delete` = "'.time().'" WHERE `url_name` = "'.$mbpage['url_name'].'" AND `id` != "'.$mbpage['id'].'"');
- $mbpage['url_name'] = htmlspecialchars($_POST['lib_urlname'],NULL,'cp1251');
+ $mbpage['url_name'] = htmlspecialchars($_POST['lib_urlname'],NULL);
mysql_query('UPDATE `library_content` SET `url_name` = "'.mysql_real_escape_string($mbpage['url_name']).'" WHERE `id` = "'.$mbpage['id'].'" LIMIT 1');
$red500 = true;
}
@@ -291,7 +291,7 @@ if( !isset($url[2]) || $url[2] == '' ) {
$mbpage['title'] = $_POST['lib_title'];
$mbpage['text'] = $_POST['con_text'];
$mbpage['time'] = time();
- mysql_query('UPDATE `library_content` SET `time` = "'.time().'",`title` = "'.mysql_real_escape_string(htmlspecialchars($mbpage['title'],NULL,'cp1251')).'",`text` = "'.mysql_real_escape_string($mbpage['text']).'" WHERE `id` = "'.$mbpage['id'].'" LIMIT 1');
+ mysql_query('UPDATE `library_content` SET `time` = "'.time().'",`title` = "'.mysql_real_escape_string(htmlspecialchars($mbpage['title'],NULL)).'",`text` = "'.mysql_real_escape_string($mbpage['text']).'" WHERE `id` = "'.$mbpage['id'].'" LIMIT 1');
}
}
}
diff --git a/rating_script/index.php b/rating_script/index.php
index 5b047b2e..8fce9bd5 100644
--- a/rating_script/index.php
+++ b/rating_script/index.php
@@ -40,7 +40,6 @@ function microLogin($id,$t,$nnz = 1) {
Бойцовский клуб
-
diff --git a/register.php b/register.php
index 18603384..040c0e91 100644
--- a/register.php
+++ b/register.php
@@ -134,7 +134,7 @@ $errorMessage = $newUser->getError() ? "
{$newUser->getError()}
" : '';
-
+
= Config::get('name') ?>: Регистрация - создай персонажа в игре.
diff --git a/repass.php b/repass.php
index b4f09e5d..be043766 100644
--- a/repass.php
+++ b/repass.php
@@ -16,13 +16,13 @@ if (isset($_GET['login'])) {
}
if (isset($_POST['relogin'])) {
- $_POST['relogin'] = htmlspecialchars($_POST['relogin'], null, 'cp1251');
+ $_POST['relogin'] = htmlspecialchars($_POST['relogin'], null);
$u = User::start();
$usr = Db::getRow('select * from users where login =?', [$_POST['relogin']]);
if (!isset($usr['id'])) {
- $error = 'Логин "' . htmlspecialchars($_POST['relogin'], null, 'cp1251') . '" не найден в базе.';
+ $error = 'Логин "' . htmlspecialchars($_POST['relogin'], null) . '" не найден в базе.';
} else {
if ($usr['admin'] != 0 || $usr['banned'] != 0) {
$error = 'Персонаж "' . $_POST['relogin'] . '" заблокирован!';
diff --git a/reting_clans.php b/reting_clans.php
index 4af0109d..12556cf8 100644
--- a/reting_clans.php
+++ b/reting_clans.php
@@ -15,7 +15,7 @@ $url = explode('/', $url[0]);
-
+
Рейтинг кланов браузерной онлайн игры Новый «Бойцовский клуб»
diff --git a/reting_pers.php b/reting_pers.php
index b670949b..db7c3dd9 100644
--- a/reting_pers.php
+++ b/reting_pers.php
@@ -16,7 +16,7 @@ $url = explode('/', $url[0]);
-
+
Рейтинг персонажей браузерной онлайн игры Новый «Бойцовский клуб»
diff --git a/ruin_characteristics.php b/ruin_characteristics.php
index 9020ab46..0dd63afd 100644
--- a/ruin_characteristics.php
+++ b/ruin_characteristics.php
@@ -120,7 +120,7 @@ if (isset($_POST['set_name'])) {
-
+
Старый Бойцовский Клуб - Профили характеристик
diff --git a/ruins.php b/ruins.php
index 45538bcb..249cb92d 100644
--- a/ruins.php
+++ b/ruins.php
@@ -12,7 +12,7 @@ $ru = mysql_fetch_array(mysql_query('SELECT * FROM `ruine_now` WHERE `id` = "'.m
-
+
diff --git a/settings.php b/settings.php
index 9a8b4215..66dbd785 100644
--- a/settings.php
+++ b/settings.php
@@ -50,7 +50,7 @@ if (isset($_POST['name'], $_POST['hobby'], $_POST['ChatColor'], $_POST['saveanke
-
+
Бойцовский Клуб - Настройки
diff --git a/spam.php b/spam.php
index 2f85fc61..3973c120 100644
--- a/spam.php
+++ b/spam.php
@@ -29,7 +29,7 @@ if (!$u->info['admin']) {
Редактирование фильтра от спама
-
+
@@ -49,7 +49,7 @@ if (isset($_GET['del'])) {
Db::sql('replace into spam_word set id = 1, data = ?', [$spam]);
$spam = explode('|', $spam);
} elseif (isset($_POST['add'])) {
- $_POST['add'] = htmlspecialchars($_POST['add'], null, 'cp1251');
+ $_POST['add'] = htmlspecialchars($_POST['add'], null);
echo '
Слово "' . $_POST['add'] . '" добавлено.
';
$spam = implode('|', $spam);
$spam .= '|' . $_POST['add'];
diff --git a/stats_bonus.php b/stats_bonus.php
index ecd40071..268ede40 100644
--- a/stats_bonus.php
+++ b/stats_bonus.php
@@ -1,7 +1,7 @@
-
+
Таблица Бонусов - Браузерная игра Новый Бойцовский Клуб
diff --git a/styles/register.css b/styles/register.css
index ab8c2d46..c4225283 100644
--- a/styles/register.css
+++ b/styles/register.css
@@ -1,4 +1,3 @@
-@charset "windows-1251";
/* CSS Document */
html, body {
diff --git a/telegraf.php b/telegraf.php
index d252ab38..6a0a7d7a 100644
--- a/telegraf.php
+++ b/telegraf.php
@@ -1,5 +1,5 @@
', '[s4;]', $v);
$v = str_replace(' ', ' ', $v);
- $v = htmlspecialchars($v, null, 'cp1251');
+ $v = htmlspecialchars($v, null);
return $v;
}
@@ -82,9 +82,6 @@ if (isset($_POST['see_msg'])) {
$html = '
Персонажи с молчанкой не могут пользоваться телеграфом.';
} else {
if (isset($_POST['to'])) {
- $_POST['to'] = go_text(iconv('UTF-8', 'windows-1251', $_POST['to']));
- $_POST['text'] = go_text(iconv('UTF-8', 'windows-1251', $_POST['text']));
- $_POST['tema'] = go_text(iconv('UTF-8', 'windows-1251', $_POST['tema']));
if (test_line($_POST['to']) == false) {
$error = 'Пустое поле "Кому".';
diff --git a/towerlog.php b/towerlog.php
index aaaaa9b8..0ab066d7 100644
--- a/towerlog.php
+++ b/towerlog.php
@@ -41,7 +41,7 @@ if (!isset($log['id'])) {
-
+
Архив: Турнир в Башне Смерти
diff --git a/transfer.php b/transfer.php
index d4cfa904..e018d3af 100644
--- a/transfer.php
+++ b/transfer.php
@@ -4,7 +4,7 @@ header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
header('Cache-Control: no-store, no-cache, must-revalidate');
header('Cache-Control: post-check=0, pre-check=0', false);
header('Pragma: no-cache');
-header('Content-Type: text/html; charset=windows-1251');
+
if ($_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest') {
define('GAME', true);
include('_incl_data/__config.php');