From e86f651a658197a081020175e2e18e6d657fc0fc Mon Sep 17 00:00:00 2001
From: Cameron <cameron@e107coders.org>
Date: Mon, 18 Mar 2013 22:38:13 -0700
Subject: [PATCH] wysiwyg emoticon fix

---
 .../tinymce/plugins/e107bbcode/img/bbcode.png    | Bin 0 -> 1257 bytes
 .../tinymce/plugins/emoticons/emoticons.php      |   8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 e107_plugins/tinymce/plugins/e107bbcode/img/bbcode.png

diff --git a/e107_plugins/tinymce/plugins/e107bbcode/img/bbcode.png b/e107_plugins/tinymce/plugins/e107bbcode/img/bbcode.png
new file mode 100644
index 0000000000000000000000000000000000000000..d245e0cbe942eef7b6b40b414de1e03aee6ed486
GIT binary patch
literal 1257
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqJQak|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+m=!WZB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%s|1+P|wiV
z#N6CmN5ROz&_Lh7NZ-&%*U;R`*vQJjKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8EkR}&8R-I5=oVMzl_XZ^<`pZ$OmImpPA<wUD9OyvQvjKmn3P{y
zVygsnDZ~r81#n~YilM;-3^4tQ!~%UoJp+)JU<!SG@hi>Eg{v+u2}(t{7puX=A(aKG
z`a!A1`K3k4z=%sz23b{L<y@4SSdw29lAoUg3&ntp{F40QjQj!x=U`KX@XWlF{PJS3
zYF}R~&%EN2#JuEGPZwJypnko~%oHmZH$!Jr0~bq610!=oLsuh96K6*YO9K~2S63q^
zXEQUHUYGpj(%jU%5}4i;gkDFSdO-;xw*Y9fOKMSOS!#+~QGTuh*uz$txZPro(>$o&
z6x?nBIvs~U^ns4i2SqDVG{b~|X$QoFCt4r}p6pZefN8x5n5elu?im3yL_&a1h-=t|
z-=D8d@7;ZtW8LTS&YAbuCiE^`cWLKz?wrNz_Z`n&fBMv=Yk&UyQCamgaQS)7iDx()
z_dR{_YR;iMYWu#nJ@~7);Ksjs%I*_(A2@sI)}v<^ZroY@{{N+u2Uz_p-@pIx|NnoV
zA}vjzT?!>Ze!)O4KEMzYBmEYr_PD2uV@SoVoC`OL4lD4m25_at=P>cj5P1Fn|0W|@
z|F>JJ8ZDK@VwwJnSehF?e=EE;UFW5>+4)mXJohR^F$gGLkI&KO<_k}Z`|4tC{MhaE
zm&H#E`mgciu6WGG6u9<Eqi<(Qca(>7&6)nh=q2l&pW6g9r)o025ve}vBw!wT<W2JQ
z_*!!pjj;aql1QgFF>+Eu^Q7Z1seV&0SE#%nUR!sMm-&HzrDSlCbK!zRPjx4xnmXxz
tm780q{Z(wf;_b{!^^^8r+s?qu!1hojs`|ss{Xj1<c)I$ztaD0e0svXU(iZ>#

literal 0
HcmV?d00001

diff --git a/e107_plugins/tinymce/plugins/emoticons/emoticons.php b/e107_plugins/tinymce/plugins/emoticons/emoticons.php
index b7a2f3cbe..8d5ea3425 100644
--- a/e107_plugins/tinymce/plugins/emoticons/emoticons.php
+++ b/e107_plugins/tinymce/plugins/emoticons/emoticons.php
@@ -21,7 +21,7 @@ e107::js('inline',"
 $(document).ready(function()
 {
 		$('.selectEmote').click(function () {			
-			var file_name = $(this).attr('src');
+			var file_name = $(this).attr('data-src');
 			var html = '<img src=\"' + file_name + '\" alt=\"\" />';
 			tinyMCEPopup.editor.execCommand('mceInsertContent', false, html);
 			tinyMCEPopup.close();
@@ -41,7 +41,7 @@ $(document).ready(function()
 		
 e107::lan('core','admin',TRUE);
 
-require_once(HEADERF);
+require_once(e_ADMIN."auth.php");
 
 
 	$emotes = $sysprefs->getArray("emote_".$pref['emotepack']);
@@ -53,7 +53,7 @@ require_once(HEADERF);
 		$key = preg_replace("#_(\w{3})$#", ".\\1", $key);
 		$value2 = substr($value, 0, strpos($value, " "));
 		$value = ($value2 ? $value2 : $value);
-			$str .= "\n<button class='btn btn-large selectEmote pull-left'>
+			$str .= "\n<button data-src=\"".e_IMAGE_ABS."emotes/" . $pref['emotepack'] . "/$key\" class='btn btn-large selectEmote pull-left'>
 			<img src=\"".e_IMAGE_ABS."emotes/" . $pref['emotepack'] . "/$key\" style=\"min-width:32px; min-height:32px; border:0px\" alt=\"\" />
 			</button>";
 		
@@ -68,7 +68,7 @@ $ns->tablerender("Emoticons",$str);
 
 
 
-require_once(FOOTERF);
+require_once(e_ADMIN."footer.php");
 exit;