(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index c8d0f94b10fa70ad3edcb5ed27e1704e532bacdb..2342df2ce94df66456707aa585ab03c80eb0b434 100644 (file)
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -10,6 +10,56 @@ class wsServices extends cubeFlashGateway {
                $gateway = new $n($core->con, $args);\r
        }\r
 \r
+       public function sendGordini() {\r
+\r
+               $fromEmail = $this->args['fromemail'];\r
+               $fromName = $this->args['fromname'];\r
+\r
+               $emails = array();\r
+\r
+               if (preg_match_all('|[a-z0-9_\-\.]*@[a-z0-9\-\.]*\.[a-z]{2,5}|i', $this->args['email'], $matches)) {\r
+                       $emails = $matches[0];\r
+               }\r
+\r
+               $http = new cubeHTTP('secure.cabestan.com', 443);\r
+               $http->useSSL(true);\r
+\r
+               $query = '<?xml version="1.0" encoding="ISO-8859-1" ?>';\r
+               $query .= '<Alert>';\r
+               $query .= '<Users>';\r
+               $query .= '<User>';\r
+               $query .= '<item code="EMAIL">' . $fromEmail . '</item>';\r
+               $query .= '<item code="NOM">' . $fromName . '</item>';\r
+               foreach ($emails as $i => $email) {\r
+                       $query .= '<item code="EMAILFILLEUL' . ($i + 1) . '_EMAIL">' . $email . '</item>';\r
+               }\r
+               $i++;\r
+               if (($i + 1) < 3) {\r
+                       for (; $i <= 2; $i++) {\r
+                               $query .= '<item code="EMAILFILLEUL' . ($i + 1) . '_EMAIL"></item>';\r
+                       }\r
+               }\r
+               $query .= '</User>';\r
+               $query .= '</Users>';\r
+               $query .= '<Trigger type="survey" code="VIRALGORDINI" />';\r
+               $query .= '</Alert>';\r
+\r
+               fb($query);\r
+\r
+               $datas = array('Emm_Login' => 'Publicis',\r
+                       'Emm_Password' => '%K8\'hQi/kr',\r
+                       'XmlOutputType' => 'XML',\r
+                       'XmlOutputMethod' => 'NOREDIRECT',\r
+                       'XmlBatch' => '1',\r
+                       'XmlQuery' => $query);\r
+\r
+               fb($datas);\r
+\r
+               $http->post('/renault/Shared/WebServices/Ws_LaunchAlert.cfm', $datas);\r
+\r
+               fb($http->getContent());\r
+       }\r
+\r
        public function sendEmail() {\r
                // Check protection hash\r
                $hash = md5(substr($this->args['fromemail'], 2, 6) . substr($this->args['email'], 3, 5) . 'SFGHF566!S' . $this->args['id']);\r

diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index a0f9943df6671659da385d46381f0bcb845b2534..31072046e8d97a1363e6d19b761f554a13b7efc8 100644 (file)
--- a/inc/ws/Metier/class.ws.theme.parametres.php
+++ b/inc/ws/Metier/class.ws.theme.parametres.php
@@ -52,9 +52,12 @@ class wsThemeParametres extends wsParametres {
                        'label' => __("Couleur du surlignage des résultats"));\r
                $this->fields['searchFieldWidth'] = array('type' => 'integer', 'default' => 230, 'editable' => true,\r
                        'label' => __("Largeur du champ de recherche"));\r
+               $this->fields['searchIndexNoResultColor'] = array('type' => 'couleurAlpha', 'default' => 'CC000000', 'editable' => true,\r
+                       'label' => __("Couleur de l'overlay (aucun résultat)"),\r
+                       'grade' => 5);\r
 \r
                $this->forms['search'] = array('label' => __('Personnalisation de la recherche'),\r
-                       'fieldsnames' => array('couleurS', 'searchFieldColor', 'searchShadeAlpha', 'searchFieldWidth', '|', 'highlightColor'));\r
+                       'fieldsnames' => array('couleurS', 'searchFieldColor', 'searchShadeAlpha', 'searchFieldWidth', '|', 'highlightColor','|','searchIndexNoResultColor'));\r
                /* Icones */\r
                $this->fields['iconSet'] = array('type' => 'icones', 'default' => 1, 'editable' => true,\r
                        'label' => __("Jeu d'icônes"));\r
@@ -98,7 +101,7 @@ class wsThemeParametres extends wsParametres {
                                '|', 'usePageEdges', 'pageEdgeColor',\r
                                '|', 'bookShadeColor',\r
                                '|', 'displayPageNumber', 'colorPageNumber',\r
-                               '|', 'linksColor','videoBackgroundColor','popupVideoOverlay'));\r
+                               '|', 'linksColor', 'videoBackgroundColor', 'popupVideoOverlay'));\r
                /* Credits */\r
                $this->fields['creditsColor'] = array('type' => 'couleurAlpha', 'default' => '80ffffff', 'editable' => true,\r
                        'label' => __("Couleur du texte"));\r
@@ -166,7 +169,7 @@ class wsThemeParametres extends wsParametres {
                );\r
 \r
                $this->forms['menubar'] = array('label' => __('Personnalisation de la barre de menu'),\r
-                       'fieldsnames' => array('menuHeight', '|', 'menuColor', '|', 'menuImage', '|', 'shadeOnMenu', '|', 'invertMenuPosition', '|', 'topBar','topBarAlign', '|', 'afterSearch'));\r
+                       'fieldsnames' => array('menuHeight', '|', 'menuColor', '|', 'menuImage', '|', 'shadeOnMenu', '|', 'invertMenuPosition', '|', 'topBar', 'topBarAlign', '|', 'afterSearch'));\r
                /* Menu bar logo */\r
                $this->fields['logo'] = array('type' => 'file', 'default' => 'menu_clientLogo.png', 'editable' => true,\r
                        'label' => __('Image'),\r
@@ -198,7 +201,7 @@ class wsThemeParametres extends wsParametres {
                        'label' => __("Couleur des marques-pages"));\r
 \r
                $this->forms['pagesbar'] = array('label' => __('Personnalisation de la barre des pages'),\r
-                       'fieldsnames' => array('pagesBar', 'pageBarThumbBack','|','bookmarkColor'));\r
+                       'fieldsnames' => array('pagesBar', 'pageBarThumbBack', '|', 'bookmarkColor'));\r
 \r
                /* Paramètres non implémentés */\r
                /* $this->fields['extraXSpace'] = array('type' => 'integer', 'default' => '0', 'editable' => true,\r