"firewall" setting - block all public pages from the public if configured to do so

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index 1ef80e515d75a0a1038a71341b4084f12611766d..13d6a36d2fc5db4c503b3ee9eafd995b74af7dbb 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -2,9 +2,9 @@
 
 set_time_limit(0);
 
-define ( 'FRIENDIKA_VERSION',      '2.1.949' );
+define ( 'FRIENDIKA_VERSION',      '2.1.956' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
-define ( 'DB_UPDATE_VERSION',      1051      );
+define ( 'DB_UPDATE_VERSION',      1053      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -2027,7 +2027,7 @@ function micropro($contact, $redirect = false, $class = '') {
                $url = '';
        return '<div class="contact-block-div' . $class . '"><a class="contact-block-link' . $class . $sparkle 
                . (($click) ? ' fakelink' : '') . '" '
-               . (($url) ? '" href="' . $url . '"' : '') . $click . ' ><img class="contact-block-img' . $class . $sparkle . '" src="' 
+               . (($url) ? ' href="' . $url . '"' : '') . $click . ' ><img class="contact-block-img' . $class . $sparkle . '" src="' 
                . $contact['micro'] . '" title="' . $contact['name'] . ' [' . $contact['url'] . ']" alt="' . $contact['name'] 
                . '" /></a></div>' . "\r\n";
 }}
@@ -2252,8 +2252,15 @@ function profile_sidebar($profile) {
 
        $photo = '<div id="profile-photo-wrapper"><img class="photo" src="' . $profile['photo'] . '" alt="' . $profile['name'] . '" /></div>';
 
+       // don't show connect link to yourself
+       
        $connect = (($profile['uid'] != local_user()) ? '<li><a id="dfrn-request-link" href="dfrn_request/' . $profile['nickname'] . '">' . t('Connect') . '</a></li>' : '');
- 
+
+       // don't show connect link to authenticated visitors either
+
+       if((remote_user()) && ($_SESSION['visitor_visiting'] == $profile['uid']))
+               $connect = ''; 
+
        if((x($profile,'address') == 1) 
                || (x($profile,'locality') == 1) 
                || (x($profile,'region') == 1) 
@@ -2661,7 +2668,7 @@ function parse_xml_string($s) {
        $x = @simplexml_load_string($s2);
        if(count(libxml_get_errors()))
                foreach(libxml_get_errors() as $err)
-                       logger('libxml: parse: ' . $err, LOGGER_DATA);
+                       logger('libxml: parse: ' . $err->code." at ".$err->line.":".$err->column." : ".$err->message, LOGGER_DATA);
        libxml_clear_errors();
        return $x;
 }}