Skip to content

Commit

Permalink
remove emoticons option
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
tenzap committed Dec 5, 2023
1 parent 0198861 commit d347bcd
Show file tree
Hide file tree
Showing 22 changed files with 0 additions and 98 deletions.
10 changes: 0 additions & 10 deletions application/config/kalkun_settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -127,16 +127,6 @@
*/
$config['sms_bomber'] = FALSE;

/*
|--------------------------------------------------------------------------
| Enable Smileys/Emoticons
|--------------------------------------------------------------------------
|
| Enable Smiley/Emoticons for messages
|
*/
$config['enable_emoticons'] = FALSE;

/*
|--------------------------------------------------------------------------
| Append @username
Expand Down
5 changes: 0 additions & 5 deletions application/views/js_init/message/js_conversation.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 0 additions & 3 deletions application/views/main/messages/index.php
Original file line number Diff line number Diff line change
@@ -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')
{
Expand Down
1 change: 0 additions & 1 deletion docs/CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ jQuery Plugin:
* Autosize 5.0.1 <https://github.com/jackmoore/autosize> - © Jack Moore <hello@jacklmoore.com>, License: MIT <http://www.opensource.org/licenses/mit-license.php>
* Field 0.9.6 <https://pengoworks.com/workshop/jquery/field/field.plugin.htm>
* jQuery Tags Input Revisited Plugin 2.1 <https://github.com/underovsky/jquery-tagsinput-revisited>
* Emoticon 0.5 <https://users.dcc.uchile.cl/~skreft/emoticon/>
* Form 4.3.0 <https://malsup.com/jquery/form/> or <https://github.com/jquery-form/form>
Chart.js API 4.3.0 <https://www.chartjs.org>
b8 Bayesian spam filter 0.7 <http://nasauber.de/opensource/b8/>
Expand Down
67 changes: 0 additions & 67 deletions media/images/emoticons/COPYING

This file was deleted.

Binary file removed media/images/emoticons/face-angel.png
Binary file not shown.
Binary file removed media/images/emoticons/face-crying.png
Binary file not shown.
Binary file removed media/images/emoticons/face-devilish.png
Binary file not shown.
Binary file removed media/images/emoticons/face-glasses.png
Binary file not shown.
Binary file removed media/images/emoticons/face-grin.png
Binary file not shown.
Binary file removed media/images/emoticons/face-kiss.png
Binary file not shown.
Binary file removed media/images/emoticons/face-love.png
Binary file not shown.
Binary file removed media/images/emoticons/face-monkey.png
Binary file not shown.
Binary file removed media/images/emoticons/face-plain.png
Binary file not shown.
Binary file removed media/images/emoticons/face-sad.png
Binary file not shown.
Binary file removed media/images/emoticons/face-smile-big.png
Binary file not shown.
Binary file removed media/images/emoticons/face-smile.png
Binary file not shown.
Binary file removed media/images/emoticons/face-surprise.png
Binary file not shown.
Binary file removed media/images/emoticons/face-unlove.png
Binary file not shown.
Binary file removed media/images/emoticons/face-wink.png
Binary file not shown.
11 changes: 0 additions & 11 deletions media/images/emoticons/index.html

This file was deleted.

1 change: 0 additions & 1 deletion media/js/jquery-plugin/jquery.emoticons.min.js

This file was deleted.

0 comments on commit d347bcd

Please sign in to comment.