aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-11-13 14:58:58 -0800
committerfriendica <info@friendica.com>2012-11-13 14:58:58 -0800
commitb7ccf08ceac4d648f97f0f422e2e6457840a1af2 (patch)
tree3b73a10542b52393a22ad2061b973eb291c0fa99
parent35a6dd1cae384bc29b2d8ca5214eb82f15e955ad (diff)
downloadvolse-hubzilla-b7ccf08ceac4d648f97f0f422e2e6457840a1af2.tar.gz
volse-hubzilla-b7ccf08ceac4d648f97f0f422e2e6457840a1af2.tar.bz2
volse-hubzilla-b7ccf08ceac4d648f97f0f422e2e6457840a1af2.zip
self-signed cert? Since you won't listen to me and insist on annoying your friends, sorry, but red won't talk to you. This snake is dead.
-rw-r--r--done2
-rw-r--r--include/network.php12
-rw-r--r--mod/cb.php24
3 files changed, 6 insertions, 32 deletions
diff --git a/done b/done
index 507119589..2dbb63cfb 100644
--- a/done
+++ b/done
@@ -87,7 +87,7 @@ mod/
+ apps.php
+ attach.php
? auth.php
- cb.php
+- cb.php
common.php
community.php
contactgroup.php
diff --git a/include/network.php b/include/network.php
index b3da192a0..47fa1d939 100644
--- a/include/network.php
+++ b/include/network.php
@@ -202,7 +202,7 @@ function z_fetch_url($url,$binary = false, &$redirects = 0, $timeout = 0, $accep
}
@curl_setopt($ch, CURLOPT_RETURNTRANSFER,true);
- @curl_setopt($ch, CURLOPT_USERAGENT, "Mozilla/5.0 (compatible; Friendica)");
+ @curl_setopt($ch, CURLOPT_USERAGENT, "Mozilla/5.0 (compatible; Friendica Red)");
if(intval($timeout)) {
@@ -212,11 +212,8 @@ function z_fetch_url($url,$binary = false, &$redirects = 0, $timeout = 0, $accep
$curl_time = intval(get_config('system','curl_timeout'));
@curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== false) ? $curl_time : 60));
}
- // by default we will allow self-signed certs
- // but you can override this
- $check_cert = get_config('system','verifyssl');
- @curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false));
+ @curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
$prx = get_config('system','proxy');
if(strlen($prx)) {
@@ -310,8 +307,9 @@ function z_post_url($url,$params, $headers = null, &$redirects = 0, $timeout = 0
if($headers)
curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
- $check_cert = get_config('system','verifyssl');
- curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false));
+
+ curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
+
$prx = get_config('system','proxy');
if(strlen($prx)) {
curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1);
diff --git a/mod/cb.php b/mod/cb.php
deleted file mode 100644
index 6375d2398..000000000
--- a/mod/cb.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * General purpose landing page for plugins/addons
- */
-
-
-function cb_init(&$a) {
- call_hooks('cb_init');
-}
-
-function cb_post(&$a) {
- call_hooks('cb_post', $_POST);
-}
-
-function cb_afterpost(&$a) {
- call_hooks('cb_afterpost');
-}
-
-function cb_content(&$a) {
- $o = '';
- call_hooks('cb_content', $o);
- return $o;
-} \ No newline at end of file