Merge pull request #9174 from annando/issue-9167

Issue 9167 - messages from non-followers

diff --git a/CREDITS.txt b/CREDITS.txt
index 402c356..1afbf16 100644 (file)
--- a/CREDITS.txt
+++ b/CREDITS.txt
@@ -212,6 +212,7 @@ repat
 Ricardo Pereira
 Rik 4
 RJ Madsen
+Roger Meyer
 Roland Häder
 Rui Andrada
 rwa

diff --git a/bin/dev/make_credits.py b/bin/dev/make_credits.py
index d895213..be7a52e 100755 (executable)
--- a/bin/dev/make_credits.py
+++ b/bin/dev/make_credits.py
@@ -34,7 +34,7 @@ dontinclude = ['root', 'friendica', 'bavatar', 'tony baldwin', 'Taek', 'silke m'
 path = os.path.abspath(argv[0].split('bin/dev/make_credits.py')[0])
 print('> base directory is assumed to be: '+path)
 #  a place to store contributors
-contributors = ["Andi Stadler", "Ratten", "Vít Šesták 'v6ak'"]
+contributors = ["Andi Stadler", "Ratten", "Roger Meyer", "Vít Šesták 'v6ak'"]
 #  get the contributors
 print('> getting contributors to the friendica core repository')
 p = subprocess.Popen(['git', 'shortlog', '--no-merges', '-s'],

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 3cd3afe..0ed3930 100644 (file)
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -354,13 +354,7 @@ class Profile
                // Fetch the account type
                $account_type = Contact::getAccountType($profile);
 
-               if (!empty($profile['address'])
-                       || !empty($profile['location'])
-                       || !empty($profile['locality'])
-                       || !empty($profile['region'])
-                       || !empty($profile['postal-code'])
-                       || !empty($profile['country-name'])
-               ) {
+               if (!empty($profile['address']) || !empty($profile['location'])) {
                        $location = DI::l10n()->t('Location:');
                }
 
@@ -427,10 +421,6 @@ class Profile
                        $p['about'] = BBCode::convert($p['about']);
                }
 
-               if (empty($p['address']) && !empty($p['location'])) {
-                       $p['address'] = $p['location'];
-               }
-
                if (isset($p['address'])) {
                        $p['address'] = BBCode::convert($p['address']);
                }

diff --git a/static/defaults.config.php b/static/defaults.config.php
index 4d59501..35b1bc7 100644 (file)
--- a/static/defaults.config.php
+++ b/static/defaults.config.php
@@ -210,6 +210,10 @@ return [
                // Disable the polling of DFRN and OStatus contacts through onepoll.php.
                'disable_polling' => false,
 
+               // display_resharer (Boolean)
+               // Display the first resharer as icon and text on a reshared item.
+               'display_resharer' => false,
+
                // dlogfile (Path)
                // location of the developer log file.
                'dlogfile' => '',
@@ -303,6 +307,12 @@ return [
                // Maximum number of queue items for a single contact before subsequent messages are discarded.
                'max_contact_queue' => 500,
 
+               // max_csv_file_size (Integer)
+               // When uploading a CSV with account addresses to follow
+               // in the user settings, this controls the maximum file
+               // size of the upload file.
+               'max_csv_file_size' => 30720,
+
                // max_feed_items (Integer)
                // Maximum number of feed items that are fetched and processed. For unlimited items set to 0.
                'max_feed_items' => 20,
@@ -395,10 +405,6 @@ return [
                // - 0 = every minute
                'pushpoll_frequency' => 3,
 
-               // queue_no_dead_check (Boolean)
-               // Ignore if the target contact or server seems to be dead during queue delivery.
-               'queue_no_dead_check' => false,
-
                // redis_host (String)
                // Host name of the redis daemon.
                'redis_host' => '127.0.0.1',

diff --git a/static/settings.config.php b/static/settings.config.php
index 9c4e739..9dfd963 100644 (file)
--- a/static/settings.config.php
+++ b/static/settings.config.php
@@ -141,19 +141,9 @@ return [
                // Used by the worker in a non-HTTP execution environment.
                'url' => '',
 
-               // max_csv_file_size (Integer)
-               // When uploading a CSV with account addresses to follow
-               // in the user settings, this controls the maximum file
-               // size of the upload file.
-               'max_csv_file_size' => 30720,
-
                // optimize_tables (Boolean)
                // Periodically (once an hour) run an "optimize table" command for cache tables
                'optimize_tables' => false,
-
-               // display_resharer (Boolean)
-               // Display the first resharer as icon and text on a reshared item.
-               'display_resharer' => false,
        ],
 
        // Used in the admin settings to lock certain features

diff --git a/view/templates/profile/vcard.tpl b/view/templates/profile/vcard.tpl
index ccf3a10..c4e9ea1 100644 (file)
--- a/view/templates/profile/vcard.tpl
+++ b/view/templates/profile/vcard.tpl
@@ -13,16 +13,12 @@
        {{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
        {{if $profile.network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_link nofilter}}</dd></dl>{{/if}}
        {{if $location}}
-               <dl class="location"><dt class="location-label">{{$location}}</dt> 
-               <dd class="adr h-adr">
-                       {{if $profile.address}}<div class="street-address p-street-address">{{$profile.address nofilter}}</div>{{/if}}
-                       <span class="city-state-zip">
-                               <span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-                               <span class="region p-region">{{$profile.region}}</span>
-                               <span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
-                       </span>
-                       {{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
-               </dd>
+               <dl class="location">
+                       <dt class="location-label">{{$location}}</dt>
+                       <dd class="adr h-adr">
+                               {{if $profile.address}}<p class="street-address p-street-address">{{$profile.address nofilter}}</p>{{/if}}
+                               {{if $profile.location}}<p class="p-location">{{$profile.location}}</p>{{/if}}
+                       </dd>
                </dl>
        {{/if}}
 

diff --git a/view/templates/wall_thread.tpl b/view/templates/wall_thread.tpl
index 202eb2b..bd8a1a2 100644 (file)
--- a/view/templates/wall_thread.tpl
+++ b/view/templates/wall_thread.tpl
@@ -20,9 +20,9 @@
 <a name="{{$item.id}}" ></a>
 <div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" >
        <div class="wall-item-content-wrapper {{$item.indent}} {{$item.shiny}}" id="wall-item-content-wrapper-{{$item.id}}" >
-               {{if $item.reshared}}
-                       <div class="wall-item-ammounce wall-item-responses" id="wall-item-ammounce-{{$item.id}}">{{$item.reshared nofilter}}</div>
-               {{/if}}
+       {{if $item.reshared}}
+               <p class="wall-item-announce wall-item-responses" id="wall-item-announce-{{$item.id}}">{{$item.reshared nofilter}}</p>
+       {{/if}}
                <div class="wall-item-info{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}">
                        {{if $item.owner_url}}
                        <div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >

diff --git a/view/theme/duepuntozero/templates/profile/vcard.tpl b/view/theme/duepuntozero/templates/profile/vcard.tpl
index f40e98e..ed6d522 100644 (file)
--- a/view/theme/duepuntozero/templates/profile/vcard.tpl
+++ b/view/theme/duepuntozero/templates/profile/vcard.tpl
@@ -12,16 +12,12 @@
        {{if $profile.network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_link nofilter}}</dd></dl>{{/if}}
 
        {{if $location}}
-               <dl class="location"><dt class="location-label">{{$location}}</dt> 
-               <dd class="adr h-adr">
-                       {{if $profile.address}}<div class="street-address p-street-address">{{$profile.address nofilter}}</div>{{/if}}
-                       <span class="city-state-zip">
-                               <span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-                               <span class="region p-region">{{$profile.region}}</span>
-                               <span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
-                       </span>
-                       {{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
-               </dd>
+               <dl class="location">
+                       <dt class="location-label">{{$location}}</dt>
+                       <dd class="adr h-adr">
+                               {{if $profile.address}}<p class="street-address p-street-address">{{$profile.address nofilter}}</p>{{/if}}
+                               {{if $profile.location}}<p class="p-location">{{$profile.location}}</p>{{/if}}
+                       </dd>
                </dl>
        {{/if}}
 

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 12aa1df..f2cfa13 100644 (file)
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -1985,7 +1985,7 @@ ul.dropdown-menu li:hover {
 }
 
 /* Media Classes */
-.wall-item-ammounce,
+p.wall-item-announce,
 .media .time,
 .media .shared-time,
 .media .delivery,

diff --git a/view/theme/frio/templates/profile/vcard.tpl b/view/theme/frio/templates/profile/vcard.tpl
index 550bb62..b1d4ada 100644 (file)
--- a/view/theme/frio/templates/profile/vcard.tpl
+++ b/view/theme/frio/templates/profile/vcard.tpl
@@ -80,13 +80,8 @@
                <div class="location detail">
                        <span class="location-label icon"><i class="fa fa-map-marker"></i></span>
                        <span class="adr">
-                               {{if $profile.address}}<span class="street-address p-street-address">{{$profile.address nofilter}}</span>{{/if}}
-                               <span class="city-state-zip">
-                                       <span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-                                       <span class="region p-region">{{$profile.region}}</span>
-                                       <span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
-                               </span>
-                               {{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
+                               {{if $profile.address}}<p class="street-address p-street-address">{{$profile.address nofilter}}</p>{{/if}}
+                               {{if $profile.location}}<p class="p-location">{{$profile.location}}</p>{{/if}}
                        </span>
                </div>
                {{/if}}

diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index 38a6cce..81532f9 100644 (file)
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -82,7 +82,7 @@ as the value of $top_child_total (this is done at the end of this file)
 {{/if}}
        <div class="media {{$item.shiny}}">
        {{if $item.reshared}}
-               <div class="wall-item-ammounce wall-item-responses" id="wall-item-ammounce-{{$item.id}}"><i class="fa fa-retweet" aria-hidden="true"></i> {{$item.reshared nofilter}}</div>
+               <p class="wall-item-announce wall-item-responses" id="wall-item-announce-{{$item.id}}"><i class="fa fa-retweet" aria-hidden="true"></i> {{$item.reshared nofilter}}</p>
        {{/if}}
                {{* The avatar picture and the photo-menu *}}
                <div class="dropdown pull-left"><!-- Dropdown -->

diff --git a/view/theme/quattro/templates/profile/vcard.tpl b/view/theme/quattro/templates/profile/vcard.tpl
index 66422dd..992700f 100644 (file)
--- a/view/theme/quattro/templates/profile/vcard.tpl
+++ b/view/theme/quattro/templates/profile/vcard.tpl
@@ -24,16 +24,12 @@
        {{if $profile.network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_link nofilter}}</dd></dl>{{/if}}
 
        {{if $location}}
-               <dl class="location"><dt class="location-label">{{$location}}</dt> 
-               <dd class="adr h-adr">
-                       {{if $profile.address}}<div class="street-address p-street-address">{{$profile.address nofilter}}</div>{{/if}}
-                       <span class="city-state-zip">
-                               <span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-                               <span class="region p-region">{{$profile.region}}</span>
-                               <span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
-                       </span>
-                       {{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
-               </dd>
+               <dl class="location">
+                       <dt class="location-label">{{$location}}</dt>
+                       <dd class="adr h-adr">
+                               {{if $profile.address}}<p class="street-address p-street-address">{{$profile.address nofilter}}</p>{{/if}}
+                               {{if $profile.location}}<p class="p-location">{{$profile.location}}</p>{{/if}}
+                       </dd>
                </dl>
        {{/if}}
 

diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css
index f997f25..207aebb 100644 (file)
--- a/view/theme/smoothly/style.css
+++ b/view/theme/smoothly/style.css
@@ -4500,11 +4500,6 @@ hr.line-dots {
 #page-footer {}
 #live-profile {}
 
-.city-state-zip {}
-.country-name {}
-.locality {}
-.region {}
-.postal-code {}
 .mpfriend {}
 .toplevel_item {}
 

diff --git a/view/theme/vier/templates/profile/vcard.tpl b/view/theme/vier/templates/profile/vcard.tpl
index 5f8e718..06c7a02 100644 (file)
--- a/view/theme/vier/templates/profile/vcard.tpl
+++ b/view/theme/vier/templates/profile/vcard.tpl
@@ -20,16 +20,12 @@
        {{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
        {{if $profile.network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_link nofilter}}</dd></dl>{{/if}}
        {{if $location}}
-               <dl class="location"><dt class="location-label">{{$location}}</dt> 
-               <dd class="adr h-adr">
-                       {{if $profile.address}}<div class="street-address p-street-address">{{$profile.address nofilter}}</div>{{/if}}
-                       <span class="city-state-zip">
-                               <span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-                               <span class="region p-region">{{$profile.region}}</span>
-                               <span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
-                       </span>
-                       {{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
-               </dd>
+               <dl class="location">
+                       <dt class="location-label">{{$location}}</dt>
+                       <dd class="adr h-adr">
+                               {{if $profile.address}}<p class="street-address p-street-address">{{$profile.address nofilter}}</p>{{/if}}
+                               {{if $profile.location}}<p class="p-location">{{$profile.location}}</p>{{/if}}
+                       </dd>
                </dl>
        {{/if}}