Группа :: Сети/Прочее
Пакет: glpi
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: patch0.patch
Скачать
Скачать
--- inc/search.class.php 2012-04-04 22:41:11.000000000 +0400
+++ inc/search.class.php 2012-04-06 22:31:14.935405993 +0400
@@ -4987,7 +4987,7 @@
case PDF_OUTPUT_PORTRAIT :
global $PDF_HEADER;
- $PDF_HEADER[$num] = Toolbox::decodeFromUtf8(Html::clean($value), 'windows-1252');
+ $PDF_HEADER[$num] = Toolbox::decodeFromUtf8(Html::clean($value), 'windows-1251');
break;
case SYLK_OUTPUT : //sylk
@@ -5043,7 +5043,7 @@
case PDF_OUTPUT_PORTRAIT :
global $PDF_ARRAY,$PDF_HEADER;
$value = Html::weblink_extract($value);
- $PDF_ARRAY[$row][$num] = Toolbox::decodeFromUtf8(Html::clean($value), 'windows-1252');
+ $PDF_ARRAY[$row][$num] = Toolbox::decodeFromUtf8(Html::clean($value), 'windows-1251');
break;
case SYLK_OUTPUT : //sylk
@@ -5135,13 +5135,13 @@
$pdf->ezStartPageNumbers(750, 10, 10, 'left',
"GLPI PDF export - ".Html::convDate(date("Y-m-d")).
" - ".count($PDF_ARRAY)." ".
- Toolbox::decodeFromUtf8($LANG['pager'][5], 'windows-1252').
+ Toolbox::decodeFromUtf8($LANG['pager'][5], 'windows-1251').
" - {PAGENUM}/{TOTALPAGENUM}");
$options = array('fontSize' => 8,
'colGap' => 2,
'maxWidth' => 800,
'titleFontSize' => 8);
- $pdf->ezTable($PDF_ARRAY, $PDF_HEADER, Toolbox::decodeFromUtf8($title, 'windows-1252'),
+ $pdf->ezTable($PDF_ARRAY, $PDF_HEADER, Toolbox::decodeFromUtf8($title, 'windows-1251'),
$options);
$pdf->ezStream();
break;
@@ -5153,13 +5153,13 @@
$pdf->ezStartPageNumbers(550, 10, 10, 'left',
"GLPI PDF export - ".Html::convDate(date("Y-m-d")).
" - ".count($PDF_ARRAY)." ".
- Toolbox::decodeFromUtf8($LANG['pager'][5], 'windows-1252').
+ Toolbox::decodeFromUtf8($LANG['pager'][5], 'windows-1251').
" - {PAGENUM}/{TOTALPAGENUM}");
$options = array('fontSize' => 8,
'colGap' => 2,
'maxWidth' => 565,
'titleFontSize' => 8);
- $pdf->ezTable($PDF_ARRAY, $PDF_HEADER, Toolbox::decodeFromUtf8($title, 'windows-1252'),
+ $pdf->ezTable($PDF_ARRAY, $PDF_HEADER, Toolbox::decodeFromUtf8($title, 'windows-1251'),
$options);
$pdf->ezStream();
break;
--- install/install.php
+++ install/install.php
@@ -478,6 +478,7 @@
if ($fp) {
$fw = fwrite($fp,$DB_str);
fclose($fp);
+ chmod(GLPI_CONFIG_DIR . "/config_db.php", 0660);
return true;
}
return false;