From 6c32f2c2d78ed8feb400d6ce2b0dfd00fbeb9f4e Mon Sep 17 00:00:00 2001 From: dave Date: Sun, 5 Apr 2009 18:02:07 +0000 Subject: [PATCH] - Merge the last 2 commits into the users makeover branch --- admin/award_upload.php | 2 ++ admin/cwsfregister.php | 1 + 2 files changed, 3 insertions(+) diff --git a/admin/award_upload.php b/admin/award_upload.php index de6f7dc..cb9af2c 100644 --- a/admin/award_upload.php +++ b/admin/award_upload.php @@ -186,6 +186,7 @@ curl_setopt ($ch, CURLOPT_POSTFIELDSIZE, 0); curl_setopt ($ch, CURLOPT_TIMEOUT, 360); curl_setopt ($ch, CURLOPT_SSLVERSION, 3); + curl_setopt ($ch, CURLOPT_SSL_VERIFYPEER, false); $datastream = curl_exec ($ch); /// execute the curl session and return the output to a variable $datastream $datastream = str_replace(" standalone=\"yes\"","",$datastream); // echo "curl close
"; @@ -238,6 +239,7 @@ award_awards JOIN award_sources ON award_awards.award_sources_id=award_sources.id WHERE award_sources.enabled='yes' + AND award_awards.year={$config['FAIRYEAR']} ORDER BY award_sources.name, award_awards.name"); echo mysql_error(); echo ""; diff --git a/admin/cwsfregister.php b/admin/cwsfregister.php index b0a5260..f5660e6 100644 --- a/admin/cwsfregister.php +++ b/admin/cwsfregister.php @@ -147,6 +147,7 @@ include "xml.inc.php"; curl_setopt ($ch, CURLOPT_POSTFIELDSIZE, 0); curl_setopt ($ch, CURLOPT_TIMEOUT, 360); curl_setopt ($ch, CURLOPT_SSLVERSION, 3); + curl_setopt ($ch, CURLOPT_SSL_VERIFYPEER, false); $datastream = curl_exec ($ch); /// execute the curl session and return the output to a variable $datastream $datastream = str_replace(" standalone=\"yes\"","",$datastream); // echo "curl close
";