harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix und variable initialization.

Browse Source 
Fixed a wrong perm_is_allowed() parameter, commented some other places
where we use variables that are not set and should not work.
This commit is contained in:
Klaus Weidenbach
2015-03-21 19:12:43 +01:00
parent 590df06556
commit daed7fbead
2 changed files with 41 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/network.php
View File

@@ -32,8 +32,6 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) {
$ret = array('return_code' => 0, 'success' => false, 'header' => "", 'body' => "");
$a = get_app();
$ch = @curl_init($url);
if(($redirects > 8) || (! $ch))
return false;
@@ -71,7 +69,6 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) {
@curl_setopt($ch, CURLOPT_SSL_VERIFYPEER,
((x($opts,'novalidate') && intval($opts['novalidate'])) ? false : true));
$prx = get_config('system','proxy');
if(strlen($prx)) {
@curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1);
@@ -518,6 +515,7 @@ function allowed_email($email) {
function avatar_img($email) {
$avatar = array();
$a = get_app();
$avatar['size'] = 175;
@@ -527,10 +525,11 @@ function avatar_img($email) {
call_hooks('avatar_lookup', $avatar);
if(! $avatar['success'])
if (! $avatar['success'])
$avatar['url'] = $a->get_baseurl() . '/' . get_default_profile_photo();
logger('Avatar: ' . $avatar['email'] . ' ' . $avatar['url'], LOGGER_DEBUG);
return $avatar['url'];
}