README.md

@@ -1,22 +1,4 @@
 # Roundcube Easy Unsubscribe
-Displays a small icon after the subject line when viewing an email, so you can very quickly unsubscribe. Multiple icons may show as the plugin is reliant upon the `List-Unsubscribe` header. Sometimes emails use multiple i.e. one mailto: and one URL.
+Displays a small icon after the subject line when viewing an email, so you can very quickly unsubscribe.
 
-
-## Demo Visual
-![Demo SS](https://i.ibb.co/58B3P57/Screenshot-2023-11-29-at-12-42-46-PM.png)
-
-## Deployment
-
-Download a copy of this repo and upload the contents to:
-```
-/path/to/roundcube/plugins/easy_unsubscribe
-```
-
-Edit your `/path/to/roundcube/config/config.inc.php` file and add `easy_unsubscribe` to the `$config['plugins']` variable. It should look something like the following: 
-
-```
-$config['plugins'] = array(
-    'password',
-    'easy_unsubscribe'
-);
-```
+![Image](https://i.imgur.com/pecWMhe.jpg)

composer.json

@@ -5,6 +5,12 @@
     "license": "GPL-3.0+",
     "keywords": ["unsubscribe","subscription", "newsletter", "mailer"],
     "homepage": "https://github.com/SS88UK/roundcube-easy-unsubscribe",
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://plugins.roundcube.net"
+        }
+    ],
     "require": {
         "roundcube/plugin-installer": ">=0.1.6"
     }

easy_unsubscribe.js

@@ -1,9 +0,0 @@
-function easy_unsubscribe_click(link) {
-
-    if(confirm(rcmail.get_label('confirm', 'easy_unsubscribe'))) {
-
-        if(link.dataset.href) window.open(link.dataset.href, '_blank');
-
-    }
-
-}

easy_unsubscribe.php

@@ -1,13 +1,12 @@
 <?php
 
-class easy_unsubscribe extends rcube_plugin {
-
-	public $task = 'mail';
+class easy_unsubscribe extends rcube_plugin
+{	
 	private $message_headers_done = false;
 	private $unsubscribe_img;
 
-	function init() {
-
+	function init()
+	{
 		$rcmail = rcmail::get_instance();
 		$layout = $rcmail->config->get('layout');
 
@@ -15,50 +14,36 @@ class easy_unsubscribe extends rcube_plugin {
 		$this->add_hook('storage_init', array($this, 'storage_init'));
 		
 		$this->include_stylesheet('easy_unsubscribe.css');
-		$this->include_script('easy_unsubscribe.js');
 
 		$this->add_texts('localization/');
-
-		$rcmail->output->add_label('easy_unsubscribe.confirm');
-
 	}
 	
-	public function storage_init($p) {
-
+	public function storage_init($p)
+	{
 		$p['fetch_headers'] = trim($p['fetch_headers'] . ' ' . strtoupper('List-Unsubscribe'));
 		return $p;
-
 	}
 	
-	public function message_headers($p) {		
-
-		if($this->message_headers_done===false) {
-
+	public function message_headers($p)
+	{		
+		if($this->message_headers_done===false)
+		{
 			$this->message_headers_done = true;
-			if(!isset($p['headers']->others['list-unsubscribe'])) return $p;
 
 			$ListUnsubscribe = $p['headers']->others['list-unsubscribe'];
-
-			if (preg_match_all('/<(.+)>/mU', $ListUnsubscribe, $items, PREG_PATTERN_ORDER)) {
-
-				foreach ( $items[1] as $uri ) {
-
-					$this->unsubscribe_img .= '<a class="easy_unsubscribe_link tooltip-right" data-tooltip="' . $this->gettext('click_to_unsubscribe') . '" data-href="'. htmlentities($uri) .'" target="_blank" onclick="easy_unsubscribe_click(this);"><img src="plugins/easy_unsubscribe/icon.png" alt="' . $this->gettext('unsubscribe') . '" /></a>';
-				
-				}
-			}
-
+			if ( preg_match_all('/<(.+)>/mU', $ListUnsubscribe, $items, PREG_PATTERN_ORDER) ) {
+                                foreach ( $items[1] as $uri ) {
+                                        $this->unsubscribe_img .= '<a class="easy_unsubscribe_link tooltip-right" data-tooltip="' . $this->gettext('click_to_unsubscribe') . '" href="'. htmlentities($uri) .'" target="_blank" onclick="return confirm(\'' . $this->gettext('confirm') . '\');"><img src="plugins/easy_unsubscribe/icon.png" alt="' . $this->gettext('unsubscribe') . '" /></a>';
+                                }
+                        }
 		}
 
-		if(isset($p['output']['subject'])) {
-
+		if(isset($p['output']['subject']))
+		{
 			$p['output']['subject']['value'] = $p['output']['subject']['value'] . $this->unsubscribe_img;
 			$p['output']['subject']['html'] = 1;
-
 		}
 
 		return $p;
-
 	}
-
 }

localization/es_ES.inc

@@ -1,7 +0,0 @@
-<?php
-
-$labels = array();
-
-$labels['click_to_unsubscribe'] = "Haz click para anular la suscripción";
-$labels['confirm'] = "¿Estás seguro de que deseas anular la suscripción?";
-$labels['unsubscribe'] = "Anular suscripción";

localization/ru_RU.inc

@@ -1,7 +0,0 @@
-<?php
-
-$labels = array();
-
-$labels['click_to_unsubscribe'] = "Нажмите, чтобы отписаться";
-$labels['confirm'] = "Вы уверены, что хотите отказаться от подписки?";
-$labels['unsubscribe'] = "Отписаться";