diff --git a/core/vendor/tinymce/link_list.json b/core/vendor/tinymce/link_list.json index 5f706e0b..41d6f312 100644 --- a/core/vendor/tinymce/link_list.json +++ b/core/vendor/tinymce/link_list.json @@ -1 +1 @@ -[{"title":"Accueil","value":"?accueil","menu":[{"title":"Enfant","value":"?enfant"},{"title":"Mise en page","value":"?mise-en-page"},{"title":"Menu lat\u00e9ral","value":"?menu-lateral"}]},{"title":"Priv\u00e9e","value":"?privee"},{"title":"Blog","value":"?blog"},{"title":"Galeries","value":"?galeries"},{"title":"Site de Zwii","value":"?site-de-zwii"},{"title":"Contact","value":"?contact"}] +[{"title":"Accueil","value":"?accueil","menu":[{"title":"Accueil","value":"?accueil"},{"title":" \u00bb Enfant","value":"?enfant"},{"title":" \u00bb Mise en page","value":"?mise-en-page"},{"title":" \u00bb Menu lat\u00e9ral","value":"?menu-lateral"}]},{"title":"Priv\u00e9e","value":"?privee"},{"title":"Blog","value":"?blog"},{"title":"Galeries","value":"?galeries"},{"title":"Site de Zwii","value":"?site-de-zwii"},{"title":"Contact","value":"?contact"}] \ No newline at end of file diff --git a/index.php b/index.php index 69858788..883ea33a 100755 --- a/index.php +++ b/index.php @@ -21,7 +21,29 @@ if(version_compare(PHP_VERSION, '5.6.0', '<')) { /* Set locale to French */ date_default_timezone_set('Europe/Paris'); -setlocale (LC_TIME, 'fr_FR', 'fra'); +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 @@ -30,4 +52,4 @@ session_start(); require 'core/core.php'; $core = new core; spl_autoload_register('core::autoload'); -echo $core->router(); \ No newline at end of file +echo $core->router();