From 2ef3251293be71772ad1ecdfe8458b63b77b9a9d Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Tue, 4 Apr 2017 19:47:45 +0200
Subject: [PATCH 1/3] added spaces + some curly braces + some usage of
dbm::is_result()
Signed-off-by: Roland Haeder <roland@mxchange.org>
---
include/identity.php | 100 +++++++++++++++++++++++--------------------
1 file changed, 53 insertions(+), 47 deletions(-)
diff --git a/include/identity.php b/include/identity.php
index 1fea5b25d..d0a670abb 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -3,10 +3,10 @@
* @file include/identity.php
*/
-require_once('include/ForumManager.php');
-require_once('include/bbcode.php');
-require_once("mod/proxy.php");
-require_once('include/cache.php');
+require_once 'include/ForumManager.php';
+require_once 'include/bbcode.php';
+require_once 'mod/proxy.php';
+require_once 'include/cache.php';
/**
*
@@ -83,9 +83,9 @@ function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) {
$a->set_template_engine(); // reset the template engine to the default in case the user's theme doesn't specify one
- $theme_info_file = "view/theme/".current_theme()."/theme.php";
- if (file_exists($theme_info_file)){
- require_once($theme_info_file);
+ $theme_info_file = "view/theme/" . current_theme() . "/theme.php";
+ if (file_exists($theme_info_file)) {
+ require_once $theme_info_file;
}
if (! (x($a->page,'aside')))
@@ -370,7 +370,7 @@ function profile_sidebar($profile, $block = 0) {
else
$diaspora = false;
- if (!$block){
+ if (!$block) {
$contact_block = contact_block();
if (is_array($a->profile) AND !$a->profile['hide-friends']) {
@@ -535,13 +535,13 @@ function get_birthdays() {
function get_events() {
- require_once('include/bbcode.php');
+ require_once 'include/bbcode.php';
$a = get_app();
- if (! local_user() || $a->is_mobile || $a->is_tablet)
+ if (! local_user() || $a->is_mobile || $a->is_tablet) {
return $o;
-
+ }
// $mobile_detect = new Mobile_Detect();
// $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
@@ -564,12 +564,14 @@ function get_events() {
$now = strtotime('now');
$istoday = false;
foreach ($r as $rr) {
- if (strlen($rr['name']))
+ if (strlen($rr['name'])) {
$total ++;
+ }
$strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start'],'Y-m-d');
- if ($strt === datetime_convert('UTC',$a->timezone,'now','Y-m-d'))
+ if ($strt === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) {
$istoday = true;
+ }
}
$classtoday = (($istoday) ? 'event-today' : '');
@@ -578,12 +580,14 @@ function get_events() {
foreach ($r as &$rr) {
$title = strip_tags(html_entity_decode(bbcode($rr['summary']),ENT_QUOTES,'UTF-8'));
- if (strlen($title) > 35)
+ if (strlen($title) > 35) {
$title = substr($title,0,32) . '... ';
+ }
$description = substr(strip_tags(bbcode($rr['desc'])),0,32) . '... ';
- if (! $description)
+ if (! $description) {
$description = t('[No description]');
+ }
$strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start']);
@@ -630,7 +634,9 @@ function advanced_profile(App $a) {
$profile['fullname'] = array( t('Full Name:'), $a->profile['name'] ) ;
- if ($a->profile['gender']) $profile['gender'] = array( t('Gender:'), $a->profile['gender'] );
+ if ($a->profile['gender']) {
+ $profile['gender'] = array( t('Gender:'), $a->profile['gender'] );
+ }
if (($a->profile['dob']) && ($a->profile['dob'] > '0001-01-01')) {
$year_bd_format = t('j F, Y');
@@ -645,10 +651,13 @@ function advanced_profile(App $a) {
}
- if ($age = age($a->profile['dob'],$a->profile['timezone'],'')) $profile['age'] = array( t('Age:'), $age );
+ if ($age = age($a->profile['dob'],$a->profile['timezone'],'')) {
+ $profile['age'] = array( t('Age:'), $age );
+ }
-
- if ($a->profile['marital']) $profile['marital'] = array( t('Status:'), $a->profile['marital']);
+ if ($a->profile['marital']) {
+ $profile['marital'] = array( t('Status:'), $a->profile['marital']);
+ }
/// @TODO Maybe use x() here, plus below?
if ($a->profile['with']) {
@@ -751,7 +760,7 @@ function advanced_profile(App $a) {
return '';
}
-function profile_tabs($a, $is_owner=False, $nickname=Null){
+function profile_tabs($a, $is_owner=False, $nickname=Null) {
//echo "<pre>"; var_dump($a->user); killme();
if (is_null($nickname)) {
@@ -768,7 +777,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
array(
'label'=>t('Status'),
'url' => $url,
- 'sel' => ((!isset($tab) && $a->argv[0]=='profile')?'active':''),
+ 'sel' => ((!isset($tab) && $a->argv[0]=='profile') ? 'active' : ''),
'title' => t('Status Messages and Posts'),
'id' => 'status-tab',
'accesskey' => 'm',
@@ -776,7 +785,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
array(
'label' => t('Profile'),
'url' => $url.'/?tab=profile',
- 'sel' => ((isset($tab) && $tab=='profile')?'active':''),
+ 'sel' => ((isset($tab) && $tab=='profile') ? 'active' : ''),
'title' => t('Profile Details'),
'id' => 'profile-tab',
'accesskey' => 'r',
@@ -784,7 +793,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
array(
'label' => t('Photos'),
'url' => App::get_baseurl() . '/photos/' . $nickname,
- 'sel' => ((!isset($tab) && $a->argv[0]=='photos')?'active':''),
+ 'sel' => ((!isset($tab) && $a->argv[0]=='photos') ? 'active' : ''),
'title' => t('Photo Albums'),
'id' => 'photo-tab',
'accesskey' => 'h',
@@ -792,7 +801,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
array(
'label' => t('Videos'),
'url' => App::get_baseurl() . '/videos/' . $nickname,
- 'sel' => ((!isset($tab) && $a->argv[0]=='videos')?'active':''),
+ 'sel' => ((!isset($tab) && $a->argv[0]=='videos') ? 'active' : ''),
'title' => t('Videos'),
'id' => 'video-tab',
'accesskey' => 'v',
@@ -804,7 +813,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
$tabs[] = array(
'label' => t('Events'),
'url' => App::get_baseurl() . '/events',
- 'sel' =>((!isset($tab) && $a->argv[0]=='events')?'active':''),
+ 'sel' =>((!isset($tab) && $a->argv[0]=='events') ? 'active' : ''),
'title' => t('Events and Calendar'),
'id' => 'events-tab',
'accesskey' => 'e',
@@ -815,18 +824,18 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
$tabs[] = array(
'label' => t('Events'),
'url' => App::get_baseurl() . '/cal/' . $nickname,
- 'sel' =>((!isset($tab) && $a->argv[0]=='cal')?'active':''),
+ 'sel' =>((!isset($tab) && $a->argv[0]=='cal') ? 'active' : ''),
'title' => t('Events and Calendar'),
'id' => 'events-tab',
'accesskey' => 'e',
);
}
- if ($is_owner){
+ if ($is_owner) {
$tabs[] = array(
'label' => t('Personal Notes'),
'url' => App::get_baseurl() . '/notes',
- 'sel' =>((!isset($tab) && $a->argv[0]=='notes')?'active':''),
+ 'sel' =>((!isset($tab) && $a->argv[0]=='notes') ? 'active' : ''),
'title' => t('Only You Can See This'),
'id' => 'notes-tab',
'accesskey' => 't',
@@ -837,7 +846,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
$tabs[] = array(
'label' => t('Contacts'),
'url' => App::get_baseurl() . '/viewcontacts/' . $nickname,
- 'sel' => ((!isset($tab) && $a->argv[0]=='viewcontacts')?'active':''),
+ 'sel' => ((!isset($tab) && $a->argv[0]=='viewcontacts') ? 'active' : ''),
'title' => t('Contacts'),
'id' => 'viewcontacts-tab',
'accesskey' => 'k',
@@ -853,8 +862,9 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
}
function get_my_url() {
- if (x($_SESSION,'my_url'))
+ if (x($_SESSION, 'my_url')) {
return $_SESSION['my_url'];
+ }
return false;
}
@@ -866,33 +876,31 @@ function zrl_init(App $a) {
// The check fetches the cached value from gprobe to reduce the load for this system
$urlparts = parse_url($tmp_str);
- $result = Cache::get("gprobe:".$urlparts["host"]);
- if (!is_null($result)) {
- if (in_array($result["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) {
- logger("DDoS attempt detected for ".$urlparts["host"]." by ".$_SERVER["REMOTE_ADDR"].". server data: ".print_r($_SERVER, true), LOGGER_DEBUG);
- return;
- }
+ $result = Cache::get("gprobe:" . $urlparts["host"]);
+ if (!is_null($result)) && (in_array($result["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) {
+ logger("DDoS attempt detected for " . $urlparts["host"] . " by " . $_SERVER["REMOTE_ADDR"] . ". server data: " . print_r($_SERVER, true), LOGGER_DEBUG);
+ return;
}
- proc_run(PRIORITY_LOW, 'include/gprobe.php',bin2hex($tmp_str));
+ proc_run(PRIORITY_LOW, 'include/gprobe.php', bin2hex($tmp_str));
$arr = array('zrl' => $tmp_str, 'url' => $a->cmd);
- call_hooks('zrl_init',$arr);
+ call_hooks('zrl_init', $arr);
}
}
-function zrl($s,$force = false) {
+function zrl($s, $force = false) {
if (! strlen($s)) {
return $s;
}
- if ((! strpos($s,'/profile/')) && (! $force)) {
+ if ((! strpos($s, '/profile/')) && (! $force)) {
return $s;
}
- if ($force && substr($s,-1,1) !== '/') {
+ if ($force && substr($s, -1, 1) !== '/') {
$s = $s . '/';
}
- $achar = strpos($s,'?') ? '&' : '?';
+ $achar = strpos($s, '?') ? '&' : '?';
$mine = get_my_url();
- if ($mine and ! link_compare($mine,$s)) {
+ if ($mine && ! link_compare($mine, $s)) {
return $s . $achar . 'zrl=' . urlencode($mine);
}
return $s;
@@ -914,10 +922,8 @@ function zrl($s,$force = false) {
*/
function get_theme_uid() {
$uid = (($_REQUEST['puid']) ? intval($_REQUEST['puid']) : 0);
- if (local_user()) {
- if ((get_pconfig(local_user(),'system','always_my_theme')) || (! $uid)) {
- return local_user();
- }
+ if ((local_user()) && ((get_pconfig(local_user(),'system','always_my_theme')) || (! $uid))) {
+ return local_user();
}
return $uid;
From 1dc4b60a5ac4a12288627bc65cda941164c12059 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Tue, 4 Apr 2017 19:48:03 +0200
Subject: [PATCH 2/3] added spaces + some curly braces + some usage of
dbm::is_result()
Signed-off-by: Roland Haeder <roland@mxchange.org>
---
include/lock.php | 25 ++++++------
include/message.php | 14 +++----
include/msgclean.php | 2 +-
include/nav.php | 4 +-
include/network.php | 97 ++++++++++++++++++++++----------------------
include/oauth.php | 2 +-
include/oembed.php | 6 ++-
include/onepoll.php | 19 +++++----
include/ostatus.php | 35 ++++++++++------
9 files changed, 111 insertions(+), 93 deletions(-)
diff --git a/include/lock.php b/include/lock.php
index a48b0ad34..64f6319ef 100644
--- a/include/lock.php
+++ b/include/lock.php
@@ -2,9 +2,9 @@
// Provide some ability to lock a PHP function so that multiple processes
// can't run the function concurrently
-if(! function_exists('lock_function')) {
+if (! function_exists('lock_function')) {
function lock_function($fn_name, $block = true, $wait_sec = 2, $timeout = 30) {
- if( $wait_sec == 0 )
+ if ( $wait_sec == 0 )
$wait_sec = 2; // don't let the user pick a value that's likely to crash the system
$got_lock = false;
@@ -16,7 +16,7 @@ function lock_function($fn_name, $block = true, $wait_sec = 2, $timeout = 30) {
dbesc($fn_name)
);
- if((dbm::is_result($r)) AND (!$r[0]['locked'] OR (strtotime($r[0]['created']) < time() - 3600))) {
+ if ((dbm::is_result($r)) AND (!$r[0]['locked'] OR (strtotime($r[0]['created']) < time() - 3600))) {
q("UPDATE `locks` SET `locked` = 1, `created` = '%s' WHERE `name` = '%s'",
dbesc(datetime_convert()),
dbesc($fn_name)
@@ -34,10 +34,10 @@ function lock_function($fn_name, $block = true, $wait_sec = 2, $timeout = 30) {
q("UNLOCK TABLES");
- if(($block) && (! $got_lock))
+ if (($block) && (! $got_lock))
sleep($wait_sec);
- } while(($block) && (! $got_lock) && ((time() - $start) < $timeout));
+ } while (($block) && (! $got_lock) && ((time() - $start) < $timeout));
logger('lock_function: function ' . $fn_name . ' with blocking = ' . $block . ' got_lock = ' . $got_lock . ' time = ' . (time() - $start), LOGGER_DEBUG);
@@ -45,28 +45,29 @@ function lock_function($fn_name, $block = true, $wait_sec = 2, $timeout = 30) {
}}
-if(! function_exists('block_on_function_lock')) {
+if (! function_exists('block_on_function_lock')) {
function block_on_function_lock($fn_name, $wait_sec = 2, $timeout = 30) {
- if( $wait_sec == 0 )
+ if ( $wait_sec == 0 )
$wait_sec = 2; // don't let the user pick a value that's likely to crash the system
$start = time();
do {
$r = q("SELECT locked FROM locks WHERE name = '%s' LIMIT 1",
- dbesc($fn_name)
- );
+ dbesc($fn_name)
+ );
- if (dbm::is_result($r) && $r[0]['locked'])
+ if (dbm::is_result($r) && $r[0]['locked']) {
sleep($wait_sec);
+ }
- } while(dbm::is_result($r) && $r[0]['locked'] && ((time() - $start) < $timeout));
+ } while (dbm::is_result($r) && $r[0]['locked'] && ((time() - $start) < $timeout));
return;
}}
-if(! function_exists('unlock_function')) {
+if (! function_exists('unlock_function')) {
function unlock_function($fn_name) {
$r = q("UPDATE `locks` SET `locked` = 0, `created` = '%s' WHERE `name` = '%s'",
dbesc(NULL_DATE),
diff --git a/include/message.php b/include/message.php
index 3d5d4d33a..b94190ca0 100644
--- a/include/message.php
+++ b/include/message.php
@@ -9,9 +9,9 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
$a = get_app();
- if(! $recipient) return -1;
+ if (! $recipient) return -1;
- if(! strlen($subject))
+ if (! strlen($subject))
$subject = t('[no subject]');
$me = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
@@ -22,7 +22,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
intval(local_user())
);
- if(! (count($me) && (count($contact)))) {
+ if (! (count($me) && (count($contact)))) {
return -2;
}
@@ -34,7 +34,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
// look for any existing conversation structure
- if(strlen($replyto)) {
+ if (strlen($replyto)) {
$reply = true;
$r = q("select convid from mail where uid = %d and ( uri = '%s' or `parent-uri` = '%s' ) limit 1",
intval(local_user()),
@@ -45,7 +45,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
$convid = $r[0]['convid'];
}
- if(! $convid) {
+ if (! $convid) {
// create a new conversation
@@ -78,12 +78,12 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
$convid = $r[0]['id'];
}
- if(! $convid) {
+ if (! $convid) {
logger('send message: conversation not found.');
return -4;
}
- if(! strlen($replyto)) {
+ if (! strlen($replyto)) {
$replyto = $convuri;
}
diff --git a/include/msgclean.php b/include/msgclean.php
index 3b5ed5487..de7dacca2 100644
--- a/include/msgclean.php
+++ b/include/msgclean.php
@@ -154,7 +154,7 @@ function removelinebreak($message)
$lines = array();
$lineno = 0;
- foreach($arrbody as $i => $line) {
+ foreach ($arrbody as $i => $line) {
$currquotelevel = 0;
$currline = $line;
while ((strlen($currline)>0) and ((substr($currline, 0, 1) == '>')
diff --git a/include/nav.php b/include/nav.php
index fe4c50818..b184f1180 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -8,7 +8,7 @@ function nav(App $a) {
*
*/
- if(!(x($a->page,'nav')))
+ if (!(x($a->page,'nav')))
$a->page['nav'] = '';
$a->page['htmlhead'] .= replace_macros(get_markup_template('nav_head.tpl'), array());
@@ -136,7 +136,7 @@ function nav_info(App $a)
if (strlen(get_config('system', 'singleuser'))) {
$gdir = get_config('system', 'directory');
- if(strlen($gdir)) {
+ if (strlen($gdir)) {
$gdirpath = zrl($gdir, true);
}
} elseif (get_config('system', 'community_page_style') == CP_USERS_ON_SERVER) {
diff --git a/include/network.php b/include/network.php
index f9d35c52c..033f7e62d 100644
--- a/include/network.php
+++ b/include/network.php
@@ -72,13 +72,13 @@ function z_fetch_url($url,$binary = false, &$redirects = 0, $opts=array()) {
$a = get_app();
$ch = @curl_init($url);
- if(($redirects > 8) || (! $ch)) {
+ if (($redirects > 8) || (! $ch)) {
return $ret;
}
@curl_setopt($ch, CURLOPT_HEADER, true);
- if(x($opts,"cookiejar")) {
+ if (x($opts,"cookiejar")) {
curl_setopt($ch, CURLOPT_COOKIEJAR, $opts["cookiejar"]);
curl_setopt($ch, CURLOPT_COOKIEFILE, $opts["cookiejar"]);
}
@@ -101,13 +101,13 @@ function z_fetch_url($url,$binary = false, &$redirects = 0, $opts=array()) {
@curl_setopt($ch, CURLOPT_RANGE, '0-'.$range);
}
- if(x($opts,'headers')){
+ if (x($opts,'headers')){
@curl_setopt($ch, CURLOPT_HTTPHEADER, $opts['headers']);
}
- if(x($opts,'nobody')){
+ if (x($opts,'nobody')){
@curl_setopt($ch, CURLOPT_NOBODY, $opts['nobody']);
}
- if(x($opts,'timeout')){
+ if (x($opts,'timeout')){
@curl_setopt($ch, CURLOPT_TIMEOUT, $opts['timeout']);
} else {
$curl_time = intval(get_config('system','curl_timeout'));
@@ -124,14 +124,14 @@ function z_fetch_url($url,$binary = false, &$redirects = 0, $opts=array()) {
}
$prx = get_config('system','proxy');
- if(strlen($prx)) {
+ if (strlen($prx)) {
@curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1);
@curl_setopt($ch, CURLOPT_PROXY, $prx);
$prxusr = @get_config('system','proxyuser');
- if(strlen($prxusr))
+ if (strlen($prxusr))
@curl_setopt($ch, CURLOPT_PROXYUSERPWD, $prxusr);
}
- if($binary)
+ if ($binary)
@curl_setopt($ch, CURLOPT_BINARYTRANSFER,1);
$a->set_curl_code(0);
@@ -156,7 +156,7 @@ function z_fetch_url($url,$binary = false, &$redirects = 0, $opts=array()) {
// Pull out multiple headers, e.g. proxy and continuation headers
// allow for HTTP/2.x without fixing code
- while(preg_match('/^HTTP\/[1-2].+? [1-5][0-9][0-9]/',$base)) {
+ while (preg_match('/^HTTP\/[1-2].+? [1-5][0-9][0-9]/',$base)) {
$chunk = substr($base,0,strpos($base,"\r\n\r\n")+4);
$header .= $chunk;
$base = substr($base,strlen($chunk));
@@ -166,7 +166,7 @@ function z_fetch_url($url,$binary = false, &$redirects = 0, $opts=array()) {
$a->set_curl_content_type($curl_info['content_type']);
$a->set_curl_headers($header);
- if($http_code == 301 || $http_code == 302 || $http_code == 303 || $http_code == 307) {
+ if ($http_code == 301 || $http_code == 302 || $http_code == 303 || $http_code == 307) {
$new_location_info = @parse_url($curl_info["redirect_url"]);
$old_location_info = @parse_url($curl_info["url"]);
@@ -179,7 +179,7 @@ function z_fetch_url($url,$binary = false, &$redirects = 0, $opts=array()) {
if (preg_match('/(Location:|URI:)(.*?)\n/i', $header, $matches)) {
$newurl = trim(array_pop($matches));
}
- if(strpos($newurl,'/') === 0)
+ if (strpos($newurl,'/') === 0)
$newurl = $old_location_info["scheme"]."://".$old_location_info["host"].$newurl;
if (filter_var($newurl, FILTER_VALIDATE_URL)) {
$redirects++;
@@ -200,7 +200,7 @@ function z_fetch_url($url,$binary = false, &$redirects = 0, $opts=array()) {
$ret['return_code'] = $rc;
$ret['success'] = (($rc >= 200 && $rc <= 299) ? true : false);
$ret['redirect_url'] = $url;
- if(! $ret['success']) {
+ if (! $ret['success']) {
$ret['error'] = curl_error($ch);
$ret['debug'] = $curl_info;
logger('z_fetch_url: error: ' . $url . ': ' . $ret['error'], LOGGER_DEBUG);
@@ -208,7 +208,7 @@ function z_fetch_url($url,$binary = false, &$redirects = 0, $opts=array()) {
}
$ret['body'] = substr($s,strlen($header));
$ret['header'] = $header;
- if(x($opts,'debug')) {
+ if (x($opts,'debug')) {
$ret['debug'] = $curl_info;
}
@curl_close($ch);
@@ -237,7 +237,7 @@ function post_url($url,$params, $headers = null, &$redirects = 0, $timeout = 0)
$a = get_app();
$ch = curl_init($url);
- if(($redirects > 8) || (! $ch))
+ if (($redirects > 8) || (! $ch))
return false;
logger("post_url: start ".$url, LOGGER_DATA);
@@ -248,7 +248,7 @@ function post_url($url,$params, $headers = null, &$redirects = 0, $timeout = 0)
curl_setopt($ch, CURLOPT_POSTFIELDS,$params);
curl_setopt($ch, CURLOPT_USERAGENT, $a->get_useragent());
- if(intval($timeout)) {
+ if (intval($timeout)) {
curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
}
else {
@@ -256,16 +256,16 @@ function post_url($url,$params, $headers = null, &$redirects = 0, $timeout = 0)
curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== false) ? $curl_time : 60));
}
- if(defined('LIGHTTPD')) {
- if(!is_array($headers)) {
+ if (defined('LIGHTTPD')) {
+ if (!is_array($headers)) {
$headers = array('Expect:');
} else {
- if(!in_array('Expect:', $headers)) {
+ if (!in_array('Expect:', $headers)) {
array_push($headers, 'Expect:');
}
}
}
- if($headers)
+ if ($headers)
curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
$check_cert = get_config('system','verifyssl');
@@ -274,11 +274,11 @@ function post_url($url,$params, $headers = null, &$redirects = 0, $timeout = 0)
@curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
}
$prx = get_config('system','proxy');
- if(strlen($prx)) {
+ if (strlen($prx)) {
curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1);
curl_setopt($ch, CURLOPT_PROXY, $prx);
$prxusr = get_config('system','proxyuser');
- if(strlen($prxusr))
+ if (strlen($prxusr))
curl_setopt($ch, CURLOPT_PROXYUSERPWD, $prxusr);
}
@@ -300,17 +300,17 @@ function post_url($url,$params, $headers = null, &$redirects = 0, $timeout = 0)
// Pull out multiple headers, e.g. proxy and continuation headers
// allow for HTTP/2.x without fixing code
- while(preg_match('/^HTTP\/[1-2].+? [1-5][0-9][0-9]/',$base)) {
+ while (preg_match('/^HTTP\/[1-2].+? [1-5][0-9][0-9]/',$base)) {
$chunk = substr($base,0,strpos($base,"\r\n\r\n")+4);
$header .= $chunk;
$base = substr($base,strlen($chunk));
}
- if($http_code == 301 || $http_code == 302 || $http_code == 303 || $http_code == 307) {
+ if ($http_code == 301 || $http_code == 302 || $http_code == 303 || $http_code == 307) {
$matches = array();
preg_match('/(Location:|URI:)(.*?)\n/', $header, $matches);
$newurl = trim(array_pop($matches));
- if(strpos($newurl,'/') === 0)
+ if (strpos($newurl,'/') === 0)
$newurl = $old_location_info["scheme"] . "://" . $old_location_info["host"] . $newurl;
if (filter_var($newurl, FILTER_VALIDATE_URL)) {
$redirects++;
@@ -341,7 +341,7 @@ function xml_status($st, $message = '') {
$xml_message = ((strlen($message)) ? "\t<message>" . xmlify($message) . "</message>\r\n" : '');
- if($st)
+ if ($st)
logger('xml_status returning non_zero: ' . $st . " message=" . $message);
header( "Content-type: text/xml" );
@@ -369,12 +369,12 @@ function xml_status($st, $message = '') {
*/
function http_status_exit($val, $description = array()) {
$err = '';
- if($val >= 400) {
+ if ($val >= 400) {
$err = 'Error';
if (!isset($description["title"]))
$description["title"] = $err." ".$val;
}
- if($val >= 200 && $val < 300)
+ if ($val >= 200 && $val < 300)
$err = 'OK';
logger('http_status_exit ' . $val);
@@ -400,20 +400,20 @@ function http_status_exit($val, $description = array()) {
* @return boolean True if it's a valid URL, fals if something wrong with it
*/
function validate_url(&$url) {
- if(get_config('system','disable_url_validation'))
+ if (get_config('system','disable_url_validation'))
return true;
// no naked subdomains (allow localhost for tests)
- if(strpos($url,'.') === false && strpos($url,'/localhost/') === false)
+ if (strpos($url,'.') === false && strpos($url,'/localhost/') === false)
return false;
- if(substr($url,0,4) != 'http')
+ if (substr($url,0,4) != 'http')
$url = 'http://' . $url;
/// @TODO Really supress function outcomes? Why not find them + debug them?
$h = @parse_url($url);
- if((is_array($h)) && (dns_get_record($h['host'], DNS_A + DNS_CNAME + DNS_PTR) || filter_var($h['host'], FILTER_VALIDATE_IP) )) {
+ if ((is_array($h)) && (dns_get_record($h['host'], DNS_A + DNS_CNAME + DNS_PTR) || filter_var($h['host'], FILTER_VALIDATE_IP) )) {
return true;
}
@@ -428,14 +428,14 @@ function validate_url(&$url) {
*/
function validate_email($addr) {
- if(get_config('system','disable_email_validation'))
+ if (get_config('system','disable_email_validation'))
return true;
- if(! strpos($addr,'@'))
+ if (! strpos($addr,'@'))
return false;
$h = substr($addr,strpos($addr,'@') + 1);
- if(($h) && (dns_get_record($h, DNS_A + DNS_CNAME + DNS_PTR + DNS_MX) || filter_var($h, FILTER_VALIDATE_IP) )) {
+ if (($h) && (dns_get_record($h, DNS_A + DNS_CNAME + DNS_PTR + DNS_MX) || filter_var($h, FILTER_VALIDATE_IP) )) {
return true;
}
return false;
@@ -454,12 +454,12 @@ function allowed_url($url) {
$h = @parse_url($url);
- if(! $h) {
+ if (! $h) {
return false;
}
$str_allowed = get_config('system','allowed_sites');
- if(! $str_allowed)
+ if (! $str_allowed)
return true;
$found = false;
@@ -468,16 +468,16 @@ function allowed_url($url) {
// always allow our own site
- if($host == strtolower($_SERVER['SERVER_NAME']))
+ if ($host == strtolower($_SERVER['SERVER_NAME']))
return true;
$fnmatch = function_exists('fnmatch');
$allowed = explode(',',$str_allowed);
- if(count($allowed)) {
- foreach($allowed as $a) {
+ if (count($allowed)) {
+ foreach ($allowed as $a) {
$pat = strtolower(trim($a));
- if(($fnmatch && fnmatch($pat,$host)) || ($pat == $host)) {
+ if (($fnmatch && fnmatch($pat,$host)) || ($pat == $host)) {
$found = true;
break;
}
@@ -497,24 +497,25 @@ function allowed_url($url) {
*/
function allowed_email($email) {
-
$domain = strtolower(substr($email,strpos($email,'@') + 1));
- if(! $domain)
+ if (! $domain) {
return false;
+ }
$str_allowed = get_config('system','allowed_email');
- if(! $str_allowed)
+ if (! $str_allowed) {
return true;
+ }
$found = false;
$fnmatch = function_exists('fnmatch');
$allowed = explode(',',$str_allowed);
- if(count($allowed)) {
- foreach($allowed as $a) {
+ if (count($allowed)) {
+ foreach ($allowed as $a) {
$pat = strtolower(trim($a));
- if(($fnmatch && fnmatch($pat,$domain)) || ($pat == $domain)) {
+ if (($fnmatch && fnmatch($pat,$domain)) || ($pat == $domain)) {
$found = true;
break;
}
@@ -543,8 +544,8 @@ function avatar_img($email) {
function parse_xml_string($s,$strict = true) {
/// @todo Move this function to the xml class
- if($strict) {
- if(! strstr($s,'<?xml'))
+ if ($strict) {
+ if (! strstr($s,'<?xml'))
return false;
$s2 = substr($s,strpos($s,'<?xml'));
}
diff --git a/include/oauth.php b/include/oauth.php
index 3d4533d3e..cd512d711 100644
--- a/include/oauth.php
+++ b/include/oauth.php
@@ -155,7 +155,7 @@ class FKOAuth1 extends OAuthServer {
//notice( t("Welcome back ") . $record['username'] . EOL);
$a->user = $record;
- if(strlen($a->user['timezone'])) {
+ if (strlen($a->user['timezone'])) {
date_default_timezone_set($a->user['timezone']);
$a->timezone = $a->user['timezone'];
}
diff --git a/include/oembed.php b/include/oembed.php
index 0b8b71366..498d9a721 100755
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -303,9 +303,11 @@ function oembed_html2bbcode($text) {
$entries = $xpath->query("//span[$xattr]");
$xattr = "@rel='oembed'";//oe_build_xpath("rel","oembed");
- foreach($entries as $e) {
+ foreach ($entries as $e) {
$href = $xpath->evaluate("a[$xattr]/@href", $e)->item(0)->nodeValue;
- if(!is_null($href)) $e->parentNode->replaceChild(new DOMText("[embed]".$href."[/embed]"), $e);
+ if (!is_null($href)) {
+ $e->parentNode->replaceChild(new DOMText("[embed]".$href."[/embed]"), $e);
+ }
}
return oe_get_inner_html( $dom->getElementsByTagName("body")->item(0) );
} else {
diff --git a/include/onepoll.php b/include/onepoll.php
index 5227b61a1..6dac996db 100644
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -170,7 +170,7 @@ function onepoll_run(&$argv, &$argc){
// But this may be our first communication, so set the writable flag if it isn't set already.
if (! intval($contact['writable'])) {
- q("update contact set writable = 1 where id = %d", intval($contact['id']));
+ q("UPDATE `contact` SET `writable` = 1 WHERE `id` = %d", intval($contact['id']));
}
$url = $contact['poll'] . '?dfrn_id=' . $idtosend
@@ -437,16 +437,18 @@ function onepoll_run(&$argv, &$argc){
if ($raw_refs) {
$refs_arr = explode(' ', $raw_refs);
if (count($refs_arr)) {
- for($x = 0; $x < count($refs_arr); $x ++)
+ for ($x = 0; $x < count($refs_arr); $x ++) {
$refs_arr[$x] = "'" . msgid2iri(str_replace(array('<','>',' '),array('','',''),dbesc($refs_arr[$x]))) . "'";
+ }
}
$qstr = implode(',',$refs_arr);
$r = q("SELECT `uri` , `parent-uri` FROM `item` USE INDEX (`uid_uri`) WHERE `uri` IN ($qstr) AND `uid` = %d LIMIT 1",
intval($importer_uid)
);
- if (dbm::is_result($r))
+ if (dbm::is_result($r)) {
$datarray['parent-uri'] = $r[0]['parent-uri']; // Set the parent as the top-level item
- // $datarray['parent-uri'] = $r[0]['uri'];
+ //$datarray['parent-uri'] = $r[0]['uri'];
+ }
}
// Decoding the header
@@ -611,14 +613,17 @@ function onepoll_run(&$argv, &$argc){
consume_feed($xml,$importer,$contact,$hub,1,2);
$hubmode = 'subscribe';
- if ($contact['network'] === NETWORK_DFRN || $contact['blocked'] || $contact['readonly'])
+ if ($contact['network'] === NETWORK_DFRN || $contact['blocked'] || $contact['readonly']) {
$hubmode = 'unsubscribe';
+ }
- if (($contact['network'] === NETWORK_OSTATUS || $contact['network'] == NETWORK_FEED) && (! $contact['hub-verify']))
+ if (($contact['network'] === NETWORK_OSTATUS || $contact['network'] == NETWORK_FEED) && (! $contact['hub-verify'])) {
$hub_update = true;
+ }
- if ($force)
+ if ($force) {
$hub_update = true;
+ }
logger("Contact ".$contact['id']." returned hub: ".$hub." Network: ".$contact['network']." Relation: ".$contact['rel']." Update: ".$hub_update);
diff --git a/include/ostatus.php b/include/ostatus.php
index c1d730eb1..61ea3d78b 100644
--- a/include/ostatus.php
+++ b/include/ostatus.php
@@ -83,33 +83,40 @@ class ostatus {
$aliaslink = $author["author-link"];
$alternate = $xpath->query("atom:author/atom:link[@rel='alternate']", $context)->item(0)->attributes;
- if (is_object($alternate))
- foreach($alternate AS $attributes)
- if ($attributes->name == "href")
+ if (is_object($alternate)) {
+ foreach($alternate AS $attributes) {
+ if ($attributes->name == "href") {
$author["author-link"] = $attributes->textContent;
+ }
+ }
+ }
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` IN ('%s', '%s') AND `network` != '%s'",
intval($importer["uid"]), dbesc(normalise_link($author["author-link"])),
dbesc(normalise_link($aliaslink)), dbesc(NETWORK_STATUSNET));
- if ($r) {
+ if (dbm::is_result($r)) {
$contact = $r[0];
$author["contact-id"] = $r[0]["id"];
- } else
+ } else {
$author["contact-id"] = $contact["id"];
+ }
$avatarlist = array();
$avatars = $xpath->query("atom:author/atom:link[@rel='avatar']", $context);
- foreach($avatars AS $avatar) {
+ foreach ($avatars AS $avatar) {
$href = "";
$width = 0;
- foreach($avatar->attributes AS $attributes) {
- if ($attributes->name == "href")
+ foreach ($avatar->attributes AS $attributes) {
+ if ($attributes->name == "href") {
$href = $attributes->textContent;
- if ($attributes->name == "width")
+ }
+ if ($attributes->name == "width") {
$width = $attributes->textContent;
+ }
}
- if (($width > 0) AND ($href != ""))
+ if (($width > 0) AND ($href != "")) {
$avatarlist[$width] = $href;
+ }
}
if (count($avatarlist) > 0) {
krsort($avatarlist);
@@ -117,8 +124,9 @@ class ostatus {
}
$displayname = $xpath->evaluate('atom:author/poco:displayName/text()', $context)->item(0)->nodeValue;
- if ($displayname != "")
+ if ($displayname != "") {
$author["author-name"] = $displayname;
+ }
$author["owner-name"] = $author["author-name"];
$author["owner-link"] = $author["author-link"];
@@ -443,7 +451,7 @@ class ostatus {
foreach ($category->attributes AS $attributes) {
if ($attributes->name == "term") {
$term = $attributes->textContent;
- if(strlen($item["tag"])) {
+ if (strlen($item["tag"])) {
$item["tag"] .= ',';
}
$item["tag"] .= "#[url=".App::get_baseurl()."/search?tag=".$term."]".$term."[/url]";
@@ -1137,6 +1145,7 @@ class ostatus {
continue;
}
+ /// @TODO One statment is okay (until if () )
$arr = array();
$arr["network"] = $details["network"];
$arr["uri"] = $single_conv->id;
@@ -2173,7 +2182,7 @@ class ostatus {
$owner = $r[0];
- if(!strlen($last_update))
+ if (!strlen($last_update))
$last_update = 'now -30 days';
$check_date = datetime_convert('UTC','UTC',$last_update,'Y-m-d H:i:s');
From cc4b481bc904603f9e1cea3a03cad78a652c9ef6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Fri, 12 May 2017 21:02:58 +0200
Subject: [PATCH 3/3] fixed parser error, need parentheses
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Roland Häder <roland@mxchange.org>
---
include/identity.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/identity.php b/include/identity.php
index 264736e97..3ab25cdc4 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -879,7 +879,7 @@ function zrl_init(App $a) {
$urlparts = parse_url($tmp_str);
$result = Cache::get("gprobe:" . $urlparts["host"]);
- if (!is_null($result)) && (in_array($result["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) {
+ if ((!is_null($result)) && (in_array($result["network"], array(NETWORK_FEED, NETWORK_PHANTOM)))) {
logger("DDoS attempt detected for " . $urlparts["host"] . " by " . $_SERVER["REMOTE_ADDR"] . ". server data: " . print_r($_SERVER, true), LOGGER_DEBUG);
return;
}