diff --git a/includes/mail/mail.php b/includes/mail/mail.php
index e0234f517..1e8625fce 100644
--- a/includes/mail/mail.php
+++ b/includes/mail/mail.php
@@ -6,54 +6,45 @@
*
*/
-function sendMail($sujet, $message, $from, $to, $cc = array() )
+function sendMail($sujet, $message, $from, $to, $cc = array())
{
- require_once 'phpmailer/class.phpmailer.php';
- $mail = new PHPMailer(true);
- //Choix de la méthode d'envoi
- if(MAIL_METHOD == 'sendmail')
- {
- $mail->IsSendmail();
- }
- elseif(MAIL_METHOD == 'smtp')
- {
- $mail->IsSMTP();
- $mail->SMTPDebug = 0; // 0, 1, 2
- $mail->Host = MAIL_SMTPHOST;
- $mail->Port = defined(MAIL_SMTPPORT)? MAIL_SMTPPORT : 25;
- $mail->SMTPAuth = defined(MAIL_SMTPAUTH)? MAIL_SMTPAUTH : false;
- $mail->Username = defined(MAIL_SMTPUSER)? MAIL_SMTPUSER : '';
- $mail->Password = defined(MAIL_SMTPPASS)? MAIL_SMTPPASS : '';
- }
- //Spécification du charset
- $mail->CharSet = defined(CHARSET)? CHARSET : 'utf-8';
- //Envoi du mail
- try
- {
- $body = $message;
- $body = eregi_replace("[\]",'',$body);
- $mail->MessageID = '<'.md5(date('YmdHis')).
- '@mail.scores-decisions.com>';
- $mail->AddReplyTo($from['email'], $from['name']);
- $mail->SetFrom($from['email'], $from['name']);
- foreach($to as $info)
- {
- $mail->AddAddress($info['email'], $info['name']);
- }
- $mail->Subject = $sujet;
- $mail->MsgHTML($body);
- $mail->Send();
- return true;
- }
- catch (phpmailerException $e)
- {
- //Ecriture des erreurs dans un fichier (sujet, to)
- file_put_contents(
- PATH_DATA.'/mailerror.log',
- $e->errorMessage().' '.$to.' '.$sujet,
- FILE_APPEND
- );
- return false;
- }
+ require_once 'phpmailer/class.phpmailer.php';
+ $mail = new PHPMailer(true);
+ // Choix de la méthode d'envoi
+ if (MAIL_METHOD == 'sendmail') {
+ $mail->IsSendmail();
+ } else if (MAIL_METHOD == 'smtp') {
+ $mail->IsSMTP();
+ $mail->SMTPDebug = 0; // 0, 1, 2
+ $mail->Host = MAIL_SMTPHOST;
+ $mail->Port = defined('MAIL_SMTPPORT') ? MAIL_SMTPPORT : 25;
+ $mail->SMTPAuth = defined('MAIL_SMTPAUTH') ? MAIL_SMTPAUTH : false;
+ $mail->Username = defined('MAIL_SMTPUSER') ? MAIL_SMTPUSER : '';
+ $mail->Password = defined('MAIL_SMTPPASS') ? MAIL_SMTPPASS : '';
+ }
+ // Spécification du charset
+ $mail->CharSet = defined('CHARSET')? CHARSET : 'utf-8';
+ // Envoi du mail
+ try {
+ $body = $message;
+ $body = preg_replace('/\\\/', '', $body);
+ $mail->MessageID = '<'.md5(date('YmdHis')).
+ '@mail.scores-decisions.com>';
+ $mail->AddReplyTo($from['email'], $from['name']);
+ $mail->SetFrom($from['email'], $from['name']);
+ foreach ($to as $info) {
+ $mail->AddAddress($info['email'], $info['name']);
+ }
+ $mail->Subject = $sujet;
+ $mail->MsgHTML($body);
+ $mail->Send();
+ return true;
+ } catch (phpmailerException $e) {
+ // Ecriture des erreurs dans un fichier (sujet, to)
+ file_put_contents(PATH_DATA.'/mailerror.log',
+ $e->errorMessage().' '.$to.' '.$sujet,
+ FILE_APPEND);
+ return false;
+ }
}
diff --git a/includes/soaperror.php b/includes/soaperror.php
index bb6d67aae..ebda365f9 100644
--- a/includes/soaperror.php
+++ b/includes/soaperror.php
@@ -19,18 +19,18 @@ require_once 'phpmailer/class.phpmailer.php';
function processSoapFault($clientSoap, $fault, $tabInfo, $debug = FALSE){
global $firephp;
-
+
$message = 'Request : '. $clientSoap->__getLastRequest() . '\n\n' .
'Response : '.$clientSoap->__getLastResponse() . '\n\n';
-
+
logSoapFault($message);
-
+
$message = 'Request : '. htmlspecialchars($clientSoap->__getLastRequest()) . '
' .
'Response : '. htmlspecialchars($clientSoap->__getLastResponse()) . '
';
-
+
$firephp->log($clientSoap->__getLastRequest(),'getLastRequest');
$firephp->log($clientSoap->__getLastResponse(),'getLastResponse');
-
+
if(is_object($fault)){
}else{
@@ -39,12 +39,12 @@ function processSoapFault($clientSoap, $fault, $tabInfo, $debug = FALSE){
$message.= '
';
$message.= 'Informations de debug :
';
$message.= '
'; - $message.= 'REQUEST : '.print_r($_REQUEST,true).''; - + if($debug == TRUE){ print '
'; - $message.= 'SERVER : '.print_r($_REQUEST,true).'
'; - $message.= 'SESSION : '.print_r($_SESSION,true).'
'; - $message.= 'tabInfo : '.print_r($tabInfo,true).'
'; + $message.= 'REQUEST : '.print_r($_REQUEST, true).'
'; + $message.= 'SERVER : ' .print_r($_SERVER, true).'
'; + $message.= 'SESSION : '.print_r($_SESSION, true).'
'; + $message.= 'tabInfo : '.print_r($tabInfo, true).'
'; $message.= '
'; print $message; @@ -61,8 +61,8 @@ function processSoapFault($clientSoap, $fault, $tabInfo, $debug = FALSE){ */ function messageSoapFault() { - (defined('ERROR_SOAP')) ? - ($message = ERROR_SOAP) : + (defined('ERROR_SOAP')) ? + ($message = ERROR_SOAP) : ($message = "Une erreur est survenue lors de votre requête"); return $message; } @@ -75,18 +75,18 @@ function messageSoapFault() function mailSoapFault($message) { require_once 'mail/mail.php'; - sendMail( - "Erreur SOAP - (Date :".date("d")."/".date("m")."/".date("Y").")", - $message, + sendMail( + "Erreur SOAP - (Date :".date("d")."/".date("m")."/".date("Y").")", + $message, //From - array( + array( 'email' => 'contact@scores-decisions.com', 'name' => 'Serveur SD-13408', - ), + ), //TO array( 0 => array( - 'email'=> EMAIL_SUPPORTDEV, + 'email'=> EMAIL_SUPPORTDEV, 'name' => 'Support' ) ) diff --git a/www/css/feed_menu_ie.css b/www/css/feed_menu_ie.css index ae7333cb1..7a831f83f 100644 --- a/www/css/feed_menu_ie.css +++ b/www/css/feed_menu_ie.css @@ -4,4 +4,4 @@ #recherche_feed .feed_menu{ width:auto; background:none; -}` \ No newline at end of file +} \ No newline at end of file diff --git a/www/img/score_orangebaisse45.gif b/www/img/score_orangebaisse45.gif new file mode 100644 index 000000000..a0757bf37 Binary files /dev/null and b/www/img/score_orangebaisse45.gif differ diff --git a/www/img/score_orangehausse45.gif b/www/img/score_orangehausse45.gif new file mode 100644 index 000000000..cbc03ac56 Binary files /dev/null and b/www/img/score_orangehausse45.gif differ diff --git a/www/img/score_rougebaisse45.gif b/www/img/score_rougebaisse45.gif new file mode 100644 index 000000000..7029981ac Binary files /dev/null and b/www/img/score_rougebaisse45.gif differ diff --git a/www/img/score_rougehausse45.gif b/www/img/score_rougehausse45.gif new file mode 100644 index 000000000..1e9b58b70 Binary files /dev/null and b/www/img/score_rougehausse45.gif differ diff --git a/www/img/score_vertbaisse45.gif b/www/img/score_vertbaisse45.gif new file mode 100644 index 000000000..7a235435a Binary files /dev/null and b/www/img/score_vertbaisse45.gif differ diff --git a/www/img/score_verthausse45.gif b/www/img/score_verthausse45.gif new file mode 100644 index 000000000..bff7e3887 Binary files /dev/null and b/www/img/score_verthausse45.gif differ diff --git a/www/pages/portefeuille.php b/www/pages/portefeuille.php index a7260ea9f..59b7eaec8 100644 --- a/www/pages/portefeuille.php +++ b/www/pages/portefeuille.php @@ -83,7 +83,6 @@ $(document).ready(function() tooltip: 'topMiddle' } } }); }); - }); @@ -98,7 +97,6 @@ $(document).ready(function() -Surveillance Score
array('min'=>11, 'max'=>20), ); - if(count($listSurveillance)>0) { foreach($listSurveillance as $item) { + //Classe de risque $couleurV = ${'couleurRisque'.$maxIndiscore}; foreach($couleurV as $couleur => $intervalle) { @@ -183,6 +181,14 @@ if(count($listSurveillance)>0) $indiScore = $item['indiScore'.$typeScore]; $indiScorePre = empty($item['indiScore'.$typeScore.'Pre']) ? 0 : $item['indiScore'.$typeScore.'Pre']; + + //Variation du risque + $variation = abs($item['indiScore']-$item['indiScorePre']); + if($variation>=5 && $variation<=9){ + $deg = '45'; + }else{ + $deg = ''; + } ?>@@ -257,12 +263,12 @@ if(count($listSurveillance)>0) //Hausse }elseif($indiScore>$indiScorePre){ ?> - + - +