0ct0pu5/b1gMail
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

skip convert (language files already utf8) + charset fix

Browse source
This commit is contained in:
Sebijk 2022-02-13 19:44:13 +01:00
parent 37d8003f43
commit 1d92b78694
2 changed files with 1 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/setup/index.php
View file

@ -674,7 +674,7 @@ elseif ($step == STEP_INSTALL) {
fclose($fp); fclose($fp);
// create config file // create config file
$configFile = sprintf("<?php\n// Generated %s\n\$mysql = array(\n\t'host'\t\t=> '%s',\n\t'user'\t\t=> '%s',\n\t'pass'\t\t=> '%s',\n\t'db'\t\t=> '%s',\n\t'prefix'\t=> '%s'\n);\ndefine('B1GMAIL_SIGNKEY', '%s');\ndefine('DB_PREFIX', '%s');\n?>", $configFile = sprintf("<?php\n// Generated %s\n\$mysql = array(\n\t'host'\t\t=> '%s',\n\t'user'\t\t=> '%s',\n\t'pass'\t\t=> '%s',\n\t'db'\t\t=> '%s',\n\t'prefix'\t=> '%s'\n);\ndefine('B1GMAIL_SIGNKEY', '%s');\ndefine('DB_CHARSET', '%s');\n?>",
date('r'), date('r'),
addslashes($_REQUEST['mysql_host']), addslashes($_REQUEST['mysql_host']),
addslashes($_REQUEST['mysql_user']), addslashes($_REQUEST['mysql_user']),

56
src/setup/update.php
View file

@ -679,62 +679,6 @@ elseif ($step == STEP_UPDATE_STEP) {
// remove outdated root certificates // remove outdated root certificates
mysqli_query($connection, 'DELETE FROM '.$mysql['prefix'].'certificates WHERE `type`=0 AND `userid`=0 AND `validto`<'.time()); mysqli_query($connection, 'DELETE FROM '.$mysql['prefix'].'certificates WHERE `type`=0 AND `userid`=0 AND `validto`<'.time());
// convert updated language files?
if (isset($bm_prefs['db_is_utf8']) && $bm_prefs['db_is_utf8'] == 1) {
$langFiles = ['../languages/deutsch.lang.php', '../languages/english.lang.php'];
foreach ($langFiles as $file) {
if (!file_exists($file)) {
continue;
}
$info = GetLanguageInfo($file);
if (!isset($info['charset'])) {
continue;
}
$charset = strtolower($info['charset']);
if ($charset == 'utf8' || $charset == 'utf-8') {
continue;
}
// read file contents
$fp = @fopen($file, 'rb+');
if (!$fp || !is_resource($fp)) {
echo 'Failed to convert language file to UTF-8: '.$file."\n";
continue;
}
$contents = fread($fp, filesize($file));
// convert contents to utf-8
$contents = ConvertEncoding($contents, $charset, 'UTF-8');
// manipulate locales
$locales = [];
$oldLocales = explode('|', $info['locale']);
foreach ($oldLocales as $locale) {
$locale = preg_replace('/\..*/i', '.UTF-8', $locale);
if (!in_array($locale, $locales)) {
$locales[] = $locale;
}
}
// manipulate lang def line
$newLangDef = sprintf('// b1gMailLang::%s::%s::%s::%s::UTF-8::%s',
$info['title'],
$info['author'],
$info['authorMail'],
$info['authorWeb'],
implode('|', $locales));
$contents = str_replace($info['langDefLine'], $newLangDef."\n".'// Converted to UTF-8 by setup/update.php at '.date('r'), $contents);
// save
fseek($fp, 0, SEEK_SET);
ftruncate($fp, 0);
fwrite($fp, $contents);
fclose($fp);
}
}
echo 'OK:DONE'; echo 'OK:DONE';
} }