From 9cbcdd28b94d8ef708b1e6670be5eb78f24d0cb7 Mon Sep 17 00:00:00 2001 From: afornerot Date: Tue, 29 Oct 2019 16:16:41 +0100 Subject: [PATCH] =?UTF-8?q?d=C3=A9claration=20du=20proxy=20en=20http=20et?= =?UTF-8?q?=20non=20plus=20en=20tcp=20(ref=20#29)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CoreBundle/Command/data/core-init-01.sql | 6 +++--- .../Resources/public/themes/transnum/look.png | Bin 27748 -> 27748 bytes .../public/themes/transnum/transnum-logo.png | Bin 27748 -> 27748 bytes .../Command/SynchroICSCommand.php | 2 +- .../Controller/PagewidgetController.php | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql index 932cd8e3..8abb1bc2 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql @@ -5,11 +5,11 @@ SET foreign_key_checks = 0; SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO'; INSERT IGNORE INTO `niveau01` (`id`, `label`, `siren`) VALUES -(-100, 'DRAAF', '130007107'); +(-100, 'Interne', 'SIREN'); INSERT IGNORE INTO `user` (`id`, `niveau01_id`, `username`, `firstname`, `lastname`, `password`, `email`, `avatar`, `role`,`siren`,`authlevel`) VALUES -(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}e8qvl9iAOSAmoVpq/NkxAa4QSpRdn+Z2 -', 'admin@ldapbundle.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', '130007107', 'simple'); +(-100, -100, 'admin', 'Administrateur', 'Cadoles', '{SSHA}mjxx1N7FQauOJjM/wcrdc9MuhhBffobd +', 'admin@eole27.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', 'SIREN', 'simple'); diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/look.png b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/look.png index 8a2d430c7349e448cb3dce035210887711a01432..f7da9c41bc628a1889b177c58dd1926eca596281 100644 GIT binary patch delta 23 fcmaEIgYn4?#tqj@Ib=EX7&cz!`Mvp`X`2}Ug>MR; delta 23 fcmaEIgYn4?#tqj@IRv=PwHRHvHg3LW+GYj-dVdK# diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/transnum-logo.png b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/transnum-logo.png index 8a2d430c7349e448cb3dce035210887711a01432..f7da9c41bc628a1889b177c58dd1926eca596281 100644 GIT binary patch delta 23 fcmaEIgYn4?#tqj@Ib=EX7&cz!`Mvp`X`2}Ug>MR; delta 23 fcmaEIgYn4?#tqj@IRv=PwHRHvHg3LW+GYj-dVdK# diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/SynchroICSCommand.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/SynchroICSCommand.php index 84c9cabf..a92e576b 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/SynchroICSCommand.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/SynchroICSCommand.php @@ -119,7 +119,7 @@ class CalFileParser { if(isset($options["proxy"])) { $aContext = array( 'http' => array( - 'proxy' => 'tcp://'.$options["proxy"], + 'proxy' => 'http://'.$options["proxy"], 'request_fulluri' => true, 'timeout' => 5 ), diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php index 193a8d4e..1a6f9aef 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php @@ -921,7 +921,7 @@ class PagewidgetController extends Controller if($PROXYactivate) { $PROXYserver = $em->getRepository("CadolesCoreBundle:Config")->find("PROXYserver")->getValue(); $PROXYport = $em->getRepository("CadolesCoreBundle:Config")->find("PROXYport")->getValue(); - $clientguzzle = new \GuzzleHttp\Client(array('timeout' => 3,'verify'=>false,'proxy' => ['http' => 'tcp://'.$PROXYserver.':'.$PROXYport,'https' => 'tcp://'.$PROXYserver.':'.$PROXYport])); + $clientguzzle = new \GuzzleHttp\Client(array('timeout' => 3,'verify'=>false,'proxy' => ['http' => 'http://'.$PROXYserver.':'.$PROXYport,'https' => 'http://'.$PROXYserver.':'.$PROXYport])); } else $clientguzzle = new \GuzzleHttp\Client(['timeout' => 3,'verify'=>false]); @@ -1126,7 +1126,7 @@ class PagewidgetController extends Controller if($PROXYactivate) { $PROXYserver = $em->getRepository("CadolesCoreBundle:Config")->find("PROXYserver")->getValue(); $PROXYport = $em->getRepository("CadolesCoreBundle:Config")->find("PROXYport")->getValue(); - $clientguzzle = new \GuzzleHttp\Client(array('timeout' => 3,'verify'=>false,'proxy' => ['http' => 'tcp://'.$PROXYserver.':'.$PROXYport,'https' => 'tcp://'.$PROXYserver.':'.$PROXYport])); + $clientguzzle = new \GuzzleHttp\Client(array('timeout' => 3,'verify'=>false,'proxy' => ['http' => 'http://'.$PROXYserver.':'.$PROXYport,'https' => 'http://'.$PROXYserver.':'.$PROXYport])); } else $clientguzzle = new \GuzzleHttp\Client(array('timeout' => 3,'verify'=>false));