(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index e2b947aea84c33e07f195c1f5e840e7d58a8a250..bace75d742f220bc742ecb7dd84e558f1568d38d 100644 (file)
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -12,16 +12,28 @@ class wsServices extends cubeFlashGateway {
        }
 
        public function sendEmail() {
+               global $core;
                if (!$this->_checkHash()) {
                        return;
                }
+
+               $dao = new wsDAOBook($core->con);
+               $book = $dao->selectById($this->args['id']);
+
+               $return = 'postmaster@fluidbook.com';
+
                // Send the email
                $mail = new cubeMail();
-               $mail->returnPath = 'postmaster@fluidbook.com';
+               $mail->returnPath = $return;
                $mail->acknowledge = isset($this->args['askAcknowledge']) && $this->args['askAcknowledge'];
                $mail->charset = 'UTF-8';
                $mail->to = $this->args['email'];
-               $mail->from = $this->args['fromname'] . '<' . $this->args['fromemail'] . '>';
+               if ($book->parametres->sendasfluidbook) {
+                       $mail->from = $this->args['fromname'] . '<' . $return . '>';
+                       $mail->replyTo = $this->args['fromname'] . '<' . $this->args['fromemail'] . '>';
+               } else {
+                       $mail->from = $this->args['fromname'] . '<' . $this->args['fromemail'] . '>';
+               }
                $mail->subject = $this->args['subject'];
                $mail->body = $this->args['body'];
                $this->xml->addChild('ok', $mail->send() ? '1' : '0');
@@ -88,6 +100,7 @@ class wsServices extends cubeFlashGateway {
                        $groups[] = $group;
                }
 
+               $return = 'postmaster@fluidbook.com';
 
                $total = count($groups);
                foreach ($groups as $i => $g) {
@@ -98,11 +111,16 @@ class wsServices extends cubeFlashGateway {
 
                        // Send the email
                        $mail = new cubeMail();
-                       $mail->returnPath = 'postmaster@fluidbook.com';
+                       $mail->returnPath = $return;
                        $mail->acknowledge = isset($this->args['askAcknowledge']) && $this->args['askAcknowledge'];
                        $mail->charset = 'UTF-8';
                        $mail->to = $this->args['email'];
-                       $mail->from = $this->args['fromname'] . '<' . $this->args['fromemail'] . '>';
+                       if ($book->parametres->sendasfluidbook) {
+                               $mail->from = $this->args['fromname'] . '<' . $return . '>';
+                               $mail->replyTo = $this->args['fromname'] . '<' . $this->args['fromemail'] . '>';
+                       } else {
+                               $mail->from = $this->args['fromname'] . '<' . $this->args['fromemail'] . '>';
+                       }
                        $mail->subject = $this->args['subject'] . $s;
                        $mail->body = $this->args['body'];
                        foreach ($g as $f) {

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 86216371fbba9d2b62382f6174472da5d60da938..999729a9ee7ff2d7d8fe3a279fc02ceb2bc9c040 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -51,6 +51,7 @@ class wsBookParametres extends wsParametres {
                $this->fields['email_body'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __("Corps de l'email") . ' "' . __('Envoyer à un ami') . '"', 'hint' => __('Laisser vide pour utiliser la valeur par défaut'));
                $this->fields['email_editable'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Permettre au lecteur de modifier le corps de l'email"));
                $this->fields['askAcknowledge'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __("Demander au destinataire un accusé de réception"), 'grade' => 3);
+               $this->fields['sendasfluidbook'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __("Envoyer le mail comme Fluidbook"), 'grade' => 3, 'hint' => __("L'expéditeur apparaîtra en reply-to"));
 
                $this->fields['facebook_title'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __("Titre du contenu partagé"), 'hint' => __('Titre proposé sur les fonction de partage (par défaut, titre de la publication)'));
                $this->fields['facebook_description'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __("Description du contenu partagé"), 'grade' => 1, 'hint' => __('Description proposée sur les fonctions de partage (par défaut, vide)'));
@@ -69,7 +70,7 @@ class wsBookParametres extends wsParametres {
                $this->fields['friendWidth'] = array('type' => 'integer', 'default' => 319, 'editable' => true, 'label' => __('Largeur du menu'), 'grade' => 5);
                $this->fields['friendHeight'] = array('type' => 'integer', 'default' => 500, 'editable' => true, 'label' => __('Largeur du menu'), 'grade' => 5);
                $this->forms['share'] = array('label' => __('Fonctions de partage'),
-                       'fieldsnames' => array('share', '|', 'email_title', 'email_body', 'email_editable', 'askAcknowledge', '|',
+                       'fieldsnames' => array('share', '|', 'email_title', 'email_body', 'email_editable', 'askAcknowledge', 'sendasfluidbook', '|',
                                'facebook_title', 'facebook_description', 'facebook_image', 'twitter_description', '|',
                                'friend', 'facebook', 'twitter', 'googleplus', 'linkedin', 'viadeo', '|', 'customSharer', '|', 'friendWidth', 'friendHeight'));
                // .