Fix formatting and PHP notices in network and photo modules

- Remove unused variable $file and associated SQL
- Add back uninitialized variables

diff --git a/mod/network.php b/mod/network.php
index 552625c2afc6dc7e6e4c2b665b49d04f99f1351d..81e6754c235595faaef302d12030794c4d463559 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -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
        $a->page_contact = $a->contact;
 
-       $o .= conversation($a, $items, $mode, $update);
+       $o = conversation($a, $items, $mode, $update);
 
        if (!$update) {
                if (PConfig::get(local_user(), 'system', 'infinite_scroll')) {
@@ -568,9 +568,9 @@ function networkThreadedView(App $a, $update = 0) {
 
                if ($group) {
                        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.",
-                                               $t), $t).EOL);
+                                               $t) . 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(
-                       '$title' => sprintf(t('Group: %s'), $r['name'])
+                       '$title' => t('Group: %s', $r['name'])
                )) . $o;
 
        } elseif ($cid) {
@@ -716,13 +716,6 @@ function networkThreadedView(App $a, $update = 0) {
        $sql_order = "";
        $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) {
                $sql_extra3 .= " AND $sql_table.`mention`";
        }
@@ -744,7 +737,7 @@ function networkThreadedView(App $a, $update = 0) {
                $sql_order = "$sql_table.$ordering";
        }
 
-       if (($_GET["offset"] != "")) {
+       if (x($_GET, 'offset')) {
                $sql_extra3 .= sprintf(" AND $sql_order <= '%s'", dbesc($_GET["offset"]));
        }
 
@@ -816,9 +809,10 @@ function networkThreadedView(App $a, $update = 0) {
        $parents_str = '';
        $date_offset = "";
 
+       $items = array();
        if (DBM::is_result($r)) {
                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'];
                        }
                }
@@ -833,12 +827,10 @@ function networkThreadedView(App $a, $update = 0) {
                        $max_comments = 100;
                }
 
-               $items = array();
-
                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` = ?
-                               ORDER BY `item`.`commented` DESC LIMIT ".intval($max_comments + 1),
+                               ORDER BY `item`.`commented` DESC LIMIT " . intval($max_comments + 1),
                                local_user(),
                                $parents
                        );
@@ -847,15 +839,15 @@ function networkThreadedView(App $a, $update = 0) {
                                $items = array_merge($items, dba::inArray($thread_items));
                        }
                }
-               $items = conv_sort($items,$ordering);
-       } else {
-               $items = array();
+               $items = conv_sort($items, $ordering);
        }
 
-       if ($_GET["offset"] == "") {
+       if (x($_GET, 'offset')) {
+               $date_offset = $_GET["offset"];
+       } elseif(count($items)) {
                $date_offset = $items[0][$order_mode];
        } else {
-               $date_offset = $_GET["offset"];
+               $date_offset = '';
        }
 
        $a->page_offset = $date_offset;

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