remove emoticons option

- Nowadays, messages can contain both unicode emoji and text smileys. - This extension/options doesn't bring a real added value IMO. Moreover it had to be enabled by the user to be effectiv to be effective - the emoticons js scripts contained pictures licensed under CC-BY-SA-2.5 which is not DFSG compatible. See: https://wiki.debian.org/DFSGLicenses#Creative_Commons_Attribution-ShareAlike_3.0_Unported_.28CC_BY-SA_3.0.29 - CI3 has a Smiley plugin which does an equivalent job and is marked as deprecated https://codeigniter.com/userguide3/helpers/smiley_helper.html
kalkun-sms · Sep 30, 2023 · eeba8ea · eeba8ea
1 parent d37c479
commit eeba8ea
Show file tree

Hide file tree

Showing 21 changed files with 0 additions and 97 deletions.
diff --git a/application/config/kalkun_settings.php b/application/config/kalkun_settings.php
@@ -127,16 +127,6 @@
 */
 $config['sms_bomber'] = FALSE;
 
-/*
-|--------------------------------------------------------------------------
-| Enable Smileys/Emoticons
-|--------------------------------------------------------------------------
-|
-| Enable Smiley/Emoticons for messages
-|
-*/
-$config['enable_emoticons'] = FALSE;
-
 /*
 |--------------------------------------------------------------------------
 | Append @username

diff --git a/application/views/js_init/message/js_conversation.php b/application/views/js_init/message/js_conversation.php
@@ -7,11 +7,6 @@
 		var current_folder = "<?php echo $this->uri->segment(6);?>";
 		//var dest_url = base + source;
 
-		<?php if ($this->config->item('enable_emoticons')) : ?>
-		$(".message_preview").emoticons("<?php echo   $this->config->item('img_path').'emoticons/'; ?>");
-		$(".message_content").emoticons("<?php echo   $this->config->item('img_path').'emoticons/'; ?>");
-		<?php endif; ?>
-
 		// Delete messages
 		$(document).on('click', "a.global_delete", action_delete = function() {
 			var count = $("input.select_message:checked:visible").length;

diff --git a/application/views/main/messages/index.php b/application/views/main/messages/index.php
@@ -1,6 +1,3 @@
-<?php if ($this->config->item('enable_emoticons')) : ?>
-<script language="javascript" src="<?php echo $this->config->item('js_path');?>jquery-plugin/jquery.emoticons.min.js"></script>
-<?php endif; ?>
 <link type="text/css" rel="stylesheet" href="<?php echo $this->config->item('css_path');?>jquery-plugin/jquerycssmenu.css" />
 <?php if ($this->uri->segment(2) !== 'conversation' && $this->uri->segment(2) !== 'search')
 {

diff --git a/media/images/emoticons/COPYING b/media/images/emoticons/COPYING
diff --git a/media/images/emoticons/face-angel.png b/media/images/emoticons/face-angel.png
diff --git a/media/images/emoticons/face-crying.png b/media/images/emoticons/face-crying.png
diff --git a/media/images/emoticons/face-devilish.png b/media/images/emoticons/face-devilish.png
diff --git a/media/images/emoticons/face-glasses.png b/media/images/emoticons/face-glasses.png
diff --git a/media/images/emoticons/face-grin.png b/media/images/emoticons/face-grin.png
diff --git a/media/images/emoticons/face-kiss.png b/media/images/emoticons/face-kiss.png
diff --git a/media/images/emoticons/face-love.png b/media/images/emoticons/face-love.png
diff --git a/media/images/emoticons/face-monkey.png b/media/images/emoticons/face-monkey.png
diff --git a/media/images/emoticons/face-plain.png b/media/images/emoticons/face-plain.png
diff --git a/media/images/emoticons/face-sad.png b/media/images/emoticons/face-sad.png
diff --git a/media/images/emoticons/face-smile-big.png b/media/images/emoticons/face-smile-big.png
diff --git a/media/images/emoticons/face-smile.png b/media/images/emoticons/face-smile.png
diff --git a/media/images/emoticons/face-surprise.png b/media/images/emoticons/face-surprise.png
diff --git a/media/images/emoticons/face-unlove.png b/media/images/emoticons/face-unlove.png
diff --git a/media/images/emoticons/face-wink.png b/media/images/emoticons/face-wink.png
diff --git a/media/images/emoticons/index.html b/media/images/emoticons/index.html
diff --git a/media/js/jquery-plugin/jquery.emoticons.min.js b/media/js/jquery-plugin/jquery.emoticons.min.js