scores/extranet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

merge into: scores:SD-32
Branches Tags
scores:SD-32
scores:develop
scores:errorsoaptologger
scores:master
scores:inextenso
scores:libraryviacomposer
scores:dupliqueannonce
scores:wip-2.9-design2016
scores:liensInterEntrepDev
scores:etablisementList
scores:wip-2.9-design2016-surv
scores:wip-2.10
scores:release-2.8
scores:release-2.7
scores:release-2.6
scores:release-2.5
scores:wip-3.0
scores:release-2.4
scores:release-2.5.1
scores:release-2.3
scores:release-2.2
scores:release-2.1
scores:release-2.0
scores:release-1.8
scores:release-1.9
scores:release-1.7
scores:release-1.6
scores:release-1.5
scores:release-1.4
scores:release-1.3
scores:release-1.2
scores:release-1.1
scores:release-1.0
scores:2.8.1
...
pull from: scores:errorsoaptologger
Branches Tags
scores:develop
scores:errorsoaptologger
scores:SD-32
scores:master
scores:inextenso
scores:libraryviacomposer
scores:dupliqueannonce
scores:wip-2.9-design2016
scores:liensInterEntrepDev
scores:etablisementList
scores:wip-2.9-design2016-surv
scores:wip-2.10
scores:release-2.8
scores:release-2.7
scores:release-2.6
scores:release-2.5
scores:wip-3.0
scores:release-2.4
scores:release-2.5.1
scores:release-2.3
scores:release-2.2
scores:release-2.1
scores:release-2.0
scores:release-1.8
scores:release-1.9
scores:release-1.7
scores:release-1.6
scores:release-1.5
scores:release-1.4
scores:release-1.3
scores:release-1.2
scores:release-1.1
scores:release-1.0
scores:2.8.1

3 Commits
SD-32 ... errorsoapt

Author SHA1 Message Date
benoitpotier
bcb2690f3c remplacement envoi mail d'erreur SOAP par log logger 2017-04-14 16:49:20 +02:00
benoitpotier
a6be515460 Merge branch 'develop' of gitlab.factory.insight.doubletrade.com:scores/extranet into develop 2017-04-12 11:32:39 +02:00
benoitpotier
c709e9c659 suppression specificité staging 2017-04-12 11:32:28 +02:00
4 changed files with 104 additions and 136 deletions
Show Stats Expand all files Collapse all files

38
application/modules/default/controllers/ErrorController.php
View File

@ -49,31 +49,21 @@ class ErrorController extends Zend_Controller_Action
$user = new Scores_Utilisateur(); $user = new Scores_Utilisateur();
//Envoyer les erreurs par mail $message = '';
if (APPLICATION_ENV != 'development') { $message.= 'Erreur Applicative : ';
$message = ''; $message.= "\n";
$message.= 'Erreur Applicative : '; $message.= 'Message : '.$errors->exception->getMessage();
$message.= "\n"; $message.= "\n";
$message.= 'Message : '.$errors->exception->getMessage(); $message.= 'Utilisateur : '.$user->getLogin();
$message.= "\n"; $message.= "\n";
$message.= 'Utilisateur : '.$user->getLogin(); $message.= "File :".$errors->exception->getFile().", Ligne : ".$errors->exception->getLine();
$message.= "\n"; $message.= "\n";
$message.= "File :".$errors->exception->getFile().", Ligne : ".$errors->exception->getLine(); $message.= "Detail :\n".$errors->exception->getTraceAsString();
$message.= "\n"; $message.= "\n\n";
$message.= "Detail :\n".$errors->exception->getTraceAsString(); $message.= "Request Parameters :\n ".print_r($this->getRequest()->getParams(), true)."\n";
$message.= "\n\n"; $message.= "Referer : ".$_SERVER['HTTP_REFERER']."\n";
$message.= "Request Parameters :\n ".print_r($this->getRequest()->getParams(), true)."\n"; $this->logger->error($message);
$message.= "Referer : ".$_SERVER['HTTP_REFERER']."\n";
$c = Zend_Registry::get('config');
$mail = new Scores_Mail_Method();
$mail->setSubject('[ERREUR APPLICATIVE] - '.$c->profil->server->name.' -'.date('Ymd'));
$mail->setBodyText($message);
$mail->setFromKey('support');
$mail->addToKey('supportdev');
$mail->execute();
}
// Log exception, if logger available // Log exception, if logger available
if ($log = $this->getLog()) { if ($log = $this->getLog()) {
$log->crit($this->view->message, $errors->exception); $log->crit($this->view->message, $errors->exception);

154
application/modules/default/controllers/IdentiteController.php
View File

@ -365,10 +365,10 @@ class IdentiteController extends Zend_Controller_Action
$user = new Scores_Utilisateur(); $user = new Scores_Utilisateur();
//Pagination //Pagination
$request = $this->getRequest(); $request = $this->getRequest();
$page = $request->getParam('page', 1); $page = $request->getParam('page', 1);
if ( $page <= 0 ) $page = 1; if ( $page <= 0 ) $page = 1;
$nbAffichage = 50; $nbAffichage = 50;
$position = ($page - 1 ) * $nbAffichage; $position = ($page - 1 ) * $nbAffichage;
$ws = new WsScores(); $ws = new WsScores();
@ -391,26 +391,26 @@ class IdentiteController extends Zend_Controller_Action
} }
} }
//Calcul pagination //Calcul pagination
$nbReponses = count($infos->result->item); $nbReponses = count($infos->result->item);
$nbReponsesTotal = $infos->nbReponses; $nbReponsesTotal = $infos->nbReponses;
if ($nbReponses < $nbReponsesTotal) { if ($nbReponses < $nbReponsesTotal) {
$pageTotal = ceil( $nbReponsesTotal / $nbAffichage ); $pageTotal = ceil( $nbReponsesTotal / $nbAffichage );
$pageCurrent = $page; $pageCurrent = $page;
$pagePrev = $page - 1; $pagePrev = $page - 1;
if ($pagePrev < 1) { if ($pagePrev < 1) {
$pagePrev = 1; $pagePrev = 1;
} }
$pageNext = $page + 1; $pageNext = $page + 1;
if( $pageNext > $pageTotal ) { if( $pageNext > $pageTotal ) {
$pageNext = $pageTotal; $pageNext = $pageTotal;
} }
} else { } else {
$pageTotal = $pageCurrent = 1; $pageTotal = $pageCurrent = 1;
} }
$this->view->assign('PageTotal', $pageTotal); $this->view->assign('PageTotal', $pageTotal);
$this->view->assign('PagePrev', $pagePrev); $this->view->assign('PagePrev', $pagePrev);
$this->view->assign('PageNext', $pageNext); $this->view->assign('PageNext', $pageNext);
$this->view->assign('PageCurrent', $pageCurrent); $this->view->assign('PageCurrent', $pageCurrent);
$this->view->assign('nbEtabActif', $nbEtabActif); $this->view->assign('nbEtabActif', $nbEtabActif);
@ -699,7 +699,7 @@ class IdentiteController extends Zend_Controller_Action
$session = new Scores_Session_Entreprise($siren, null, true); $session = new Scores_Session_Entreprise($siren, null, true);
$this->view->assign('siren', $siren); $this->view->assign('siren', $siren);
$this->view->assign('siret', $session->getSiret()); $this->view->assign('siret', $session->getSiret());
$this->view->assign('isin', $session->getIsin()); $this->view->assign('isin', $session->getIsin());
$this->view->assign('surveillance', $user->checkPerm('survdirigeants')); $this->view->assign('surveillance', $user->checkPerm('survdirigeants'));
} }
@ -725,7 +725,7 @@ class IdentiteController extends Zend_Controller_Action
$this->view->assign('isin', $session->getIsin()); $this->view->assign('isin', $session->getIsin());
$this->view->assign('siren', $siren); $this->view->assign('siren', $siren);
$this->view->assign('siret', $this->siret); $this->view->assign('siret', $this->siret);
$this->view->assign('raisonSociale', $session->getRaisonSociale()); $this->view->assign('raisonSociale', $session->getRaisonSociale());
$this->view->assign('surveillance', $user->checkPerm('liens')); $this->view->assign('surveillance', $user->checkPerm('liens'));
//Check access to display group link //Check access to display group link
@ -748,18 +748,18 @@ class IdentiteController extends Zend_Controller_Action
$this->view->assign('PP', true); $this->view->assign('PP', true);
//@todo : using this function is strange - How to get the id before ? //@todo : using this function is strange - How to get the id before ?
$result = $ws->searchLienRef($siren, 'siren'); $result = $ws->searchLienRef($siren, 'siren');
if (count($result->item)>0) { if (count($result->item)>0) {
foreach ($result->item as $item) { foreach ($result->item as $item) {
$id = $item->id; $id = $item->id;
break; break;
} }
} }
$result = $ws->getLienRef($id); $result = $ws->getLienRef($id);
$this->view->assign('nom', $result->nom); $this->view->assign('nom', $result->nom);
$this->view->assign('prenom', $result->prenom); $this->view->assign('prenom', $result->prenom);
$this->view->assign('civilite', $result->civilite); $this->view->assign('civilite', $result->civilite);
$this->view->assign('naissanceDate', $result->naissance_Date); $this->view->assign('naissanceDate', $result->naissance_Date);
} }
@ -1233,55 +1233,49 @@ class IdentiteController extends Zend_Controller_Action
$this->_helper->layout()->disableLayout(); $this->_helper->layout()->disableLayout();
$this->_helper->viewRenderer->setNoRender(true); $this->_helper->viewRenderer->setNoRender(true);
// --- En environement de preprod, on envoi sur le site
if (APPLICATION_ENV == 'staging') {
$this->redirect('http://avis-situation-sirene.insee.fr/');
}
// --- Téléchargement du fichier et distribution // --- Téléchargement du fichier et distribution
else { $avis = new Scores_Insee_AvisSituation($this->siret);
$avis = new Scores_Insee_AvisSituation($this->siret); if ( !$avis->erreur() ) {
if ( !$avis->erreur() ) { $avis->erreurcpt('raz');
$avis->erreurcpt('raz'); $file = $avis->get();
$file = $avis->get(); if ($file === false) {
if ($file === false) { $avis->erreurcpt('plus');
$avis->erreurcpt('plus'); echo $avis->erreurmsg();
echo $avis->erreurmsg(); } else {
} else { // --- Envoi du fichier sur la sortie standard
// --- Envoi du fichier sur la sortie standard $content_type = 'application/pdf';
$content_type = 'application/pdf'; if ( file_exists($file) ) {
if ( file_exists($file) ) { $ws = new WsScores();
$ws = new WsScores(); $ws->setLog('avis_situation', $this->siret, 0, '');
$ws->setLog('avis_situation', $this->siret, 0, ''); $modules = array(); //apache_get_modules();
$modules = array(); //apache_get_modules(); if (in_array('mod_xsendfile', $modules)) {
if (in_array('mod_xsendfile', $modules)) { header ('X-Sendfile: ' . $file);
header ('X-Sendfile: ' . $file); header ('Content-Type: ' . $content_type);
header ('Content-Type: ' . $content_type); header ('Content-Disposition: attachment; filename="' . $content_type . '"');
header ('Content-Disposition: attachment; filename="' . $content_type . '"'); exit;
exit;
} else {
ini_set('zlib.output_compression', '0');
header('Content-Transfer-Encoding: none');
header('Content-Type: ' . $content_type.'');
header('Content-Length: ' . filesize($file));
header('Content-MD5: ' . base64_encode(md5_file($file)));
header('Content-Disposition: attachment; filename="' . basename($file) . '"');
header('Cache-Control: private, max-age=0, must-revalidate');
header('Pragma: public');
readfile($file);
exit;
}
} else { } else {
echo "Impossible de charger le fichier"; ini_set('zlib.output_compression', '0');
header('Content-Transfer-Encoding: none');
header('Content-Type: ' . $content_type.'');
header('Content-Length: ' . filesize($file));
header('Content-MD5: ' . base64_encode(md5_file($file)));
header('Content-Disposition: attachment; filename="' . basename($file) . '"');
header('Cache-Control: private, max-age=0, must-revalidate');
header('Pragma: public');
readfile($file);
exit;
} }
} else {
echo "Impossible de charger le fichier";
} }
} else { }
if ($avis->nberreur()==5){ } else {
$avis->mailerreur(); if ($avis->nberreur()==5){
} $avis->mailerreur();
$avis->erreurcpt('plus'); }
echo $avis->erreurmsg(); $avis->erreurcpt('plus');
} echo $avis->erreurmsg();
} }
} }
/** /**

38
library/Scores/Ws/Client.php
View File

@ -209,32 +209,22 @@ class Scores_Ws_Client extends Zend_Soap_Client
// --- Logging // --- Logging
if ( array_key_exists('log', $methodConfig) ) { if ( array_key_exists('log', $methodConfig) ) {
// --- Envoi email de contexte $message = '';
if( $methodConfig['log'] == 'mail' && in_array(APPLICATION_ENV, array('production', 'staging')) ) { $message.= 'Erreur SOAP - Code : '.$fault->faultcode.' - Message : '.$fault->faultstring;
$message = ''; $message.= ' - Utilisateur : '.$this->getHttpLogin();
$message.= 'Erreur SOAP - Code : '.$fault->faultcode.' - Message : '.$fault->faultstring; $message.= "\n\n";
$message.= ' - Utilisateur : '.$this->getHttpLogin(); $message.= "Method : ".$name.", File :".$fault->getFile().", Ligne : ".$fault->getLine();
$message.= "\n\n";
$message.= "Detail :\n".$fault->getTraceAsString();
$message.= "\n\n";
if ( $controller = Zend_Controller_Front::getInstance() ) {
$message.= "Request Parameters :\n ".print_r($controller->getRequest()->getParams(), true);
$message.= "\n\n"; $message.= "\n\n";
$message.= "Method : ".$name.", File :".$fault->getFile().", Ligne : ".$fault->getLine();
$message.= "\n\n";
$message.= "Detail :\n".$fault->getTraceAsString();
$message.= "\n\n";
if ( $controller = Zend_Controller_Front::getInstance() ) {
$message.= "Request Parameters :\n ".print_r($controller->getRequest()->getParams(), true);
$message.= "\n\n";
}
$message.= "Referer : ".$_SERVER['HTTP_REFERER']."\n\n";
$message.= "Requete :\n ".$requete."\n";
$message.= "Reponse :\n ".$reponse."\n";
$c = Zend_Registry::get('config');
$mail = new Scores_Mail_Method();
$mail->setSubject('[ERREUR SOAP] - '.$c->profil->server->name.' -'.date('Ymd'));
$mail->setBodyTextC($message);
$mail->setFromKey('contact');
$mail->addToKey('supportdev');
$mail->execute();
} }
$message.= "Referer : ".$_SERVER['HTTP_REFERER']."\n\n";
$message.= "Requete :\n ".$name."\n Arguments : ".$arguments."\n";
$message.= "Reponse :\n ".$response."\n";
$this->logger->error($message);
} }
return false; return false;

10
library/Scores/WsScores.php
View File

@ -750,7 +750,7 @@ class WsScores
$params = new stdClass(); $params = new stdClass();
$params->id = $id; $params->id = $id;
$params->type = $type; $params->type = $type;
$params->groupe = $groupes; $params->groupe = $groupe;
$client = $this->loadClient('saisie'); $client = $this->loadClient('saisie');
try { try {
$reponse = $client->getLienDoc($params); $reponse = $client->getLienDoc($params);
@ -3358,13 +3358,7 @@ class WsScores
if (APPLICATION_ENV == 'development' ) { if (APPLICATION_ENV == 'development' ) {
$this->logger->info('Erreur SOAP - Code : '.$fault->faultcode.' - Message : '.$fault->faultstring); $this->logger->info('Erreur SOAP - Code : '.$fault->faultcode.' - Message : '.$fault->faultstring);
} else { } else {
$c = Zend_Registry::get('config'); $this->logger->error($message);
$mail = new Scores_Mail_Method();
$mail->setSubject('[ERREUR SOAP] - '.$c->profil->server->name.' -'.date('Ymd'));
$mail->setBodyTextC($message);
$mail->setFromKey('support');
$mail->addToKey('supportdev');
$mail->execute();
} }
} }
} }