From 41a36606c6ee92c914acbb7f6d9ea79c0a149088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Thu, 26 Jan 2017 16:01:56 +0100 Subject: [PATCH] added spaces + some curly braces MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- include/Contact.php | 24 +-- include/DirSearch.php | 7 +- include/ForumManager.php | 14 +- include/NotificationsManager.php | 26 ++-- include/Probe.php | 25 ++-- include/Smilies.php | 10 +- include/acl_selectors.php | 48 +++--- include/api.php | 64 ++++---- include/attach.php | 2 +- include/bb2diaspora.php | 6 +- include/bbcode.php | 46 +++--- include/cli_startup.php | 2 +- include/contact_widgets.php | 38 ++--- include/conversation.php | 211 +++++++++++++------------- include/cron.php | 61 ++++---- include/cronhooks.php | 10 +- include/crypto.php | 12 +- include/datetime.php | 86 ++++++----- include/dba_pdo.php | 74 ++++----- include/dbstructure.php | 4 +- include/dfrn.php | 26 ++-- include/diaspora.php | 75 +++++----- include/discover_poco.php | 4 +- include/email.php | 22 +-- include/enotify.php | 6 +- include/event.php | 105 +++++++------ include/expire.php | 7 +- include/features.php | 10 +- include/feed.php | 5 +- include/files.php | 2 +- include/friendica_smarty.php | 10 +- include/group.php | 40 ++--- include/identity.php | 95 ++++++------ include/items.php | 8 +- include/lock.php | 25 ++-- include/message.php | 14 +- include/nav.php | 4 +- include/network.php | 88 +++++------ include/oauth.php | 2 +- include/oembed.php | 4 +- include/onepoll.php | 2 +- include/ostatus.php | 8 +- include/pgettext.php | 30 ++-- include/plugin.php | 65 ++++---- include/poller.php | 8 +- include/profile_selectors.php | 6 +- include/pubsubpublish.php | 12 +- include/queue_fn.php | 11 +- include/quoteconvert.php | 6 +- include/redir.php | 14 +- include/salmon.php | 19 ++- include/security.php | 38 ++--- include/socgraph.php | 44 +++--- include/tags.php | 17 ++- include/template_processor.php | 2 +- include/text.php | 248 +++++++++++++++---------------- include/threads.php | 24 ++- include/update_gcontact.php | 22 ++- include/user.php | 48 +++--- include/xml.php | 2 +- 60 files changed, 1018 insertions(+), 930 deletions(-) diff --git a/include/Contact.php b/include/Contact.php index 9fd61f8d5e..de76789e8c 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -5,7 +5,7 @@ // authorisation to do this. function user_remove($uid) { - if(! $uid) + if (! $uid) return; logger('Removing user: ' . $uid); @@ -49,7 +49,7 @@ function user_remove($uid) { // Send an update to the directory proc_run(PRIORITY_LOW, "include/directory.php", $r[0]['url']); - if($uid == local_user()) { + if ($uid == local_user()) { unset($_SESSION['authenticated']); unset($_SESSION['uid']); goaway(App::get_baseurl()); @@ -124,10 +124,10 @@ function terminate_friendship($user,$self,$contact) { function mark_for_death($contact) { - if($contact['archive']) + if ($contact['archive']) return; - if($contact['term-date'] == '0000-00-00 00:00:00') { + if ($contact['term-date'] == '0000-00-00 00:00:00') { q("UPDATE `contact` SET `term-date` = '%s' WHERE `id` = %d", dbesc(datetime_convert()), intval($contact['id']) @@ -151,7 +151,7 @@ function mark_for_death($contact) { /// Check for contact vitality via probing $expiry = $contact['term-date'] . ' + 32 days '; - if(datetime_convert() > datetime_convert('UTC','UTC',$expiry)) { + if (datetime_convert() > datetime_convert('UTC','UTC',$expiry)) { // relationship is really truly dead. // archive them rather than delete @@ -483,7 +483,7 @@ function random_profile() { function contacts_not_grouped($uid,$start = 0,$count = 0) { - if(! $count) { + if (! $count) { $r = q("select count(*) as total from contact where uid = %d and self = 0 and id not in (select distinct(`contact-id`) from group_member where uid = %d) ", intval($uid), intval($uid) @@ -775,18 +775,18 @@ function posts_from_contact_url(App $a, $contact_url) { function formatted_location($profile) { $location = ''; - if($profile['locality']) + if ($profile['locality']) $location .= $profile['locality']; - if($profile['region'] AND ($profile['locality'] != $profile['region'])) { - if($location) + if ($profile['region'] AND ($profile['locality'] != $profile['region'])) { + if ($location) $location .= ', '; $location .= $profile['region']; } - if($profile['country-name']) { - if($location) + if ($profile['country-name']) { + if ($location) $location .= ', '; $location .= $profile['country-name']; @@ -808,7 +808,7 @@ function account_type($contact) { // "page-flags" is a field in the user table, // "forum" and "prv" are used in the contact table. They stand for PAGE_COMMUNITY and PAGE_PRVGROUP. // "community" is used in the gcontact table and is true if the contact is PAGE_COMMUNITY or PAGE_PRVGROUP. - if((isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_COMMUNITY)) + if ((isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_COMMUNITY)) || (isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_PRVGROUP)) || (isset($contact['forum']) && intval($contact['forum'])) || (isset($contact['prv']) && intval($contact['prv'])) diff --git a/include/DirSearch.php b/include/DirSearch.php index 5968608236..da32358c1c 100644 --- a/include/DirSearch.php +++ b/include/DirSearch.php @@ -20,7 +20,7 @@ class DirSearch { */ public static function global_search_by_name($search, $mode = '') { - if($search) { + if ($search) { // check supported networks if (get_config('system','diaspora_enabled')) $diaspora = NETWORK_DIASPORA; @@ -33,10 +33,11 @@ class DirSearch { $ostatus = NETWORK_DFRN; // check if we search only communities or every contact - if($mode === "community") + if ($mode === "community") { $extra_sql = " AND `community`"; - else + } else { $extra_sql = ""; + } $search .= "%"; diff --git a/include/ForumManager.php b/include/ForumManager.php index c2a20df29f..3fae9f3d81 100644 --- a/include/ForumManager.php +++ b/include/ForumManager.php @@ -76,7 +76,7 @@ class ForumManager { */ public static function widget($uid,$cid = 0) { - if(! intval(feature_enabled(local_user(),'forumlist_widget'))) + if (! intval(feature_enabled(local_user(),'forumlist_widget'))) return; $o = ''; @@ -136,7 +136,7 @@ class ForumManager { public static function profile_advanced($uid) { $profile = intval(feature_enabled($uid,'forumlist_profile')); - if(! $profile) + if (! $profile) return; $o = ''; @@ -154,13 +154,17 @@ class ForumManager { foreach($contacts as $contact) { $forumlist .= micropro($contact,false,'forumlist-profile-advanced'); $total_shown ++; - if($total_shown == $show_total) + + if ($total_shown == $show_total) { break; + } } - if(count($contacts) > 0) + if (count($contacts) > 0) { $o .= $forumlist; - return $o; + } + + return $o; } /** diff --git a/include/NotificationsManager.php b/include/NotificationsManager.php index 611860f9d0..c75407993e 100644 --- a/include/NotificationsManager.php +++ b/include/NotificationsManager.php @@ -81,7 +81,7 @@ class NotificationsManager { } $order_sql = implode(", ", $asOrder); - if($limit!="") + if ($limit!="") $limit = " LIMIT ".$limit; $r = q("SELECT * FROM `notify` WHERE `uid` = %d $filter_sql ORDER BY $order_sql $limit", @@ -369,7 +369,7 @@ class NotificationsManager { private function networkTotal($seen = 0) { $sql_seen = ""; - if($seen === 0) + if ($seen === 0) $sql_seen = " AND `item`.`unseen` = 1 "; $r = q("SELECT COUNT(*) AS `total` @@ -406,7 +406,7 @@ class NotificationsManager { $notifs = array(); $sql_seen = ""; - if($seen === 0) + if ($seen === 0) $sql_seen = " AND `item`.`unseen` = 1 "; @@ -445,7 +445,7 @@ class NotificationsManager { private function systemTotal($seen = 0) { $sql_seen = ""; - if($seen === 0) + if ($seen === 0) $sql_seen = " AND `seen` = 0 "; $r = q("SELECT COUNT(*) AS `total` FROM `notify` WHERE `uid` = %d $sql_seen", @@ -478,7 +478,7 @@ class NotificationsManager { $notifs = array(); $sql_seen = ""; - if($seen === 0) + if ($seen === 0) $sql_seen = " AND `seen` = 0 "; $r = q("SELECT `id`, `url`, `photo`, `msg`, `date`, `seen` FROM `notify` @@ -530,7 +530,7 @@ class NotificationsManager { $sql_seen = ""; $sql_extra = $this->_personal_sql_extra(); - if($seen === 0) + if ($seen === 0) $sql_seen = " AND `item`.`unseen` = 1 "; $r = q("SELECT COUNT(*) AS `total` @@ -569,7 +569,7 @@ class NotificationsManager { $notifs = array(); $sql_seen = ""; - if($seen === 0) + if ($seen === 0) $sql_seen = " AND `item`.`unseen` = 1 "; $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`, @@ -608,7 +608,7 @@ class NotificationsManager { private function homeTotal($seen = 0) { $sql_seen = ""; - if($seen === 0) + if ($seen === 0) $sql_seen = " AND `item`.`unseen` = 1 "; $r = q("SELECT COUNT(*) AS `total` FROM `item` @@ -644,7 +644,7 @@ class NotificationsManager { $notifs = array(); $sql_seen = ""; - if($seen === 0) + if ($seen === 0) $sql_seen = " AND `item`.`unseen` = 1 "; $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`, @@ -682,7 +682,7 @@ class NotificationsManager { private function introTotal($all = false) { $sql_extra = ""; - if(!$all) + if (!$all) $sql_extra = " AND `ignore` = 0 "; $r = q("SELECT COUNT(*) AS `total` FROM `intro` @@ -716,7 +716,7 @@ class NotificationsManager { $notifs = array(); $sql_extra = ""; - if(!$all) + if (!$all) $sql_extra = " AND `ignore` = 0 "; /// @todo Fetch contact details by "get_contact_details_by_url" instead of queries to contact, fcontact and gcontact @@ -761,7 +761,7 @@ class NotificationsManager { // We have to distinguish between these two because they use different data. // Contact suggestions - if($it['fid']) { + if ($it['fid']) { $return_addr = bin2hex($this->a->user['nickname'] . '@' . $this->a->get_hostname() . (($this->a->path) ? '/' . $this->a->path : '')); @@ -793,7 +793,7 @@ class NotificationsManager { $it['gnetwork'] = $ret["network"]; // Don't show these data until you are connected. Diaspora is doing the same. - if($it['gnetwork'] === NETWORK_DIASPORA) { + if ($it['gnetwork'] === NETWORK_DIASPORA) { $it['glocation'] = ""; $it['gabout'] = ""; $it['ggender'] = ""; diff --git a/include/Probe.php b/include/Probe.php index 1b6feb107f..ac7fe712f0 100644 --- a/include/Probe.php +++ b/include/Probe.php @@ -564,15 +564,15 @@ class Probe { */ public static function valid_dfrn($data) { $errors = 0; - if(!isset($data['key'])) + if (!isset($data['key'])) $errors ++; - if(!isset($data['dfrn-request'])) + if (!isset($data['dfrn-request'])) $errors ++; - if(!isset($data['dfrn-confirm'])) + if (!isset($data['dfrn-confirm'])) $errors ++; - if(!isset($data['dfrn-notify'])) + if (!isset($data['dfrn-notify'])) $errors ++; - if(!isset($data['dfrn-poll'])) + if (!isset($data['dfrn-poll'])) $errors ++; return $errors; } @@ -1133,15 +1133,17 @@ class Probe { $password = ''; openssl_private_decrypt(hex2bin($r[0]['pass']), $password,$x[0]['prvkey']); $mbox = email_connect($mailbox,$r[0]['user'], $password); - if(!mbox) + if (!$mbox) { return false; + } } $msgs = email_poll($mbox, $uri); logger('searching '.$uri.', '.count($msgs).' messages found.', LOGGER_DEBUG); - if (!count($msgs)) + if (!count($msgs)) { return false; + } $data = array(); @@ -1157,13 +1159,14 @@ class Probe { $data["poll"] = 'email '.random_string(); $x = email_msg_meta($mbox, $msgs[0]); - if(stristr($x[0]->from, $uri)) + if (stristr($x[0]->from, $uri)) { $adr = imap_rfc822_parse_adrlist($x[0]->from, ''); - elseif(stristr($x[0]->to, $uri)) + } elseif (stristr($x[0]->to, $uri)) { $adr = imap_rfc822_parse_adrlist($x[0]->to, ''); - if(isset($adr)) { + } + if (isset($adr)) { foreach($adr as $feadr) { - if((strcasecmp($feadr->mailbox, $data["name"]) == 0) + if ((strcasecmp($feadr->mailbox, $data["name"]) == 0) &&(strcasecmp($feadr->host, $phost) == 0) && (strlen($feadr->personal))) { diff --git a/include/Smilies.php b/include/Smilies.php index d67b92d8b0..fd8ea60af0 100644 --- a/include/Smilies.php +++ b/include/Smilies.php @@ -125,7 +125,7 @@ class Smilies { * @return string HML Output of the Smilie */ public static function replace($s, $sample = false) { - if(intval(get_config('system','no_smilies')) + if (intval(get_config('system','no_smilies')) || (local_user() && intval(get_pconfig(local_user(),'system','no_smilies')))) return $s; @@ -135,7 +135,7 @@ class Smilies { $params = self::get_list(); $params['string'] = $s; - if($sample) { + if ($sample) { $s = '
'; for($x = 0; $x < count($params['texts']); $x ++) { $s .= '
' . $params['texts'][$x] . '
' . $params['icons'][$x] . '
'; @@ -170,11 +170,13 @@ class Smilies { * @todo: Rework because it doesn't work correctly */ private function preg_heart($x) { - if(strlen($x[1]) == 1) + if (strlen($x[1]) == 1) { return $x[0]; + } $t = ''; - for($cnt = 0; $cnt < strlen($x[1]); $cnt ++) + for($cnt = 0; $cnt < strlen($x[1]); $cnt ++) { $t .= '<3'; + } $r = str_replace($x[0],$t,$x[0]); return $r; } diff --git a/include/acl_selectors.php b/include/acl_selectors.php index f4b644d68f..5eb54edf31 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -35,7 +35,7 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) { if (dbm::is_result($r)) { foreach ($r as $rr) { - if((is_array($preselected)) && in_array($rr['id'], $preselected)) + if ((is_array($preselected)) && in_array($rr['id'], $preselected)) $selected = " selected=\"selected\" "; else $selected = ''; @@ -88,13 +88,13 @@ function contact_selector($selname, $selclass, $preselected = false, $options) { $networks = array(NETWORK_DFRN); break; case 'PRIVATE': - if(is_array($a->user) && $a->user['prvnets']) + if (is_array($a->user) && $a->user['prvnets']) $networks = array(NETWORK_DFRN,NETWORK_MAIL,NETWORK_DIASPORA); else $networks = array(NETWORK_DFRN,NETWORK_FACEBOOK,NETWORK_MAIL, NETWORK_DIASPORA); break; case 'TWO_WAY': - if(is_array($a->user) && $a->user['prvnets']) + if (is_array($a->user) && $a->user['prvnets']) $networks = array(NETWORK_DFRN,NETWORK_MAIL,NETWORK_DIASPORA); else $networks = array(NETWORK_DFRN,NETWORK_FACEBOOK,NETWORK_MAIL,NETWORK_DIASPORA,NETWORK_OSTATUS); @@ -113,14 +113,14 @@ function contact_selector($selname, $selclass, $preselected = false, $options) { $sql_extra = ''; - if($x['mutual']) { + if ($x['mutual']) { $sql_extra .= sprintf(" AND `rel` = %d ", intval(CONTACT_IS_FRIEND)); } - if(intval($x['exclude'])) + if (intval($x['exclude'])) $sql_extra .= sprintf(" AND `id` != %d ", intval($x['exclude'])); - if(is_array($x['networks']) && count($x['networks'])) { + if (is_array($x['networks']) && count($x['networks'])) { for($y = 0; $y < count($x['networks']) ; $y ++) $x['networks'][$y] = "'" . dbesc($x['networks'][$y]) . "'"; $str_nets = implode(',',$x['networks']); @@ -129,7 +129,7 @@ function contact_selector($selname, $selclass, $preselected = false, $options) { $tabindex = (x($options, 'tabindex') ? "tabindex=\"" . $options["tabindex"] . "\"" : ""); - if($x['single']) + if ($x['single']) $o .= "\r\n"; @@ -185,14 +185,14 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p $sql_extra = ''; - if($privmail || $celeb) { + if ($privmail || $celeb) { $sql_extra .= sprintf(" AND `rel` = %d ", intval(CONTACT_IS_FRIEND)); } - if($privmail) + if ($privmail) $sql_extra .= sprintf(" AND `network` IN ('%s' , '%s') ", NETWORK_DFRN, NETWORK_DIASPORA); - elseif($privatenet) + elseif ($privatenet) $sql_extra .= sprintf(" AND `network` IN ('%s' , '%s', '%s', '%s') ", NETWORK_DFRN, NETWORK_MAIL, NETWORK_FACEBOOK, NETWORK_DIASPORA); @@ -204,7 +204,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p } else $hidepreselected = ""; - if($privmail) + if ($privmail) $o .= "\r\n"; @@ -287,7 +287,7 @@ function prune_deadguys($arr) { function get_acl_permissions($user = null) { $allow_cid = $allow_gid = $deny_cid = $deny_gid = false; - if(is_array($user)) { + if (is_array($user)) { $allow_cid = ((strlen($user['allow_cid'])) ? explode('><', $user['allow_cid']) : array() ); $allow_gid = ((strlen($user['allow_gid'])) @@ -318,25 +318,25 @@ function populate_acl($user = null, $show_jotnets = false) { $perms = get_acl_permissions($user); $jotnets = ''; - if($show_jotnets) { + if ($show_jotnets) { $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1); $mail_enabled = false; $pubmail_enabled = false; - if(! $mail_disabled) { + if (! $mail_disabled) { $r = q("SELECT `pubmail` FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", intval(local_user()) ); if (dbm::is_result($r)) { $mail_enabled = true; - if(intval($r[0]['pubmail'])) + if (intval($r[0]['pubmail'])) $pubmail_enabled = true; } } if (!$user['hidewall']) { - if($mail_enabled) { + if ($mail_enabled) { $selected = (($pubmail_enabled) ? ' checked="checked" ' : ''); $jotnets .= '
' . t("Post to Email") . '
'; } @@ -379,20 +379,20 @@ function construct_acl_data(App $a, $user) { $user_defaults = get_acl_permissions($user); - if($acl_data['groups']) { + if ($acl_data['groups']) { foreach($acl_data['groups'] as $key=>$group) { // Add a "selected" flag to groups that are posted to by default - if($user_defaults['allow_gid'] && + if ($user_defaults['allow_gid'] && in_array($group['id'], $user_defaults['allow_gid']) && !in_array($group['id'], $user_defaults['deny_gid']) ) $acl_data['groups'][$key]['selected'] = 1; else $acl_data['groups'][$key]['selected'] = 0; } } - if($acl_data['contacts']) { + if ($acl_data['contacts']) { foreach($acl_data['contacts'] as $key=>$contact) { // Add a "selected" flag to groups that are posted to by default - if($user_defaults['allow_cid'] && + if ($user_defaults['allow_cid'] && in_array($contact['id'], $user_defaults['allow_cid']) && !in_array($contact['id'], $user_defaults['deny_cid']) ) $acl_data['contacts'][$key]['selected'] = 1; else @@ -419,8 +419,8 @@ function acl_lookup(App $a, $out_type = 'json') { // For use with jquery.textcomplete for private mail completion - if(x($_REQUEST,'query') && strlen($_REQUEST['query'])) { - if(! $type) + if (x($_REQUEST,'query') && strlen($_REQUEST['query'])) { + if (! $type) $type = 'm'; $search = $_REQUEST['query']; } @@ -546,7 +546,7 @@ function acl_lookup(App $a, $out_type = 'json') { dbesc(NETWORK_STATUSNET) ); } - elseif($type == 'm') { + elseif ($type == 'm') { $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag` FROM `contact` WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `network` IN ('%s','%s','%s') @@ -665,7 +665,7 @@ function acl_lookup(App $a, $out_type = 'json') { call_hooks('acl_lookup_end', $results); - if($out_type === 'html') { + if ($out_type === 'html') { $o = array( 'tot' => $results['tot'], 'start' => $results['start'], diff --git a/include/api.php b/include/api.php index 701e527cc8..66703bd6ca 100644 --- a/include/api.php +++ b/include/api.php @@ -154,9 +154,9 @@ use \Friendica\Core\Config; // workaround for HTTP-auth in CGI mode - if(x($_SERVER,'REDIRECT_REMOTE_USER')) { + if (x($_SERVER,'REDIRECT_REMOTE_USER')) { $userpass = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"],6)) ; - if(strlen($userpass)) { + if (strlen($userpass)) { list($name, $password) = explode(':', $userpass); $_SERVER['PHP_AUTH_USER'] = $name; $_SERVER['PHP_AUTH_PW'] = $password; @@ -199,7 +199,7 @@ use \Friendica\Core\Config; call_hooks('authenticate', $addon_auth); - if(($addon_auth['authenticated']) && (count($addon_auth['user_record']))) { + if (($addon_auth['authenticated']) && (count($addon_auth['user_record']))) { $record = $addon_auth['user_record']; } else { @@ -215,7 +215,7 @@ use \Friendica\Core\Config; $record = $r[0]; } - if((! $record) || (! count($record))) { + if ((! $record) || (! count($record))) { logger('API_login failure: ' . print_r($_SERVER,true), LOGGER_DEBUG); header('WWW-Authenticate: Basic realm="Friendica"'); #header('HTTP/1.0 401 Unauthorized'); @@ -457,7 +457,7 @@ use \Friendica\Core\Config; logger("api_get_user: Fetching user data for user ".$contact_id, LOGGER_DEBUG); // Searching for contact URL - if(!is_null($contact_id) AND (intval($contact_id) == 0)){ + if (!is_null($contact_id) AND (intval($contact_id) == 0)){ $user = dbesc(normalise_link($contact_id)); $url = $user; $extra_query = "AND `contact`.`nurl` = '%s' "; @@ -465,7 +465,7 @@ use \Friendica\Core\Config; } // Searching for contact id with uid = 0 - if(!is_null($contact_id) AND (intval($contact_id) != 0)){ + if (!is_null($contact_id) AND (intval($contact_id) != 0)){ $user = dbesc(api_unique_id_to_url($contact_id)); if ($user == "") @@ -476,7 +476,7 @@ use \Friendica\Core\Config; if (api_user()!==false) $extra_query .= "AND `contact`.`uid`=".intval(api_user()); } - if(is_null($user) && x($_GET, 'user_id')) { + if (is_null($user) && x($_GET, 'user_id')) { $user = dbesc(api_unique_id_to_url($_GET['user_id'])); if ($user == "") @@ -486,7 +486,7 @@ use \Friendica\Core\Config; $extra_query = "AND `contact`.`nurl` = '%s' "; if (api_user()!==false) $extra_query .= "AND `contact`.`uid`=".intval(api_user()); } - if(is_null($user) && x($_GET, 'screen_name')) { + if (is_null($user) && x($_GET, 'screen_name')) { $user = dbesc($_GET['screen_name']); $nick = $user; $extra_query = "AND `contact`.`nick` = '%s' "; @@ -496,7 +496,7 @@ use \Friendica\Core\Config; if (is_null($user) AND ($a->argc > (count($called_api)-1)) AND (count($called_api) > 0)){ $argid = count($called_api); list($user, $null) = explode(".",$a->argv[$argid]); - if(is_numeric($user)){ + if (is_numeric($user)){ $user = dbesc(api_unique_id_to_url($user)); if ($user == "") @@ -593,7 +593,7 @@ use \Friendica\Core\Config; } } - if($uinfo[0]['self']) { + if ($uinfo[0]['self']) { if ($uinfo[0]['network'] == "") $uinfo[0]['network'] = NETWORK_DFRN; @@ -648,7 +648,7 @@ use \Friendica\Core\Config; $starred = $r[0]['count']; - if(! $uinfo[0]['self']) { + if (! $uinfo[0]['self']) { $countfriends = 0; $countfollowers = 0; $starred = 0; @@ -923,7 +923,7 @@ use \Friendica\Core\Config; $txt = requestdata('status'); //$txt = urldecode(requestdata('status')); - if((strpos($txt,'<') !== false) || (strpos($txt,'>') !== false)) { + if ((strpos($txt,'<') !== false) || (strpos($txt,'>') !== false)) { $txt = html2bb_video($txt); $config = HTMLPurifier_Config::createDefault(); @@ -964,9 +964,9 @@ use \Friendica\Core\Config; // logger('api_post: ' . print_r($_POST,true)); - if(requestdata('htmlstatus')) { + if (requestdata('htmlstatus')) { $txt = requestdata('htmlstatus'); - if((strpos($txt,'<') !== false) || (strpos($txt,'>') !== false)) { + if ((strpos($txt,'<') !== false) || (strpos($txt,'>') !== false)) { $txt = html2bb_video($txt); $config = HTMLPurifier_Config::createDefault(); @@ -989,16 +989,16 @@ use \Friendica\Core\Config; if ($parent == -1) $parent = ""; - if(ctype_digit($parent)) + if (ctype_digit($parent)) $_REQUEST['parent'] = $parent; else $_REQUEST['parent_uri'] = $parent; - if(requestdata('lat') && requestdata('long')) + if (requestdata('lat') && requestdata('long')) $_REQUEST['coord'] = sprintf("%s %s",requestdata('lat'),requestdata('long')); $_REQUEST['profile_uid'] = api_user(); - if($parent) + if ($parent) $_REQUEST['type'] = 'net-comment'; else { // Check for throttling (maximum posts per day, week and month) @@ -1066,11 +1066,11 @@ use \Friendica\Core\Config; $_REQUEST['type'] = 'wall'; } - if(x($_FILES,'media')) { + if (x($_FILES,'media')) { // upload the image if we have one $_REQUEST['hush']='yeah'; //tell wall_upload function to return img info instead of echo $media = wall_upload_post($a); - if(strlen($media)>0) + if (strlen($media)>0) $_REQUEST['body'] .= "\n\n".$media; } @@ -1115,13 +1115,13 @@ use \Friendica\Core\Config; $user_info = api_get_user($a); - if(!x($_FILES,'media')) { + if (!x($_FILES,'media')) { // Output error throw new BadRequestException("No media."); } $media = wall_upload_post($a, false); - if(!$media) { + if (!$media) { // Output error throw new InternalServerErrorException(); } @@ -2641,9 +2641,9 @@ use \Friendica\Core\Config; return false; } - if($qtype == 'friends') + if ($qtype == 'friends') $sql_extra = sprintf(" AND ( `rel` = %d OR `rel` = %d ) ", intval(CONTACT_IS_SHARING), intval(CONTACT_IS_FRIEND)); - if($qtype == 'followers') + if ($qtype == 'followers') $sql_extra = sprintf(" AND ( `rel` = %d OR `rel` = %d ) ", intval(CONTACT_IS_FOLLOWER), intval(CONTACT_IS_FRIEND)); // friends and followers only for self @@ -2697,7 +2697,7 @@ use \Friendica\Core\Config; $closed = (($a->config['register_policy'] == REGISTER_CLOSED) ? 'true' : 'false'); $private = ((Config::get('system', 'block_public')) ? 'true' : 'false'); $textlimit = (string) (($a->config['max_import_size']) ? $a->config['max_import_size'] : 200000); - if($a->config['api_import_size']) + if ($a->config['api_import_size']) $texlimit = string($a->config['api_import_size']); $ssl = ((Config::get('system', 'have_ssl')) ? 'true' : 'false'); $sslserver = (($ssl === 'true') ? str_replace('http:','https:',App::get_baseurl()) : ''); @@ -2737,13 +2737,13 @@ use \Friendica\Core\Config; $a = get_app(); - if(! api_user()) throw new ForbiddenException(); + if (! api_user()) throw new ForbiddenException(); $user_info = api_get_user($a); - if($qtype == 'friends') + if ($qtype == 'friends') $sql_extra = sprintf(" AND ( `rel` = %d OR `rel` = %d ) ", intval(CONTACT_IS_SHARING), intval(CONTACT_IS_FRIEND)); - if($qtype == 'followers') + if ($qtype == 'followers') $sql_extra = sprintf(" AND ( `rel` = %d OR `rel` = %d ) ", intval(CONTACT_IS_FOLLOWER), intval(CONTACT_IS_FRIEND)); if (!$user_info["self"]) @@ -2967,7 +2967,7 @@ use \Friendica\Core\Config; if ($user_id !="") { $sql_extra .= ' AND `mail`.`contact-id` = ' . intval($user_id); } - elseif($screen_name !=""){ + elseif ($screen_name !=""){ $sql_extra .= " AND `contact`.`nick` = '" . dbesc($screen_name). "'"; } @@ -2978,7 +2978,7 @@ use \Friendica\Core\Config; ); if ($verbose == "true") { // stop execution and return error message if no mails available - if($r == null) { + if ($r == null) { $answer = array('result' => 'error', 'message' => 'no mails available'); return api_format_data("direct_messages_all", $type, array('$result' => $answer)); } @@ -3092,7 +3092,7 @@ use \Friendica\Core\Config; function api_fr_photo_detail($type) { if (api_user()===false) throw new ForbiddenException(); - if(!x($_REQUEST,'photo_id')) throw new BadRequestException("No photo id."); + if (!x($_REQUEST,'photo_id')) throw new BadRequestException("No photo id."); $scale = (x($_REQUEST, 'scale') ? intval($_REQUEST['scale']) : false); $scale_sql = ($scale === false ? "" : sprintf("and scale=%d",intval($scale))); @@ -3183,11 +3183,11 @@ use \Friendica\Core\Config; $dfrn_id = $orig_id = (($r[0]['issued-id']) ? $r[0]['issued-id'] : $r[0]['dfrn-id']); - if($r[0]['duplex'] && $r[0]['issued-id']) { + if ($r[0]['duplex'] && $r[0]['issued-id']) { $orig_id = $r[0]['issued-id']; $dfrn_id = '1:' . $orig_id; } - if($r[0]['duplex'] && $r[0]['dfrn-id']) { + if ($r[0]['duplex'] && $r[0]['dfrn-id']) { $orig_id = $r[0]['dfrn-id']; $dfrn_id = '0:' . $orig_id; } diff --git a/include/attach.php b/include/attach.php index 6b26b1ed65..3232f3e763 100644 --- a/include/attach.php +++ b/include/attach.php @@ -1061,7 +1061,7 @@ function z_mime_content_type($filename) { ); $dot = strpos($filename,'.'); - if($dot !== false) { + if ($dot !== false) { $ext = strtolower(substr($filename,$dot+1)); if (array_key_exists($ext, $mime_types)) { return $mime_types[$ext]; diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index e509999236..eaf418510b 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -193,7 +193,7 @@ function unescape_underscores_in_links($m) { function format_event_diaspora($ev) { - if(! ((is_array($ev)) && count($ev))) + if (! ((is_array($ev)) && count($ev))) return ''; $bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8 AM @@ -209,7 +209,7 @@ function format_event_diaspora($ev) { $ev['start'] , $bd_format))) . '](' . App::get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['start'])) . ")\n"; - if(! $ev['nofinish']) + if (! $ev['nofinish']) $o .= t('Finishes:') . ' ' . '[' . (($ev['adjust']) ? day_translate(datetime_convert('UTC', 'UTC', $ev['finish'] , $bd_format )) @@ -217,7 +217,7 @@ function format_event_diaspora($ev) { $ev['finish'] , $bd_format ))) . '](' . App::get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['finish'])) . ")\n"; - if(strlen($ev['location'])) + if (strlen($ev['location'])) $o .= t('Location:') . bb2diaspora($ev['location']) . "\n"; diff --git a/include/bbcode.php b/include/bbcode.php index 489ef8b2e3..46daaae93f 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -214,21 +214,21 @@ function bb_unspacefy_and_trim($st) { function bb_find_open_close($s, $open, $close, $occurance = 1) { - if($occurance < 1) + if ($occurance < 1) $occurance = 1; $start_pos = -1; for($i = 1; $i <= $occurance; $i++) { - if( $start_pos !== false) + if ( $start_pos !== false) $start_pos = strpos($s, $open, $start_pos + 1); } - if( $start_pos === false) + if ( $start_pos === false) return false; $end_pos = strpos($s, $close, $start_pos); - if( $end_pos === false) + if ( $end_pos === false) return false; $res = array( 'start' => $start_pos, 'end' => $end_pos ); @@ -238,34 +238,34 @@ function bb_find_open_close($s, $open, $close, $occurance = 1) { function get_bb_tag_pos($s, $name, $occurance = 1) { - if($occurance < 1) + if ($occurance < 1) $occurance = 1; $start_open = -1; for($i = 1; $i <= $occurance; $i++) { - if( $start_open !== false) + if ( $start_open !== false) $start_open = strpos($s, '[' . $name, $start_open + 1); // allow [name= type tags } - if( $start_open === false) + if ( $start_open === false) return false; $start_equal = strpos($s, '=', $start_open); $start_close = strpos($s, ']', $start_open); - if( $start_close === false) + if ( $start_close === false) return false; $start_close++; $end_open = strpos($s, '[/' . $name . ']', $start_close); - if( $end_open === false) + if ( $end_open === false) return false; $res = array( 'start' => array('open' => $start_open, 'close' => $start_close), 'end' => array('open' => $end_open, 'close' => $end_open + strlen('[/' . $name . ']')) ); - if( $start_equal !== false) + if ( $start_equal !== false) $res['start']['equal'] = $start_equal + 1; return $res; @@ -277,12 +277,12 @@ function bb_tag_preg_replace($pattern, $replace, $name, $s) { $occurance = 1; $pos = get_bb_tag_pos($string, $name, $occurance); - while($pos !== false && $occurance < 1000) { + while ($pos !== false && $occurance < 1000) { $start = substr($string, 0, $pos['start']['open']); $subject = substr($string, $pos['start']['open'], $pos['end']['close'] - $pos['start']['open']); $end = substr($string, $pos['end']['close']); - if($end === false) + if ($end === false) $end = ''; $subject = preg_replace($pattern, $replace, $subject); @@ -295,7 +295,7 @@ function bb_tag_preg_replace($pattern, $replace, $name, $s) { return $string; } -if(! function_exists('bb_extract_images')) { +if (! function_exists('bb_extract_images')) { function bb_extract_images($body) { $saved_image = array(); @@ -306,12 +306,12 @@ function bb_extract_images($body) { $img_start = strpos($orig_body, '[img'); $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false); $img_end = ($img_start !== false ? strpos(substr($orig_body, $img_start), '[/img]') : false); - while(($img_st_close !== false) && ($img_end !== false)) { + while (($img_st_close !== false) && ($img_end !== false)) { $img_st_close++; // make it point to AFTER the closing bracket $img_end += $img_start; - if(! strcmp(substr($orig_body, $img_start + $img_st_close, 5), 'data:')) { + if (! strcmp(substr($orig_body, $img_start + $img_st_close, 5), 'data:')) { // This is an embedded image $saved_image[$cnt] = substr($orig_body, $img_start + $img_st_close, $img_end - ($img_start + $img_st_close)); @@ -324,7 +324,7 @@ function bb_extract_images($body) { $orig_body = substr($orig_body, $img_end + strlen('[/img]')); - if($orig_body === false) // in case the body ends on a closing image tag + if ($orig_body === false) // in case the body ends on a closing image tag $orig_body = ''; $img_start = strpos($orig_body, '[img'); @@ -337,7 +337,7 @@ function bb_extract_images($body) { return array('body' => $new_body, 'images' => $saved_image); }} -if(! function_exists('bb_replace_images')) { +if (! function_exists('bb_replace_images')) { function bb_replace_images($body, $images) { $newbody = $body; @@ -619,7 +619,7 @@ function bb_DiasporaLinks($match) { function bb_RemovePictureLinks($match) { $text = Cache::get($match[1]); - if(is_null($text)){ + if (is_null($text)){ $a = get_app(); $stamp1 = microtime(true); @@ -673,7 +673,7 @@ function bb_expand_links($match) { function bb_CleanPictureLinksSub($match) { $text = Cache::get($match[1]); - if(is_null($text)){ + if (is_null($text)){ $a = get_app(); $stamp1 = microtime(true); @@ -724,7 +724,7 @@ function bb_CleanPictureLinks($text) { } function bb_highlight($match) { - if(in_array(strtolower($match[1]),['php','css','mysql','sql','abap','diff','html','perl','ruby', + if (in_array(strtolower($match[1]),['php','css','mysql','sql','abap','diff','html','perl','ruby', 'vbscript','avrc','dtd','java','xml','cpp','python','javascript','js','sh'])) return text_highlight($match[2],strtolower($match[1])); return $match[0]; @@ -814,7 +814,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal $Text = str_replace(array("\r","\n"), array('
','
'), $Text); - if($preserve_nl) + if ($preserve_nl) $Text = str_replace(array("\n","\r"), array('',''),$Text); // Set up the parameters for a URL search string @@ -1132,7 +1132,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal // Summary (e.g. title) is required, earlier revisions only required description (in addition to // start which is always required). Allow desc with a missing summary for compatibility. - if((x($ev,'desc') || x($ev,'summary')) && x($ev,'start')) { + if ((x($ev,'desc') || x($ev,'summary')) && x($ev,'start')) { $sub = format_event_html($ev, $simplehtml); $Text = preg_replace("/\[event\-summary\](.*?)\[\/event\-summary\]/ism",'',$Text); @@ -1178,7 +1178,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal $regex = '#<([^>]*?)(href)="(?!' . implode('|', $allowed_link_protocols) . ')(.*?)"(.*?)>#ism'; $Text = preg_replace($regex, '<$1$2="javascript:void(0)"$4 class="invalid-href" title="' . t('Invalid link protocol') . '">', $Text); - if($saved_image) { + if ($saved_image) { $Text = bb_replace_images($Text, $saved_image); } diff --git a/include/cli_startup.php b/include/cli_startup.php index 4b66b47a00..557d08c288 100644 --- a/include/cli_startup.php +++ b/include/cli_startup.php @@ -19,7 +19,7 @@ function cli_startup() { require_once("dba.php"); $db = new dba($db_host, $db_user, $db_pass, $db_data); unset($db_host, $db_user, $db_pass, $db_data); - }; + }; require_once('include/session.php'); diff --git a/include/contact_widgets.php b/include/contact_widgets.php index d077a065e1..0f6f46ef6d 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -17,9 +17,9 @@ function findpeople_widget() { $a = get_app(); - if(get_config('system','invitation_only')) { + if (get_config('system','invitation_only')) { $x = get_pconfig(local_user(),'system','invites_remaining'); - if($x || is_site_admin()) { + if ($x || is_site_admin()) { $a->page['aside'] .= '' . $inv; @@ -108,7 +108,7 @@ function networks_widget($baseurl,$selected = '') { } } - if(count($nets) < 2) + if (count($nets) < 2) return ''; return replace_macros(get_markup_template('nets.tpl'),array( @@ -173,7 +173,7 @@ function categories_widget($baseurl,$selected = '') { $matches = false; $terms = array(); $cnt = preg_match_all('/<(.*?)>/',$saved,$matches,PREG_SET_ORDER); - if($cnt) { + if ($cnt) { foreach($matches as $mtch) { $unescaped = xmlify(file_tag_decode($mtch[1])); $terms[] = array('name' => $unescaped,'selected' => (($selected == $unescaped) ? 'selected' : '')); @@ -195,29 +195,29 @@ function common_friends_visitor_widget($profile_uid) { $a = get_app(); - if(local_user() == $profile_uid) + if (local_user() == $profile_uid) return; $cid = $zcid = 0; - if(is_array($_SESSION['remote'])) { + if (is_array($_SESSION['remote'])) { foreach($_SESSION['remote'] as $visitor) { - if($visitor['uid'] == $profile_uid) { + if ($visitor['uid'] == $profile_uid) { $cid = $visitor['cid']; break; } } } - if(! $cid) { - if(get_my_url()) { + if (! $cid) { + if (get_my_url()) { $r = q("select id from contact where nurl = '%s' and uid = %d limit 1", dbesc(normalise_link(get_my_url())), intval($profile_uid) ); - if (dbm::is_result($r)) + if (dbm::is_result($r)) { $cid = $r[0]['id']; - else { + } else { $r = q("select id from gcontact where nurl = '%s' limit 1", dbesc(normalise_link(get_my_url())) ); @@ -227,22 +227,26 @@ function common_friends_visitor_widget($profile_uid) { } } - if($cid == 0 && $zcid == 0) + if ($cid == 0 && $zcid == 0) { return; + } require_once('include/socgraph.php'); - if($cid) + if ($cid) { $t = count_common_friends($profile_uid,$cid); - else + } else { $t = count_common_friends_zcid($profile_uid,$zcid); - if(! $t) + } + if (! $t) { return; + } - if($cid) + if ($cid) { $r = common_friends($profile_uid,$cid,0,5,true); - else + } else { $r = common_friends_zcid($profile_uid,$zcid,0,5,true); + } return replace_macros(get_markup_template('remote_friends_common.tpl'), array( '$desc' => sprintf( tt("%d contact in common", "%d contacts in common", $t), $t), diff --git a/include/conversation.php b/include/conversation.php index 93c42cd7b1..424f60bb49 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -7,7 +7,7 @@ require_once("include/acl_selectors.php"); // Note: the code in 'item_extract_images' and 'item_redir_and_replace_images' // is identical to the code in mod/message.php for 'item_extract_images' and // 'item_redir_and_replace_images' -if(! function_exists('item_extract_images')) { +if (! function_exists('item_extract_images')) { function item_extract_images($body) { $saved_image = array(); @@ -18,12 +18,12 @@ function item_extract_images($body) { $img_start = strpos($orig_body, '[img'); $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false); $img_end = ($img_start !== false ? strpos(substr($orig_body, $img_start), '[/img]') : false); - while(($img_st_close !== false) && ($img_end !== false)) { + while (($img_st_close !== false) && ($img_end !== false)) { $img_st_close++; // make it point to AFTER the closing bracket $img_end += $img_start; - if(! strcmp(substr($orig_body, $img_start + $img_st_close, 5), 'data:')) { + if (! strcmp(substr($orig_body, $img_start + $img_st_close, 5), 'data:')) { // This is an embedded image $saved_image[$cnt] = substr($orig_body, $img_start + $img_st_close, $img_end - ($img_start + $img_st_close)); @@ -36,7 +36,7 @@ function item_extract_images($body) { $orig_body = substr($orig_body, $img_end + strlen('[/img]')); - if($orig_body === false) // in case the body ends on a closing image tag + if ($orig_body === false) // in case the body ends on a closing image tag $orig_body = ''; $img_start = strpos($orig_body, '[img'); @@ -49,7 +49,7 @@ function item_extract_images($body) { return array('body' => $new_body, 'images' => $saved_image); }} -if(! function_exists('item_redir_and_replace_images')) { +if (! function_exists('item_redir_and_replace_images')) { function item_redir_and_replace_images($body, $images, $cid) { $origbody = $body; @@ -57,7 +57,7 @@ function item_redir_and_replace_images($body, $images, $cid) { $cnt = 1; $pos = get_bb_tag_pos($origbody, 'url', 1); - while($pos !== false && $cnt < 1000) { + while ($pos !== false && $cnt < 1000) { $search = '/\[url\=(.*?)\]\[!#saved_image([0-9]*)#!\]\[\/url\]' . '/is'; $replace = '[url=' . z_path() . '/redir/' . $cid @@ -66,7 +66,7 @@ function item_redir_and_replace_images($body, $images, $cid) { $newbody .= substr($origbody, 0, $pos['start']['open']); $subject = substr($origbody, $pos['start']['open'], $pos['end']['close'] - $pos['start']['open']); $origbody = substr($origbody, $pos['end']['close']); - if($origbody === false) + if ($origbody === false) $origbody = ''; $subject = preg_replace($search, $replace, $subject); @@ -96,7 +96,7 @@ function item_redir_and_replace_images($body, $images, $cid) { function localize_item(&$item){ $extracted = item_extract_images($item['body']); - if($extracted['images']) + if ($extracted['images']) $item['body'] = item_redir_and_replace_images($extracted['body'], $extracted['images'], $item['contact-id']); $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; @@ -126,7 +126,7 @@ function localize_item(&$item){ } break; default: - if($obj['resource-id']){ + if ($obj['resource-id']){ $post_type = t('photo'); $m=array(); preg_match("/\[url=([^]]*)\]/", $obj['body'], $m); $rr['plink'] = $m[1]; @@ -137,19 +137,19 @@ function localize_item(&$item){ $plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]'; - if(activity_match($item['verb'],ACTIVITY_LIKE)) { + if (activity_match($item['verb'],ACTIVITY_LIKE)) { $bodyverb = t('%1$s likes %2$s\'s %3$s'); } - elseif(activity_match($item['verb'],ACTIVITY_DISLIKE)) { + elseif (activity_match($item['verb'],ACTIVITY_DISLIKE)) { $bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s'); } - elseif(activity_match($item['verb'],ACTIVITY_ATTEND)) { + elseif (activity_match($item['verb'],ACTIVITY_ATTEND)) { $bodyverb = t('%1$s attends %2$s\'s %3$s'); } - elseif(activity_match($item['verb'],ACTIVITY_ATTENDNO)) { + elseif (activity_match($item['verb'],ACTIVITY_ATTENDNO)) { $bodyverb = t('%1$s doesn\'t attend %2$s\'s %3$s'); } - elseif(activity_match($item['verb'],ACTIVITY_ATTENDMAYBE)) { + elseif (activity_match($item['verb'],ACTIVITY_ATTENDMAYBE)) { $bodyverb = t('%1$s attends maybe %2$s\'s %3$s'); } $item['body'] = sprintf($bodyverb, $author, $objauthor, $plink); @@ -187,7 +187,7 @@ function localize_item(&$item){ } if (stristr($item['verb'],ACTIVITY_POKE)) { $verb = urldecode(substr($item['verb'],strpos($item['verb'],'#')+1)); - if(! $verb) + if (! $verb) return; if ($item['object-type']=="" || $item['object-type']!== ACTIVITY_OBJ_PERSON) return; @@ -229,7 +229,7 @@ function localize_item(&$item){ } if (stristr($item['verb'],ACTIVITY_MOOD)) { $verb = urldecode(substr($item['verb'],strpos($item['verb'],'#')+1)); - if(! $verb) + if (! $verb) return; $Aname = $item['author-name']; @@ -262,7 +262,7 @@ function localize_item(&$item){ } break; default: - if($obj['resource-id']){ + if ($obj['resource-id']){ $post_type = t('photo'); $m=array(); preg_match("/\[url=([^]]*)\]/", $obj['body'], $m); $rr['plink'] = $m[1]; @@ -289,7 +289,7 @@ function localize_item(&$item){ $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; $obj = parse_xml_string($xmlhead.$item['object']); - if(strlen($obj->id)) { + if (strlen($obj->id)) { $r = q("select * from item where uri = '%s' and uid = %d limit 1", dbesc($obj->id), intval($item['uid']) @@ -307,16 +307,16 @@ function localize_item(&$item){ } } $matches = null; - if(preg_match_all('/@\[url=(.*?)\]/is',$item['body'],$matches,PREG_SET_ORDER)) { + if (preg_match_all('/@\[url=(.*?)\]/is',$item['body'],$matches,PREG_SET_ORDER)) { foreach($matches as $mtch) { - if(! strpos($mtch[1],'zrl=')) + if (! strpos($mtch[1],'zrl=')) $item['body'] = str_replace($mtch[0],'@[url=' . zrl($mtch[1]). ']',$item['body']); } } // add zrl's to public images $photo_pattern = "/\[url=(.*?)\/photos\/(.*?)\/image\/(.*?)\]\[img(.*?)\]h(.*?)\[\/img\]\[\/url\]/is"; - if(preg_match($photo_pattern,$item['body'])) { + if (preg_match($photo_pattern,$item['body'])) { $photo_replace = '[url=' . zrl('$1' . '/photos/' . '$2' . '/image/' . '$3' ,true) . '][img' . '$4' . ']h' . '$5' . '[/img][/url]'; $item['body'] = bb_tag_preg_replace($photo_pattern, $photo_replace, 'url', $item['body']); } @@ -343,9 +343,9 @@ function localize_item(&$item){ function count_descendants($item) { $total = count($item['children']); - if($total > 0) { + if ($total > 0) { foreach($item['children'] as $child) { - if(! visible_activity($child)) + if (! visible_activity($child)) $total --; $total += count_descendants($child); } @@ -361,13 +361,13 @@ function visible_activity($item) { $hidden_activities = array(ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE); foreach($hidden_activities as $act) { - if(activity_match($item['verb'],$act)) { + if (activity_match($item['verb'],$act)) { return false; } } - if(activity_match($item['verb'],ACTIVITY_FOLLOW) && $item['object-type'] === ACTIVITY_OBJ_NOTE) { - if(! (($item['self']) && ($item['uid'] == local_user()))) { + if (activity_match($item['verb'],ACTIVITY_FOLLOW) && $item['object-type'] === ACTIVITY_OBJ_NOTE) { + if (! (($item['self']) && ($item['uid'] == local_user()))) { return false; } } @@ -465,7 +465,7 @@ function item_condition() { * */ -if(!function_exists('conversation')) { +if (!function_exists('conversation')) { function conversation(App $a, $items, $mode, $update, $preview = false) { require_once('include/bbcode.php'); @@ -480,9 +480,9 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $arr_blocked = null; - if(local_user()) { + if (local_user()) { $str_blocked = get_pconfig(local_user(),'system','blocked'); - if($str_blocked) { + if ($str_blocked) { $arr_blocked = explode(',',$str_blocked); for($x = 0; $x < count($arr_blocked); $x ++) $arr_blocked[$x] = trim($arr_blocked[$x]); @@ -492,10 +492,10 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $previewing = (($preview) ? ' preview ' : ''); - if($mode === 'network') { + if ($mode === 'network') { $profile_owner = local_user(); $page_writeable = true; - if(!$update) { + if (!$update) { // The special div is needed for liveUpdate to kick in for this page. // We only launch liveUpdate if you aren't filtering in some incompatible // way and also you aren't writing a comment (discovered in javascript). @@ -520,14 +520,14 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { . "'; var profile_page = " . $a->pager['page'] . "; \r\n"; } } - else if($mode === 'profile') { + else if ($mode === 'profile') { $profile_owner = $a->profile['profile_uid']; $page_writeable = can_write_wall($a,$profile_owner); - if(!$update) { + if (!$update) { $tab = notags(trim($_GET['tab'])); $tab = ( $tab ? $tab : 'posts' ); - if($tab === 'posts') { + if ($tab === 'posts') { // This is ugly, but we can't pass the profile_uid through the session to the ajax updater, // because browser prefetching might change it on us. We have to deliver it with the page. @@ -537,40 +537,40 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { } } } - else if($mode === 'notes') { + else if ($mode === 'notes') { $profile_owner = local_user(); $page_writeable = true; - if(!$update) { + if (!$update) { $live_update_div = '
' . "\r\n" . "\r\n"; } } - else if($mode === 'display') { + else if ($mode === 'display') { $profile_owner = $a->profile['uid']; $page_writeable = can_write_wall($a,$profile_owner); - if(!$update) { + if (!$update) { $live_update_div = '
' . "\r\n" . ""; } } - else if($mode === 'community') { + else if ($mode === 'community') { $profile_owner = 0; $page_writeable = false; - if(!$update) { + if (!$update) { $live_update_div = '
' . "\r\n" . "\r\n"; } } - else if($mode === 'search') { + else if ($mode === 'search') { $live_update_div = '' . "\r\n"; } $page_dropping = ((local_user() && local_user() == $profile_owner) ? true : false); - if($update) + if ($update) $return_url = $_SESSION['return_url']; else $return_url = $_SESSION['return_url'] = $a->query_string; @@ -594,9 +594,9 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $page_template = get_markup_template("conversation.tpl"); - if($items && count($items)) { + if ($items && count($items)) { - if($mode === 'network-new' || $mode === 'search' || $mode === 'community') { + if ($mode === 'network-new' || $mode === 'search' || $mode === 'community') { // "New Item View" on network page or search page results // - just loop through the items and format them minimally for display @@ -606,15 +606,15 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { foreach($items as $item) { - if($arr_blocked) { + if ($arr_blocked) { $blocked = false; foreach($arr_blocked as $b) { - if($b && link_compare($item['author-link'],$b)) { + if ($b && link_compare($item['author-link'],$b)) { $blocked = true; break; } } - if($blocked) + if ($blocked) continue; } @@ -626,8 +626,8 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $owner_name = ''; $sparkle = ''; - if($mode === 'search' || $mode === 'community') { - if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) + if ($mode === 'search' || $mode === 'community') { + if (((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) && ($item['id'] != $item['parent'])) continue; $nickname = $item['nickname']; @@ -636,11 +636,11 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $nickname = $a->user['nickname']; // prevent private email from leaking. - if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) + if ($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) continue; $profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']); - if($item['author-link'] && (! $item['author-name'])) + if ($item['author-link'] && (! $item['author-name'])) $profile_name = $item['author-link']; @@ -669,9 +669,9 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $sp = false; $profile_link = best_link_url($item,$sp); - if($profile_link === 'mailbox') + if ($profile_link === 'mailbox') $profile_link = ''; - if($sp) + if ($sp) $sparkle = ' sparkle'; else $profile_link = zrl($profile_link); @@ -698,7 +698,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_dummy($locate)); localize_item($item); - if($mode === 'network-new') + if ($mode === 'network-new') $dropping = true; else $dropping = false; @@ -723,7 +723,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { list($categories, $folders) = get_cats_and_terms($item); - if($a->theme['template_engine'] === 'internal') { + if ($a->theme['template_engine'] === 'internal') { $profile_name_e = template_escape($profile_name); $item['title_e'] = template_escape($item['title']); $body_e = template_escape($body); @@ -820,16 +820,16 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $threads = array(); foreach($items as $item) { - if($arr_blocked) { + if ($arr_blocked) { $blocked = false; foreach($arr_blocked as $b) { - if($b && link_compare($item['author-link'],$b)) { + if ($b && link_compare($item['author-link'],$b)) { $blocked = true; break; } } - if($blocked) + if ($blocked) continue; } @@ -839,10 +839,10 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { builtin_activity_puller($item, $conv_responses); // Only add what is visible - if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) { + if ($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) { continue; } - if(! visible_activity($item)) { + if (! visible_activity($item)) { continue; } @@ -850,7 +850,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $item['pagedrop'] = $page_dropping; - if($item['id'] == $item['parent']) { + if ($item['id'] == $item['parent']) { $item_object = new Item($item); $conv->add_thread($item_object); } @@ -858,7 +858,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $threads = $conv->get_template_data($conv_responses); - if(!$threads) { + if (!$threads) { logger('[ERROR] conversation : Failed to get template data.', LOGGER_DEBUG); $threads = array(); } @@ -894,8 +894,8 @@ function best_link_url($item,&$sparkle,$ssl_state = false) { $sparkle = true; } } - if(! $best_url) { - if(strlen($item['author-link'])) + if (! $best_url) { + if (strlen($item['author-link'])) $best_url = $item['author-link']; else $best_url = $item['url']; @@ -910,7 +910,7 @@ function item_photo_menu($item) { $ssl_state = false; - if(local_user()) { + if (local_user()) { $ssl_state = true; } @@ -944,7 +944,7 @@ function item_photo_menu($item) $rel = $r[0]['rel']; } - if($sparkle) { + if ($sparkle) { $status_link = $profile_link . '?url=status'; $photos_link = $profile_link . '?url=photos'; $profile_link = $profile_link . '?url=profile'; @@ -1012,7 +1012,7 @@ function item_photo_menu($item) * @param array &$conv_responses (already created with builtin activity structure) * @return void */ -if(! function_exists('builtin_activity_puller')) { +if (! function_exists('builtin_activity_puller')) { function builtin_activity_puller($item, &$conv_responses) { foreach($conv_responses as $mode => $v) { $url = ''; @@ -1039,9 +1039,9 @@ function builtin_activity_puller($item, &$conv_responses) { break; } - if((activity_match($item['verb'], $verb)) && ($item['id'] != $item['parent'])) { + if ((activity_match($item['verb'], $verb)) && ($item['id'] != $item['parent'])) { $url = $item['author-link']; - if((local_user()) && (local_user() == $item['uid']) && ($item['network'] === NETWORK_DFRN) && (! $item['self']) && (link_compare($item['author-link'],$item['url']))) { + if ((local_user()) && (local_user() == $item['uid']) && ($item['network'] === NETWORK_DFRN) && (! $item['self']) && (link_compare($item['author-link'],$item['url']))) { $url = 'redir/' . $item['contact-id']; $sparkle = ' class="sparkle" '; } @@ -1050,18 +1050,18 @@ function builtin_activity_puller($item, &$conv_responses) { $url = '' . htmlentities($item['author-name']) . ''; - if(! $item['thr-parent']) + if (! $item['thr-parent']) $item['thr-parent'] = $item['parent-uri']; - if(! ((isset($conv_responses[$mode][$item['thr-parent'] . '-l'])) + if (! ((isset($conv_responses[$mode][$item['thr-parent'] . '-l'])) && (is_array($conv_responses[$mode][$item['thr-parent'] . '-l'])))) $conv_responses[$mode][$item['thr-parent'] . '-l'] = array(); // only list each unique author once - if(in_array($url,$conv_responses[$mode][$item['thr-parent'] . '-l'])) + if (in_array($url,$conv_responses[$mode][$item['thr-parent'] . '-l'])) continue; - if(! isset($conv_responses[$mode][$item['thr-parent']])) + if (! isset($conv_responses[$mode][$item['thr-parent']])) $conv_responses[$mode][$item['thr-parent']] = 1; else $conv_responses[$mode][$item['thr-parent']] ++; @@ -1085,12 +1085,12 @@ function builtin_activity_puller($item, &$conv_responses) { // $id = item id // returns formatted text -if(! function_exists('format_like')) { +if (! function_exists('format_like')) { function format_like($cnt,$arr,$type,$id) { $o = ''; $expanded = ''; - if($cnt == 1) { + if ($cnt == 1) { $likers = $arr[0]; // Phrase if there is only one liker. In other cases it will be uses for the expanded @@ -1114,16 +1114,16 @@ function format_like($cnt,$arr,$type,$id) { } } - if($cnt > 1) { + if ($cnt > 1) { $total = count($arr); - if($total >= MAX_LIKERS) + if ($total >= MAX_LIKERS) $arr = array_slice($arr, 0, MAX_LIKERS - 1); - if($total < MAX_LIKERS) { + if ($total < MAX_LIKERS) { $last = t('and') . ' ' . $arr[count($arr)-1]; $arr2 = array_slice($arr, 0, -1); $str = implode(', ', $arr2) . ' ' . $last; } - if($total >= MAX_LIKERS) { + if ($total >= MAX_LIKERS) { $str = implode(', ', $arr); $str .= sprintf( t(', and %d other people'), $total - MAX_LIKERS ); } @@ -1211,17 +1211,17 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { // Private/public post links for the non-JS ACL form $private_post = 1; - if($_REQUEST['public']) + if ($_REQUEST['public']) $private_post = 0; $query_str = $a->query_string; - if(strpos($query_str, 'public=1') !== false) + if (strpos($query_str, 'public=1') !== false) $query_str = str_replace(array('?public=1', '&public=1'), array('', ''), $query_str); // I think $a->query_string may never have ? in it, but I could be wrong // It looks like it's from the index.php?q=[etc] rewrite that the web // server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61 - if(strpos($query_str, '?') === false) + if (strpos($query_str, '?') === false) $public_post_link = '?public=1'; else $public_post_link = '&public=1'; @@ -1303,19 +1303,19 @@ function get_item_children($arr, $parent) { $children = array(); $a = get_app(); foreach($arr as $item) { - if($item['id'] != $item['parent']) { - if(get_config('system','thread_allow') && $a->theme_thread_allow) { + if ($item['id'] != $item['parent']) { + if (get_config('system','thread_allow') && $a->theme_thread_allow) { // Fallback to parent-uri if thr-parent is not set $thr_parent = $item['thr-parent']; - if($thr_parent == '') + if ($thr_parent == '') $thr_parent = $item['parent-uri']; - if($thr_parent == $parent['uri']) { + if ($thr_parent == $parent['uri']) { $item['children'] = get_item_children($arr, $item); $children[] = $item; } } - else if($item['parent'] == $parent['id']) { + else if ($item['parent'] == $parent['id']) { $children[] = $item; } } @@ -1327,7 +1327,7 @@ function sort_item_children($items) { $result = $items; usort($result,'sort_thr_created_rev'); foreach($result as $k => $i) { - if(count($result[$k]['children'])) { + if (count($result[$k]['children'])) { $result[$k]['children'] = sort_item_children($result[$k]['children']); } } @@ -1337,14 +1337,14 @@ function sort_item_children($items) { function add_children_to_list($children, &$arr) { foreach($children as $y) { $arr[] = $y; - if(count($y['children'])) + if (count($y['children'])) add_children_to_list($y['children'], $arr); } } function conv_sort($arr,$order) { - if((!(is_array($arr) && count($arr)))) + if ((!(is_array($arr) && count($arr)))) return array(); $parents = array(); @@ -1360,28 +1360,28 @@ function conv_sort($arr,$order) { $arr = $newarr; foreach($arr as $x) - if($x['id'] == $x['parent']) + if ($x['id'] == $x['parent']) $parents[] = $x; - if(stristr($order,'created')) + if (stristr($order,'created')) usort($parents,'sort_thr_created'); - elseif(stristr($order,'commented')) + elseif (stristr($order,'commented')) usort($parents,'sort_thr_commented'); - if(count($parents)) + if (count($parents)) foreach($parents as $i=>$_x) $parents[$i]['children'] = get_item_children($arr, $_x); /*foreach($arr as $x) { - if($x['id'] != $x['parent']) { + if ($x['id'] != $x['parent']) { $p = find_thread_parent_index($parents,$x); - if($p !== false) + if ($p !== false) $parents[$p]['children'][] = $x; } }*/ - if(count($parents)) { + if (count($parents)) { foreach($parents as $k => $v) { - if(count($parents[$k]['children'])) { + if (count($parents[$k]['children'])) { $parents[$k]['children'] = sort_item_children($parents[$k]['children']); /*$y = $parents[$k]['children']; usort($y,'sort_thr_created_rev'); @@ -1391,10 +1391,10 @@ function conv_sort($arr,$order) { } $ret = array(); - if(count($parents)) { + if (count($parents)) { foreach($parents as $x) { $ret[] = $x; - if(count($x['children'])) + if (count($x['children'])) add_children_to_list($x['children'], $ret); /*foreach($x['children'] as $y) $ret[] = $y;*/ @@ -1418,9 +1418,11 @@ function sort_thr_commented($a,$b) { } function find_thread_parent_index($arr,$x) { - foreach($arr as $k => $v) - if($v['id'] == $x['parent']) + foreach($arr as $k => $v) { + if ($v['id'] == $x['parent']) { return $k; + } + } return false; } @@ -1439,12 +1441,11 @@ function get_responses($conv_responses,$response_verbs,$ob,$item) { $ret[$v]['count'] = ((x($conv_responses[$v],$item['uri'])) ? $conv_responses[$v][$item['uri']] : ''); $ret[$v]['list'] = ((x($conv_responses[$v],$item['uri'])) ? $conv_responses[$v][$item['uri'] . '-l'] : ''); $ret[$v]['self'] = ((x($conv_responses[$v],$item['uri'])) ? $conv_responses[$v][$item['uri'] . '-self'] : '0'); - if(count($ret[$v]['list']) > MAX_LIKERS) { + if (count($ret[$v]['list']) > MAX_LIKERS) { $ret[$v]['list_part'] = array_slice($ret[$v]['list'], 0, MAX_LIKERS); array_push($ret[$v]['list_part'], '' . t('View all') . ''); - } - else { + } else { $ret[$v]['list_part'] = ''; } $ret[$v]['button'] = get_response_button_text($v,$ret[$v]['count']); diff --git a/include/cron.php b/include/cron.php index 059c199923..552121746d 100644 --- a/include/cron.php +++ b/include/cron.php @@ -19,12 +19,12 @@ function cron_run(&$argv, &$argc){ $last = get_config('system','last_cron'); $poll_interval = intval(get_config('system','cron_interval')); - if(! $poll_interval) + if (! $poll_interval) $poll_interval = 10; - if($last) { + if ($last) { $next = $last + ($poll_interval * 60); - if($next > time()) { + if ($next > time()) { logger('cron intervall not reached'); return; } @@ -64,7 +64,7 @@ function cron_run(&$argv, &$argc){ $d1 = get_config('system','last_expire_day'); $d2 = intval(datetime_convert('UTC','UTC','now','d')); - if($d2 != intval($d1)) { + if ($d2 != intval($d1)) { update_contact_birthdays(); @@ -171,7 +171,7 @@ function cron_poll_contacts($argc, $argv) { // we are unable to match those posts with a Diaspora GUID and prevent duplicates. $abandon_days = intval(get_config('system','account_abandon_days')); - if($abandon_days < 1) + if ($abandon_days < 1) $abandon_days = 0; $abandon_sql = (($abandon_days) @@ -214,13 +214,13 @@ function cron_poll_contacts($argc, $argv) { $xml = false; - if($manual_id) + if ($manual_id) $contact['last-update'] = '0000-00-00 00:00:00'; - if(in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS))) + if (in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS))) $contact['priority'] = 2; - if($contact['subhub'] AND in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS))) { + if ($contact['subhub'] AND in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS))) { // We should be getting everything via a hub. But just to be sure, let's check once a day. // (You can make this more or less frequent if desired by setting 'pushpoll_frequency' appropriately) // This also lets us update our subscription to the hub, and add or replace hubs in case it @@ -230,7 +230,7 @@ function cron_poll_contacts($argc, $argv) { $contact['priority'] = (($poll_interval !== false) ? intval($poll_interval) : 3); } - if($contact['priority'] AND !$force) { + if ($contact['priority'] AND !$force) { $update = false; @@ -242,24 +242,24 @@ function cron_poll_contacts($argc, $argv) { switch ($contact['priority']) { case 5: - if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 month")) + if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 month")) $update = true; break; case 4: - if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 week")) + if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 week")) $update = true; break; case 3: - if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day")) + if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day")) $update = true; break; case 2: - if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 12 hour")) + if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 12 hour")) $update = true; break; case 1: default: - if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 hour")) + if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 hour")) $update = true; break; } @@ -287,14 +287,16 @@ function cron_clear_cache(App $a) { $last = get_config('system','cache_last_cleared'); - if($last) { + if ($last) { $next = $last + (3600); // Once per hour $clear_cache = ($next <= time()); - } else + } else { $clear_cache = true; + } - if (!$clear_cache) + if (!$clear_cache) { return; + } // clear old cache Cache::clear(); @@ -313,7 +315,9 @@ function cron_clear_cache(App $a) { clear_cache($a->get_basepath(), $a->get_basepath()."/proxy"); $cachetime = get_config('system','proxy_cache_time'); - if (!$cachetime) $cachetime = PROXY_DEFAULT_TIME; + if (!$cachetime) { + $cachetime = PROXY_DEFAULT_TIME; + } q('DELETE FROM `photo` WHERE `uid` = 0 AND `resource-id` LIKE "pic:%%" AND `created` < NOW() - INTERVAL %d SECOND', $cachetime); } @@ -326,26 +330,30 @@ function cron_clear_cache(App $a) { // Maximum table size in megabyte $max_tablesize = intval(get_config('system','optimize_max_tablesize')) * 1000000; - if ($max_tablesize == 0) + if ($max_tablesize == 0) { $max_tablesize = 100 * 1000000; // Default are 100 MB + } if ($max_tablesize > 0) { // Minimum fragmentation level in percent $fragmentation_level = intval(get_config('system','optimize_fragmentation')) / 100; - if ($fragmentation_level == 0) + if ($fragmentation_level == 0) { $fragmentation_level = 0.3; // Default value is 30% + } // Optimize some tables that need to be optimized $r = q("SHOW TABLE STATUS"); foreach($r as $table) { // Don't optimize tables that are too large - if ($table["Data_length"] > $max_tablesize) + if ($table["Data_length"] > $max_tablesize) { continue; + } // Don't optimize empty tables - if ($table["Data_length"] == 0) + if ($table["Data_length"] == 0) { continue; + } // Calculate fragmentation $fragmentation = $table["Data_free"] / ($table["Data_length"] + $table["Index_length"]); @@ -353,8 +361,9 @@ function cron_clear_cache(App $a) { logger("Table ".$table["Name"]." - Fragmentation level: ".round($fragmentation * 100, 2), LOGGER_DEBUG); // Don't optimize tables that needn't to be optimized - if ($fragmentation < $fragmentation_level) + if ($fragmentation < $fragmentation_level) { continue; + } // So optimize it logger("Optimize Table ".$table["Name"], LOGGER_DEBUG); @@ -414,9 +423,11 @@ function cron_repair_database() { // Update the global contacts for local users $r = q("SELECT `uid` FROM `user` WHERE `verified` AND NOT `blocked` AND NOT `account_removed` AND NOT `account_expired`"); - if (dbm::is_result($r)) - foreach ($r AS $user) + if (dbm::is_result($r)) { + foreach ($r AS $user) { update_gcontact_for_user($user["uid"]); + } + } /// @todo /// - remove thread entries without item diff --git a/include/cronhooks.php b/include/cronhooks.php index bea0f6a198..349cac4f4e 100644 --- a/include/cronhooks.php +++ b/include/cronhooks.php @@ -8,23 +8,25 @@ function cronhooks_run(&$argv, &$argc){ require_once('include/datetime.php'); if (($argc == 2) AND is_array($a->hooks) AND array_key_exists("cron", $a->hooks)) { - foreach ($a->hooks["cron"] as $hook) + foreach ($a->hooks["cron"] as $hook) { if ($hook[1] == $argv[1]) { logger("Calling cron hook '".$hook[1]."'", LOGGER_DEBUG); call_single_hook($a, $name, $hook, $data); } + } return; } $last = get_config('system', 'last_cronhook'); $poll_interval = intval(get_config('system','cronhook_interval')); - if(! $poll_interval) + if (! $poll_interval) { $poll_interval = 9; + } - if($last) { + if ($last) { $next = $last + ($poll_interval * 60); - if($next > time()) { + if ($next > time()) { logger('cronhook intervall not reached'); return; } diff --git a/include/crypto.php b/include/crypto.php index f5163a9dac..5eb0bc6e19 100644 --- a/include/crypto.php +++ b/include/crypto.php @@ -12,7 +12,7 @@ function rsa_sign($data,$key,$alg = 'sha256') { openssl_sign($data,$sig,$key,(($alg == 'sha1') ? OPENSSL_ALGO_SHA1 : $alg)); } else { - if(strlen($key) < 1024 || extension_loaded('gmp')) { + if (strlen($key) < 1024 || extension_loaded('gmp')) { require_once('library/phpsec/Crypt/RSA.php'); $rsa = new CRYPT_RSA(); $rsa->signatureMode = CRYPT_RSA_SIGNATURE_PKCS1; @@ -34,7 +34,7 @@ function rsa_verify($data,$sig,$key,$alg = 'sha256') { $verify = openssl_verify($data,$sig,$key,(($alg == 'sha1') ? OPENSSL_ALGO_SHA1 : $alg)); } else { - if(strlen($key) <= 300 || extension_loaded('gmp')) { + if (strlen($key) <= 300 || extension_loaded('gmp')) { require_once('library/phpsec/Crypt/RSA.php'); $rsa = new CRYPT_RSA(); $rsa->signatureMode = CRYPT_RSA_SIGNATURE_PKCS1; @@ -186,7 +186,7 @@ function salmon_key($pubkey) { -if(! function_exists('aes_decrypt')) { +if (! function_exists('aes_decrypt')) { // DEPRECATED IN 3.4.1 function aes_decrypt($val,$ky) { @@ -200,7 +200,7 @@ function aes_decrypt($val,$ky) }} -if(! function_exists('aes_encrypt')) { +if (! function_exists('aes_encrypt')) { // DEPRECATED IN 3.4.1 function aes_encrypt($val,$ky) { @@ -237,12 +237,12 @@ function new_keypair($bits) { ); $conf = get_config('system','openssl_conf_file'); - if($conf) + if ($conf) $openssl_options['config'] = $conf; $result = openssl_pkey_new($openssl_options); - if(empty($result)) { + if (empty($result)) { logger('new_keypair: failed'); return false; } diff --git a/include/datetime.php b/include/datetime.php index 8d4961cd7c..d4e9027119 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -14,12 +14,12 @@ use \Friendica\Core\Config; * @return int */ function timezone_cmp($a, $b) { - if(strstr($a,'/') && strstr($b,'/')) { + if (strstr($a,'/') && strstr($b,'/')) { if ( t($a) == t($b)) return 0; return ( t($a) < t($b)) ? -1 : 1; } - if(strstr($a,'/')) return -1; - if(strstr($b,'/')) return 1; + if (strstr($a,'/')) return -1; + if (strstr($b,'/')) return 1; if ( t($a) == t($b)) return 0; return ( t($a) < t($b)) ? -1 : 1; @@ -41,21 +41,21 @@ function select_timezone($current = 'America/Los_Angeles') { $continent = ''; foreach($timezone_identifiers as $value) { $ex = explode("/", $value); - if(count($ex) > 1) { - if($ex[0] != $continent) { - if($continent != '') + if (count($ex) > 1) { + if ($ex[0] != $continent) { + if ($continent != '') $o .= ''; $continent = $ex[0]; $o .= ''; } - if(count($ex) > 2) + if (count($ex) > 2) $city = substr($value,strpos($value,'/')+1); else $city = $ex[1]; } else { $city = $ex[0]; - if($continent != t('Miscellaneous')) { + if ($continent != t('Miscellaneous')) { $o .= ''; $continent = t('Miscellaneous'); $o .= ''; @@ -114,11 +114,11 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d // Defaults to UTC if nothing is set, but throws an exception if set to empty string. // Provide some sane defaults regardless. - if($from === '') + if ($from === '') $from = 'UTC'; - if($to === '') + if ($to === '') $to = 'UTC'; - if( ($s === '') || (! is_string($s)) ) + if ( ($s === '') || (! is_string($s)) ) $s = 'now'; // Slight hackish adjustment so that 'zero' datetime actually returns what is intended @@ -126,7 +126,7 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d // add 32 days so that we at least get year 00, and then hack around the fact that // months and days always start with 1. - if(substr($s,0,10) == '0000-00-00') { + if (substr($s,0,10) == '0000-00-00') { $d = new DateTime($s . ' + 32 days', new DateTimeZone('UTC')); return str_replace('1','0',$d->format($fmt)); } @@ -169,9 +169,9 @@ function dob($dob) { list($year,$month,$day) = sscanf($dob,'%4d-%2d-%2d'); $f = get_config('system','birthday_input_format'); - if(! $f) + if (! $f) $f = 'ymd'; - if($dob === '0000-00-00') + if ($dob === '0000-00-00') $value = ''; else $value = (($year) ? datetime_convert('UTC','UTC',$dob,'Y-m-d') : datetime_convert('UTC','UTC',$dob,'m-d')); @@ -279,9 +279,9 @@ function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicke $o = ''; $dateformat = ''; - if($pickdate) $dateformat .= 'Y-m-d'; - if($pickdate && $picktime) $dateformat .= ' '; - if($picktime) $dateformat .= 'H:i'; + if ($pickdate) $dateformat .= 'Y-m-d'; + if ($pickdate && $picktime) $dateformat .= ' '; + if ($picktime) $dateformat .= 'H:i'; $minjs = $min ? ",minDate: new Date({$min->getTimestamp()}*1000), yearStart: " . $min->format('Y') : ''; $maxjs = $max ? ",maxDate: new Date({$max->getTimestamp()}*1000), yearEnd: " . $max->format('Y') : ''; @@ -290,14 +290,14 @@ function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicke $defaultdatejs = $default ? ",defaultDate: new Date({$default->getTimestamp()}*1000)" : ''; $pickers = ''; - if(!$pickdate) $pickers .= ',datepicker: false'; - if(!$picktime) $pickers .= ',timepicker: false'; + if (!$pickdate) $pickers .= ',datepicker: false'; + if (!$picktime) $pickers .= ',timepicker: false'; $extra_js = ''; $pickers .= ",dayOfWeekStart: ".$firstDay.",lang:'".$lang."'"; - if($minfrom != '') + if ($minfrom != '') $extra_js .= "\$('#id_$minfrom').data('xdsoft_datetimepicker').setOptions({onChangeDateTime: function (currentDateTime) { \$('#id_$id').data('xdsoft_datetimepicker').setOptions({minDate: currentDateTime})}})"; - if($maxfrom != '') + if ($maxfrom != '') $extra_js .= "\$('#id_$maxfrom').data('xdsoft_datetimepicker').setOptions({onChangeDateTime: function (currentDateTime) { \$('#id_$id').data('xdsoft_datetimepicker').setOptions({maxDate: currentDateTime})}})"; $readable_format = $dateformat; @@ -394,11 +394,11 @@ function relative_date($posted_date, $format = null) { * @return int Age in years */ function age($dob,$owner_tz = '',$viewer_tz = '') { - if(! intval($dob)) + if (! intval($dob)) return 0; - if(! $owner_tz) + if (! $owner_tz) $owner_tz = date_default_timezone_get(); - if(! $viewer_tz) + if (! $viewer_tz) $viewer_tz = date_default_timezone_get(); $birthdate = datetime_convert('UTC',$owner_tz,$dob . ' 00:00:00+00:00','Y-m-d'); @@ -407,7 +407,7 @@ function age($dob,$owner_tz = '',$viewer_tz = '') { $curr_month = datetime_convert('UTC',$viewer_tz,'now','m'); $curr_day = datetime_convert('UTC',$viewer_tz,'now','d'); - if(($curr_month < $month) || (($curr_month == $month) && ($curr_day < $day))) + if (($curr_month < $month) || (($curr_month == $month) && ($curr_day < $day))) $year_diff--; return $year_diff; @@ -430,10 +430,10 @@ function get_dim($y,$m) { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31); - if($m != 2) + if ($m != 2) return $dim[$m]; - if(((($y % 4) == 0) && (($y % 100) != 0)) || (($y % 400) == 0)) + if (((($y % 4) == 0) && (($y % 100) != 0)) || (($y % 400) == 0)) return 29; return $dim[2]; @@ -486,10 +486,12 @@ function cal($y = 0,$m = 0, $links = false, $class='') { $thisyear = datetime_convert('UTC',date_default_timezone_get(),'now','Y'); $thismonth = datetime_convert('UTC',date_default_timezone_get(),'now','m'); - if(! $y) + if (! $y) { $y = $thisyear; - if(! $m) + } + if (! $m) { $m = intval($thismonth); + } $dn = array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'); $f = get_first_dim($y,$m); @@ -498,29 +500,33 @@ function cal($y = 0,$m = 0, $links = false, $class='') { $dow = 0; $started = false; - if(($y == $thisyear) && ($m == $thismonth)) + if (($y == $thisyear) && ($m == $thismonth)) { $tddate = intval(datetime_convert('UTC',date_default_timezone_get(),'now','j')); + } $str_month = day_translate($mtab[$m]); $o = ''; $o .= ""; - for($a = 0; $a < 7; $a ++) + for($a = 0; $a < 7; $a ++) { $o .= ''; + } $o .= ''; - while($d <= $l) { - if(($dow == $f) && (! $started)) + while ($d <= $l) { + if (($dow == $f) && (! $started)) { $started = true; + } $today = (((isset($tddate)) && ($tddate == $d)) ? "class=\"today\" " : ''); $o .= "'; $dow ++; - if(($dow == 7) && ($d <= $l)) { + if (($dow == 7) && ($d <= $l)) { $dow = 0; $o .= ''; } } - if($dow) - for($a = $dow; $a < 7; $a ++) + if ($dow) { + for ($a = $dow; $a < 7; $a ++) { $o .= ''; + } + } $o .= '
$str_month $y
' . mb_substr(day_translate($dn[$a]),0,3,'UTF-8') . '
"; $day = str_replace(' ',' ',sprintf('%2.2d', $d)); - if($started) { - if(is_array($links) && isset($links[$d])) + if ($started) { + if (is_array($links) && isset($links[$d])) { $o .= "$day"; - else + } else { $o .= $day; + } $d ++; } else { @@ -529,14 +535,16 @@ function cal($y = 0,$m = 0, $links = false, $class='') { $o .= '
 
'."\r\n"; diff --git a/include/dba_pdo.php b/include/dba_pdo.php index a44c447af2..56692fbb39 100644 --- a/include/dba_pdo.php +++ b/include/dba_pdo.php @@ -34,7 +34,7 @@ $objDDDBLResultHandler->add('PDOStatement', array('HANDLER' => $cloPDOStatementR * */ -if(! class_exists('dba')) { +if (! class_exists('dba')) { class dba { private $debug = 0; @@ -66,9 +66,9 @@ class dba { return; } - if($install) { - if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) { - if(! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) { + if ($install) { + if (strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) { + if (! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) { $this->error = sprintf( t('Cannot locate DNS info for database server \'%s\''), $server); $this->connected = false; $this->db = null; @@ -81,13 +81,13 @@ class dba { \DDDBL\connect(); $this->db = \DDDBL\getDB(); - if(\DDDBL\isConnected()) { + if (\DDDBL\isConnected()) { $this->connected = true; } - if(! $this->connected) { + if (! $this->connected) { $this->db = null; - if(! $install) + if (! $install) system_unavailable(); } @@ -109,11 +109,11 @@ class dba { $objPreparedQueryPool = new \DDDBL\DataObjectPool('Query-Definition'); # check if query do not exists till now, if so create its definition - if(!$objPreparedQueryPool->exists($strQueryAlias)) + if (!$objPreparedQueryPool->exists($strQueryAlias)) $objPreparedQueryPool->add($strQueryAlias, array('QUERY' => $sql, 'HANDLER' => $strHandler)); - if((! $this->db) || (! $this->connected)) + if ((! $this->db) || (! $this->connected)) return false; $this->error = ''; @@ -124,7 +124,7 @@ class dba { $r = \DDDBL\get($strQueryAlias); # bad workaround to emulate the bizzare behavior of mysql_query - if(in_array($strSQLType, array('INSERT', 'UPDATE', 'DELETE', 'CREATE', 'DROP', 'SET'))) + if (in_array($strSQLType, array('INSERT', 'UPDATE', 'DELETE', 'CREATE', 'DROP', 'SET'))) $result = true; $intErrorCode = false; @@ -138,7 +138,7 @@ class dba { $a->save_timestamp($stamp1, "database"); - if(x($a->config,'system') && x($a->config['system'],'db_log')) { + if (x($a->config,'system') && x($a->config['system'],'db_log')) { if (($duration > $a->config["system"]["db_loglimit"])) { $duration = round($duration, 3); $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); @@ -149,20 +149,20 @@ class dba { } } - if($intErrorCode) + if ($intErrorCode) $this->error = $intErrorCode; - if(strlen($this->error)) { + if (strlen($this->error)) { logger('dba: ' . $this->error); } - if($this->debug) { + if ($this->debug) { $mesg = ''; - if($result === false) + if ($result === false) $mesg = 'false'; - elseif($result === true) + elseif ($result === true) $mesg = 'true'; else { # this needs fixing, but is a bug itself @@ -182,13 +182,13 @@ class dba { * These usually indicate SQL syntax errors that need to be resolved. */ - if(isset($result) AND ($result === false)) { + if (isset($result) AND ($result === false)) { logger('dba: ' . printable($sql) . ' returned false.' . "\n" . $this->error); - if(file_exists('dbfail.out')) + if (file_exists('dbfail.out')) file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n" . $this->error . "\n", FILE_APPEND); } - if(isset($result) AND (($result === true) || ($result === false))) + if (isset($result) AND (($result === true) || ($result === false))) return $result; if ($onlyquery) { @@ -199,7 +199,7 @@ class dba { //$a->save_timestamp($stamp1, "database"); - if($this->debug) + if ($this->debug) logger('dba: ' . printable(print_r($r, true))); return($r); } @@ -223,7 +223,7 @@ class dba { } public function escape($str) { - if($this->db && $this->connected) { + if ($this->db && $this->connected) { $strQuoted = $this->db->quote($str); # this workaround is needed, because quote creates "'" and the beginning and the end # of the string, which is correct. but until now the queries set this delimiter manually, @@ -238,27 +238,27 @@ class dba { } }} -if(! function_exists('printable')) { +if (! function_exists('printable')) { function printable($s) { $s = preg_replace("~([\x01-\x08\x0E-\x0F\x10-\x1F\x7F-\xFF])~",".", $s); $s = str_replace("\x00",'.',$s); - if(x($_SERVER,'SERVER_NAME')) + if (x($_SERVER,'SERVER_NAME')) $s = escape_tags($s); return $s; }} // Procedural functions -if(! function_exists('dbg')) { +if (! function_exists('dbg')) { function dbg($state) { global $db; - if($db) + if ($db) $db->dbg($state); }} -if(! function_exists('dbesc')) { +if (! function_exists('dbesc')) { function dbesc($str) { global $db; - if($db && $db->connected) + if ($db && $db->connected) return($db->escape($str)); else return(str_replace("'","\\'",$str)); @@ -271,17 +271,17 @@ function dbesc($str) { // Example: $r = q("SELECT * FROM `%s` WHERE `uid` = %d", // 'user', 1); -if(! function_exists('q')) { +if (! function_exists('q')) { function q($sql) { global $db; $args = func_get_args(); unset($args[0]); - if($db && $db->connected) { + if ($db && $db->connected) { $stmt = @vsprintf($sql,$args); // Disabled warnings //logger("dba: q: $stmt", LOGGER_ALL); - if($stmt === false) + if ($stmt === false) logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true), LOGGER_DEBUG); return $db->q($stmt); } @@ -303,11 +303,11 @@ function q($sql) { * */ -if(! function_exists('dbq')) { +if (! function_exists('dbq')) { function dbq($sql) { global $db; - if($db && $db->connected) + if ($db && $db->connected) $ret = $db->q($sql); else $ret = false; @@ -321,21 +321,21 @@ function dbq($sql) { // cast to int to avoid trouble. -if(! function_exists('dbesc_array_cb')) { +if (! function_exists('dbesc_array_cb')) { function dbesc_array_cb(&$item, $key) { - if(is_string($item)) + if (is_string($item)) $item = dbesc($item); }} -if(! function_exists('dbesc_array')) { +if (! function_exists('dbesc_array')) { function dbesc_array(&$arr) { - if(is_array($arr) && count($arr)) { + if (is_array($arr) && count($arr)) { array_walk($arr,'dbesc_array_cb'); } }} -if(! function_exists('dba_timer')) { +if (! function_exists('dba_timer')) { function dba_timer() { return microtime(true); }} diff --git a/include/dbstructure.php b/include/dbstructure.php index c1ed4bb986..10db66bd6c 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -1615,11 +1615,11 @@ function db_definition($charset) { function dbstructure_run(&$argv, &$argc) { global $a, $db; - if(is_null($a)){ + if (is_null($a)){ $a = new App; } - if(is_null($db)) { + if (is_null($db)) { @include(".htconfig.php"); require_once("include/dba.php"); $db = new dba($db_host, $db_user, $db_pass, $db_data); diff --git a/include/dfrn.php b/include/dfrn.php index 0c88d22c4b..7d5020425b 100644 --- a/include/dfrn.php +++ b/include/dfrn.php @@ -870,7 +870,7 @@ class dfrn { // The signed text contains the content in Markdown, the sender handle and the signatur for the content // It is needed for relayed comments to Diaspora. - if($item['signed_text']) { + if ($item['signed_text']) { $sign = base64_encode(json_encode(array('signed_text' => $item['signed_text'],'signature' => $item['signature'],'signer' => $item['signer']))); xml::add_element($doc, $entry, "dfrn:diaspora_signature", $sign); } @@ -1277,7 +1277,7 @@ class dfrn { $href = ""; $width = 0; foreach ($avatar->attributes AS $attributes) { - /// @TODO Rewrite these similar if() to one switch + /// @TODO Rewrite these similar if () to one switch if ($attributes->name == "href") { $href = $attributes->textContent; } @@ -1836,7 +1836,7 @@ class dfrn { if (edited_timestamp_is_newer($current, $item)) { // do not accept (ignore) an earlier edit than one we currently have. - if(datetime_convert("UTC","UTC",$item["edited"]) < $current["edited"]) + if (datetime_convert("UTC","UTC",$item["edited"]) < $current["edited"]) return(false); $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s', `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d", @@ -1887,7 +1887,7 @@ class dfrn { if ($item["parent-uri"] != $item["uri"]) { $community = false; - if($importer["page-flags"] == PAGE_COMMUNITY || $importer["page-flags"] == PAGE_PRVGROUP) { + if ($importer["page-flags"] == PAGE_COMMUNITY || $importer["page-flags"] == PAGE_PRVGROUP) { $sql_extra = ""; $community = true; logger("possible community action"); @@ -1974,7 +1974,7 @@ class dfrn { } } - if($Blink && link_compare($Blink,App::get_baseurl()."/profile/".$importer["nickname"])) { + if ($Blink && link_compare($Blink,App::get_baseurl()."/profile/".$importer["nickname"])) { // send a notification notification(array( @@ -2043,7 +2043,7 @@ class dfrn { return false; } } else { - if(($item["verb"] == ACTIVITY_LIKE) + if (($item["verb"] == ACTIVITY_LIKE) || ($item["verb"] == ACTIVITY_DISLIKE) || ($item["verb"] == ACTIVITY_ATTEND) || ($item["verb"] == ACTIVITY_ATTENDNO) @@ -2122,7 +2122,7 @@ class dfrn { $title = ""; foreach ($links AS $link) { foreach ($link->attributes AS $attributes) { - /// @TODO Rewrite these repeated (same) if() statements to a switch() + /// @TODO Rewrite these repeated (same) if () statements to a switch() if ($attributes->name == "href") { $href = $attributes->textContent; } @@ -2370,7 +2370,7 @@ class dfrn { // When activated, forums don't work. // And: Why should we disallow commenting by followers? // the behaviour is now similar to the Diaspora part. - //if($importer["rel"] == CONTACT_IS_FOLLOWER) { + //if ($importer["rel"] == CONTACT_IS_FOLLOWER) { // logger("Contact ".$importer["id"]." is only follower. Quitting", LOGGER_DEBUG); // return; //} @@ -2492,7 +2492,7 @@ class dfrn { logger("Item was stored with id ".$posted_id, LOGGER_DEBUG); - if(stristr($item["verb"],ACTIVITY_POKE)) + if (stristr($item["verb"],ACTIVITY_POKE)) self::do_poke($item, $importer, $posted_id); } } @@ -2594,7 +2594,7 @@ class dfrn { } } - if($entrytype == DFRN_TOP_LEVEL) { + if ($entrytype == DFRN_TOP_LEVEL) { $r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s', `body` = '', `title` = '' WHERE `parent-uri` = '%s' AND `uid` = %d", @@ -2618,7 +2618,7 @@ class dfrn { create_tags_from_itemuri($uri, $importer["uid"]); create_files_from_itemuri($uri, $importer["uid"]); update_thread_uri($uri, $importer["importer_uid"]); - if($item["last-child"]) { + if ($item["last-child"]) { // ensure that last-child is set in case the comment that had it just got wiped. q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d ", dbesc(datetime_convert()), @@ -2639,7 +2639,7 @@ class dfrn { } // if this is a relayed delete, propagate it to other recipients - if($entrytype == DFRN_REPLY_RC) { + if ($entrytype == DFRN_REPLY_RC) { logger("Notifying followers about deletion of post ".$item["id"], LOGGER_DEBUG); proc_run(PRIORITY_HIGH, "include/notifier.php","drop", $item["id"]); } @@ -2659,7 +2659,7 @@ class dfrn { if ($xml == "") return; - if($importer["readonly"]) { + if ($importer["readonly"]) { // We aren't receiving stuff from this person. But we will quietly ignore them // rather than a blatant "go away" message. logger('ignoring contact '.$importer["id"]); diff --git a/include/diaspora.php b/include/diaspora.php index eca22092d8..6f189f9c07 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -181,7 +181,7 @@ class Diaspora { $children = $basedom->children('https://joindiaspora.com/protocol'); - if($children->header) { + if ($children->header) { $public = true; $author_link = str_replace('acct:','',$children->header->author_id); } else { @@ -217,11 +217,11 @@ class Diaspora { // figure out where in the DOM tree our data is hiding - if($dom->provenance->data) + if ($dom->provenance->data) $base = $dom->provenance; - elseif($dom->env->data) + elseif ($dom->env->data) $base = $dom->env; - elseif($dom->data) + elseif ($dom->data) $base = $dom; if (!$base) { @@ -254,7 +254,7 @@ class Diaspora { $data = base64url_decode($data); - if($public) + if ($public) $inner_decrypted = $data; else { @@ -556,7 +556,7 @@ class Diaspora { logger("Fetching diaspora key for: ".$handle); $r = self::person_by_handle($handle); - if($r) + if ($r) return $r["pubkey"]; return ""; @@ -612,7 +612,7 @@ class Diaspora { */ private static function add_fcontact($arr, $update = false) { - if($update) { + if ($update) { $r = q("UPDATE `fcontact` SET `name` = '%s', `photo` = '%s', @@ -796,7 +796,7 @@ class Diaspora { // perhaps we were already sharing with this person. Now they're sharing with us. // That makes us friends. // Normally this should have handled by getting a request - but this could get lost - if($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) { + if ($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) { q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d", intval(CONTACT_IS_FRIEND), intval($contact["id"]), @@ -806,12 +806,12 @@ class Diaspora { logger("defining user ".$contact["nick"]." as friend"); } - if(($contact["blocked"]) || ($contact["readonly"]) || ($contact["archive"])) + if (($contact["blocked"]) || ($contact["readonly"]) || ($contact["archive"])) return false; - if($contact["rel"] == CONTACT_IS_SHARING || $contact["rel"] == CONTACT_IS_FRIEND) + if ($contact["rel"] == CONTACT_IS_SHARING || $contact["rel"] == CONTACT_IS_FRIEND) return true; - if($contact["rel"] == CONTACT_IS_FOLLOWER) - if(($importer["page-flags"] == PAGE_COMMUNITY) OR $is_comment) + if ($contact["rel"] == CONTACT_IS_FOLLOWER) + if (($importer["page-flags"] == PAGE_COMMUNITY) OR $is_comment) return true; // Messages for the global users are always accepted @@ -969,7 +969,7 @@ class Diaspora { logger("Fetch post from ".$source_url, LOGGER_DEBUG); $envelope = fetch_url($source_url); - if($envelope) { + if ($envelope) { logger("Envelope was fetched.", LOGGER_DEBUG); $x = self::verify_magic_envelope($envelope); if (!$x) @@ -985,7 +985,7 @@ class Diaspora { logger("Fetch post from ".$source_url, LOGGER_DEBUG); $x = fetch_url($source_url); - if(!$x) + if (!$x) return false; } @@ -1042,7 +1042,7 @@ class Diaspora { FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1", intval($uid), dbesc($guid)); - if(!$r) { + if (!$r) { $result = self::store_by_guid($guid, $contact["url"], $uid); if (!$result) { @@ -1303,7 +1303,7 @@ class Diaspora { } // If we are the origin of the parent we store the original data and notify our followers - if($message_id AND $parent_item["origin"]) { + if ($message_id AND $parent_item["origin"]) { // Formerly we stored the signed text, the signature and the author in different fields. // We now store the raw data so that we are more flexible. @@ -1480,7 +1480,7 @@ class Diaspora { intval($importer["uid"]), dbesc($guid) ); - if($c) + if ($c) $conversation = $c[0]; else { $r = q("INSERT INTO `conv` (`uid`, `guid`, `creator`, `created`, `updated`, `subject`, `recips`) @@ -1493,13 +1493,13 @@ class Diaspora { dbesc($subject), dbesc($participants) ); - if($r) + if ($r) $c = q("SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1", intval($importer["uid"]), dbesc($guid) ); - if($c) + if ($c) $conversation = $c[0]; } if (!$conversation) { @@ -1637,7 +1637,7 @@ class Diaspora { logger("Stored like ".$datarray["guid"]." with message id ".$message_id, LOGGER_DEBUG); // If we are the origin of the parent we store the original data and notify our followers - if($message_id AND $parent_item["origin"]) { + if ($message_id AND $parent_item["origin"]) { // Formerly we stored the signed text, the signature and the author in different fields. // We now store the raw data so that we are more flexible. @@ -1812,10 +1812,10 @@ class Diaspora { $handle_parts = explode("@", $author); $nick = $handle_parts[0]; - if($name === "") + if ($name === "") $name = $handle_parts[0]; - if( preg_match("|^https?://|", $image_url) === 0) + if ( preg_match("|^https?://|", $image_url) === 0) $image_url = "http://".$handle_parts[1].$image_url; update_contact_avatar($image_url, $importer["uid"], $contact["id"]); @@ -1830,7 +1830,7 @@ class Diaspora { // this is to prevent multiple birthday notifications in a single year // if we already have a stored birthday and the 'm-d' part hasn't changed, preserve the entry, which will preserve the notify year - if(substr($birthday,5) === substr($contact["bd"],5)) + if (substr($birthday,5) === substr($contact["bd"],5)) $birthday = $contact["bd"]; $r = q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `addr` = '%s', `name-date` = '%s', `bd` = '%s', @@ -1876,7 +1876,7 @@ class Diaspora { $a = get_app(); - if($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) { + if ($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) { q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d", intval(CONTACT_IS_FRIEND), intval($contact["id"]), @@ -1889,7 +1889,7 @@ class Diaspora { intval($importer["uid"]) ); - if($r && !$r[0]["hide-friends"] && !$contact["hidden"] && intval(get_pconfig($importer["uid"], "system", "post_newfriend"))) { + if ($r && !$r[0]["hide-friends"] && !$contact["hidden"] && intval(get_pconfig($importer["uid"], "system", "post_newfriend"))) { $self = q("SELECT * FROM `contact` WHERE `self` AND `uid` = %d LIMIT 1", intval($importer["uid"]) @@ -1897,7 +1897,7 @@ class Diaspora { // they are not CONTACT_IS_FOLLOWER anymore but that's what we have in the array - if($self && $contact["rel"] == CONTACT_IS_FOLLOWER) { + if ($self && $contact["rel"] == CONTACT_IS_FOLLOWER) { $arr = array(); $arr["uri"] = $arr["parent-uri"] = item_new_uri($a->get_hostname(), $importer["uid"]); @@ -1928,7 +1928,7 @@ class Diaspora { $arr["deny_gid"] = $user[0]["deny_gid"]; $i = item_store($arr); - if($i) + if ($i) proc_run(PRIORITY_HIGH, "include/notifier.php", "activity", $i); } } @@ -2067,12 +2067,12 @@ class Diaspora { $def_gid = get_default_group($importer['uid'], $ret["network"]); - if(intval($def_gid)) + if (intval($def_gid)) group_add_member($importer["uid"], "", $contact_record["id"], $def_gid); update_contact_avatar($ret["photo"], $importer['uid'], $contact_record["id"], true); - if($importer["page-flags"] == PAGE_NORMAL) { + if ($importer["page-flags"] == PAGE_NORMAL) { logger("Sending intra message for author ".$author.".", LOGGER_DEBUG); @@ -2122,7 +2122,7 @@ class Diaspora { ); $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer["uid"])); - if($u) { + if ($u) { logger("Sending share message (Relation: ".$new_relation.") to author ".$author." - Contact: ".$contact_record["id"]." - User: ".$importer["uid"], LOGGER_DEBUG); $ret = self::send_share($u[0], $contact_record); @@ -2748,7 +2748,7 @@ class Diaspora { $a = get_app(); $enabled = intval(get_config("system", "diaspora_enabled")); - if(!$enabled) + if (!$enabled) return 200; $logid = random_string(4); @@ -3087,12 +3087,12 @@ class Diaspora { $body = html_entity_decode(bb2diaspora($body)); // Adding the title - if(strlen($title)) + if (strlen($title)) $body = "## ".html_entity_decode($title)."\n\n".$body; if ($item["attach"]) { $cnt = preg_match_all('/href=\"(.*?)\"(.*?)title=\"(.*?)\"/ism', $item["attach"], $matches, PREG_SET_ORDER); - if(cnt) { + if (cnt) { $body .= "\n".t("Attachments:")."\n"; foreach($matches as $mtch) $body .= "[".$mtch[3]."](".$mtch[1].")\n"; @@ -3632,17 +3632,20 @@ class Diaspora { } $r = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1", intval($contact['uid'])); - if(!$r) + if (!dbm::is_result($r)) { return false; + } $contact["uprvkey"] = $r[0]['prvkey']; $r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1", intval($post_id)); - if (!$r) + if (!dbm::is_result($r)) { return false; + } - if (!in_array($r[0]["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) + if (!in_array($r[0]["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) { return false; + } $message = self::construct_like($r[0], $contact); $message["author_signature"] = self::signature($contact, $message); diff --git a/include/discover_poco.php b/include/discover_poco.php index f0bfb646bd..c13f898944 100644 --- a/include/discover_poco.php +++ b/include/discover_poco.php @@ -174,10 +174,10 @@ function discover_directory($search) { $j = json_decode($x); if (count($j->results)) { - foreach($j->results as $jj) { + foreach ($j->results as $jj) { // Check if the contact already exists $exists = q("SELECT `id`, `last_contact`, `last_failure`, `updated` FROM `gcontact` WHERE `nurl` = '%s'", normalise_link($jj->url)); - if ($exists) { + if (dbm::is_result($exists)) { logger("Profile ".$jj->url." already exists (".$search.")", LOGGER_DEBUG); if (($exists[0]["last_contact"] < $exists[0]["last_failure"]) AND diff --git a/include/email.php b/include/email.php index 42f80c2427..ffd93bc256 100644 --- a/include/email.php +++ b/include/email.php @@ -4,7 +4,7 @@ require_once('include/msgclean.php'); require_once('include/quoteconvert.php'); function email_connect($mailbox,$username,$password) { - if(! function_exists('imap_open')) + if (! function_exists('imap_open')) return false; $mbox = @imap_open($mailbox,$username,$password); @@ -14,23 +14,23 @@ function email_connect($mailbox,$username,$password) { function email_poll($mbox,$email_addr) { - if(! ($mbox && $email_addr)) + if (! ($mbox && $email_addr)) return array(); $search1 = @imap_search($mbox,'FROM "' . $email_addr . '"', SE_UID); - if(! $search1) + if (! $search1) $search1 = array(); $search2 = @imap_search($mbox,'TO "' . $email_addr . '"', SE_UID); - if(! $search2) + if (! $search2) $search2 = array(); $search3 = @imap_search($mbox,'CC "' . $email_addr . '"', SE_UID); - if(! $search3) + if (! $search3) $search3 = array(); $search4 = @imap_search($mbox,'BCC "' . $email_addr . '"', SE_UID); - if(! $search4) + if (! $search4) $search4 = array(); $res = array_unique(array_merge($search1,$search2,$search3,$search4)); @@ -57,7 +57,7 @@ function email_msg_headers($mbox,$uid) { $raw_header = str_replace("\r",'',$raw_header); $ret = array(); $h = explode("\n",$raw_header); - if(count($h)) + if (count($h)) foreach($h as $line ) { if (preg_match("/^[a-zA-Z]/", $line)) { $key = substr($line,0,strpos($line,':')); @@ -79,10 +79,10 @@ function email_get_msg($mbox,$uid, $reply) { $struc = (($mbox && $uid) ? @imap_fetchstructure($mbox,$uid,FT_UID) : null); - if(! $struc) + if (! $struc) return $ret; - if(! $struc->parts) { + if (! $struc->parts) { $ret['body'] = email_get_part($mbox,$uid,$struc,0, 'html'); $html = $ret['body']; @@ -210,12 +210,12 @@ function email_header_encode($in_str, $charset) { $need_to_convert = false; for($x = 0; $x < strlen($in_str); $x ++) { - if((ord($in_str[$x]) == 0) || ((ord($in_str[$x]) > 128))) { + if ((ord($in_str[$x]) == 0) || ((ord($in_str[$x]) > 128))) { $need_to_convert = true; } } - if(! $need_to_convert) + if (! $need_to_convert) return $in_str; if ($out_str && $charset) { diff --git a/include/enotify.php b/include/enotify.php index ebc27309db..f86174bd40 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -411,10 +411,12 @@ function notification($params) { $hash = random_string(); $r = q("SELECT `id` FROM `notify` WHERE `hash` = '%s' LIMIT 1", dbesc($hash)); - if (dbm::is_result($r)) + if (dbm::is_result($r)) { $dups = true; - } while($dups == true); + } + } while ($dups == true); + /// @TODO One statement is enough $datarray = array(); $datarray['hash'] = $hash; $datarray['name'] = $params['source_name']; diff --git a/include/event.php b/include/event.php index 9e5bafbdb0..1aa3abb2f3 100644 --- a/include/event.php +++ b/include/event.php @@ -10,7 +10,7 @@ require_once('include/datetime.php'); function format_event_html($ev, $simple = false) { - if(! ((is_array($ev)) && count($ev))) + if (! ((is_array($ev)) && count($ev))) return ''; $bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8 AM @@ -32,10 +32,10 @@ function format_event_html($ev, $simple = false) { $o .= "

".t('Starts:')."

".$event_start."

"; - if(! $ev['nofinish']) + if (! $ev['nofinish']) $o .= "

".t('Finishes:')."

".$event_end."

"; - if(strlen($ev['location'])) + if (strlen($ev['location'])) $o .= "

".t('Location:')."

".$ev['location']."

"; return $o; @@ -53,13 +53,13 @@ function format_event_html($ev, $simple = false) { . '" >'.$event_start . '

' . "\r\n"; - if(! $ev['nofinish']) + if (! $ev['nofinish']) $o .= '

' . t('Finishes:') . ' '.$event_end . '

' . "\r\n"; - if(strlen($ev['location'])){ + if (strlen($ev['location'])){ $o .= '

' . t('Location:') . ' ' . bbcode($ev['location']) . '

' . "\r\n"; @@ -92,26 +92,26 @@ function parse_event($h) { logger('parse_event: parse error: ' . $e); } - if(! $dom) + if (! $dom) return $ret; $items = $dom->getElementsByTagName('*'); foreach($items as $item) { - if(attribute_contains($item->getAttribute('class'), 'vevent')) { + if (attribute_contains($item->getAttribute('class'), 'vevent')) { $level2 = $item->getElementsByTagName('*'); foreach($level2 as $x) { - if(attribute_contains($x->getAttribute('class'),'dtstart') && $x->getAttribute('title')) { + if (attribute_contains($x->getAttribute('class'),'dtstart') && $x->getAttribute('title')) { $ret['start'] = $x->getAttribute('title'); - if(! strpos($ret['start'],'Z')) + if (! strpos($ret['start'],'Z')) $ret['adjust'] = true; } - if(attribute_contains($x->getAttribute('class'),'dtend') && $x->getAttribute('title')) + if (attribute_contains($x->getAttribute('class'),'dtend') && $x->getAttribute('title')) $ret['finish'] = $x->getAttribute('title'); - if(attribute_contains($x->getAttribute('class'),'description')) + if (attribute_contains($x->getAttribute('class'),'description')) $ret['desc'] = $x->textContent; - if(attribute_contains($x->getAttribute('class'),'location')) + if (attribute_contains($x->getAttribute('class'),'location')) $ret['location'] = $x->textContent; } } @@ -119,23 +119,23 @@ function parse_event($h) { // sanitise - if((x($ret,'desc')) && ((strpos($ret['desc'],'<') !== false) || (strpos($ret['desc'],'>') !== false))) { + if ((x($ret,'desc')) && ((strpos($ret['desc'],'<') !== false) || (strpos($ret['desc'],'>') !== false))) { $config = HTMLPurifier_Config::createDefault(); $config->set('Cache.DefinitionImpl', null); $purifier = new HTMLPurifier($config); $ret['desc'] = html2bbcode($purifier->purify($ret['desc'])); } - if((x($ret,'location')) && ((strpos($ret['location'],'<') !== false) || (strpos($ret['location'],'>') !== false))) { + if ((x($ret,'location')) && ((strpos($ret['location'],'<') !== false) || (strpos($ret['location'],'>') !== false))) { $config = HTMLPurifier_Config::createDefault(); $config->set('Cache.DefinitionImpl', null); $purifier = new HTMLPurifier($config); $ret['location'] = html2bbcode($purifier->purify($ret['location'])); } - if(x($ret,'start')) + if (x($ret,'start')) $ret['start'] = datetime_convert('UTC','UTC',$ret['start']); - if(x($ret,'finish')) + if (x($ret,'finish')) $ret['finish'] = datetime_convert('UTC','UTC',$ret['finish']); return $ret; @@ -146,22 +146,22 @@ function format_event_bbcode($ev) { $o = ''; - if($ev['summary']) + if ($ev['summary']) $o .= '[event-summary]' . $ev['summary'] . '[/event-summary]'; - if($ev['desc']) + if ($ev['desc']) $o .= '[event-description]' . $ev['desc'] . '[/event-description]'; - if($ev['start']) + if ($ev['start']) $o .= '[event-start]' . $ev['start'] . '[/event-start]'; - if(($ev['finish']) && (! $ev['nofinish'])) + if (($ev['finish']) && (! $ev['nofinish'])) $o .= '[event-finish]' . $ev['finish'] . '[/event-finish]'; - if($ev['location']) + if ($ev['location']) $o .= '[event-location]' . $ev['location'] . '[/event-location]'; - if($ev['adjust']) + if ($ev['adjust']) $o .= '[event-adjust]' . $ev['adjust'] . '[/event-adjust]'; @@ -172,7 +172,7 @@ function format_event_bbcode($ev) { function bbtovcal($s) { $o = ''; $ev = bbtoevent($s); - if($ev['desc']) + if ($ev['desc']) $o = format_event_html($ev); return $o; } @@ -183,22 +183,22 @@ function bbtoevent($s) { $ev = array(); $match = ''; - if(preg_match("/\[event\-summary\](.*?)\[\/event\-summary\]/is",$s,$match)) + if (preg_match("/\[event\-summary\](.*?)\[\/event\-summary\]/is",$s,$match)) $ev['summary'] = $match[1]; $match = ''; - if(preg_match("/\[event\-description\](.*?)\[\/event\-description\]/is",$s,$match)) + if (preg_match("/\[event\-description\](.*?)\[\/event\-description\]/is",$s,$match)) $ev['desc'] = $match[1]; $match = ''; - if(preg_match("/\[event\-start\](.*?)\[\/event\-start\]/is",$s,$match)) + if (preg_match("/\[event\-start\](.*?)\[\/event\-start\]/is",$s,$match)) $ev['start'] = $match[1]; $match = ''; - if(preg_match("/\[event\-finish\](.*?)\[\/event\-finish\]/is",$s,$match)) + if (preg_match("/\[event\-finish\](.*?)\[\/event\-finish\]/is",$s,$match)) $ev['finish'] = $match[1]; $match = ''; - if(preg_match("/\[event\-location\](.*?)\[\/event\-location\]/is",$s,$match)) + if (preg_match("/\[event\-location\](.*?)\[\/event\-location\]/is",$s,$match)) $ev['location'] = $match[1]; $match = ''; - if(preg_match("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is",$s,$match)) + if (preg_match("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is",$s,$match)) $ev['adjust'] = $match[1]; $ev['nofinish'] = (((x($ev, 'start') && $ev['start']) && (!x($ev, 'finish') || !$ev['finish'])) ? 1 : 0); return $ev; @@ -218,7 +218,7 @@ function ev_compare($a,$b) { $date_a = (($a['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$a['start']) : $a['start']); $date_b = (($b['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$b['start']) : $b['start']); - if($date_a === $date_b) + if ($date_a === $date_b) return strcasecmp($a['desc'],$b['desc']); return strcmp($date_a,$date_b); @@ -248,7 +248,7 @@ function event_store($arr) { $arr['private'] = ((x($arr,'private')) ? intval($arr['private']) : 0); $arr['guid'] = get_guid(32); - if($arr['cid']) + if ($arr['cid']) $c = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($arr['cid']), intval($arr['uid']) @@ -258,13 +258,13 @@ function event_store($arr) { intval($arr['uid']) ); - if(count($c)) + if (count($c)) $contact = $c[0]; // Existing event being modified - if($arr['id']) { + if ($arr['id']) { // has the event actually changed? @@ -272,7 +272,7 @@ function event_store($arr) { intval($arr['id']), intval($arr['uid']) ); - if((! dbm::is_result($r)) || ($r[0]['edited'] === $arr['edited'])) { + if ((! dbm::is_result($r)) || ($r[0]['edited'] === $arr['edited'])) { // Nothing has changed. Grab the item id to return. @@ -412,7 +412,7 @@ function event_store($arr) { // $plink = App::get_baseurl() . '/display/' . $r[0]['nickname'] . '/' . $item_id; - if($item_id) { + if ($item_id) { //q("UPDATE `item` SET `plink` = '%s', `event-id` = %d WHERE `uid` = %d AND `id` = %d", // dbesc($plink), // intval($event['id']), @@ -524,7 +524,7 @@ function event_remove_duplicates($dates) { */ function event_by_id($owner_uid = 0, $event_params, $sql_extra = '') { // ownly allow events if there is a valid owner_id - if($owner_uid == 0) + if ($owner_uid == 0) return; // query for the event by event id @@ -557,7 +557,7 @@ function event_by_id($owner_uid = 0, $event_params, $sql_extra = '') { */ function events_by_date($owner_uid = 0, $event_params, $sql_extra = '') { // ownly allow events if there is a valid owner_id - if($owner_uid == 0) + if ($owner_uid == 0) return; // query for the event by date @@ -614,7 +614,7 @@ function process_events($arr) { $last_date = $d; $edit = ((! $rr['cid']) ? array(App::get_baseurl().'/events/event/'.$rr['id'],t('Edit event'),'','') : null); $title = strip_tags(html_entity_decode(bbcode($rr['summary']),ENT_QUOTES,'UTF-8')); - if(! $title) { + if (! $title) { list($title, $_trash) = explode(" t("Export"), diff --git a/include/expire.php b/include/expire.php index 35b109a50a..098125a798 100644 --- a/include/expire.php +++ b/include/expire.php @@ -11,12 +11,13 @@ function expire_run(&$argv, &$argc){ // physically remove anything that has been deleted for more than two months - $r = q("delete from item where deleted = 1 and changed < UTC_TIMESTAMP() - INTERVAL 60 DAY"); + $r = q("DELETE FROM `item` WHERE `deleted` = 1 AND `changed` < UTC_TIMESTAMP() - INTERVAL 60 DAY"); // make this optional as it could have a performance impact on large sites - if(intval(get_config('system','optimize_items'))) - q("optimize table item"); + if (intval(get_config('system','optimize_items'))) { + q("OPTIMIZE TABLE `item`"); + } logger('expire: start'); diff --git a/include/features.php b/include/features.php index 74c110427c..c49680cb87 100644 --- a/include/features.php +++ b/include/features.php @@ -38,7 +38,7 @@ function get_feature_default($feature) { $f = get_features(); foreach($f as $cat) { foreach($cat as $feat) { - if(is_array($feat) && $feat[0] === $feature) + if (is_array($feat) && $feat[0] === $feature) return $feat[3]; } } @@ -116,13 +116,13 @@ function get_features($filtered = true) { // removed any locked features and remove the entire category if this makes it empty - if($filtered) { + if ($filtered) { foreach($arr as $k => $x) { $has_items = false; $kquantity = count($arr[$k]); for($y = 0; $y < $kquantity; $y ++) { - if(is_array($arr[$k][$y])) { - if($arr[$k][$y][4] === false) { + if (is_array($arr[$k][$y])) { + if ($arr[$k][$y][4] === false) { $has_items = true; } else { @@ -130,7 +130,7 @@ function get_features($filtered = true) { } } } - if(! $has_items) { + if (! $has_items) { unset($arr[$k]); } } diff --git a/include/feed.php b/include/feed.php index 2959933703..1fb766fcce 100644 --- a/include/feed.php +++ b/include/feed.php @@ -163,7 +163,7 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) { $header["contact-id"] = $contact["id"]; - if(!strlen($contact["notify"])) { + if (!strlen($contact["notify"])) { // one way feed - no remote comment ability $header["last-child"] = 0; } @@ -289,8 +289,9 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) { $type = $attributes->textContent; } } - if(strlen($item["attach"])) + if (strlen($item["attach"])) { $item["attach"] .= ','; + } $attachments[] = array("link" => $href, "type" => $type, "length" => $length); diff --git a/include/files.php b/include/files.php index 7bff0e3468..c20a6d832d 100644 --- a/include/files.php +++ b/include/files.php @@ -33,7 +33,7 @@ function create_files_from_item($itemid) { function create_files_from_itemuri($itemuri, $uid) { $messages = q("SELECT `id` FROM `item` WHERE uri ='%s' AND uid=%d", dbesc($itemuri), intval($uid)); - if(count($messages)) { + if (count($messages)) { foreach ($messages as $message) create_files_from_item($message["id"]); } diff --git a/include/friendica_smarty.php b/include/friendica_smarty.php index 9ba2d2a744..9a224534e1 100644 --- a/include/friendica_smarty.php +++ b/include/friendica_smarty.php @@ -18,7 +18,7 @@ class FriendicaSmarty extends Smarty { // setTemplateDir can be set to an array, which Smarty will parse in order. // The order is thus very important here $template_dirs = array('theme' => "view/theme/$theme/".SMARTY3_TEMPLATE_FOLDER."/"); - if( x($a->theme_info,"extends") ) + if ( x($a->theme_info,"extends") ) $template_dirs = $template_dirs + array('extends' => "view/theme/".$a->theme_info["extends"]."/".SMARTY3_TEMPLATE_FOLDER."/"); $template_dirs = $template_dirs + array('base' => "view/".SMARTY3_TEMPLATE_FOLDER."/"); $this->setTemplateDir($template_dirs); @@ -35,7 +35,7 @@ class FriendicaSmarty extends Smarty { } function parsed($template = '') { - if($template) { + if ($template) { return $this->fetch('string:' . $template); } return $this->fetch('file:' . $this->filename); @@ -48,7 +48,7 @@ class FriendicaSmartyEngine implements ITemplateEngine { static $name ="smarty3"; public function __construct(){ - if(!is_writable('view/smarty3/')){ + if (!is_writable('view/smarty3/')){ echo "ERROR: folder view/smarty3/ must be writable by webserver."; killme(); } } @@ -56,7 +56,7 @@ class FriendicaSmartyEngine implements ITemplateEngine { // ITemplateEngine interface public function replace_macros($s, $r) { $template = ''; - if(gettype($s) === 'string') { + if (gettype($s) === 'string') { $template = $s; $s = new FriendicaSmarty(); } @@ -72,7 +72,7 @@ class FriendicaSmartyEngine implements ITemplateEngine { $r = $arr['vars']; foreach($r as $key=>$value) { - if($key[0] === '$') { + if ($key[0] === '$') { $key = substr($key, 1); } $s->assign($key, $value); diff --git a/include/group.php b/include/group.php index 6332c45da2..dee0d30c24 100644 --- a/include/group.php +++ b/include/group.php @@ -4,9 +4,9 @@ function group_add($uid,$name) { $ret = false; - if(x($uid) && x($name)) { + if (x($uid) && x($name)) { $r = group_byname($uid,$name); // check for dups - if($r !== false) { + if ($r !== false) { // This could be a problem. // Let's assume we've just created a group which we once deleted @@ -17,7 +17,7 @@ function group_add($uid,$name) { $z = q("SELECT * FROM `group` WHERE `id` = %d LIMIT 1", intval($r) ); - if(count($z) && $z[0]['deleted']) { + if (count($z) && $z[0]['deleted']) { $r = q("UPDATE `group` SET `deleted` = 0 WHERE `uid` = %d AND `name` = '%s'", intval($uid), dbesc($name) @@ -39,14 +39,14 @@ function group_add($uid,$name) { function group_rmv($uid,$name) { $ret = false; - if(x($uid) && x($name)) { + if (x($uid) && x($name)) { $r = q("SELECT id FROM `group` WHERE `uid` = %d AND `name` = '%s' LIMIT 1", intval($uid), dbesc($name) ); if (dbm::is_result($r)) $group_id = $r[0]['id']; - if(! $group_id) + if (! $group_id) return false; // remove group from default posting lists @@ -57,20 +57,20 @@ function group_rmv($uid,$name) { $user_info = $r[0]; $change = false; - if($user_info['def_gid'] == $group_id) { + if ($user_info['def_gid'] == $group_id) { $user_info['def_gid'] = 0; $change = true; } - if(strpos($user_info['allow_gid'], '<' . $group_id . '>') !== false) { + if (strpos($user_info['allow_gid'], '<' . $group_id . '>') !== false) { $user_info['allow_gid'] = str_replace('<' . $group_id . '>', '', $user_info['allow_gid']); $change = true; } - if(strpos($user_info['deny_gid'], '<' . $group_id . '>') !== false) { + if (strpos($user_info['deny_gid'], '<' . $group_id . '>') !== false) { $user_info['deny_gid'] = str_replace('<' . $group_id . '>', '', $user_info['deny_gid']); $change = true; } - if($change) { + if ($change) { q("UPDATE user SET def_gid = %d, allow_gid = '%s', deny_gid = '%s' WHERE uid = %d", intval($user_info['def_gid']), dbesc($user_info['allow_gid']), @@ -100,7 +100,7 @@ function group_rmv($uid,$name) { } function group_byname($uid,$name) { - if((! $uid) || (! strlen($name))) + if ((! $uid) || (! strlen($name))) return false; $r = q("SELECT * FROM `group` WHERE `uid` = %d AND `name` = '%s' LIMIT 1", intval($uid), @@ -113,9 +113,9 @@ function group_byname($uid,$name) { function group_rmv_member($uid,$name,$member) { $gid = group_byname($uid,$name); - if(! $gid) + if (! $gid) return false; - if(! ( $uid && $gid && $member)) + if (! ( $uid && $gid && $member)) return false; $r = q("DELETE FROM `group_member` WHERE `uid` = %d AND `gid` = %d AND `contact-id` = %d", intval($uid), @@ -129,9 +129,9 @@ function group_rmv_member($uid,$name,$member) { function group_add_member($uid,$name,$member,$gid = 0) { - if(! $gid) + if (! $gid) $gid = group_byname($uid,$name); - if((! $gid) || (! $uid) || (! $member)) + if ((! $gid) || (! $uid) || (! $member)) return false; $r = q("SELECT * FROM `group_member` WHERE `uid` = %d AND `gid` = %d AND `contact-id` = %d LIMIT 1", @@ -156,7 +156,7 @@ function group_add_member($uid,$name,$member,$gid = 0) { function group_get_members($gid) { $ret = array(); - if(intval($gid)) { + if (intval($gid)) { $r = q("SELECT `group_member`.`contact-id`, `contact`.* FROM `group_member` INNER JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id` WHERE `gid` = %d AND `group_member`.`uid` = %d AND @@ -173,7 +173,7 @@ function group_get_members($gid) { function group_public_members($gid) { $ret = 0; - if(intval($gid)) { + if (intval($gid)) { $r = q("SELECT `contact`.`id` AS `contact-id` FROM `group_member` INNER JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id` WHERE `gid` = %d AND `group_member`.`uid` = %d @@ -252,7 +252,7 @@ function group_side($every="contacts",$each="group",$editmode = "standard", $gro intval($_SESSION['uid']) ); $member_of = array(); - if($cid) { + if ($cid) { $member_of = groups_containing(local_user(),$cid); } @@ -302,7 +302,7 @@ function group_side($every="contacts",$each="group",$editmode = "standard", $gro } function expand_groups($a,$check_dead = false, $use_gcontact = false) { - if(! (is_array($a) && count($a))) + if (! (is_array($a) && count($a))) return array(); $groups = implode(',', $a); $groups = dbesc($groups); @@ -320,7 +320,7 @@ function expand_groups($a,$check_dead = false, $use_gcontact = false) { if (dbm::is_result($r)) foreach($r as $rr) $ret[] = $rr['contact-id']; - if($check_dead AND !$use_gcontact) { + if ($check_dead AND !$use_gcontact) { require_once('include/acl_selectors.php'); $ret = prune_deadguys($ret); } @@ -399,7 +399,7 @@ function get_default_group($uid, $network = "") { return $default_group; $g = q("SELECT `def_gid` FROM `user` WHERE `uid` = %d LIMIT 1", intval($uid)); - if($g && intval($g[0]["def_gid"])) + if ($g && intval($g[0]["def_gid"])) $default_group = $g[0]["def_gid"]; return $default_group; diff --git a/include/identity.php b/include/identity.php index ab80c71cea..a85b78e717 100644 --- a/include/identity.php +++ b/include/identity.php @@ -38,7 +38,7 @@ function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) { dbesc($nickname) ); - if(!$user && count($user) && !count($profiledata)) { + if (!$user && count($user) && !count($profiledata)) { logger('profile error: ' . $a->query_string, LOGGER_DEBUG); notice( t('Requested account is not available.') . EOL ); $a->error = 404; @@ -47,7 +47,7 @@ function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) { $pdata = get_profiledata_by_nick($nickname, $user[0]['uid'], $profile); - if(($pdata === false) || (!count($pdata)) && !count($profiledata)) { + if (($pdata === false) || (!count($pdata)) && !count($profiledata)) { logger('profile error: ' . $a->query_string, LOGGER_DEBUG); notice( t('Requested profile is not available.') . EOL ); $a->error = 404; @@ -56,11 +56,11 @@ function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) { // fetch user tags if this isn't the default profile - if(!$pdata['is-default']) { + if (!$pdata['is-default']) { $x = q("SELECT `pub_keywords` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1", intval($pdata['profile_uid']) ); - if($x && count($x)) + if ($x && count($x)) $pdata['pub_keywords'] = $x[0]['pub_keywords']; } @@ -88,10 +88,10 @@ function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) { require_once($theme_info_file); } - if(! (x($a->page,'aside'))) + if (! (x($a->page,'aside'))) $a->page['aside'] = ''; - if(local_user() && local_user() == $a->profile['uid'] && $profiledata) { + if (local_user() && local_user() == $a->profile['uid'] && $profiledata) { $a->page['aside'] .= replace_macros(get_markup_template('profile_edlink.tpl'),array( '$editprofile' => t('Edit profile'), '$profid' => $a->profile['id'] @@ -110,7 +110,7 @@ function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) { else $a->page['aside'] .= profile_sidebar($a->profile, $block); - /*if(! $block) + /*if (! $block) $a->page['aside'] .= contact_block();*/ return; @@ -133,9 +133,9 @@ function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) { * Includes all available profile data */ function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) { - if(remote_user() && count($_SESSION['remote'])) { + if (remote_user() && count($_SESSION['remote'])) { foreach($_SESSION['remote'] as $visitor) { - if($visitor['uid'] == $uid) { + if ($visitor['uid'] == $uid) { $r = q("SELECT `profile-id` FROM `contact` WHERE `id` = %d LIMIT 1", intval($visitor['cid']) ); @@ -148,7 +148,7 @@ function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) { $r = null; - if($profile) { + if ($profile) { $profile_int = intval($profile); $r = q("SELECT `contact`.`id` AS `contact_id`, `profile`.`uid` AS `profile_uid`, `profile`.*, `contact`.`avatar-date` AS picdate, `contact`.`addr`, `user`.* @@ -202,7 +202,7 @@ function profile_sidebar($profile, $block = 0) { $address = false; // $pdesc = true; - if((! is_array($profile)) && (! count($profile))) + if ((! is_array($profile)) && (! count($profile))) return $o; $profile['picdate'] = urlencode($profile['picdate']); @@ -219,9 +219,9 @@ function profile_sidebar($profile, $block = 0) { $connect = (($profile['uid'] != local_user()) ? t('Connect') : False); // don't show connect link to authenticated visitors either - if(remote_user() && count($_SESSION['remote'])) { + if (remote_user() && count($_SESSION['remote'])) { foreach($_SESSION['remote'] as $visitor) { - if($visitor['uid'] == $profile['uid']) { + if ($visitor['uid'] == $profile['uid']) { $connect = false; break; } @@ -322,7 +322,7 @@ function profile_sidebar($profile, $block = 0) { // Fetch the account type $account_type = account_type($profile); - if((x($profile,'address') == 1) + if ((x($profile,'address') == 1) || (x($profile,'location') == 1) || (x($profile,'locality') == 1) || (x($profile,'region') == 1) @@ -341,7 +341,7 @@ function profile_sidebar($profile, $block = 0) { $xmpp = ((x($profile,'xmpp') == 1) ? t('XMPP:') : False); - if(($profile['hidewall'] || $block) && (! local_user()) && (! remote_user())) { + if (($profile['hidewall'] || $block) && (! local_user()) && (! remote_user())) { $location = $pdesc = $gender = $marital = $homepage = $about = False; } @@ -368,7 +368,7 @@ function profile_sidebar($profile, $block = 0) { if (!$block){ $contact_block = contact_block(); - if(is_array($a->profile) AND !$a->profile['hide-friends']) { + if (is_array($a->profile) AND !$a->profile['hide-friends']) { $r = q("SELECT `gcontact`.`updated` FROM `contact` INNER JOIN `gcontact` WHERE `gcontact`.`nurl` = `contact`.`nurl` AND `self` AND `uid` = %d LIMIT 1", intval($a->profile['uid'])); if (dbm::is_result($r)) @@ -406,7 +406,7 @@ function profile_sidebar($profile, $block = 0) { if (isset($p["photo"])) $p["photo"] = proxy_url($p["photo"], false, PROXY_SIZE_SMALL); - if($a->theme['template_engine'] === 'internal') + if ($a->theme['template_engine'] === 'internal') $location = template_escape($location); $tpl = get_markup_template('profile_vcard.tpl'); @@ -445,13 +445,13 @@ function get_birthdays() { $a = get_app(); $o = ''; - 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(); -// if($is_mobile) +// if ($is_mobile) // return $o; $bd_format = t('g A l F d') ; // 8 AM Friday January 18 @@ -479,27 +479,27 @@ function get_birthdays() { $istoday = false; foreach ($r as $rr) { - if(strlen($rr['name'])) + if (strlen($rr['name'])) $total ++; - if((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) + if ((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) $istoday = true; } $classtoday = $istoday ? ' birthday-today ' : ''; - if($total) { + if ($total) { foreach($r as &$rr) { - if(! strlen($rr['name'])) + if (! strlen($rr['name'])) continue; // avoid duplicates - if(in_array($rr['cid'],$cids)) + if (in_array($rr['cid'],$cids)) continue; $cids[] = $rr['cid']; $today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false); $sparkle = ''; $url = $rr['url']; - if($rr['network'] === NETWORK_DFRN) { + if ($rr['network'] === NETWORK_DFRN) { $sparkle = " sparkle"; $url = App::get_baseurl() . '/redir/' . $rr['cid']; } @@ -534,14 +534,14 @@ function get_events() { $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(); -// if($is_mobile) +// if ($is_mobile) // return $o; $bd_format = t('g A l F d') ; // 8 AM Friday January 18 @@ -559,11 +559,11 @@ 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' : ''); @@ -573,16 +573,16 @@ 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']); - if(substr($strt,0,10) < datetime_convert('UTC',$a->timezone,'now','Y-m-d')) { + if (substr($strt,0,10) < datetime_convert('UTC',$a->timezone,'now','Y-m-d')) { $skip++; continue; } @@ -617,7 +617,7 @@ function advanced_profile(App $a) { '$title' => t('Profile') )); - if($a->profile['name']) { + if ($a->profile['name']) { $tpl = get_markup_template('profile_advanced.tpl'); @@ -625,10 +625,10 @@ 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'] != '0000-00-00')) { + if (($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) { $year_bd_format = t('j F, Y'); $short_bd_format = t('j F'); @@ -642,10 +642,10 @@ 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']) { @@ -850,14 +850,14 @@ 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; } function zrl_init(App $a) { $tmp_str = get_my_url(); - if(validate_url($tmp_str)) { + if (validate_url($tmp_str)) { // Is it a DDoS attempt? // The check fetches the cached value from gprobe to reduce the load for this system @@ -878,16 +878,20 @@ function zrl_init(App $a) { } function zrl($s,$force = false) { - if(! strlen($s)) + 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,'?') ? '&' : '?'; $mine = get_my_url(); - if($mine and ! link_compare($mine,$s)) + if ($mine and ! link_compare($mine,$s)) { return $s . $achar . 'zrl=' . urlencode($mine); + } return $s; } @@ -907,9 +911,10 @@ 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)) + if (local_user()) { + if ((get_pconfig(local_user(),'system','always_my_theme')) || (! $uid)) { return local_user(); + } } return $uid; diff --git a/include/items.php b/include/items.php index 24eb1b30fb..03503f26ac 100644 --- a/include/items.php +++ b/include/items.php @@ -60,7 +60,7 @@ function limit_body_size($body) { $img_start = strpos($orig_body, '[img'); $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false); $img_end = ($img_start !== false ? strpos(substr($orig_body, $img_start), '[/img]') : false); - while(($img_st_close !== false) && ($img_end !== false)) { + while (($img_st_close !== false) && ($img_end !== false)) { $img_st_close++; // make it point to AFTER the closing bracket $img_end += $img_start; @@ -1681,7 +1681,7 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) { $img_start = strpos($orig_body, '[img'); $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false); $img_len = ($img_start !== false ? strpos(substr($orig_body, $img_start + $img_st_close + 1), '[/img]') : false); - while( ($img_st_close !== false) && ($img_len !== false) ) { + while ( ($img_st_close !== false) && ($img_len !== false) ) { $img_st_close++; // make it point to AFTER the closing bracket $image = substr($orig_body, $img_start + $img_st_close, $img_len); @@ -2179,7 +2179,7 @@ function list_post_dates($uid, $wall) { // Starting with the current month, get the first and last days of every // month down to and including the month of the first post - while(substr($dnow, 0, 7) >= substr($dthen, 0, 7)) { + while (substr($dnow, 0, 7) >= substr($dthen, 0, 7)) { $dyear = intval(substr($dnow,0,4)); $dstart = substr($dnow,0,8) . '01'; $dend = substr($dnow,0,8) . get_dim(intval($dnow),intval(substr($dnow,5))); @@ -2208,7 +2208,7 @@ function posted_dates($uid,$wall) { $ret = array(); // Starting with the current month, get the first and last days of every // month down to and including the month of the first post - while(substr($dnow, 0, 7) >= substr($dthen, 0, 7)) { + while (substr($dnow, 0, 7) >= substr($dthen, 0, 7)) { $dstart = substr($dnow,0,8) . '01'; $dend = substr($dnow,0,8) . get_dim(intval($dnow),intval(substr($dnow,5))); $start_month = datetime_convert('','',$dstart,'Y-m-d'); diff --git a/include/lock.php b/include/lock.php index b3d488a357..a9cd7d6437 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` = '0000-00-00 00:00:00' WHERE `name` = '%s'", dbesc($fn_name) diff --git a/include/message.php b/include/message.php index 3d5d4d33ab..b94190ca00 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/nav.php b/include/nav.php index fe4c50818e..b184f11806 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 f9d35c52c3..2ec306472c 100644 --- a/include/network.php +++ b/include/network.php @@ -78,7 +78,7 @@ function z_fetch_url($url,$binary = false, &$redirects = 0, $opts=array()) { @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" . xmlify($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)) { + 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; } @@ -499,11 +499,11 @@ 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; @@ -511,10 +511,10 @@ function allowed_email($email) { $fnmatch = function_exists('fnmatch'); $allowed = explode(',',$str_allowed); - if(count($allowed)) { + 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 +543,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,'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 a1945894fc..2490e5ecaa 100755 --- a/include/oembed.php +++ b/include/oembed.php @@ -316,7 +316,9 @@ function oembed_html2bbcode($text) { $xattr = "@rel='oembed'";//oe_build_xpath("rel","oembed"); 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 43c4495b6c..e6cbd34f45 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -61,7 +61,7 @@ function onepoll_run(&$argv, &$argc){ intval($contact_id) ); - if (! count($contacts)) { + if (! dbm::is_result($contacts)) { return; } diff --git a/include/ostatus.php b/include/ostatus.php index d20e4cb4fd..26be15a020 100644 --- a/include/ostatus.php +++ b/include/ostatus.php @@ -411,7 +411,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]"; } @@ -454,7 +454,7 @@ class ostatus { break; case "enclosure": $enclosure = $href; - if(strlen($item["attach"])) + if (strlen($item["attach"])) $item["attach"] .= ','; $item["attach"] .= '[attach]href="'.$href.'" length="'.$length.'" type="'.$type.'" title="'.$title.'"[/attach]'; @@ -1138,7 +1138,7 @@ class ostatus { continue; } - /// @TODO One statment is okay (until if() ) + /// @TODO One statment is okay (until if () ) $arr = array(); $arr["network"] = $details["network"]; $arr["uri"] = $single_conv->id; @@ -2234,7 +2234,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'); diff --git a/include/pgettext.php b/include/pgettext.php index 335869eda2..21d95e3249 100644 --- a/include/pgettext.php +++ b/include/pgettext.php @@ -14,7 +14,7 @@ use \Friendica\Core\Config; require_once("include/dba.php"); -if(! function_exists('get_browser_language')) { +if (! function_exists('get_browser_language')) { /** * @brief get the prefered language from the HTTP_ACCEPT_LANGUAGE header */ @@ -44,7 +44,7 @@ function get_browser_language() { // check if we have translations for the preferred languages and pick the 1st that has for ($i=0; $ilangsave = $lang; - if($language === $lang) + if ($language === $lang) return; - if(isset($a->strings) && count($a->strings)) { + if (isset($a->strings) && count($a->strings)) { $a->stringsave = $a->strings; } $a->strings = array(); @@ -77,10 +77,10 @@ function push_lang($language) { function pop_lang() { global $lang, $a; - if($lang === $a->langsave) + if ($lang === $a->langsave) return; - if(isset($a->stringsave)) + if (isset($a->stringsave)) $a->strings = $a->stringsave; else $a->strings = array(); @@ -91,7 +91,7 @@ function pop_lang() { // l -if(! function_exists('load_translation_table')) { +if (! function_exists('load_translation_table')) { /** * load string translation table for alternate language * @@ -108,13 +108,13 @@ function load_translation_table($lang) { if ($plugins!==false) { foreach($plugins as $p) { $name = $p['name']; - if(file_exists("addon/$name/lang/$lang/strings.php")) { + if (file_exists("addon/$name/lang/$lang/strings.php")) { include("addon/$name/lang/$lang/strings.php"); } } } - if(file_exists("view/lang/$lang/strings.php")) { + if (file_exists("view/lang/$lang/strings.php")) { include("view/lang/$lang/strings.php"); } @@ -122,27 +122,27 @@ function load_translation_table($lang) { // translate string if translation exists -if(! function_exists('t')) { +if (! function_exists('t')) { function t($s) { $a = get_app(); - if(x($a->strings,$s)) { + if (x($a->strings,$s)) { $t = $a->strings[$s]; return is_array($t)?$t[0]:$t; } return $s; }} -if(! function_exists('tt')){ +if (! function_exists('tt')){ function tt($singular, $plural, $count){ global $lang; $a = get_app(); - if(x($a->strings,$singular)) { + if (x($a->strings,$singular)) { $t = $a->strings[$singular]; $f = 'string_plural_select_' . str_replace('-','_',$lang); - if(! function_exists($f)) + if (! function_exists($f)) $f = 'string_plural_select_default'; $k = $f($count); return is_array($t)?$t[$k]:$t; @@ -158,7 +158,7 @@ function tt($singular, $plural, $count){ // provide a fallback which will not collide with // a function defined in any language file -if(! function_exists('string_plural_select_default')) { +if (! function_exists('string_plural_select_default')) { function string_plural_select_default($n) { return ($n != 1); }} diff --git a/include/plugin.php b/include/plugin.php index 83f6f1ab95..c75441bf9e 100644 --- a/include/plugin.php +++ b/include/plugin.php @@ -20,7 +20,7 @@ function uninstall_plugin($plugin){ ); @include_once('addon/' . $plugin . '/' . $plugin . '.php'); - if(function_exists($plugin . '_uninstall')) { + if (function_exists($plugin . '_uninstall')) { $func = $plugin . '_uninstall'; $func(); } @@ -36,12 +36,12 @@ if (! function_exists('install_plugin')){ function install_plugin($plugin) { // silently fail if plugin was removed - if(! file_exists('addon/' . $plugin . '/' . $plugin . '.php')) + if (! file_exists('addon/' . $plugin . '/' . $plugin . '.php')) return false; logger("Addons: installing " . $plugin); $t = @filemtime('addon/' . $plugin . '/' . $plugin . '.php'); @include_once('addon/' . $plugin . '/' . $plugin . '.php'); - if(function_exists($plugin . '_install')) { + if (function_exists($plugin . '_install')) { $func = $plugin . '_install'; $func(); @@ -57,7 +57,7 @@ function install_plugin($plugin) { // once most site tables have been updated. // This way the system won't fall over dead during the update. - if(file_exists('addon/' . $plugin . '/.hidden')) { + if (file_exists('addon/' . $plugin . '/.hidden')) { q("UPDATE `addon` SET `hidden` = 1 WHERE `name` = '%s'", dbesc($plugin) ); @@ -73,10 +73,10 @@ function install_plugin($plugin) { // reload all updated plugins -if(! function_exists('reload_plugins')) { +if (! function_exists('reload_plugins')) { function reload_plugins() { $plugins = get_config('system','addon'); - if(strlen($plugins)) { + if (strlen($plugins)) { $r = q("SELECT * FROM `addon` WHERE `installed` = 1"); if (dbm::is_result($r)) @@ -86,25 +86,25 @@ function reload_plugins() { $parr = explode(',',$plugins); - if(count($parr)) { + if (count($parr)) { foreach($parr as $pl) { $pl = trim($pl); $fname = 'addon/' . $pl . '/' . $pl . '.php'; - if(file_exists($fname)) { + if (file_exists($fname)) { $t = @filemtime($fname); foreach($installed as $i) { - if(($i['name'] == $pl) && ($i['timestamp'] != $t)) { + if (($i['name'] == $pl) && ($i['timestamp'] != $t)) { logger('Reloading plugin: ' . $i['name']); @include_once($fname); - if(function_exists($pl . '_uninstall')) { + if (function_exists($pl . '_uninstall')) { $func = $pl . '_uninstall'; $func(); } - if(function_exists($pl . '_install')) { + if (function_exists($pl . '_install')) { $func = $pl . '_install'; $func(); } @@ -142,7 +142,7 @@ function plugin_enabled($plugin) { * @param int $priority A priority (defaults to 0) * @return mixed|bool */ -if(! function_exists('register_hook')) { +if (! function_exists('register_hook')) { function register_hook($hook,$file,$function,$priority=0) { $r = q("SELECT * FROM `hook` WHERE `hook` = '%s' AND `file` = '%s' AND `function` = '%s' LIMIT 1", @@ -170,7 +170,7 @@ function register_hook($hook,$file,$function,$priority=0) { * @param string $function the name of the function that the hook called * @return array */ -if(! function_exists('unregister_hook')) { +if (! function_exists('unregister_hook')) { function unregister_hook($hook,$file,$function) { $r = q("DELETE FROM `hook` WHERE `hook` = '%s' AND `file` = '%s' AND `function` = '%s'", @@ -182,7 +182,7 @@ function unregister_hook($hook,$file,$function) { }} -if(! function_exists('load_hooks')) { +if (! function_exists('load_hooks')) { function load_hooks() { $a = get_app(); $a->hooks = array(); @@ -190,7 +190,7 @@ function load_hooks() { if (dbm::is_result($r)) { foreach ($r as $rr) { - if(! array_key_exists($rr['hook'],$a->hooks)) + if (! array_key_exists($rr['hook'],$a->hooks)) $a->hooks[$rr['hook']] = array(); $a->hooks[$rr['hook']][] = array($rr['file'],$rr['function']); } @@ -244,13 +244,13 @@ function call_single_hook($a, $name, $hook, &$data = null) { //check if an app_menu hook exist for plugin $name. //Return true if the plugin is an app -if(! function_exists('plugin_is_app')) { +if (! function_exists('plugin_is_app')) { function plugin_is_app($name) { $a = get_app(); - if(is_array($a->hooks) && (array_key_exists('app_menu',$a->hooks))) { + if (is_array($a->hooks) && (array_key_exists('app_menu',$a->hooks))) { foreach($a->hooks['app_menu'] as $hook) { - if($hook[0] == 'addon/'.$name.'/'.$name.'.php') + if ($hook[0] == 'addon/'.$name.'/'.$name.'.php') return true; } } @@ -352,9 +352,9 @@ function get_theme_info($theme){ 'unsupported' => false ); - if(file_exists("view/theme/$theme/experimental")) + if (file_exists("view/theme/$theme/experimental")) $info['experimental'] = true; - if(file_exists("view/theme/$theme/unsupported")) + if (file_exists("view/theme/$theme/unsupported")) $info['unsupported'] = true; if (!is_file("view/theme/$theme/theme.php")) return $info; @@ -511,11 +511,11 @@ function service_class_fetch($uid,$property) { $service_class = $r[0]['service_class']; } } - if(! x($service_class)) + if (! x($service_class)) return false; // everything is allowed $arr = get_config('service_class',$service_class); - if(! is_array($arr) || (! count($arr))) + if (! is_array($arr) || (! count($arr))) return false; return((array_key_exists($property,$arr)) ? $arr[$property] : false); @@ -524,12 +524,14 @@ function service_class_fetch($uid,$property) { function upgrade_link($bbcode = false) { $l = get_config('service_class','upgrade_link'); - if(! $l) + if (! $l) { return ''; - if($bbcode) + } + if ($bbcode) { $t = sprintf('[url=%s]' . t('Click here to upgrade.') . '[/url]', $l); - else + } else { $t = sprintf('' . t('Click here to upgrade.') . '
', $l); + } return $t; } @@ -556,13 +558,15 @@ function upgrade_bool_message($bbcode = false) { */ function theme_include($file, $root = '') { // Make sure $root ends with a slash / if it's not blank - if($root !== '' && $root[strlen($root)-1] !== '/') + if ($root !== '' && $root[strlen($root)-1] !== '/') { $root = $root . '/'; + } $theme_info = $a->theme_info; - if(is_array($theme_info) AND array_key_exists('extends',$theme_info)) + if (is_array($theme_info) AND array_key_exists('extends',$theme_info)) { $parent = $theme_info['extends']; - else + } else { $parent = 'NOPATH'; + } $theme = current_theme(); $thname = $theme; $ext = substr($file,strrpos($file,'.')+1); @@ -573,10 +577,11 @@ function theme_include($file, $root = '') { ); foreach($paths as $p) { // strpos() is faster than strstr when checking if one string is in another (http://php.net/manual/en/function.strstr.php) - if(strpos($p,'NOPATH') !== false) + if (strpos($p,'NOPATH') !== false) { continue; - if(file_exists($p)) + } elseif (file_exists($p)) { return $p; + } } return ''; } diff --git a/include/poller.php b/include/poller.php index 855400ba6c..b9dadb1fcc 100644 --- a/include/poller.php +++ b/include/poller.php @@ -17,11 +17,11 @@ require_once("boot.php"); function poller_run($argv, $argc){ global $a, $db; - if(is_null($a)) { + if (is_null($a)) { $a = new App; } - if(is_null($db)) { + if (is_null($db)) { @include(".htconfig.php"); require_once("include/dba.php"); $db = new dba($db_host, $db_user, $db_pass, $db_data); @@ -49,7 +49,7 @@ function poller_run($argv, $argc){ return; } - if(($argc <= 1) OR ($argv[1] != "no_cron")) { + if (($argc <= 1) OR ($argv[1] != "no_cron")) { poller_run_cron(); } @@ -415,7 +415,7 @@ function poller_too_much_workers() { // Decrease the number of workers at higher load $load = current_load(); - if($load) { + if ($load) { $maxsysload = intval(Config::get("system", "maxloadavg", 50)); $maxworkers = $queues; diff --git a/include/profile_selectors.php b/include/profile_selectors.php index 8d29fd0998..ad47c0ba6c 100644 --- a/include/profile_selectors.php +++ b/include/profile_selectors.php @@ -9,7 +9,7 @@ function gender_selector($current="",$suffix="") { $o .= ""; foreach($select as $selection) { - if($selection !== 'NOTRANSLATION') { + if ($selection !== 'NOTRANSLATION') { $selected = (($selection == $current) ? ' selected="selected" ' : ''); $o .= ""; } @@ -45,7 +45,7 @@ function marital_selector($current="",$suffix="") { $o .= "