Merge pull request #6336 from MrPetovan/bug/6334-get-app-namespace

Move mod/register to Module\Register

diff --git a/src/Database/PostUpdate.php b/src/Database/PostUpdate.php
index c40bfc98e78f72825d366fb524bc945d343a8a3d..acafea900c78fb62dafd7ef4e8e7fd4ff0b2edaf 100644 (file)
--- a/src/Database/PostUpdate.php
+++ b/src/Database/PostUpdate.php
@@ -34,6 +34,9 @@ class PostUpdate
                if (!self::update1281()) {
                        return false;
                }
+               if (!self::update1297()) {
+                       return false;
+               }
 
                return true;
        }
@@ -377,4 +380,40 @@ class PostUpdate
 
                return false;
        }
+
+       /**
+        * Set the delivery queue count to a negative value for all items preceding the feature.
+        *
+        * @return bool "true" when the job is done
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        */
+       private static function update1297()
+       {
+               // Was the script completed?
+               if (Config::get('system', 'post_update_version') >= 1297) {
+                       return true;
+               }
+
+               $max_item_delivery_data = DBA::selectFirst('item-delivery-data', ['iid'], ['queue_count > 0 OR queue_done > 0'], ['order' => ['iid']]);
+               $max_iid = $max_item_delivery_data['iid'];
+
+               Logger::info('Start update1297 with max iid: ' . $max_iid);
+
+               $condition = ['`queue_count` = 0 AND `iid` < ?', $max_iid];
+
+               DBA::update('item-delivery-data', ['queue_count' => -1], $condition);
+
+               if (DBA::errorNo() != 0) {
+                       Logger::error('Database error ' . DBA::errorNo() . ':' . DBA::errorMessage());
+                       return false;
+               }
+
+               Logger::info('Processed rows: ' . DBA::affectedRows());
+
+               Config::set('system', 'post_update_version', 1297);
+
+               Logger::info('Done');
+
+               return true;
+       }
 }

diff --git a/view/templates/sub/delivery_count.tpl b/view/templates/sub/delivery_count.tpl
index d10eda639b7fce42bf28cd0bf936b2dba18d952c..b487be88473c8d23ccfcfa70eb914292656d828c 100644 (file)
--- a/view/templates/sub/delivery_count.tpl
+++ b/view/templates/sub/delivery_count.tpl
@@ -2,12 +2,17 @@
        Please don't use this template as is, this is a placeholder that needs to be\r
        overriden with specific icons to avoid taking too much visual space\r
 *}}\r
-{{if $delivery.queue_count == 0}}\r
-       {{$delivery.notifier_pending|escape}}\r
-{{elseif $delivery.queue_done == 0}}\r
-       {{$delivery.delivery_pending|escape}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}\r
-{{elseif $delivery.queue_done / $delivery.queue_count < 0.75}}\r
-       {{$delivery.delivery_underway|escape}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}\r
-{{else}}\r
-       {{$delivery.delivery_almost|escape}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}\r
+{{if $delivery.queue_count >= -1 && $delivery.queue_count !== '' && $delivery.queue_count !== null}}\r
+<span class="delivery">\r
+       &bullet;\r
+       {{if $delivery.queue_count == 0}}\r
+               {{$delivery.notifier_pending}}\r
+       {{elseif $delivery.queue_done == 0}}\r
+               {{$delivery.delivery_pending}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}\r
+       {{elseif $delivery.queue_done / $delivery.queue_count < 0.75}}\r
+               {{$delivery.delivery_underway}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}\r
+       {{else}}\r
+               {{$delivery.delivery_almost}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}\r
+       {{/if}}\r
+</span>\r
 {{/if}}\r

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index cfb404f9fe57e6a93cad17f7cda46f699bdcd176..896892531db23f6bce02bc07d476b473dbb62d58 100644 (file)
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -2094,6 +2094,7 @@ ul.dropdown-menu li:hover {
 /* Media Classes */
 .media .time,
 .media .shared-time,
+.media .delivery,
 .media .location,
 .media .location a {
     font-size: 11px;

diff --git a/view/theme/frio/templates/sub/delivery_count.tpl b/view/theme/frio/templates/sub/delivery_count.tpl
index 05d1d171c7e59e28a6871748ce8978c8affb6a45..ee9e411cc4c0c8709c41d22f2bbfa0d299e443b3 100644 (file)
--- a/view/theme/frio/templates/sub/delivery_count.tpl
+++ b/view/theme/frio/templates/sub/delivery_count.tpl
@@ -1,13 +1,18 @@
-{{if $delivery.queue_count == 0}}\r
-       <i class="fa fa-hourglass-o" aria-hidden="true" title="{{$delivery.notifier_pending|escape}}"></i>\r
-       <span class="sr-only">{{$delivery.notifier_pending|escape}}</span>\r
-{{elseif $delivery.queue_done == 0}}\r
-       <i class="fa fa-hourglass" aria-hidden="true" title="{{$delivery.delivery_pending|escape}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i>\r
-       <span class="sr-only">{{$delivery.delivery_pending|escape}}</span>\r
-{{elseif $delivery.queue_done / $delivery.queue_count < 0.75}}\r
-       <i class="fa fa-paper-plane-o" aria-hidden="true" title="{{$delivery.delivery_underway|escape}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i>\r
-       <span class="sr-only">{{$delivery.delivery_underway|escape}}</span>\r
-{{else}}\r
-       <i class="fa fa-paper-plane" aria-hidden="true" title="{{$delivery.delivery_almost|escape}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i>\r
-       <span class="sr-only">{{$delivery.delivery_almost|escape}}</span>\r
+{{if $delivery.queue_count >= -1 && $delivery.queue_count !== '' && $delivery.queue_count !== null}}\r
+<span class="delivery">\r
+       &bullet;\r
+       {{if $delivery.queue_count == 0}}\r
+               <i class="fa fa-hourglass-o" aria-hidden="true" title="{{$delivery.notifier_pending}}"></i>\r
+               <span class="sr-only">{{$delivery.notifier_pending}}</span>\r
+       {{elseif $delivery.queue_done == 0}}\r
+               <i class="fa fa-hourglass" aria-hidden="true" title="{{$delivery.delivery_pending}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i>\r
+               <span class="sr-only">{{$delivery.delivery_pending}}</span>\r
+       {{elseif $delivery.queue_done / $delivery.queue_count < 0.75}}\r
+               <i class="fa fa-paper-plane-o" aria-hidden="true" title="{{$delivery.delivery_underway}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i>\r
+               <span class="sr-only">{{$delivery.delivery_underway}}</span>\r
+       {{else}}\r
+               <i class="fa fa-paper-plane" aria-hidden="true" title="{{$delivery.delivery_almost}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i>\r
+               <span class="sr-only">{{$delivery.delivery_almost}}</span>\r
+       {{/if}}\r
+</span>\r
 {{/if}}\r

diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index 8d357960fe262f06ed2ce7a97cbd479cc951860d..12e419f8a59f8562ac06fea94aa475d8171ad090 100644 (file)
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -202,7 +202,16 @@ as the value of $top_child_total (this is done at the end of this file)
 
                        <div class="additional-info text-muted">
                                <div id="wall-item-ago-{{$item.id}}" class="wall-item-ago">
-                                       <small><a href="{{$item.plink.orig}}"><span class="time" title="{{$item.localtime}}" data-toggle="tooltip"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time></span></a></small>
+                                       <small>
+                                               <a href="{{$item.plink.orig}}">
+                                                       <span class="time" title="{{$item.localtime}}" data-toggle="tooltip">
+                                                               <time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time>
+                                                       </span>
+                                               </a>
+                                               {{if $item.owner_self}}
+                                                       {{include file="sub/delivery_count.tpl" delivery=$item.delivery}}
+                                               {{/if}}
+                                       </small>
                                </div>
 
                                {{if $item.location}}
@@ -223,7 +232,6 @@ as the value of $top_child_total (this is done at the end of this file)
                                                <a class="time" href="{{$item.plink.orig}}"><span class="wall-item-ago">{{$item.ago}}</span></a>
                                                {{if $item.location}}&nbsp;&mdash;&nbsp;({{$item.location nofilter}}){{/if}}
                                                {{if $item.owner_self}}
-                                                       &bullet;
                                                        {{include file="sub/delivery_count.tpl" delivery=$item.delivery}}
                                                {{/if}}
                                        </small>
@@ -239,7 +247,13 @@ as the value of $top_child_total (this is done at the end of this file)
                        <h5 class="media-heading">
                                <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span class="fakelink">{{$item.name}}</span></a>
                                <span class="text-muted">
-                                       <small><a class="time" href="{{$item.plink.orig}}" title="{{$item.localtime}}" data-toggle="tooltip">{{$item.ago}}</a> {{if $item.location}}&nbsp;&mdash;&nbsp;({{$item.location nofilter}}){{/if}}</small>
+                                       <small>
+                                               <a class="time" href="{{$item.plink.orig}}" title="{{$item.localtime}}" data-toggle="tooltip">{{$item.ago}}</a>
+                                               {{if $item.location}}&nbsp;&mdash;&nbsp;({{$item.location nofilter}}){{/if}}
+                                               {{if $item.owner_self}}
+                                                       {{include file="sub/delivery_count.tpl" delivery=$item.delivery}}
+                                               {{/if}}
+                                       </small>
                                </span>
                        </h5>
                </div>

diff --git a/view/theme/vier/templates/sub/delivery_count.tpl b/view/theme/vier/templates/sub/delivery_count.tpl
index 594ce38c53ee8edfd31eb35288e2091cd2cb232c..a0719f762f5c437963c9c040ba28afa042acc45f 100644 (file)
--- a/view/theme/vier/templates/sub/delivery_count.tpl
+++ b/view/theme/vier/templates/sub/delivery_count.tpl
@@ -1,13 +1,18 @@
-{{if $delivery.queue_count == 0}}\r
-       <i class="icon-spinner" aria-hidden="true" title="{{$delivery.notifier_pending|escape}}"></i>\r
-       <span class="sr-only">{{$delivery.notifier_pending|escape}}</span>\r
-{{elseif $delivery.queue_done == 0}}\r
-       <i class="icon-spinner" aria-hidden="true" title="{{$delivery.delivery_pending|escape}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i>\r
-       <span class="sr-only">{{$delivery.delivery_pending|escape}}</span>\r
-{{elseif $delivery.queue_done / $delivery.queue_count < 0.75}}\r
-       <i class="icon-plane" aria-hidden="true" title="{{$delivery.delivery_underway|escape}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i>\r
-       <span class="sr-only">{{$delivery.delivery_underway|escape}}</span>\r
-{{else}}\r
-       <i class="icon-plane" aria-hidden="true" title="{{$delivery.delivery_almost|escape}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i>\r
-       <span class="sr-only">{{$delivery.delivery_almost|escape}}</span>\r
+{{if $delivery.queue_count >= -1 && $delivery.queue_count !== '' && $delivery.queue_count !== null}}\r
+<span class="delivery">\r
+       &bullet;\r
+       {{if $delivery.queue_count == 0}}\r
+               <i class="icon-spinner" aria-hidden="true" title="{{$delivery.notifier_pending}}"></i>\r
+               <span class="sr-only">{{$delivery.notifier_pending}}</span>\r
+       {{elseif $delivery.queue_done == 0}}\r
+               <i class="icon-spinner" aria-hidden="true" title="{{$delivery.delivery_pending}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i>\r
+               <span class="sr-only">{{$delivery.delivery_pending}}</span>\r
+       {{elseif $delivery.queue_done / $delivery.queue_count < 0.75}}\r
+               <i class="icon-plane" aria-hidden="true" title="{{$delivery.delivery_underway}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i>\r
+               <span class="sr-only">{{$delivery.delivery_underway}}</span>\r
+       {{else}}\r
+               <i class="icon-plane" aria-hidden="true" title="{{$delivery.delivery_almost}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i>\r
+               <span class="sr-only">{{$delivery.delivery_almost}}</span>\r
+       {{/if}}\r
+</span>\r
 {{/if}}\r

diff --git a/view/theme/vier/templates/wall_thread.tpl b/view/theme/vier/templates/wall_thread.tpl
index 607a789e564314356fa201bc036133d6fc1dee19..21ebcea38f56769944ac1e4f2e7d1fd13a1c339f 100644 (file)
--- a/view/theme/vier/templates/wall_thread.tpl
+++ b/view/theme/vier/templates/wall_thread.tpl
@@ -57,7 +57,6 @@
                        <span class="wall-item-ago">
                                {{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.href}}" class="u-url" style="color: #999"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.created}}</time></a>{{else}} <time class="dt-published" datetime="{{$item.localtime}}">{{$item.created}}</time> {{/if}}
                                {{if $item.owner_self}}
-                                       &bullet;
                                        {{include file="sub/delivery_count.tpl" delivery=$item.delivery}}
                                {{/if}}
                        </span>