From 1d48ab0191fbf0dba4d62fdbb35301b1e988c37d Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sun, 8 Feb 2015 11:54:42 +0100
Subject: [PATCH] "altpager" is now the standard value and can be disabled.
Depending upon the user reactions we can disable it in an upcoming version.
---
mod/admin.php | 3 +++
mod/community.php | 7 +++----
mod/network.php | 7 +++----
mod/profile.php | 9 ++++-----
mod/search.php | 7 +++----
view/templates/admin_site.tpl | 1 +
6 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/mod/admin.php b/mod/admin.php
index 2a923f4ca..e47d7b5b0 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -372,6 +372,7 @@ function admin_page_site_post(&$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);
$disable_noscrape = ((x($_POST,'disable_noscrape')) ? true : false);
if($ssl_policy != intval(get_config('system','ssl_policy'))) {
if($ssl_policy == SSL_POLICY_FULL) {
@@ -500,6 +501,7 @@ function admin_page_site_post(&$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','disable_noscrape', $disable_noscrape);
info( t('Site settings updated.') . EOL);
@@ -666,6 +668,7 @@ function admin_page_site(&$a) {
'$temppath' => array('temppath', t("Temp path"), get_config('system','temppath'), "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'), "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.")),
'$relocate_url' => array('relocate_url', t("New base url"), $a->get_baseurl(), "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 e23115157..e3d2b77c0 100644
--- a/mod/community.php
+++ b/mod/community.php
@@ -44,7 +44,7 @@ function community_content(&$a, $update = 0) {
// Only public posts can be shown
// OR your own posts if you are a logged in member
- if( (! get_config('alt_pager', 'global')) && (! get_pconfig(local_user(),'system','alt_pager')) ) {
+ if(get_config('system', 'old_pager')) {
$r = q("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
@@ -103,10 +103,9 @@ function community_content(&$a, $update = 0) {
$o .= conversation($a,$s,'community',$update);
- if(get_config('alt_pager', 'global') || get_pconfig(local_user(),'system','alt_pager') ) {
+ if(!get_config('system', 'old_pager')) {
$o .= alt_pager($a,count($r));
- }
- else {
+ } else {
$o .= paginate($a);
}
diff --git a/mod/network.php b/mod/network.php
index 355f6edcd..f9d4b59ad 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -627,7 +627,7 @@ die("ss");
}
else {
- if( (! get_config('alt_pager', 'global')) && (! get_pconfig(local_user(),'system','alt_pager')) ) {
+ if(get_config('system', 'old_pager')) {
$r = q("SELECT COUNT(*) AS `total`
FROM $sql_table $sql_post_table INNER JOIN `contact` ON `contact`.`id` = $sql_table.`contact-id`
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
@@ -815,10 +815,9 @@ die("ss");
$o .= conversation($a,$items,$mode,$update);
if(!$update) {
- if( get_config('alt_pager', 'global') || get_pconfig(local_user(),'system','alt_pager') ) {
+ if(!get_config('system', 'old_pager')) {
$o .= alt_pager($a,count($items));
- }
- else {
+ } else {
$o .= paginate($a);
}
}
diff --git a/mod/profile.php b/mod/profile.php
index f442c73f5..bb45d1fec 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -246,7 +246,7 @@ function profile_content(&$a, $update = 0) {
$sql_extra2 .= protect_sprintf(sprintf(" AND `thread`.`created` >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2))));
}
- if( (! get_config('alt_pager', 'global')) && (! get_pconfig($a->profile['profile_uid'],'system','alt_pager')) ) {
+ 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`
@@ -331,7 +331,7 @@ function profile_content(&$a, $update = 0) {
if($is_owner) {
- $r = q("UPDATE `item` SET `unseen` = 0
+ $r = q("UPDATE `item` SET `unseen` = 0
WHERE `wall` = 1 AND `unseen` = 1 AND `uid` = %d",
intval(local_user())
);
@@ -340,10 +340,9 @@ function profile_content(&$a, $update = 0) {
$o .= conversation($a,$items,'profile',$update);
if(! $update) {
- if( get_config('alt_pager', 'global') || get_pconfig($a->profile['profile_uid'],'system','alt_pager') ) {
+ if(!get_config('system', 'old_pager')) {
$o .= alt_pager($a,count($items));
- }
- else {
+ } else {
$o .= paginate($a);
}
}
diff --git a/mod/search.php b/mod/search.php
index 00f379a75..57f42d640 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -150,7 +150,7 @@ function search_content(&$a) {
// OR your own posts if you are a logged in member
// No items will be shown if the member has a blocked profile wall.
- if( (! get_config('alt_pager', 'global')) && (! get_pconfig(local_user(),'system','alt_pager')) ) {
+ if(get_config('system', 'old_pager')) {
$r = q("SELECT distinct(`item`.`uri`) as `total`
FROM $sql_table INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
@@ -205,10 +205,9 @@ function search_content(&$a) {
$o .= conversation($a,$r,'search',false);
- if( get_config('alt_pager', 'global') || get_pconfig(local_user(),'system','alt_pager') ) {
+ if(!get_config('system', 'old_pager')) {
$o .= alt_pager($a,count($r));
- }
- else {
+ } else {
$o .= paginate($a);
}
diff --git a/view/templates/admin_site.tpl b/view/templates/admin_site.tpl
index 24ff751be..03473089d 100644
--- a/view/templates/admin_site.tpl
+++ b/view/templates/admin_site.tpl
@@ -117,6 +117,7 @@
{{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}}" /></div>
</form>