Remove cp1251. Я сильно недооценивал трудолюбие неизвестного кодера.

This commit is contained in:
2023-01-10 19:26:14 +02:00
parent 008f36c094
commit b3810d2349
147 changed files with 267 additions and 1295 deletions
-1
View File
@@ -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');
+2 -2
View File
@@ -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,
]
+1 -3
View File
@@ -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