tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Fix more undefined variable/index notice in tests

Browse source
This commit is contained in:
Hypolite Petovan 2018-07-01 04:03:57 -04:00
commit a380bcd1c1
7 changed files with 43 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/api.php
View file

@ -1482,7 +1482,7 @@ function api_users_lookup($type)
{ {
$users = []; $users = [];
if (x($_REQUEST['user_id'])) { if (!empty($_REQUEST['user_id'])) {
foreach (explode(',', $_REQUEST['user_id']) as $id) { foreach (explode(',', $_REQUEST['user_id']) as $id) {
if (!empty($id)) { if (!empty($id)) {
$users[] = api_get_user(get_app(), $id); $users[] = api_get_user(get_app(), $id);

4
include/text.php
View file

@ -1156,7 +1156,7 @@ function put_item_in_cache(&$item, $update = false)
$rendered_html = defaults($item, 'rendered-html', ''); $rendered_html = defaults($item, 'rendered-html', '');
if ($rendered_hash == '' if ($rendered_hash == ''
|| $item["rendered-html"] == "" || $rendered_html == ""
|| $rendered_hash != hash("md5", $item["body"]) || $rendered_hash != hash("md5", $item["body"])
|| Config::get("system", "ignore_cache") || Config::get("system", "ignore_cache")
) { ) {
@ -1176,7 +1176,7 @@ function put_item_in_cache(&$item, $update = false)
$update = true; $update = true;
} }
if ($update && ($item["id"] > 0)) { if ($update && !empty($item["id"])) {
Item::update(['rendered-html' => $item["rendered-html"], 'rendered-hash' => $item["rendered-hash"]], Item::update(['rendered-html' => $item["rendered-html"], 'rendered-hash' => $item["rendered-hash"]],
['id' => $item["id"]]); ['id' => $item["id"]]);
} }

22
mod/item.php
View file

@ -178,6 +178,8 @@ function item_post(App $a) {
return; return;
} }
$categories = '';
if ($orig_post) { if ($orig_post) {
$str_group_allow = $orig_post['allow_gid']; $str_group_allow = $orig_post['allow_gid'];
$str_contact_allow = $orig_post['allow_cid']; $str_contact_allow = $orig_post['allow_cid'];
@ -223,13 +225,13 @@ function item_post(App $a) {
$str_contact_deny = perms2str($_REQUEST['contact_deny']); $str_contact_deny = perms2str($_REQUEST['contact_deny']);
} }
$title = notags(trim($_REQUEST['title'])); $title = notags(trim(defaults($_REQUEST, 'title' , '')));
$location = notags(trim($_REQUEST['location'])); $location = notags(trim(defaults($_REQUEST, 'location', '')));
$coord = notags(trim($_REQUEST['coord'])); $coord = notags(trim(defaults($_REQUEST, 'coord' , '')));
$verb = notags(trim($_REQUEST['verb'])); $verb = notags(trim(defaults($_REQUEST, 'verb' , '')));
$emailcc = notags(trim($_REQUEST['emailcc'])); $emailcc = notags(trim(defaults($_REQUEST, 'emailcc' , '')));
$body = escape_tags(trim($_REQUEST['body'])); $body = escape_tags(trim(defaults($_REQUEST, 'body' , '')));
$network = notags(trim(defaults($_REQUEST, 'network', NETWORK_DFRN))); $network = notags(trim(defaults($_REQUEST, 'network' , NETWORK_DFRN)));
$guid = get_guid(32); $guid = get_guid(32);
$postopts = defaults($_REQUEST, 'postopts', ''); $postopts = defaults($_REQUEST, 'postopts', '');
@ -279,15 +281,15 @@ function item_post(App $a) {
} }
} }
if (strlen($categories)) { if (!empty($categories)) {
// get the "fileas" tags for this post // get the "fileas" tags for this post
$filedas = file_tag_file_to_list($categories, 'file'); $filedas = file_tag_file_to_list($categories, 'file');
} }
// save old and new categories, so we can determine what needs to be deleted from pconfig // save old and new categories, so we can determine what needs to be deleted from pconfig
$categories_old = $categories; $categories_old = $categories;
$categories = file_tag_list_to_file(trim($_REQUEST['category']), 'category'); $categories = file_tag_list_to_file(trim(defaults($_REQUEST, 'category', '')), 'category');
$categories_new = $categories; $categories_new = $categories;
if (strlen($filedas)) { if (!empty($filedas)) {
// append the fileas stuff to the new categories list // append the fileas stuff to the new categories list
$categories .= file_tag_list_to_file($filedas, 'file'); $categories .= file_tag_list_to_file($filedas, 'file');
} }

40
mod/wall_upload.php
View file

@ -125,28 +125,36 @@ function wall_upload_post(App $a, $desktopmode = true)
$filetype = $_FILES['userfile']['type']; $filetype = $_FILES['userfile']['type'];
} elseif (x($_FILES, 'media')) { } elseif (x($_FILES, 'media')) {
if (is_array($_FILES['media']['tmp_name'])) { if (!empty($_FILES['media']['tmp_name'])) {
$src = $_FILES['media']['tmp_name'][0]; if (is_array($_FILES['media']['tmp_name'])) {
} else { $src = $_FILES['media']['tmp_name'][0];
$src = $_FILES['media']['tmp_name']; } else {
$src = $_FILES['media']['tmp_name'];
}
} }
if (is_array($_FILES['media']['name'])) { if (!empty($_FILES['media']['name'])) {
$filename = basename($_FILES['media']['name'][0]); if (is_array($_FILES['media']['name'])) {
} else { $filename = basename($_FILES['media']['name'][0]);
$filename = basename($_FILES['media']['name']); } else {
$filename = basename($_FILES['media']['name']);
}
} }
if (is_array($_FILES['media']['size'])) { if (!empty($_FILES['media']['size'])) {
$filesize = intval($_FILES['media']['size'][0]); if (is_array($_FILES['media']['size'])) {
} else { $filesize = intval($_FILES['media']['size'][0]);
$filesize = intval($_FILES['media']['size']); } else {
$filesize = intval($_FILES['media']['size']);
}
} }
if (is_array($_FILES['media']['type'])) { if (!empty($_FILES['media']['type'])) {
$filetype = $_FILES['media']['type'][0]; if (is_array($_FILES['media']['type'])) {
} else { $filetype = $_FILES['media']['type'][0];
$filetype = $_FILES['media']['type']; } else {
$filetype = $_FILES['media']['type'];
}
} }
} }

2
src/Model/Conversation.php
View file

@ -61,7 +61,7 @@ class Conversation
unset($old_conv['source']); unset($old_conv['source']);
} }
// Update structure data all the time but the source only when its from a better protocol. // Update structure data all the time but the source only when its from a better protocol.
if (($old_conv['protocol'] < $conversation['protocol']) && ($old_conv['protocol'] != 0)) { if (isset($conversation['protocol']) && isset($conversation['source']) && ($old_conv['protocol'] < $conversation['protocol']) && ($old_conv['protocol'] != 0)) {
unset($conversation['protocol']); unset($conversation['protocol']);
unset($conversation['source']); unset($conversation['source']);
} }

2
src/Model/Item.php
View file

@ -1989,7 +1989,7 @@ class Item extends BaseObject
Contact::unmarkForArchival($contact); Contact::unmarkForArchival($contact);
} }
$update = (!$arr['private'] && (($arr["author-link"] === $arr["owner-link"]) || ($arr["parent-uri"] === $arr["uri"]))); $update = (!$arr['private'] && ((defaults($arr, 'author-link', '') === defaults($arr, 'owner-link', '')) || ($arr["parent-uri"] === $arr["uri"])));
// Is it a forum? Then we don't care about the rules from above // Is it a forum? Then we don't care about the rules from above
if (!$update && ($arr["network"] == NETWORK_DFRN) && ($arr["parent-uri"] === $arr["uri"])) { if (!$update && ($arr["network"] == NETWORK_DFRN) && ($arr["parent-uri"] === $arr["uri"])) {

2
tests/ApiTest.php
View file

@ -1110,6 +1110,7 @@ class ApiTest extends DatabaseTest
'width' => 666, 'width' => 666,
'height' => 666, 'height' => 666,
'tmp_name' => $this->getTempImage(), 'tmp_name' => $this->getTempImage(),
'name' => 'spacer.png',
'type' => 'image/png' 'type' => 'image/png'
] ]
]; ];
@ -1217,6 +1218,7 @@ class ApiTest extends DatabaseTest
'width' => 666, 'width' => 666,
'height' => 666, 'height' => 666,
'tmp_name' => $this->getTempImage(), 'tmp_name' => $this->getTempImage(),
'name' => 'spacer.png',
'type' => 'image/png' 'type' => 'image/png'
] ]
]; ];