set board by email address delimiter (+).

README.md

@@ -1,26 +1,27 @@
 # mail2deck
 Provides an "email in" solution for the Nextcloud Deck app
-## A. For users
+# 🚀 A. For users
 Follow the above steps to add a new card from email.
 
 * Deck Bot is the user who will create the cards and it will be set up by your nextcloud admin.
 * In this tutorial email address for Deck Bot will be: <code>bot@ncserver.com</code>
 
-### 1) Assign Deck Bot to the board.
-### 2) Mail subject & content
+## 1) Assign Deck Bot to the board.
+## 2) Mail subject & content
 Let's assume you want to add a card with title "Update website logo" on board "Website" and stack "To do".
 You can do this in two ways.
 
-#### 2.1: Set stack and board in the email subject
+### 2.1: Set stack and board in the email subject
 Here's how the email subject should look like:
-<code>Update website logo b-'Website' s-'To do'</code>
+<code>Update website logo b-'website' s-'to do'</code>
 
 *You can use single or double quotes.*
+*Case-insensitive for board and stack respectively*
 
-#### 2.2: Set the board in the email address
-At the end of the email address prefix (before @) add "+Website"
+### 2.2: Set the board in the email address
+At the end of the email address prefix (before @) add "+website"
 
-Example: <code>bot+Website@ncserver.com</code>
+Example: <code>bot+website@ncserver.com</code>
 
 In this case, if you don't specify the stack in the email subject, the card will be added in the first stack (if it exists).
 
@@ -28,22 +29,22 @@ Note:
 * Email content will be card description
 * You can add attachments in the email and those will be integrated in the created card
 
-## B. For NextCloud admins to setup
-### Requirements
+# ⚙️ B. For NextCloud admins to setup
+## Requirements
 This app requires php-curl, php-mbstring ,php-imap and some sort of imap server (e.g. Postfix with Courier).
-### NC new user
+## NC new user
 Create a new user from User Management on your NC server, which will have to function as a bot. We chose to call him *deckbot*, but you can call it however you want.<br>
 __Note__: that you have to assign *deckbot* on each board you want to add new cards from email.
-### Configure Email
-#### Option 1 - Set up Postfix for incoming email
+## Configure Email
+### Option 1 - Set up Postfix for incoming email
 You can setup Posfix mail server folowing the instructions on [Posfix setup](https://docs.gitlab.com/ee/administration/reply_by_email_postfix_setup.html), and after that add "+" delimiter (which separe the user from the board in the email address) using the command:<br>
 ```
 sudo postconf -e "recipient_delimiter = +"
 ```
-#### Option 2 - Use an existing email server
+### Option 2 - Use an existing email server
 This could be any hosted email service. The only requirement is that you can connect to it via the IMAP protocol.
 *Please note this option may not be as flexible as a self-hosted server. For example your email service may not support the "+"delimiter for directing messages to a specific board.*
-### Download and install
+## Download and install
 If using a self-hosted Postfix server, clone this repository into the home directory of the *incoming* user. If not self-hosting, you may need to create a new user on your system and adjust the commands in future steps to match that username.<br>
 ```
 cd /home/incoming/
@@ -54,11 +55,12 @@ Edit the config file as you need:
 sudo nano /home/incoming/mail2deck/config.php
 ```
 *You can refer to https://www.php.net/manual/en/function.imap-open.php for setting the value of MAIL_SERVER_FLAGS*
-### Add a cronjob which will run mail2deck.
+## Add a cronjob which will run mail2deck.
 ```
 sudo crontab -u incoming -e
 ```
 Add the following line in the opened file:
 <code>*/5 * * * * /usr/bin/php /home/incoming/mail2deck/index.php >/dev/null 2>&1</code>
-### Finish
+
+## Finish
 Now __mail2deck__ will add new cards every five minutes if new emails are received.

index.php

@@ -59,6 +59,8 @@ if ($emails)
         }
 
         $overview = $inbox->headerInfo($emails[$j]);
+        $board = null;
+        if(strstr($overview->to[0]->mailbox, '+')) $board = substr($overview->to[0]->mailbox, strpos($overview->to[0]->mailbox, '+') + 1);
         
         $data = new stdClass();
         $data->title = DECODE_SPECIAL_CHARACTERS ? mb_decode_mimeheader($overview->subject) : $overview->subject;
@@ -75,7 +77,7 @@ if ($emails)
         $mailSender->userId = $overview->from[0]->mailbox;
 
         $newcard = new DeckClass();
-        $response = $newcard->addCard($data, $mailSender);
+        $response = $newcard->addCard($data, $mailSender, $board);
         $mailSender->userId .= "@{$overview->from[0]->host}";
         if($response && ASSIGN_SENDER) {
             $inbox->reply($mailSender->userId, $response);

lib/DeckClass.php

@@ -35,11 +35,12 @@ class DeckClass {
         return json_decode($response);
     }
 
-    public function getParameters($params) {// get the board and the stack
-        if(preg_match('/b-"([^"]+)"/', $params, $m) || preg_match("/b-'([^']+)'/", $params, $m)) {
-            $boardFromMail = $m[1];
-            $params = str_replace($m[0], '', $params);
-        }
+    public function getParameters($params, $boardFromMail = null) {// get the board and the stack
+	    if(!$boardFromMail) // if board is not set within the email address, look for board into email subject
+        	if(preg_match('/b-"([^"]+)"/', $params, $m) || preg_match("/b-'([^']+)'/", $params, $m)) {
+            		$boardFromMail = $m[1];
+            		$params = str_replace($m[0], '', $params);
+        	}
         if(preg_match('/s-"([^"]+)"/', $params, $m) || preg_match("/s-'([^']+)'/", $params, $m)) {
             $stackFromMail = $m[1];
             $params = str_replace($m[0], '', $params);
@@ -68,8 +69,8 @@ class DeckClass {
         return $boardStack;
     }
 
-    public function addCard($data, $user) {
-        $params = $this->getParameters($data->title);
+    public function addCard($data, $user, $board = null) {
+        $params = $this->getParameters($data->title, $board);
         $data->title = $params->newTitle;
         $card = $this->apiCall("POST", NC_SERVER . "/index.php/apps/deck/api/v1.0/boards/{$params->board}/stacks/{$params->stack}/cards", $data);
         $card->board = $params->board;

lib/MailClass.php

@@ -49,4 +49,4 @@ class MailClass {
 
         mail($sender, 'An issue has been reported!', $message, $headers);
     }
-}
+}