Switched to using mb_convert_encoding

Author: Ninjasoturi

logic/gymMenu.php

@@ -172,7 +172,7 @@ function createGymKeys($buttonAction, $showHidden, $gymareaId, $gymareaQuery, $s
       $letter = trim($letter);
       debug_log($letter, 'Special gym letter:');
       // Fix chinese chars, prior: $length = strlen($letter);
-      $length = strlen(utf8_decode($letter));
+      $length = strlen(mb_convert_encoding($letter, 'ISO-8859-1'));
       $select .= SP . 'WHEN UPPER(LEFT(gym_name, ' . $length . ')) = \'' . $letter . '\' THEN UPPER(LEFT(gym_name, ' . $length . '))' . SP;
     }
     $select .= 'ELSE UPPER(LEFT(gym_name, 1)) END AS first_letter';
@@ -205,7 +205,7 @@ function createGymListKeysByFirstLetter($firstLetter, $showHidden, $gymareaQuery
   global $config, $menuActions, $botUser;
   // Length of first letter.
   // Fix chinese chars, prior: $first_length = strlen($first);
-  $first_length = strlen(utf8_decode($firstLetter));
+  $first_length = strlen(mb_convert_encoding($firstLetter, 'ISO-8859-1'));
 
   // Special/Custom gym letters?
   $not = '';
@@ -218,7 +218,7 @@ function createGymListKeysByFirstLetter($firstLetter, $showHidden, $gymareaQuery
       $letter = trim($letter);
       debug_log($letter, 'Special gym letter:');
       // Fix chinese chars, prior: $length = strlen($letter);
-      $length = strlen(utf8_decode($letter));
+      $length = strlen(mb_convert_encoding($letter, 'ISO-8859-1'));
       $not .= SP . 'AND UPPER(LEFT(gym_name, ' . $length . ')) != UPPER(\'' . $letter . '\')' . SP;
     }
   }

logic/raid_picture.php

@@ -415,11 +415,11 @@ function create_raid_picture($raid, $standalone_photo = false, $debug = false) {
   // Gym name
   // Largest gym name we found so far for testing:
   //$gym_name = 'Zentrum für Junge Erwachsene der Kirche Jesu Christi der Heiligen der Letzten Tage Pfahl Düsseldorf';
-  $gym_name = $raid['gym_name'];
+  $gym_name = mb_convert_encoding($raid['gym_name'], 'ISO-8859-1');
 
   // Get length, the shortest and largest word of the gym name
   $gym_name_words = explode(SP, $gym_name);
-  $gym_name_word_lengths = array_map('strlen', array_map('utf8_decode', $gym_name_words));
+  $gym_name_word_lengths = array_map('strlen', $gym_name_words);
   $gym_name_word_largest = max($gym_name_word_lengths);
   $gym_name_total_chars = strlen(mb_convert_encoding($gym_name, 'ISO-8859-1', 'UTF-8'));
 

mods/history.php

@@ -34,7 +34,7 @@
       $letter = trim($letter);
       debug_log($letter, 'Special gym letter:');
       // Fix chinese chars, prior: $length = strlen($letter);
-      $length = strlen(utf8_decode($letter));
+      $length = strlen(mb_convert_encoding($letter, 'ISO-8859-1'));
       $select_query .= SP . "WHEN UPPER(LEFT(gym_name, " . $length . ")) = '" . $letter . "' THEN UPPER(LEFT(gym_name, " . $length . "))" . SP;
     }
     $select_query .= 'ELSE UPPER(LEFT(gym_name, 1)) END';

mods/history_gyms.php

@@ -20,7 +20,7 @@
 
 // Length of first letter.
 // Fix chinese chars, prior: $first_length = strlen($first);
-$first_length = strlen(utf8_decode($first));
+$first_length = strlen(mb_convert_encoding($first, 'ISO-8859-1'));
 
 // Special/Custom gym letters?
 $not = '';
@@ -33,7 +33,7 @@
     $letter = trim($letter);
     debug_log($letter, 'Special gym letter:');
     // Fix chinese chars, prior: $length = strlen($letter);
-    $length = strlen(utf8_decode($letter));
+    $length = strlen(mb_convert_encoding($letter, 'ISO-8859-1'));
     $not .= SP . "AND UPPER(LEFT(gym_name, " . $length . ")) != UPPER('" . $letter . "')" . SP;
   }
 }