tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #5705 from annando/still-notices

Browse source 
Still there had been notices - must have a good camouflage
This commit is contained in:
Tobias Diekershoff 2018-08-31 07:56:01 +02:00 committed by GitHub
commit cad5c1b69e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mod/contacts.php
View file

@ -122,11 +122,12 @@ function contacts_init(App $a)
function contacts_batch_actions(App $a) function contacts_batch_actions(App $a)
{ {
$contacts_id = $_POST['contact_batch']; if (empty($_POST['contact_batch']) || !is_array($_POST['contact_batch'])) {
if (!is_array($contacts_id)) {
return; return;
} }
$contacts_id = $_POST['contact_batch'];
$orig_records = q("SELECT * FROM `contact` WHERE `id` IN (%s) AND `uid` = %d AND `self` = 0", $orig_records = q("SELECT * FROM `contact` WHERE `id` IN (%s) AND `uid` = %d AND `self` = 0",
implode(",", $contacts_id), implode(",", $contacts_id),
intval(local_user()) intval(local_user())

4
src/Module/Proxy.php
View file

@ -133,6 +133,10 @@ class Proxy extends BaseModule
$direct_cache = false; $direct_cache = false;
} }
if (empty($_REQUEST['url'])) {
System::httpExit(400, ["title" => L10n::t('Bad Request.')]);
}
if (!$direct_cache) { if (!$direct_cache) {
$urlhash = 'pic:' . sha1($_REQUEST['url']); $urlhash = 'pic:' . sha1($_REQUEST['url']);

2
src/Object/Image.php
View file

@ -792,7 +792,7 @@ class Image
try { try {
if (function_exists("getimagesizefromstring")) { if (function_exists("getimagesizefromstring")) {
$data = getimagesizefromstring($img_str); $data = @getimagesizefromstring($img_str);
} else { } else {
$tempfile = tempnam(get_temppath(), "cache"); $tempfile = tempnam(get_temppath(), "cache");

5
src/Protocol/DFRN.php
View file

@ -2407,8 +2407,11 @@ class DFRN
break; break;
case "enclosure": case "enclosure":
$enclosure = $href; $enclosure = $href;
if (strlen($item["attach"])) {
if (!empty($item["attach"])) {
$item["attach"] .= ","; $item["attach"] .= ",";
} else {
$item["attach"] = "";
} }
$item["attach"] .= '[attach]href="' . $href . '" length="' . $length . '" type="' . $type . '" title="' . $title . '"[/attach]'; $item["attach"] .= '[attach]href="' . $href . '" length="' . $length . '" type="' . $type . '" title="' . $title . '"[/attach]';