MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix formatting and PHP notices in network and photo modules

Browse source 
- Remove unused variable $file and associated SQL
- Add back uninitialized variables
This commit is contained in:
Hypolite Petovan 2018-01-01 16:33:21 -05:00
parent e52c11cc58
commit 97bc54cf1b
2 changed files with 34 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
mod/network.php
View file

@ -365,7 +365,7 @@ function networkConversation($a, $items, $mode, $update) {
// Set this so that the conversation function can find out contact info for our wall-wall items // Set this so that the conversation function can find out contact info for our wall-wall items
$a->page_contact = $a->contact; $a->page_contact = $a->contact;
$o .= conversation($a, $items, $mode, $update); $o = conversation($a, $items, $mode, $update);
if (!$update) { if (!$update) {
if (PConfig::get(local_user(), 'system', 'infinite_scroll')) { if (PConfig::get(local_user(), 'system', 'infinite_scroll')) {
@ -568,9 +568,9 @@ function networkThreadedView(App $a, $update = 0) {
if ($group) { if ($group) {
if (($t = Contact::getOStatusCountByGroupId($group)) && !PConfig::get(local_user(), 'system', 'nowarn_insecure')) { if (($t = Contact::getOStatusCountByGroupId($group)) && !PConfig::get(local_user(), 'system', 'nowarn_insecure')) {
notice(sprintf(tt("Warning: This group contains %s member from a network that doesn't allow non public messages.", notice(tt("Warning: This group contains %s member from a network that doesn't allow non public messages.",
"Warning: This group contains %s members from a network that doesn't allow non public messages.", "Warning: This group contains %s members from a network that doesn't allow non public messages.",
$t), $t).EOL); $t) . EOL);
notice(t("Messages in this group won't be send to these receivers.").EOL); notice(t("Messages in this group won't be send to these receivers.").EOL);
} }
} }
@ -664,7 +664,7 @@ function networkThreadedView(App $a, $update = 0) {
} }
$o = replace_macros(get_markup_template("section_title.tpl"),array( $o = replace_macros(get_markup_template("section_title.tpl"),array(
'$title' => sprintf(t('Group: %s'), $r['name']) '$title' => t('Group: %s', $r['name'])
)) . $o; )) . $o;
} elseif ($cid) { } elseif ($cid) {
@ -716,13 +716,6 @@ function networkThreadedView(App $a, $update = 0) {
$sql_order = ""; $sql_order = "";
$order_mode = "received"; $order_mode = "received";
if (strlen($file)) {
$sql_post_table .= sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
dbesc(protect_sprintf($file)), intval(TERM_OBJ_POST), intval(TERM_FILE), intval(local_user()));
$sql_order = "`item`.`id`";
$order_mode = "id";
}
if ($conv) { if ($conv) {
$sql_extra3 .= " AND $sql_table.`mention`"; $sql_extra3 .= " AND $sql_table.`mention`";
} }
@ -744,7 +737,7 @@ function networkThreadedView(App $a, $update = 0) {
$sql_order = "$sql_table.$ordering"; $sql_order = "$sql_table.$ordering";
} }
if (($_GET["offset"] != "")) { if (x($_GET, 'offset')) {
$sql_extra3 .= sprintf(" AND $sql_order <= '%s'", dbesc($_GET["offset"])); $sql_extra3 .= sprintf(" AND $sql_order <= '%s'", dbesc($_GET["offset"]));
} }
@ -816,9 +809,10 @@ function networkThreadedView(App $a, $update = 0) {
$parents_str = ''; $parents_str = '';
$date_offset = ""; $date_offset = "";
$items = array();
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
foreach ($r as $rr) { foreach ($r as $rr) {
if (!in_array($rr['item_id'],$parents_arr)) { if (!in_array($rr['item_id'], $parents_arr)) {
$parents_arr[] = $rr['item_id']; $parents_arr[] = $rr['item_id'];
} }
} }
@ -833,12 +827,10 @@ function networkThreadedView(App $a, $update = 0) {
$max_comments = 100; $max_comments = 100;
} }
$items = array();
foreach ($parents_arr AS $parents) { foreach ($parents_arr AS $parents) {
$thread_items = dba::p(item_query()." AND `item`.`uid` = ? $thread_items = dba::p(item_query() . " AND `item`.`uid` = ?
AND `item`.`parent` = ? AND `item`.`parent` = ?
ORDER BY `item`.`commented` DESC LIMIT ".intval($max_comments + 1), ORDER BY `item`.`commented` DESC LIMIT " . intval($max_comments + 1),
local_user(), local_user(),
$parents $parents
); );
@ -847,15 +839,15 @@ function networkThreadedView(App $a, $update = 0) {
$items = array_merge($items, dba::inArray($thread_items)); $items = array_merge($items, dba::inArray($thread_items));
} }
} }
$items = conv_sort($items,$ordering); $items = conv_sort($items, $ordering);
} else {
$items = array();
} }
if ($_GET["offset"] == "") { if (x($_GET, 'offset')) {
$date_offset = $_GET["offset"];
} elseif(count($items)) {
$date_offset = $items[0][$order_mode]; $date_offset = $items[0][$order_mode];
} else { } else {
$date_offset = $_GET["offset"]; $date_offset = '';
} }
$a->page_offset = $date_offset; $a->page_offset = $date_offset;

54
mod/photo.php
View file

@ -1,4 +1,5 @@
<?php <?php
/** /**
* @file mod/photo.php * @file mod/photo.php
*/ */
@ -8,7 +9,8 @@ use Friendica\Object\Image;
require_once 'include/security.php'; require_once 'include/security.php';
function photo_init(App $a) { function photo_init(App $a)
{
global $_SERVER; global $_SERVER;
$prvcachecontrol = false; $prvcachecontrol = false;
@ -37,8 +39,8 @@ function photo_init(App $a) {
if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) { if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
header('HTTP/1.1 304 Not Modified'); header('HTTP/1.1 304 Not Modified');
header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()) . " GMT"); header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()) . " GMT");
header('Etag: '.$_SERVER['HTTP_IF_NONE_MATCH']); header('Etag: ' . $_SERVER['HTTP_IF_NONE_MATCH']);
header("Expires: " . gmdate("D, d M Y H:i:s", time() + (31536000)) . " GMT"); header("Expires: " . gmdate("D, d M Y H:i:s", time() + (31536000)) . " GMT");
header("Cache-Control: max-age=31536000"); header("Cache-Control: max-age=31536000");
if (function_exists('header_remove')) { if (function_exists('header_remove')) {
header_remove('Last-Modified'); header_remove('Last-Modified');
@ -49,15 +51,11 @@ function photo_init(App $a) {
} }
$default = 'images/person-175.jpg'; $default = 'images/person-175.jpg';
$public = true;
if (isset($type)) { if (isset($type)) {
// Profile photos
/**
* Profile photos
*/
switch ($type) { switch ($type) {
case 'profile': case 'profile':
case 'custom': case 'custom':
$resolution = 4; $resolution = 4;
@ -76,7 +74,7 @@ function photo_init(App $a) {
$uid = str_replace(array('.jpg', '.png', '.gif'), array('', '', ''), $person); $uid = str_replace(array('.jpg', '.png', '.gif'), array('', '', ''), $person);
foreach (Image::supportedTypes() AS $m => $e) { foreach (Image::supportedTypes() AS $m => $e) {
$uid = str_replace('.'.$e, '', $uid); $uid = str_replace('.' . $e, '', $uid);
} }
$r = q("SELECT * FROM `photo` WHERE `scale` = %d AND `uid` = %d AND `profile` = 1 LIMIT 1", $r = q("SELECT * FROM `photo` WHERE `scale` = %d AND `uid` = %d AND `profile` = 1 LIMIT 1",
@ -92,16 +90,12 @@ function photo_init(App $a) {
$mimetype = 'image/jpeg'; $mimetype = 'image/jpeg';
} }
} else { } else {
// Other photos
/**
* Other photos
*/
$resolution = 0; $resolution = 0;
$photo = str_replace(array('.jpg', '.png', '.gif'), array('', '', ''), $photo); $photo = str_replace(array('.jpg', '.png', '.gif'), array('', '', ''), $photo);
foreach (Image::supportedTypes() AS $m => $e) { foreach (Image::supportedTypes() AS $m => $e) {
$photo = str_replace('.'.$e, '', $photo); $photo = str_replace('.' . $e, '', $photo);
} }
if (substr($photo, -2, 1) == '-') { if (substr($photo, -2, 1) == '-') {
@ -115,22 +109,18 @@ function photo_init(App $a) {
intval($resolution) intval($resolution)
); );
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
$sql_extra = permissions_sql($r[0]['uid']); $sql_extra = permissions_sql($r[0]['uid']);
// Now we'll see if we can access the photo // Now we'll see if we can access the photo
$r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `scale` <= %d $sql_extra ORDER BY scale DESC LIMIT 1", $r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `scale` <= %d $sql_extra ORDER BY scale DESC LIMIT 1",
dbesc($photo), dbesc($photo),
intval($resolution) intval($resolution)
); );
$public = (DBM::is_result($r)) && ($r[0]['allow_cid'] == '') && ($r[0]['allow_gid'] == '') && ($r[0]['deny_cid'] == '') && ($r[0]['deny_gid'] == '');
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
$resolution = $r[0]['scale']; $resolution = $r[0]['scale'];
$data = $r[0]['data']; $data = $r[0]['data'];
$mimetype = $r[0]['type']; $mimetype = $r[0]['type'];
$public = $r[0]['allow_cid'] == '' && $r[0]['allow_gid'] == '' && $r[0]['deny_cid'] == '' && $r[0]['deny_gid'] == '';
} else { } else {
// The picure exists. We already checked with the first query. // The picure exists. We already checked with the first query.
// obviously, this is not an authorized viev! // obviously, this is not an authorized viev!
@ -145,7 +135,6 @@ function photo_init(App $a) {
if (empty($data)) { if (empty($data)) {
if (isset($resolution)) { if (isset($resolution)) {
switch ($resolution) { switch ($resolution) {
case 4: case 4:
$data = file_get_contents('images/person-175.jpg'); $data = file_get_contents('images/person-175.jpg');
$mimetype = 'image/jpeg'; $mimetype = 'image/jpeg';
@ -167,7 +156,7 @@ function photo_init(App $a) {
} }
// Resize only if its not a GIF and it is supported by the library // Resize only if its not a GIF and it is supported by the library
if (($mimetype != "image/gif") && in_array($mimetype, Image::supportedTypes())) { if ($mimetype != "image/gif" && in_array($mimetype, Image::supportedTypes())) {
$Image = new Image($data, $mimetype); $Image = new Image($data, $mimetype);
if ($Image->isValid()) { if ($Image->isValid()) {
if (isset($customres) && $customres > 0 && $customres < 500) { if (isset($customres) && $customres > 0 && $customres < 500) {
@ -183,36 +172,33 @@ function photo_init(App $a) {
header_remove('pragma'); header_remove('pragma');
} }
header("Content-type: ".$mimetype); header("Content-type: " . $mimetype);
if ($prvcachecontrol) { if ($prvcachecontrol) {
// it is a private photo that they have no permission to view. // it is a private photo that they have no permission to view.
// tell the browser not to cache it, in case they authenticate // tell the browser not to cache it, in case they authenticate
// and subsequently have permission to see it // and subsequently have permission to see it
header("Cache-Control: no-store, no-cache, must-revalidate"); header("Cache-Control: no-store, no-cache, must-revalidate");
} else { } else {
header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()) . " GMT"); header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()) . " GMT");
header('Etag: "'.md5($data).'"'); header('Etag: "' . md5($data) . '"');
header("Expires: " . gmdate("D, d M Y H:i:s", time() + (31536000)) . " GMT"); header("Expires: " . gmdate("D, d M Y H:i:s", time() + (31536000)) . " GMT");
header("Cache-Control: max-age=31536000"); header("Cache-Control: max-age=31536000");
} }
echo $data; echo $data;
// If the photo is public and there is an existing photo directory store the photo there // If the photo is public and there is an existing photo directory store the photo there
if ($public and ($file != "")) { if ($public and $file != '') {
// If the photo path isn't there, try to create it // If the photo path isn't there, try to create it
$basepath = $a->get_basepath(); $basepath = $a->get_basepath();
if (!is_dir($basepath."/photo")) { if (!is_dir($basepath . "/photo")) {
if (is_writable($basepath)) { if (is_writable($basepath)) {
mkdir($basepath."/photo"); mkdir($basepath . "/photo");
} }
} }
if (is_dir($basepath."/photo")) { if (is_dir($basepath . "/photo")) {
file_put_contents($basepath."/photo/".$file, $data); file_put_contents($basepath . "/photo/" . $file, $data);
} }
} }