And again, and again, and again, ... some more notices removed (#5601)

* And again, and again, and again, ... some more notices removed

* And some more notices ...

* Some more place

diff --git a/mod/bookmarklet.php b/mod/bookmarklet.php
index a26757740a3daf6625e4edce488951fef8e8c789..21b2039c5891c97260aae78c34a91c8a84716540 100644 (file)
--- a/mod/bookmarklet.php
+++ b/mod/bookmarklet.php
@@ -26,7 +26,7 @@ function bookmarklet_content(App $a)
                return $o;
        }
 
-       $referer = normalise_link($_SERVER["HTTP_REFERER"]);
+       $referer = normalise_link(defaults($_SERVER, 'HTTP_REFERER', ''));
        $page = normalise_link(System::baseUrl() . "/bookmarklet");
 
        if (!strstr($referer, $page)) {
@@ -43,7 +43,7 @@ function bookmarklet_content(App $a)
                        'bang' => '',
                        'visitor' => 'block',
                        'profile_uid' => local_user(),
-                       'title' => trim($_REQUEST["title"], "*"),
+                       'title' => trim(defaults($_REQUEST, 'title', ''), "*"),
                        'content' => $content
                ];
                $o = status_editor($a, $x, 0, false);

diff --git a/mod/item.php b/mod/item.php
index 125606d2778697a2d9e36383cf1eb84616f00f15..be3af101d9e18f66879c38883579ab1891724014 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -395,12 +395,12 @@ function item_post(App $a) {
                                $tagged[] = $tag;
                        }
                        // When the forum is private or the forum is addressed with a "!" make the post private
-                       if (is_array($success['contact']) && ($success['contact']['prv'] || ($tag_type == '!'))) {
+                       if (is_array($success['contact']) && (!empty($success['contact']['prv']) || ($tag_type == '!'))) {
                                $private_forum = $success['contact']['prv'];
                                $only_to_forum = ($tag_type == '!');
                                $private_id = $success['contact']['id'];
                                $forum_contact = $success['contact'];
-                       } elseif (is_array($success['contact']) && $success['contact']['forum'] &&
+                       } elseif (is_array($success['contact']) && !empty($success['contact']['forum']) &&
                                ($str_contact_allow == '<' . $success['contact']['id'] . '>')) {
                                $private_forum = false;
                                $only_to_forum = true;

diff --git a/src/Content/Nav.php b/src/Content/Nav.php
index 60937ff7b191dbeaac42db50a8610b629dad43c3..99decc92bb2e645dbade209f754626ef02cd1056 100644 (file)
--- a/src/Content/Nav.php
+++ b/src/Content/Nav.php
@@ -186,7 +186,7 @@ class Nav
                        $nav['home'] = ['profile/' . $a->user['nickname'], L10n::t('Home'), '', L10n::t('Your posts and conversations')];
 
                        // Don't show notifications for public communities
-                       if ($_SESSION['page_flags'] != Contact::PAGE_COMMUNITY) {
+                       if (defaults($_SESSION, 'page_flags', '') != Contact::PAGE_COMMUNITY) {
                                $nav['introductions'] = ['notifications/intros', L10n::t('Introductions'), '', L10n::t('Friend Requests')];
                                $nav['notifications'] = ['notifications',       L10n::t('Notifications'), '', L10n::t('Notifications')];
                                $nav['notifications']['all'] = ['notifications/system', L10n::t('See all notifications'), '', ''];

diff --git a/src/Content/Widget/CalendarExport.php b/src/Content/Widget/CalendarExport.php
index 0e85e16c466f6d5cdb073dff04387ee237c61297..2c21b2f0d0ab7e2d1b2f59194e87e038d27437cb 100644 (file)
--- a/src/Content/Widget/CalendarExport.php
+++ b/src/Content/Widget/CalendarExport.php
@@ -27,6 +27,10 @@ class CalendarExport
        public static function getHTML() {
                $a = get_app();
 
+               if (empty($a->data['user'])) {
+                       return;
+               }
+
                $owner_uid = $a->data['user']['uid'];
 
                // The permission testing is a little bit tricky because we have to respect many cases.

diff --git a/view/theme/frio/templates/profile_edit.tpl b/view/theme/frio/templates/profile_edit.tpl
index c06e3a715984cb4bda984a641a5873a811042d39..cd4ed1816f6adbd8dcd9d8791a1c8914fa524f98 100644 (file)
--- a/view/theme/frio/templates/profile_edit.tpl
+++ b/view/theme/frio/templates/profile_edit.tpl
@@ -318,8 +318,10 @@
                <input type="hidden" name="religion" id="profile-edit-religion" value="{{$religion.2}}" />
                <input type="hidden" id="likes-jot-text" name="likes" value="{{$likes.2}}" />
                <input type="hidden" id="dislikes-jot-text" name="dislikes" value="{{$dislikes.2}}" />
+               <input type="hidden" name="marital" id="profile-edit-marital" value="{{$marital.2}}" />
                <input type="hidden" name="with" id="profile-edit-with" value="{{$with.2}}" />
                <input type="hidden" name="howlong" id="profile-edit-howlong" value="{{$howlong.2}}" />
+               <input type="hidden" name="sexual" id="profile-edit-sexual" value="{{$sexual.2}}" />
                <input type="hidden" id="romance-jot-text" name="romance" value="{{$romance.2}}" />
                <input type="hidden" id="work-jot-text" name="work" value="{{$work.2}}" />
                <input type="hidden" id="education-jot-text" name="education" value="{{$education.2}}" />