From 28f0803101dfd34cdb2091bf823473145541f401 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Fri, 3 May 2019 22:48:18 +0200
Subject: [PATCH] =?UTF-8?q?[9.1.0]=20remise=20des=20ic=C3=B4nes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core.php |  4 ++--
 index.php     | 22 ----------------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/core/core.php b/core/core.php
index 8b8e78d8..3628923b 100644
--- a/core/core.php
+++ b/core/core.php
@@ -2291,7 +2291,7 @@ class layout extends common {
 			if($this->getUser('group') >= self::GROUP_ADMIN) {
 				$rightItems .= '<li><a href="' . helper::baseUrl() . 'user" data-tippy-content="Configurer les utilisateurs">' . template::ico('users') . '</a></li>';
 				$rightItems .= '<li><a href="' . helper::baseUrl() . 'theme" data-tippy-content="Personnaliser le thème">' . template::ico('brush') . '</a></li>';
-				$rightItems .= '<li><a href="' . helper::baseUrl() . 'config" data-tippy-content="Configurer le site">' . template::ico('gear') . '</a></li>';
+				$rightItems .= '<li><a href="' . helper::baseUrl() . 'config" data-tippy-content="Configurer le site">' . template::ico('cog-alt') . '</a></li>';
 				// Mise à jour automatique
 				 if(helper::checkNewVersion() ) {
 				  $rightItems .= '<li><a id="barUpdate" href="' . helper::baseUrl() . 'install/update" data-tippy-content="Mettre à jour Zwii '. common::ZWII_VERSION .' vers '. helper::getOnlineVersion() .'">' . template::ico('update colorRed') . '</a></li>';
@@ -2673,7 +2673,7 @@ class template {
 				%s
 				data-lity
 			>
-				' . self::ico('download', 'right') . '
+				' . self::ico('upload', 'right') . '
 				<span class="inputFileLabel"></span>
 			</a>',
 			$attributes['class'],
diff --git a/index.php b/index.php
index 883ea33a..f4329f70 100755
--- a/index.php
+++ b/index.php
@@ -23,28 +23,6 @@ if(version_compare(PHP_VERSION, '5.6.0', '<')) {
 date_default_timezone_set('Europe/Paris');
 setlocale (LC_TIME, 'fra_fra', 'french');
 
-
-/*Configuration Proxy */
-$proxy = 'cache-etu.univ-artois.fr:3128';
-if (!empty($proxy)) {
-    $proxy = str_replace('http://', 'tcp://', $proxy);
-    $context = array(
-        'http' => array(
-            'proxy' => $proxy,
-            'request_fulluri' => true,
-            'verify_peer'      => false,
-            'verify_peer_name' => false,
-        ),
-        "ssl"=>array(
-        "verify_peer"=>false,
-        "verify_peer_name"=>false
-        )
-    );
-    stream_context_set_default($context);
-} else {
-    echo "Proxy not found" . PHP_EOL;
-}
-
 /**
  * Initialisation de Zwii
  */