Merge remote-tracking branch 'upstream/develop' into 1702-no-old_pager

Conflicts:
	mod/profile.php

diff --git a/include/Contact.php b/include/Contact.php
index ee5ec0cfceb0c681dbba76487b9f0af3b9e84505..3d4d6ded7fa64dfea6ab6972bf84a46523dbce0e 100644 (file)
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -702,15 +702,6 @@ function posts_from_gcontact(App $a, $gcontact_id) {
        else
                $sql = "`item`.`uid` = %d";
 
-       if(get_config('system', 'old_pager')) {
-               $r = q("SELECT COUNT(*) AS `total` FROM `item`
-                       WHERE `gcontact-id` = %d and $sql",
-                       intval($gcontact_id),
-                       intval(local_user()));
-
-               $a->set_pager_total($r[0]['total']);
-       }
-
        $r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
                        `author-name` AS `name`, `owner-avatar` AS `photo`,
                        `owner-link` AS `url`, `owner-avatar` AS `thumb`
@@ -726,11 +717,7 @@ function posts_from_gcontact(App $a, $gcontact_id) {
 
        $o = conversation($a,$r,'community',false);
 
-       if(!get_config('system', 'old_pager')) {
-               $o .= alt_pager($a,count($r));
-       } else {
-               $o .= paginate($a);
-       }
+       $o .= alt_pager($a,count($r));
 
        return $o;
 }
@@ -763,15 +750,6 @@ function posts_from_contact_url(App $a, $contact_url) {
 
        $author_id = intval($r[0]["author-id"]);
 
-       if (get_config('system', 'old_pager')) {
-               $r = q("SELECT COUNT(*) AS `total` FROM `item`
-                       WHERE `author-id` = %d and $sql",
-                       intval($author_id),
-                       intval(local_user()));
-
-               $a->set_pager_total($r[0]['total']);
-       }
-
        $r = q(item_query()." AND `item`.`author-id` = %d AND ".$sql.
                " ORDER BY `item`.`created` DESC LIMIT %d, %d",
                intval($author_id),
@@ -782,11 +760,7 @@ function posts_from_contact_url(App $a, $contact_url) {
 
        $o = conversation($a,$r,'community',false);
 
-       if (!get_config('system', 'old_pager')) {
-               $o .= alt_pager($a,count($r));
-       } else {
-               $o .= paginate($a);
-       }
+       $o .= alt_pager($a,count($r));
 
        return $o;
 }

diff --git a/mod/admin.php b/mod/admin.php
index 14751308344f39fc233566aaffa717ea6f871c41..d91b2d0a5f53fbb44c5defd65925f337d9cbfc23 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -662,7 +662,6 @@ function admin_page_site_post(App $a) {
        $basepath               =       ((x($_POST,'basepath'))                 ? notags(trim($_POST['basepath']))              : '');
        $singleuser             =       ((x($_POST,'singleuser'))               ? notags(trim($_POST['singleuser']))            : '');
        $proxy_disabled         =       ((x($_POST,'proxy_disabled'))           ? True                                          : False);
-       $old_pager              =       ((x($_POST,'old_pager'))                ? True                                          : False);
        $only_tag_search        =       ((x($_POST,'only_tag_search'))          ? True                                          : False);
        $rino                   =       ((x($_POST,'rino'))                     ? intval($_POST['rino'])                        : 0);
        $embedly                =       ((x($_POST,'embedly'))                  ? notags(trim($_POST['embedly']))               : '');
@@ -815,7 +814,6 @@ function admin_page_site_post(App $a) {
        set_config('system','temppath', $temppath);
        set_config('system','basepath', $basepath);
        set_config('system','proxy_disabled', $proxy_disabled);
-       set_config('system','old_pager', $old_pager);
        set_config('system','only_tag_search', $only_tag_search);
        set_config('system','worker', $worker);
        set_config('system','worker_queues', $worker_queues);
@@ -1061,7 +1059,6 @@ function admin_page_site(App $a) {
                '$temppath'             => array('temppath', t("Temp path"), get_config('system','temppath'), t("If you have a restricted system where the webserver can't access the system temp path, enter another path here.")),
                '$basepath'             => array('basepath', t("Base path to installation"), get_config('system','basepath'), t("If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot.")),
                '$proxy_disabled'       => array('proxy_disabled', t("Disable picture proxy"), get_config('system','proxy_disabled'), t("The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith.")),
-               '$old_pager'            => array('old_pager', t("Enable old style pager"), get_config('system','old_pager'), t("The old style pager has page numbers but slows down massively the page speed.")),
                '$only_tag_search'      => array('only_tag_search', t("Only search in tags"), get_config('system','only_tag_search'), t("On large systems the text search can slow down the system extremely.")),
 
                '$relocate_url'         => array('relocate_url', t("New base url"), App::get_baseurl(), t("Change base url for this server. Sends relocate message to all DFRN contacts of all users.")),

diff --git a/mod/community.php b/mod/community.php
index 7c92ff462f65aeda743ffa3dcb4636aa376c56f3..91b09bba9a11eacec39d6893746a656646ffbe1b 100644 (file)
--- a/mod/community.php
+++ b/mod/community.php
@@ -48,27 +48,6 @@ function community_content(App $a, $update = 0) {
        // Only public posts can be shown
        // OR your own posts if you are a logged in member
 
-       if(get_config('system', 'old_pager')) {
-               $r = qu("SELECT COUNT(distinct(`item`.`uri`)) AS `total`
-                       FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-                       AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-                       INNER JOIN `user` ON `user`.`uid` = `item`.`uid` AND `user`.`hidewall` = 0
-                       WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
-                       AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
-                       AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
-                       AND `item`.`private` = 0 AND `item`.`wall` = 1"
-               );
-
-               if (dbm::is_result($r))
-                       $a->set_pager_total($r[0]['total']);
-
-               if(! $r[0]['total']) {
-                       info( t('No results.') . EOL);
-                       return $o;
-               }
-
-       }
-
        $r = community_getitems($a->pager['start'], $a->pager['itemspage']);
 
        if (! dbm::is_result($r)) {
@@ -107,11 +86,7 @@ function community_content(App $a, $update = 0) {
 
        $o .= conversation($a,$s,'community',$update);
 
-       if(!get_config('system', 'old_pager')) {
-               $o .= alt_pager($a,count($r));
-       } else {
-               $o .= paginate($a);
-       }
+        $o .= alt_pager($a,count($r));
 
        return $o;
 }

diff --git a/mod/network.php b/mod/network.php
index 23cf098b65b25913ad3bc95bd0ec2f3ac6d3411d..284bf3d9617538ea8a2bc557bbd24f76bad0d208 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -599,21 +599,6 @@ function network_content(App $a, $update = 0) {
                $pager_sql = '';
 
        } else {
-               if(get_config('system', 'old_pager')) {
-                       $r = qu("SELECT COUNT(*) AS `total`
-                               FROM $sql_table $sql_post_table INNER JOIN `contact` ON `contact`.`id` = $sql_table.`contact-id`
-                               AND (NOT `contact`.`blocked` OR `contact`.`pending`)
-                               WHERE $sql_table.`uid` = %d AND $sql_table.`visible` AND NOT $sql_table.`deleted`
-                               $sql_extra2 $sql_extra3
-                               $sql_extra $sql_nets ",
-                               intval($_SESSION['uid'])
-                       );
-
-                       if (dbm::is_result($r)) {
-                               $a->set_pager_total($r[0]['total']);
-                       }
-               }
-
                //  check if we serve a mobile device and get the user settings
                //  accordingly
                if ($a->is_mobile) {
@@ -793,10 +778,8 @@ function network_content(App $a, $update = 0) {
        if (!$update) {
                if (get_pconfig(local_user(),'system','infinite_scroll')) {
                        $o .= scroll_loader();
-               } elseif (!get_config('system', 'old_pager')) {
-                       $o .= alt_pager($a,count($items));
                } else {
-                       $o .= paginate($a);
+                       $o .= alt_pager($a,count($items));
                }
        }
 

diff --git a/mod/profile.php b/mod/profile.php
index d2864d838a3ea7eafe7a04a858e7a51411931e2c..93f2602e23f6b8b4ef1c40be6818f246bedf3c5c 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -251,23 +251,6 @@ function profile_content(App $a, $update = 0) {
                        $sql_extra3 = sprintf(" AND `thread`.`contact-id` = %d ", intval(intval($a->profile['contact_id'])));
                }
 
-               if(get_config('system', 'old_pager')) {
-                   $r = q("SELECT COUNT(*) AS `total`
-                           FROM `thread` INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
-                           $sql_post_table INNER JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
-                           AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-                           WHERE `thread`.`uid` = %d AND `thread`.`visible` = 1 AND `thread`.`deleted` = 0
-                           and `thread`.`moderated` = 0
-                           AND `thread`.`wall` = 1
-                           $sql_extra3 $sql_extra $sql_extra2 ",
-                           intval($a->profile['profile_uid'])
-                       );
-
-                       if (dbm::is_result($r)) {
-                               $a->set_pager_total($r[0]['total']);
-                       }
-               }
-
                //  check if we serve a mobile device and get the user settings
                //  accordingly
                if ($a->is_mobile) {
@@ -337,12 +320,8 @@ function profile_content(App $a, $update = 0) {
 
        $o .= conversation($a,$items,'profile',$update);
 
-       if(! $update) {
-               if(!get_config('system', 'old_pager')) {
-                       $o .= alt_pager($a,count($items));
-               } else {
-                       $o .= paginate($a);
-               }
+       if (!$update) {
+               $o .= alt_pager($a,count($items));
        }
 
        return $o;

diff --git a/view/templates/admin_site.tpl b/view/templates/admin_site.tpl
index 2edfddb885f277bbae863ea9cf1b0b2ea04c494f..7434993705890c1598138ad675c5a4bd3a319a03 100644 (file)
--- a/view/templates/admin_site.tpl
+++ b/view/templates/admin_site.tpl
@@ -153,7 +153,6 @@
        {{include file="field_input.tpl" field=$itemcache_duration}}
        {{include file="field_input.tpl" field=$max_comments}}
        {{include file="field_checkbox.tpl" field=$proxy_disabled}}
-       {{include file="field_checkbox.tpl" field=$old_pager}}
        <div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
 
        <h3>{{$worker_title}}</h3>