Centralize our encoding code into a new helpers and use

mb_convert_encoding if possible.  Build on the work in
c791ae96d5bb28f39b26a0e556e10e636f97436c by momo-i.  Fixes #1660.

3 files changed, 35 insertions, 22 deletions

diff --git a/modules/exif/helpers/exif.php b/modules/exif/helpers/exif.php
index f752d336..a35a2141 100644
--- a/modules/exif/helpers/exif.php
+++ b/modules/exif/helpers/exif.php
@@ -36,15 +36,7 @@ class exif_Core {
         foreach(self::_keys() as $field => $exifvar) {
           if (isset($exif_raw[$exifvar[0]][$exifvar[1]])) {
             $value = $exif_raw[$exifvar[0]][$exifvar[1]];
-            if (function_exists("mb_detect_encoding") &&
-                function_exists("mb_convert_encoding") &&
-                mb_detect_encoding($value, "ISO-8859-1, UTF-8") != "UTF-8") {
-              $value = mb_convert_encoding($value, "UTF-8", mb_detect_encoding($value));
-            }
-            else if (function_exists("mb_detect_encoding") &&
-                mb_detect_encoding($value, "ISO-8859-1, UTF-8") != "UTF-8") {
-              $value = utf8_encode($value);
-            }
+            $value = encoding::convert_to_utf8($value);
             $keys[$field] = Input::clean($value);
 
             if ($field == "DateTime") {
@@ -65,15 +57,7 @@ class exif_Core {
         foreach (array("Keywords" => "2#025", "Caption" => "2#120") as $keyword => $iptc_key) {
           if (!empty($iptc[$iptc_key])) {
             $value = implode(" ", $iptc[$iptc_key]);
-            if (function_exists("mb_detect_encoding") &&
-                function_exists("mb_convert_encoding") &&
-                mb_detect_encoding($value, "ISO-8859-1, UTF-8") != "UTF-8") {
-              $value = mb_convert_encoding($value, "UTF-8", mb_detect_encoding($value));
-            }
-            else if (function_exists("mb_detect_encoding") &&
-                mb_detect_encoding($value, "ISO-8859-1, UTF-8") != "UTF-8") {
-              $value = utf8_encode($value);
-            }
+            $value = encoding::convert_to_utf8($value);
             $keys[$keyword] = Input::clean($value);
 
             if ($keyword == "Caption" && !$item->description) {
diff --git a/modules/gallery/helpers/encoding.php b/modules/gallery/helpers/encoding.php
new file mode 100644
index 00000000..c5928634
--- /dev/null
+++ b/modules/gallery/helpers/encoding.php
@@ -0,0 +1,32 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2011 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class encoding_Core {
+  static function convert_to_utf8($value) {
+    if (function_exists("mb_detect_encoding") &&
+        function_exists("mb_convert_encoding") &&
+        mb_detect_encoding($value, "ISO-8859-1, UTF-8") != "UTF-8") {
+      $value = mb_convert_encoding($value, "UTF-8", mb_detect_encoding($value));
+    } else if (function_exists("mb_detect_encoding") &&
+               mb_detect_encoding($value, "ISO-8859-1, UTF-8") != "UTF-8") {
+      $value = utf8_encode($value);
+    }
+    return $value;
+  }
+}
\ No newline at end of file
diff --git a/modules/tag/helpers/tag_event.php b/modules/tag/helpers/tag_event.php
index cd79f734..efef916f 100644
--- a/modules/tag/helpers/tag_event.php
+++ b/modules/tag/helpers/tag_event.php
@@ -36,10 +36,7 @@ class tag_event_Core {
             $tag = str_replace("\0",  "", $tag);
             foreach (explode(",", $tag) as $word) {
               $word = trim($word);
-              if (function_exists("mb_detect_encoding") &&
-                  mb_detect_encoding($word, "ISO-8859-1, UTF-8") != "UTF-8") {
-                $word = utf8_encode($word);
-              }
+              $word = encoding::convert_to_utf8($word);
               $tags[$word] = 1;
             }
           }