Working on #2972 Template Conversion to Twig Format (smilieinsert) (#…

…3252) * Converted smilieinsert * Unlocked smilie inclusion * Fixed indent, moved HTML from php to twig * Minor fixes
mybb · Jun 2, 2019 · 954b08e · 954b08e
1 parent 29a53c7
commit 954b08e
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 30 deletions.
diff --git a/inc/functions.php b/inc/functions.php
@@ -2880,6 +2880,8 @@ function build_mycode_inserter($bind="message", $smilies = true)
 function build_clickable_smilies()
 {
     global $cache, $smiliecache, $theme, $templates, $lang, $mybb, $smiliecount;
+
+    $clickablesmilies = '';
 
     if ($mybb->settings['smilieinserter'] != 0 && $mybb->settings['smilieinsertercols'] && $mybb->settings['smilieinsertertot']) {
         if (!$smiliecount) {
@@ -2902,19 +2904,13 @@ function build_clickable_smilies()
         if (is_array($smiliecache)) {
             reset($smiliecache);
 
-            $getmore = '';
             if ($mybb->settings['smilieinsertertot'] >= $smiliecount) {
                 $mybb->settings['smilieinsertertot'] = $smiliecount;
-            } elseif ($mybb->settings['smilieinsertertot'] < $smiliecount) {
-                $smiliecount = $mybb->settings['smilieinsertertot'];
-                eval("\$getmore = \"".$templates->get("smilieinsert_getmore")."\";");
             }
 
-            $smilies = '';
-            $counter = 0;
+            $smilies = [];
             $i = 0;
 
-            $extra_class = '';
             foreach ($smiliecache as $smilie) {
                 if ($i < $mybb->settings['smilieinsertertot'] && $smilie['showclickable'] != 0) {
                     $smilie['image'] = str_replace("{theme}", $theme['imgdir'], $smilie['image']);
@@ -2925,34 +2921,18 @@ function build_clickable_smilies()
                     $temp = explode("\n", $smilie['find']); // assign to temporary variable for php 5.3 compatibility
                     $smilie['find'] = $temp[0];
 
-                    $find = str_replace(array('\\', "'"), array('\\\\', "\'"), htmlspecialchars_uni($smilie['find']));
-
-                    $onclick = " onclick=\"MyBBEditor.insertText(' $find ');\"";
-                    $extra_class = ' smilie_pointer';
-                    eval('$smilie = "'.$templates->get('smilie', 1, 0).'";');
-                    eval("\$smilie_icons .= \"".$templates->get("smilieinsert_smilie")."\";");
+                    $smilie['onclick'] = str_replace(array('\\', "'"), array('\\\\', "\'"), htmlspecialchars_uni($smilie['find']));
+                    $smilie['extra_class'] = true;
                     ++$i;
-                    ++$counter;
-
-                    if ($counter == $mybb->settings['smilieinsertercols']) {
-                        $counter = 0;
-                        eval("\$smilies .= \"".$templates->get("smilieinsert_row")."\";");
-                        $smilie_icons = '';
-                    }
+                    $smilies[] = $smilie;
                 }
             }
 
-            if ($counter != 0) {
-                $colspan = $mybb->settings['smilieinsertercols'] - $counter;
-                eval("\$smilies .= \"".$templates->get("smilieinsert_row_empty")."\";");
-            }
-
-            eval("\$clickablesmilies = \"".$templates->get("smilieinsert")."\";");
-        } else {
-            $clickablesmilies = "";
+            $clickablesmilies = \MyBB\template('smilieinsert/main.twig', [
+                'smilies' => $smilies,
+                'smiliecount' => $smiliecount
+            ]);
         }
-    } else {
-        $clickablesmilies = "";
     }
 
     return $clickablesmilies;

diff --git a/inc/views/base/smilieinsert/main.twig b/inc/views/base/smilieinsert/main.twig
@@ -0,0 +1,37 @@
+<div style="margin:auto; width: 170px; margin-top: 20px;">
+    <table border="0" cellspacing="{{ theme.borderwidth }}" cellpadding="{{ theme.tablespace }}" class="tborder" width="150">
+        <tr>
+            <td class="thead"><span class="smalltext"><strong>{{ lang.smilieinsert }}</strong></span></td>
+        </tr>
+        <tr>
+            <td class="trow1">
+                <table width="100%" align="center" border="0" cellspacing="0" cellpadding="2" id="clickable_smilies">
+                    {% for smilie in smilies %}
+                        {% set remainder = (loop.index % mybb.settings.smilieinsertercols) %}
+                            <td>{% include 'parser/mycodes/smilie.twig' %}</td>
+                        {% if (mybb.settings.smilieinsertercols > 0 and remainder == 0) or loop.last %}
+                            {% if loop.last %}
+                                    <td colspan="{{ remainder }}"></td>
+                                </tr>
+                            {% else %}
+                                </tr>
+                                <tr>
+                            {% endif %}
+                        {% endif %}
+                    {% endfor %}
+                </table>
+            </td>
+        </tr>
+        {% if mybb.settings.smilieinsertertot < smiliecount %}
+            <tr>
+                <td class="trow2" align="center">
+                    <span class="smalltext">
+                        <strong>
+                            [<a href="javascript:void(0)" onclick="MyBB.popupWindow('/misc.php?action=smilies&amp;popup=true&amp;editor=MyBBEditor&amp;modal=1'); return false;">{{ lang.smilieinsert_getmore }}</a>]
+                        </strong>
+                    </span>
+                </td>
+            </tr>
+        {% endif %}
+    </table>
+</div>