From f234cfc7b80b96fdede02c5adf3d4ac48651428f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaussoin=20Timoth=C3=A9e?= Date: Mon, 24 Jun 2013 21:27:53 +0200 Subject: [PATCH] - Fix Routes when URL rewriting is disabled - Fix HTTPS BOSH in Admin --- app/widgets/Admin/Admin.php | 3 +++ system/Route.php | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/widgets/Admin/Admin.php b/app/widgets/Admin/Admin.php index 1e06ccdf0..b298a4a95 100644 --- a/app/widgets/Admin/Admin.php +++ b/app/widgets/Admin/Admin.php @@ -105,6 +105,9 @@ class Admin extends WidgetBase { curl_setopt($ch, CURLOPT_ENCODING, 'gzip,deflate'); curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); + curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0); + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0); + // Fire ! $rs = array(); diff --git a/system/Route.php b/system/Route.php index fa80babc4..d2aa219b4 100644 --- a/system/Route.php +++ b/system/Route.php @@ -24,11 +24,11 @@ class Route extends ControllerBase { 'server' => array('s'), ); - if($_SERVER['HTTP_MOD_REWRITE']) + if($_SERVER['HTTP_MOD_REWRITE']) { $q = $this->fetch_get('query'); - else + $this->find($q); + } else $q = $this->fetch_get('q'); - $this->find($q); } private function find($q) {