Changeset 6356

Timestamp:

May 25, 2010, 9:55:28 PM (14 years ago)

Author:

rvelices

Message:

merge -r 6355 from trunk
fix bug 1663 : wrong decoding of non Ascii iptc/exif (charset issue)

Location:

branches/2.1

Files:

• admin/include/languages.class.php (modified) (3 diffs, 1 prop)
• include/functions.inc.php (modified) (8 diffs, 1 prop)

branches/2.1/admin/include/languages.class.php

@@ -99 +99 @@
           break;
         }
-        
+
         $query = "
 DELETE
@@ -148 +148 @@
   /**
   *  Get languages defined in the language directory
-  */  
+  */
   function get_fs_languages($target_charset = null)
   {
@@ -166 +166 @@
         list($language_name) = @file($path.'/iso.txt');
 
-        $languages[$file] = convert_charset($language_name, $target_charset);
+        $languages[$file] = convert_charset($language_name, 'utf-8', $target_charset);
       }
     }

branches/2.1/include/functions.inc.php

@@ -383 +383 @@
 {
   $raw = $str;
-  
+
   $str = remove_accents($str);
   $str = preg_replace('/[^a-z0-9_\s\'\:\/\[\],-]/','',strtolower($str));
@@ -1267 +1267 @@
             if ( is_array($v) )
             {
-              $func = create_function('$v', 'return convert_charset($v, "'.$target_charset.'");' );
+              $func = create_function('$v', 'return convert_charset($v, "utf-8", "'.$target_charset.'");' );
               $lang[$k] = array_map($func, $v);
             }
             else
-              $lang[$k] = convert_charset($v, $target_charset);
+              $lang[$k] = convert_charset($v, 'utf-8', $target_charset);
           }
         }
@@ -1278 +1278 @@
           foreach ($load_lang_info as $k => $v)
           {
-            $lang_info[$k] = convert_charset($v, $target_charset);
+            $lang_info[$k] = convert_charset($v, 'utf-8', $target_charset);
           }
         }
@@ -1292 +1292 @@
     {
       $content = @file_get_contents($source_file);
-      $content = convert_charset($content, $target_charset);
+      $content = convert_charset($content, 'utf-8', $target_charset);
       return $content;
     }
@@ -1300 +1300 @@
 
 /**
- * converts a string from utf-8 character set to another character set
+ * converts a string from a character set to another character set
  * @param string str the string to be converted
+ * @param string source_charset the character set in which the string is encoded
  * @param string dest_charset the destination character set
  */
-function convert_charset($str, $dest_charset)
-{
-  if ($dest_charset=='utf-8')
-  {
+function convert_charset($str, $source_charset, $dest_charset)
+{
+  if ($source_charset==$dest_charset)
     return $str;
-  }
-  if ($dest_charset=='iso-8859-1')
+  if ($source_charset=='iso-8859-1' and $dest_charset=='utf-8')
+  {
+    return utf8_encode($str);
+  }
+  if ($source_charset=='utf-8' and $dest_charset=='iso-8859-1')
   {
     return utf8_decode($str);
@@ -1316 +1319 @@
   if (function_exists('iconv'))
   {
-    return iconv('utf-8', $dest_charset, $str);
+    return iconv($source_charset, $dest_charset, $str);
   }
   if (function_exists('mb_convert_encoding'))
   {
-    return mb_convert_encoding( $str, $dest_charset, 'utf-8' );
+    return mb_convert_encoding( $str, $dest_charset, $source_charset );
   }
   return $str; //???
@@ -1537 +1540 @@
 {
   global $conf;
-  
+
   $options = array();
   foreach (array_reverse($conf['available_permission_levels']) as $level)
   {
     $label = null;
-  
+
     if (0 == $level)
     {
@@ -1567 +1570 @@
           );
       }
-      
+
       $label = implode(', ', $labels);
     }