X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fitem.php;h=8bf922d97c6b11164d7bdaa31d1daaf5ffd11476;hb=f146c85e75314462823076a9d89ac2e698e6de45;hp=1f80719981681b3dc9c6309225e688464377d830;hpb=3d595c4dcc57e163400c01129f45d5e99eca16b7;p=friendica.git
diff --git a/mod/item.php b/mod/item.php
index 1f80719981..8bf922d97c 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -29,11 +29,11 @@ require_once 'include/Contact.php';
function item_post(App $a) {
- if ((! local_user()) && (! remote_user()) && (! x($_REQUEST,'commenter'))) {
+ if ((! local_user()) && (! remote_user()) && (! x($_REQUEST, 'commenter'))) {
return;
}
- require_once('include/security.php');
+ require_once 'include/security.php';
$uid = local_user();
@@ -71,8 +71,8 @@ function item_post(App $a) {
}
// Is this a reply to something?
- $parent = ((x($_REQUEST,'parent')) ? intval($_REQUEST['parent']) : 0);
- $parent_uri = ((x($_REQUEST,'parent_uri')) ? trim($_REQUEST['parent_uri']) : '');
+ $parent = ((x($_REQUEST, 'parent')) ? intval($_REQUEST['parent']) : 0);
+ $parent_uri = ((x($_REQUEST, 'parent_uri')) ? trim($_REQUEST['parent_uri']) : '');
$parent_item = null;
$parent_contact = null;
@@ -85,7 +85,7 @@ function item_post(App $a) {
$objecttype = ACTIVITY_OBJ_COMMENT;
- if (! x($_REQUEST,'type')) {
+ if (! x($_REQUEST, 'type')) {
$_REQUEST['type'] = 'net-comment';
}
@@ -114,7 +114,7 @@ function item_post(App $a) {
if (! dbm::is_result($r)) {
notice( t('Unable to locate original post.') . EOL);
- if (x($_REQUEST,'return')) {
+ if (x($_REQUEST, 'return')) {
goaway($return_path);
}
killme();
@@ -142,7 +142,7 @@ function item_post(App $a) {
$parent_contact = get_contact_details_by_url($thrparent[0]["author-link"]);
if (!isset($parent_contact["nick"])) {
- require_once("include/Scrape.php");
+ require_once 'include/Scrape.php';
$probed_contact = probe_url($thrparent[0]["author-link"]);
if ($probed_contact["network"] != NETWORK_FEED) {
$parent_contact = $probed_contact;
@@ -167,11 +167,11 @@ function item_post(App $a) {
logger('mod_item: item_post parent=' . $parent);
}
- $profile_uid = ((x($_REQUEST,'profile_uid')) ? intval($_REQUEST['profile_uid']) : 0);
- $post_id = ((x($_REQUEST,'post_id')) ? intval($_REQUEST['post_id']) : 0);
- $app = ((x($_REQUEST,'source')) ? strip_tags($_REQUEST['source']) : '');
- $extid = ((x($_REQUEST,'extid')) ? strip_tags($_REQUEST['extid']) : '');
- $object = ((x($_REQUEST,'object')) ? $_REQUEST['object'] : '');
+ $profile_uid = ((x($_REQUEST, 'profile_uid')) ? intval($_REQUEST['profile_uid']) : 0);
+ $post_id = ((x($_REQUEST, 'post_id')) ? intval($_REQUEST['post_id']) : 0);
+ $app = ((x($_REQUEST, 'source')) ? strip_tags($_REQUEST['source']) : '');
+ $extid = ((x($_REQUEST, 'extid')) ? strip_tags($_REQUEST['extid']) : '');
+ $object = ((x($_REQUEST, 'object')) ? $_REQUEST['object'] : '');
// Check for multiple posts with the same message id (when the post was created via API)
if (($message_id != '') AND ($profile_uid != 0)) {
@@ -264,12 +264,12 @@ function item_post(App $a) {
* use the user default permissions - as they won't have
* been supplied via a form.
*/
-
+ /// @TODO use x($_REQUEST, 'foo') here
if (($api_source)
- && (! array_key_exists('contact_allow',$_REQUEST))
- && (! array_key_exists('group_allow',$_REQUEST))
- && (! array_key_exists('contact_deny',$_REQUEST))
- && (! array_key_exists('group_deny',$_REQUEST))) {
+ && (! array_key_exists('contact_allow', $_REQUEST))
+ && (! array_key_exists('group_allow', $_REQUEST))
+ && (! array_key_exists('contact_deny', $_REQUEST))
+ && (! array_key_exists('group_deny', $_REQUEST))) {
$str_group_allow = $user['allow_gid'];
$str_contact_allow = $user['allow_cid'];
$str_group_deny = $user['deny_gid'];
@@ -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'];
@@ -513,12 +514,12 @@ function item_post(App $a) {
// Fold multi-line [code] sequences
$body = preg_replace('/\[\/code\]\s*\[code\]/ism', "\n", $body);
- $body = scale_external_images($body,false);
+ $body = scale_external_images($body, false);
// Setting the object type if not defined before
if (!$objecttype) {
$objecttype = ACTIVITY_OBJ_NOTE; // Default value
- require_once("include/plaintext.php");
+ require_once 'include/plaintext.php';
$objectdata = get_attached_data($body);
if ($post["type"] == "link") {
@@ -544,8 +545,8 @@ 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)) {
- $body = $contact.' '.$body;
+ if (!in_array($contact, $tags)) {
+ $body = $contact . ' ' . $body;
$tags[] = $contact;
}
@@ -557,10 +558,10 @@ function item_post(App $a) {
$toplevel_contact = '@' . $toplevel_parent[0]['nick'] . '+' . $toplevel_parent[0]['id'];
} else {
$toplevel_parent = q("SELECT `author-link`, `author-name` FROM `item` WHERE `id` = `parent` AND `parent` = %d", intval($parent));
- $toplevel_contact = '@[url='.$toplevel_parent[0]['author-link'].']'.$toplevel_parent[0]['author-name'].'[/url]';
+ $toplevel_contact = '@[url=' . $toplevel_parent[0]['author-link'] . ']' . $toplevel_parent[0]['author-name'] . '[/url]';
}
- if (!in_array($toplevel_contact, $tags)) [
+ if (!in_array($toplevel_contact, $tags)) {
$tags[] = $toplevel_contact;
}
}
@@ -581,8 +582,9 @@ function item_post(App $a) {
* Robert Johnson should be first in the $tags array
*/
$fullnametagged = false;
- for ($x = 0; $x < count($tagged); $x ++) {
- if (stristr($tagged[$x],$tag . ' ')) {
+ /// @TODO $tagged is initialized above if() block and is not filled, maybe old-lost code?
+ foreach ($tagged as $nextTag) {
+ if (stristr($nextTag, $tag . ' ')) {
$fullnametagged = true;
break;
}
@@ -647,7 +649,7 @@ function item_post(App $a) {
// even if the post arrived via API we are considering that it
// originated on this site by default for determining relayability.
- $origin = ((x($_REQUEST,'origin')) ? intval($_REQUEST['origin']) : 1);
+ $origin = ((x($_REQUEST, 'origin')) ? intval($_REQUEST['origin']) : 1);
$notify_type = (($parent) ? 'comment-new' : 'wall-new' );
@@ -730,7 +732,7 @@ function item_post(App $a) {
// preview mode - prepare the body for display and send it via json
if ($preview) {
- require_once('include/conversation.php');
+ require_once 'include/conversation.php';
// We set the datarray ID to -1 because in preview mode the dataray
// doesn't have an ID.
$datarray["id"] = -1;
@@ -749,7 +751,7 @@ function item_post(App $a) {
}
$json = array('cancel' => 1);
- if (x($_REQUEST,'jsreload') && strlen($_REQUEST['jsreload'])) {
+ if (x($_REQUEST, 'jsreload') && strlen($_REQUEST['jsreload'])) {
$json['reload'] = App::get_baseurl() . '/' . $_REQUEST['jsreload'];
}
@@ -783,7 +785,7 @@ function item_post(App $a) {
file_tag_update_pconfig($uid,$categories_old,$categories_new,'category');
proc_run(PRIORITY_HIGH, "include/notifier.php", 'edit_post', $post_id);
- if ((x($_REQUEST,'return')) && strlen($return_path)) {
+ if ((x($_REQUEST, 'return')) && strlen($return_path)) {
logger('return: ' . $return_path);
goaway($return_path);
}
@@ -976,7 +978,7 @@ function item_post(App $a) {
if (! strlen($addr)) {
continue;
}
- $disclaimer = '
' . sprintf( t('This message was sent to you by %s, a member of the Friendica social network.'),$a->user['username'])
+ $disclaimer = '
' . sprintf( t('This message was sent to you by %s, a member of the Friendica social network.'), $a->user['username'])
. '
';
$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;
@@ -988,7 +990,7 @@ function item_post(App $a) {
$link = '![' . $a->user['username'] . '](' . $author['thumb'] . ')
';
$html = prepare_body($datarray);
$message = '' . $link . $html . $disclaimer . '';
- include_once('include/html2plain.php');
+ include_once 'include/html2plain.php';
$params = array (
'fromName' => $a->user['username'],
'fromEmail' => $a->user['email'],
@@ -1041,7 +1043,7 @@ function item_post_return($baseurl, $api_source, $return_path) {
}
$json = array('success' => 1);
- if (x($_REQUEST,'jsreload') && strlen($_REQUEST['jsreload'])) {
+ if (x($_REQUEST, 'jsreload') && strlen($_REQUEST['jsreload'])) {
$json['reload'] = $baseurl . '/' . $_REQUEST['jsreload'];
}
@@ -1059,7 +1061,7 @@ function item_content(App $a) {
return;
}
- require_once('include/security.php');
+ require_once 'include/security.php';
$o = '';
if (($a->argc == 3) && ($a->argv[1] === 'drop') && intval($a->argv[2])) {
@@ -1087,9 +1089,9 @@ function item_content(App $a) {
*
* @return boolean true if replaced, false if not replaced
*/
-function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $network = "") {
- require_once("include/Scrape.php");
- require_once("include/socgraph.php");
+function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $network = "") {
+ require_once 'include/Scrape.php';
+ require_once 'include/socgraph.php';
$replaced = false;
$r = null;
@@ -1099,7 +1101,7 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo
//is it already replaced?
if (strpos($tag, '[url=')) {
//append tag to str_tags
- if (!stristr($str_tags,$tag)) {
+ if (!stristr($str_tags, $tag)) {
if (strlen($str_tags)) {
$str_tags .= ',';
}
@@ -1200,9 +1202,9 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo
}
} 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),
@@ -1271,22 +1273,24 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo
$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 .= ',';
}