Remove cp1251. Я сильно недооценивал трудолюбие неизвестного кодера.
This commit is contained in:
@@ -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');
|
||||
|
||||
@@ -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,
|
||||
]
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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 = '';
|
||||
|
||||
/**
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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');
|
||||
|
||||
@@ -302,7 +302,6 @@ function getImg($id, $num) {
|
||||
<html>
|
||||
<head>
|
||||
<link rel="stylesheet" type="text/css" href="https://img.new-combats.com/css/main.css" />
|
||||
<meta content="text/html; charset=windows-1251" http-equiv="Content-type" />
|
||||
<meta http-equiv="Cache-Control" content="no-cache, max-age=0, must-revalidate, no-store" />
|
||||
<meta http-equiv="PRAGMA" content="NO-CACHE" />
|
||||
<meta http-equiv="Expires" content="0" />
|
||||
|
||||
Reference in New Issue
Block a user