Changeset 3759

Timestamp:

Aug 23, 2007, 3:13:08 PM (13 years ago)

Author:

maruyama

Message:

merged prj_emoji

Location:

OpenPNE/trunk/webapp

Files:

• lib/OpenPNE/KtaiEmoji.php (added)
• lib/OpenPNE/Smarty.php (modified) (3 diffs)
• lib/util/emoji.php (modified) (5 diffs)
• modules/ktai/init.inc (modified) (1 diff)

OpenPNE/trunk/webapp/lib/OpenPNE/Smarty.php

@@ -27 +27 @@
     function ext_display($resource_name, $cache_id = null, $compile_id = null)
     {
+        $this->register_outputfilter('smarty_outputfilter_convert_emoji');
         // とりあえず携帯用にSJISのみ対応
         if ($this->output_charset == 'SJIS') {
@@ -101 +102 @@
 function smarty_outputfilter_unescape_emoji($tpl_output, &$smarty)
 {
-    return emoji_unescape($tpl_output, true);
+    $tpl_output = emoji_unescape($tpl_output, true);
+    $tpl_output = emoji_unescape($tpl_output, false);
+    return $tpl_output;
 }
 
@@ -119 +122 @@
 }
 
+function smarty_outputfilter_convert_emoji($tpl_output, &$smarty)
+{
+    return emoji_convert($tpl_output, true);
+}
+
 ?>

OpenPNE/trunk/webapp/lib/util/emoji.php

@@ -5 +5 @@
  */
 
+require_once(OPENPNE_WEBAPP_DIR .'/lib/OpenPNE/KtaiEmoji.php');
 function emoji_escape($str, $remove = false)
 {
@@ -11 +12 @@
         $emoji = '';
         $c1 = ord($str[$i]);
-        if ($c1 == 0xF8 || $c1 == 0xF9) {
+        if ($GLOBALS['__Framework']['carrier'] == 's') {
+                if ($c1 == 0xF7 || $c1 == 0xF9 || $c1 == 0xFB) {
+                $bin = substr($str, $i, 2);
+                $emoji = emoji_escape_sb($bin);
+            }
+        } elseif ($c1 == 0xF8 || $c1 == 0xF9) {
             $bin = substr($str, $i, 2);
             $emoji = emoji_escape_i($bin);
@@ -39 +45 @@
     if (preg_match('/'.$iemoji.'/', $bin)) {
         $unicode = mb_convert_encoding($bin, 'UCS2', 'SJIS-win');
-        return sprintf('&#x%02X%02X;', ord($unicode[0]), ord($unicode[1]));
+        $emoji_code = OpenPNE_KtaiEmoji::getInstance();
+        $code = $emoji_code->get_emoji_code4emoji(sprintf('&#x%02X%02X;', ord($unicode[0]), ord($unicode[1])), 'i');
+        return '%%'.$code.'%%';
     } else {
         return '';
@@ -79 +87 @@
         return '';
     }
-    return sprintf('&#x%04X;', $unicode);
+    $emoji_code = OpenPNE_KtaiEmoji::getInstance();
+    $code = $emoji_code->get_emoji_code4emoji(sprintf('&#x%04X;', $unicode), 'e');
+    return '%%'.$code.'%%';
+}
+
+function emoji_escape_sb($bin)
+{
+    $sjis1 = ord($bin[0]);
+    $sjis2 = ord($bin[1]);
+    $web1 = $web2 = 0;
+    switch ($sjis1) {
+        case 0xF9:
+            if ($sjis2 >= 0x41 && $sjis2 <= 0x7E) {
+                $web1 = ord('G');
+                $web2 = $sjis2 - 0x20;
+            } elseif($sjis2 >= 0x80 && $sjis2 <= 0x9B) {
+                $web1 = ord('G');
+                $web2 = $sjis2 - 0x21;
+            } elseif ($sjis2 >= 0xA1 && $sjis2 <= 0xED) {
+                $web1 = ord('O');
+                $web2 = $sjis2 - 0x80;
+            }
+            break;
+        case 0xF7:
+            if ($sjis2 >= 0x41 && $sjis2 <= 0x7E) {
+                $web1 = ord('E');
+                $web2 = $sjis2 - 0x20;
+            } elseif ($sjis2 >= 0x80 && $sjis2 <= 0x9B) {
+                $web1 = ord('E');
+                $web2 = $sjis2 - 0x21;
+            } elseif ($sjis2 >= 0xA1 && $sjis2 <= 0xF3) {
+                $web1 = ord('F');
+                $web2 = $sjis2 - 0x80;
+            }
+            break;
+        case 0xFB:
+            if ($sjis2 >= 0x41 && $sjis2 <= 0x7E) {
+                $web1 = ord('P');
+                $web2 = $sjis2 - 0x20;
+            } elseif ($sjis2 >= 0x80 && $sjis2 <= 0x8D) {
+                $web1 = ord('P');
+                $web2 = $sjis2 - 0x21;
+            } elseif ($sjis2 >= 0xA1 && $sjis2 <= 0xD7) {
+                $web1 = ord('Q');
+                $web2 = $sjis2 - 0x80;
+            }
+            break;
+        default:
+        return '';
+    }
+    $emoji_code = OpenPNE_KtaiEmoji::getInstance();
+    $code = $emoji_code->get_emoji_code4emoji(pack('c5', 0x1b, 0x24, $web1, $web2, 0x0f), 's');
+    return '%%'.$code.'%%';
 }
 
@@ -142 +202 @@
 }
 
+function emoji_convert($str)
+{
+    $moji_pattern = '/%%([a-z][0-9]+)%%/i';
+    return preg_replace_callback($moji_pattern, '_emoji_convert', $str);
+}
+
+function _emoji_convert($matches)
+{
+    $o_code = $matches[1];
+    
+    switch ($GLOBALS['__Framework']['carrier']) {
+        case 'i':
+        $carrior = 'i';
+        break;
+        case 's':
+        $carrior = 's';
+        break;
+        case 'e':
+        $carrior = 'e';
+        break;
+        default:
+        return '〓';
+    }
+    
+    $emoji_code = OpenPNE_KtaiEmoji::getInstance();
+    $c_emoji = $emoji_code->convert_emoji($o_code, $carrior);
+    if ($c_emoji) {
+        return $c_emoji;
+    } else {
+        return '〓';
+    }
+}
+
 ?>

OpenPNE/trunk/webapp/modules/ktai/init.inc

@@ -19 +19 @@
 if (CHECK_KTAI_UA && !isKtaiUserAgent()) {
     openpne_redirect('pc');
+}
+
+$agent = new OpenPNE_KtaiUA();
+if ($agent->is_docomo()) {
+    $GLOBALS['__Framework']['carrier'] = 'i';
+} elseif ($agent->is_au()) {
+    $GLOBALS['__Framework']['carrier'] = 'e';
+} elseif ($agent->is_vodafone()) {
+    $GLOBALS['__Framework']['carrier'] = 's';
 }