From 9d6e05e4809713f843872b46f6b5570fef31bca9 Mon Sep 17 00:00:00 2001
From: systopia <endres@systopia.de>
Date: Fri, 27 Mar 2015 13:20:48 +0100
Subject: [PATCH] fixed certificate requirement

---
 proxy/file.php  |  6 ++++--
 proxy/proxy.php | 15 +++++++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/proxy/file.php b/proxy/file.php
index 9687807..ace0719 100644
--- a/proxy/file.php
+++ b/proxy/file.php
@@ -76,8 +76,10 @@ curl_setopt($curlSession, CURLOPT_URL, $url);
 curl_setopt($curlSession, CURLOPT_HEADER, 1);
 curl_setopt($curlSession, CURLOPT_RETURNTRANSFER,1);
 curl_setopt($curlSession, CURLOPT_TIMEOUT, 30);
-curl_setopt($curlSession, CURLOPT_SSL_VERIFYHOST, 0);
-curl_setopt($curlSession, CURLOPT_CAINFO, 'target.pem');
+curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 1);
+if (file_exists(dirname(__FILE__).'/target.pem')) {
+  curl_setopt($curlSession, CURLOPT_CAINFO, dirname(__FILE__).'/target.pem');
+}
 
 //Send the request and store the result in an array
 $response = curl_exec($curlSession);
diff --git a/proxy/proxy.php b/proxy/proxy.php
index 52b43f6..dbd5b06 100644
--- a/proxy/proxy.php
+++ b/proxy/proxy.php
@@ -48,8 +48,10 @@ function civiproxy_redirect($url_requested, $parameters) {
   curl_setopt($curlSession, CURLOPT_HEADER, 1);
   curl_setopt($curlSession, CURLOPT_RETURNTRANSFER,1);
   curl_setopt($curlSession, CURLOPT_TIMEOUT, 30);
-  curl_setopt($curlSession, CURLOPT_SSL_VERIFYHOST, 0);
-  curl_setopt($curlSession, CURLOPT_CAINFO, dirname(__FILE__).'/target.pem');
+  curl_setopt($curlSession, CURLOPT_SSL_VERIFYHOST, 1);
+  if (file_exists(dirname(__FILE__).'/target.pem')) {
+    curl_setopt($curlSession, CURLOPT_CAINFO, dirname(__FILE__).'/target.pem');
+  }
 
   //Send the request and store the result in an array
   $response = curl_exec($curlSession);  
@@ -226,10 +228,11 @@ function civicrm_api3($entity, $action, $data) {
   curl_setopt($curl, CURLOPT_POSTFIELDS,     $query);
   curl_setopt($curl, CURLOPT_URL,            $target_rest);
   curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
-  curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
-  curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false);
-  curl_setopt($curl, CURLOPT_SSLVERSION,     1);
-  curl_setopt($curl, CURLOPT_CAINFO, dirname(__FILE__).'/target.pem');
+  // curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 1);
+  curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 1);
+  if (file_exists(dirname(__FILE__).'/target.pem')) {
+    curl_setopt($curlSession, CURLOPT_CAINFO, dirname(__FILE__).'/target.pem');
+  }
 
   $response = curl_exec($curl);