standards

[friendica.git] / mod / item.php

diff --git a/mod/item.php b/mod/item.php
index 34079fa9d627cb69b7d100906d0a0e0fc68a7b5a..8bf922d97c6b11164d7bdaa31d1daaf5ffd11476 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -325,8 +325,9 @@ function item_post(App $a) {
                // if using the API, we won't see pubmail_enable - figure out if it should be set
 
                if ($api_source && $profile_uid && $profile_uid == local_user() && (! $private)) {
-                       $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
+                       $mail_disabled = ((function_exists('imap_open') && (! get_config('system', 'imap_disabled'))) ? 0 : 1);
                        if (! $mail_disabled) {
+                               /// @TODO Check if only pubmail is loaded, * loads all columns
                                $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
                                        intval(local_user())
                                );
@@ -372,7 +373,7 @@ function item_post(App $a) {
                $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
                        intval($_SESSION['uid']));
        } elseif(remote_user()) {
-               if (is_array($_SESSION['remote'])) {
+               if (x($_SESSION, 'remote') && is_array($_SESSION['remote'])) {
                        foreach ($_SESSION['remote'] as $v) {
                                if ($v['uid'] == $profile_uid) {
                                        $contact_id = $v['cid'];
@@ -544,7 +545,7 @@ function item_post(App $a) {
        if ($parent AND ($parent_contact['network'] == NETWORK_OSTATUS)) {
                $contact = '@[url=' . $parent_contact['url'] . ']' . $parent_contact['nick'] . '[/url]';
 
-               if (!in_array($contact,$tags)) {
+               if (!in_array($contact, $tags)) {
                        $body = $contact . ' ' . $body;
                        $tags[] = $contact;
                }
@@ -977,7 +978,7 @@ function item_post(App $a) {
                                if (! strlen($addr)) {
                                        continue;
                                }
-                               $disclaimer = '<hr />' . sprintf( t('This message was sent to you by %s, a member of the Friendica social network.'),$a->user['username'])
+                               $disclaimer = '<hr />' . sprintf( t('This message was sent to you by %s, a member of the Friendica social network.'), $a->user['username'])
                                        . '<br />';
                                $disclaimer .= sprintf( t('You may visit them online at %s'), App::get_baseurl() . '/profile/' . $a->user['nickname']) . EOL;
                                $disclaimer .= t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . EOL;
@@ -1201,9 +1202,9 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n
                        }
                } else {
                        $r = false;
-                       if (strrpos($name,'+')) {
+                       if (strrpos($name, '+')) {
                                // Is it in format @nick+number?
-                               $tagcid = intval(substr($name,strrpos($name,'+') + 1));
+                               $tagcid = intval(substr($name, strrpos($name, '+') + 1));
 
                                $r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                                                intval($tagcid),
@@ -1272,22 +1273,24 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n
 
                        $replaced = true;
                        // create profile link
-                       $profile = str_replace(',','%2c',$profile);
-                       $newtag = '@[url='.$profile.']'.$newname.'[/url]';
-                       $body = str_replace('@'.$name, $newtag, $body);
+                       $profile = str_replace(',', '%2c', $profile);
+                       $newtag = '@[url=' . $profile . ']' . $newname . '[/url]';
+                       $body = str_replace('@' . $name, $newtag, $body);
                        // append tag to str_tags
-                       if (! stristr($str_tags,$newtag)) {
+                       if (! stristr($str_tags, $newtag)) {
                                if (strlen($str_tags)) {
                                        $str_tags .= ',';
                                }
                                $str_tags .= $newtag;
                        }
 
-                       // Status.Net seems to require the numeric ID URL in a mention if the person isn't
-                       // subscribed to you. But the nickname URL is OK if they are. Grrr. We'll tag both.
+                       /*
+                        * Status.Net seems to require the numeric ID URL in a mention if the person isn't
+                        * subscribed to you. But the nickname URL is OK if they are. Grrr. We'll tag both.
+                        */
                        if (strlen($alias)) {
-                               $newtag = '@[url='.$alias.']'.$newname.'[/url]';
-                               if (! stristr($str_tags,$newtag)) {
+                               $newtag = '@[url=' . $alias . ']' . $newname . '[/url]';
+                               if (! stristr($str_tags, $newtag)) {
                                        if (strlen($str_tags)) {
                                                $str_tags .= ',';
                                        }