Cadoles
/
ninegate
18
0
Fork 0
Code Issues 29 Pull Requests Projects 1 Releases Wiki Activity

Merge branch 'master' into dist/envole/6/master

This commit is contained in:
Arnaud Fornerot 2020-01-08 15:27:07 +01:00
parent a97ba39dbd 8be086fe70
commit 61c8ad37fd
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dicos/90_ninegate.xml
View File

@ -581,7 +581,7 @@
<!-- AFFICHAGE EN FONCTION DU WIDGET BALDAO -->
<!-- AFFICHAGE EN FONCTION DU WIDGET BALADAO -->
<fill name='calc_multi_condition' target='ninegate_activate_widbalado'>
<param>oui</param>
<param type='eole' name='condition_1' hidden='False'>activer_balado</param>
@ -594,6 +594,7 @@
<param>non</param>
<target type='variable'>ninegate_widbalado_url</target>
<target type='variable'>ninegate_widbalado_syncenvole</target>
</condition>
<fill name='calc_multi_condition' target='ninegate_widbalado_url'>
@ -720,6 +721,7 @@
<param>non</param>
<target type='variable'>ninegate_widgepi_url</target>
<target type='variable'>ninegate_widgepi_syncenvole</target>
</condition>
<fill name='calc_multi_condition' target='ninegate_widgepi_url'>
@ -912,6 +914,7 @@
<param>non</param>
<target type='variable'>ninegate_widnextcloud_url</target>
<target type='variable'>ninegate_widnextcloud_syncenvole</target>
</condition>
<fill name='calc_multi_condition' target='ninegate_widnextcloud_url'>
@ -1070,6 +1073,7 @@
<param>non</param>
<target type='variable'>ninegate_widsacoche_url</target>
<target type='variable'>ninegate_widsacoche_syncenvole</target>
</condition>
<fill name='calc_multi_condition' target='ninegate_widsacoche_url'>

2
src/ninegate-1.0/src/Cadoles/CoreBundle/Command/OnlyCommand.php
View File

@ -131,7 +131,7 @@ class OnlyCommand extends Command
$this->writeln('== AUTHENTIFICATION =================================');
\Unirest\Request::verifyPeer(false);
\Unirest\Request::verifyHost(false);
\Unirest\Request::timeout(5);
\Unirest\Request::timeout(20);
$headers = ['Host' => $this->only_host, 'Accept' => 'application/json','Content-Type'=>'application/json','Retry-After'=>'5'];
$query = array('userName' => $this->only_user, 'password' => $this->only_password);
$body = \Unirest\Request\Body::json($query);

4
src/ninegate-1.0/src/Cadoles/CoreBundle/Service/onlyService.php
View File

@ -47,6 +47,9 @@ class onlyService
//==================================================================================================================================================================
public function syncUser(User $user) {
/* Pour l'instant ne sert plus en effet la synchro du côté only ne permet pas de modifier le mail d'une personne
Et une personne lié à une fiche ldap sur only on ne peut pas nom plus modifier nom et prénom
$this->mydebug("==SYNC ONLY USER==========================================================");
// Authentification à Only
@ -94,6 +97,7 @@ class onlyService
// Sinon création
// Ratacchement utilisateur group
*/
return true;
}