--- search.class.php.2	2011-08-29 10:42:49.000000000 +0400
+++ search.class.php	2011-08-29 11:01:03.000000000 +0400
@@ -4776,7 +4776,7 @@
 
          case PDF_OUTPUT_PORTRAIT :
             global $PDF_HEADER;
-            $PDF_HEADER[$num] = decodeFromUtf8(html_clean($value), 'windows-1252');
+            $PDF_HEADER[$num] = decodeFromUtf8(html_clean($value), 'windows-1251');
             break;
 
          case SYLK_OUTPUT : //sylk
@@ -4786,7 +4786,7 @@
             break;
 
          case CSV_OUTPUT : //CSV
-            $out = "\"".csv_clean($value)."\"".$_SESSION["glpicsv_delimiter"];
+            $out = "\"".decodeFromUtf8(csv_clean($value),'windows-1251')."\"".$_SESSION["glpicsv_delimiter"];
             break;
 
          default :
@@ -4832,7 +4832,7 @@
          case PDF_OUTPUT_PORTRAIT :
             global $PDF_ARRAY,$PDF_HEADER;
             $value = weblink_extract($value);
-            $PDF_ARRAY[$row][$num] = decodeFromUtf8(html_clean($value), 'windows-1252');
+            $PDF_ARRAY[$row][$num] = decodeFromUtf8(html_clean($value), 'windows-1251');
             break;
 
          case SYLK_OUTPUT : //sylk
@@ -4844,7 +4844,7 @@
 
          case CSV_OUTPUT : //csv
             $value = weblink_extract($value);
-            $out = "\"".csv_clean($value)."\"".$_SESSION["glpicsv_delimiter"];
+            $out = "\"".decodeFromUtf8(csv_clean($value),'windows-1251')."\"".$_SESSION["glpicsv_delimiter"];
             break;
 
          default :
@@ -4922,13 +4922,13 @@
             $pdf = new Cezpdf('a4','landscape');
             $pdf->selectFont(GLPI_ROOT."/lib/ezpdf/fonts/Helvetica.afm");
             $pdf->ezStartPageNumbers(750,10,10,'left',"GLPI PDF export - ".convDate(date("Y-m-d")).
-               " - ".count($PDF_ARRAY)." ".decodeFromUtf8($LANG['pager'][5], 'windows-1252').
+               " - ".count($PDF_ARRAY)." ".decodeFromUtf8($LANG['pager'][5], 'windows-1251').
                " - {PAGENUM}/{TOTALPAGENUM}");
             $options = array('fontSize'      => 8,
                              'colGap'        => 2,
                              'maxWidth'      => 800,
                              'titleFontSize' => 8);
-            $pdf->ezTable($PDF_ARRAY, $PDF_HEADER, decodeFromUtf8($title, 'windows-1252'), $options);
+            $pdf->ezTable($PDF_ARRAY, $PDF_HEADER, decodeFromUtf8($title, 'windows-1251'), $options);
             $pdf->ezStream();
             break;
 
@@ -4937,13 +4937,13 @@
             $pdf= new Cezpdf('a4','portrait');
             $pdf->selectFont(GLPI_ROOT."/lib/ezpdf/fonts/Helvetica.afm");
             $pdf->ezStartPageNumbers(550,10,10,'left',"GLPI PDF export - ".convDate(date("Y-m-d")).
-               " - ".count($PDF_ARRAY)." ".decodeFromUtf8($LANG['pager'][5], 'windows-1252').
+               " - ".count($PDF_ARRAY)." ".decodeFromUtf8($LANG['pager'][5], 'windows-1251').
                " - {PAGENUM}/{TOTALPAGENUM}");
             $options = array('fontSize'      => 8,
                              'colGap'        => 2,
                              'maxWidth'      => 565,
                              'titleFontSize' => 8);
-            $pdf->ezTable($PDF_ARRAY, $PDF_HEADER, decodeFromUtf8($title, 'windows-1252'), $options);
+            $pdf->ezTable($PDF_ARRAY, $PDF_HEADER, decodeFromUtf8($title, 'windows-1251'), $options);
             $pdf->ezStream();
             break;
 
@@ -5149,3 +5149,4 @@
 }
 
 ?>
+

