Commit 7d6d34cd authored by Arnaud AUZOLAT's avatar Arnaud AUZOLAT

Merge branch '3.0' into 'master'

Correction des bugs sonarqube sur la 3.0

See merge request libriciel/pole-citoyens/web-GFC/webgfc!32
parents 48ef8742 364955d7
Pipeline #10270 failed with stages
......@@ -299,7 +299,6 @@ class DemarchessimplifieesController extends AppController {
'name' => '[DS] '.$datasDossier[$dossierId]['Objet'],
'objet' => $datasDossier[$dossierId]['Message'],
'user_creator_id' => CakeSession::read('Auth.User.id'),
'soustype_id' => !empty($soustypeId) ? $soustypeId : null,
'date' => date('Y-m-d'),
'datereception' => date( 'Y-m-d H:i:s', strtotime($dossierInfo->dossier->created_at)),
'reference' => $this->Courrier->genReferenceUnique(),
......
......@@ -232,7 +232,6 @@ class DirectmairiesController extends AppController {
'name' => '[DM] '.$issueInfo->category->label,
'objet' => $issueInfo->description,
'user_creator_id' => CakeSession::read('Auth.User.id'),
'soustype_id' => !empty($soustypeId) ? $soustypeId : null,
'date' => date('Y-m-d'),
'datereception' => date( 'Y-m-d H:i:s', strtotime($issueInfo->creationInstant)),
'reference' => $this->Courrier->genReferenceUnique(),
......@@ -281,8 +280,8 @@ class DirectmairiesController extends AppController {
}
}
if( isset($datas->pictures) && !empty($datas->pictures[0]->id) ) {
// $this->_genFileAssoc(file_get_contents($datas->pictures[0]->id) , $courrierId, $return); //TODO
if( isset($issueInfo->pictures) && !empty($issueInfo->pictures[0]->id) ) {
// $this->_genFileAssoc(file_get_contents($issueInfo->pictures[0]->id) , $courrierId, $return); //TODO
}
$this->Courrier->commit();
}
......
......@@ -2438,15 +2438,11 @@ class Courrier extends AppModel {
}
}
$signature_type = '';
if (empty($dossier['getdossier']['signatureformat']) || strpos($dossier['getdossier']['signatureformat'], 'PAdES') === false) {
// Sauvegarde des signatures (zip)
if (!empty($dossier['getdossier']['signature'])) {
$this->Document->saveField('signature', base64_decode($dossier['getdossier']['signature'], true));
}
$signature_type == 'PKCS#7';
} elseif (!empty($dossier['getdossier']['signatureformat']) && strpos($dossier['getdossier']['signatureformat'], 'PAdES') !== false) {
$signature_type='PAdES';
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment