Merge remote-tracking branch 'friendica/develop' into develop

boot.php

@@ -1889,11 +1889,35 @@ function goaway($s) {
  * @return int|bool user id or false
  */
 function local_user() {
-	if((x($_SESSION,'authenticated')) && (x($_SESSION,'uid')))
+	if (x($_SESSION, 'authenticated') && x($_SESSION, 'uid')) {
 		return intval($_SESSION['uid']);
+	}
 	return false;
 }
 
+/**
+ * @brief Returns the public contact id of logged in user or false.
+ *
+ * @return int|bool public contact id or false
+ */
+function public_contact() {
+	static $public_contact_id = false;
+
+	if (!$public_contact_id && x($_SESSION, 'authenticated')) {
+		if (x($_SESSION, 'my_address')) {
+			// Local user
+			$public_contact_id = intval(get_contact($_SESSION['my_address'], 0));
+		} else if (x($_SESSION, 'visitor_home')) {
+			// Remote user
+			$public_contact_id = intval(get_contact($_SESSION['visitor_home'], 0));
+		}
+	} else if (!x($_SESSION, 'authenticated')) {
+		$public_contact_id = false;
+	}
+
+	return $public_contact_id;
+}
+
 /**
  * @brief Returns contact id of authenticated site visitor or false
  *

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`
@@ -724,13 +715,9 @@ function posts_from_gcontact(App $a, $gcontact_id) {
 		intval($a->pager['itemspage'])
 	);
 
-	$o = conversation($a,$r,'community',false);
+	$o = conversation($a, $r, 'community', false);
 
-	if(!get_config('system', 'old_pager')) {
+	$o .= alt_pager($a, count($r));
-		$o .= alt_pager($a,count($r));
-	} else {
-		$o .= paginate($a);
-	}
 
 	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),
@@ -780,13 +758,9 @@ function posts_from_contact_url(App $a, $contact_url) {
 		intval($a->pager['itemspage'])
 	);
 
-	$o = conversation($a,$r,'community',false);
+	$o = conversation($a, $r, 'community', false);
 
-	if (!get_config('system', 'old_pager')) {
+	$o .= alt_pager($a, count($r));
-		$o .= alt_pager($a,count($r));
-	} else {
-		$o .= paginate($a);
-	}
 
 	return $o;
 }

include/conversation.php

@@ -416,8 +416,8 @@ These Fields are not added below (yet). They are here to for bug search.
 `item`.`shadow`,
 */
 
-	return "`item`.`author-link`, `item`.`author-name`, `item`.`author-avatar`,
+	return "`item`.`author-id`, `item`.`author-link`, `item`.`author-name`, `item`.`author-avatar`,
-		`item`.`owner-link`, `item`.`owner-name`, `item`.`owner-avatar`,
+		`item`.`owner-id`, `item`.`owner-link`, `item`.`owner-name`, `item`.`owner-avatar`,
 		`item`.`contact-id`, `item`.`uid`, `item`.`id`, `item`.`parent`,
 		`item`.`uri`, `item`.`thr-parent`, `item`.`parent-uri`,
 		`item`.`commented`, `item`.`created`, `item`.`edited`,
@@ -1066,8 +1066,9 @@ function builtin_activity_puller($item, &$conv_responses) {
 			else
 				$conv_responses[$mode][$item['thr-parent']] ++;
 
-			if((local_user()) && (local_user() == $item['uid']) && ($item['self']))
+			if (public_contact() == $item['author-id']) {
 				$conv_responses[$mode][$item['thr-parent'] . '-self'] = 1;
+			}
 
 			$conv_responses[$mode][$item['thr-parent'] . '-l'][] = $url;
 

include/like.php

@@ -18,155 +18,169 @@ require_once("include/diaspora.php");
 function do_like($item_id, $verb) {
 	$a = get_app();
 
-	if(! local_user() && ! remote_user()) {
+	if (! local_user() && ! remote_user()) {
 		return false;
 	}
 
-	switch($verb) {
+	switch ($verb) {
 		case 'like':
+			$bodyverb = t('%1$s likes %2$s\'s %3$s');
+			$activity = ACTIVITY_LIKE;
+			break;
 		case 'unlike':
+			$bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s');
 			$activity = ACTIVITY_LIKE;
 			break;
 		case 'dislike':
 		case 'undislike':
+			$bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s');
 			$activity = ACTIVITY_DISLIKE;
 			break;
 		case 'attendyes':
 		case 'unattendyes':
+			$bodyverb = t('%1$s is attending %2$s\'s %3$s');
 			$activity = ACTIVITY_ATTEND;
 			break;
 		case 'attendno':
 		case 'unattendno':
+			$bodyverb = t('%1$s is not attending %2$s\'s %3$s');
 			$activity = ACTIVITY_ATTENDNO;
 			break;
 		case 'attendmaybe':
 		case 'unattendmaybe':
+			$bodyverb = t('%1$s may attend %2$s\'s %3$s');
 			$activity = ACTIVITY_ATTENDMAYBE;
 			break;
 		default:
+			logger('like: unknown verb ' . $verb . ' for item ' . $item_id);
 			return false;
-			break;
 	}
 
+	// Enable activity toggling instead of on/off
+	$event_verb_flag = $activity === ACTIVITY_ATTEND || $activity === ACTIVITY_ATTENDNO || $activity === ACTIVITY_ATTENDMAYBE;
+
 	logger('like: verb ' . $verb . ' item ' . $item_id);
 
-	$r = q("SELECT * FROM `item` WHERE `id` = '%s' OR `uri` = '%s' LIMIT 1",
+	// Retrieve item
+	$items = q("SELECT * FROM `item` WHERE `id` = '%s' OR `uri` = '%s' LIMIT 1",
 		dbesc($item_id),
 		dbesc($item_id)
 	);
 
-	if(! $item_id || (! dbm::is_result($r))) {
+	if (! $item_id || ! dbm::is_result($items)) {
-		logger('like: no item ' . $item_id);
+		logger('like: unknown item ' . $item_id);
 		return false;
 	}
 
-	$item = $r[0];
+	$item = $items[0];
 
-	$owner_uid = $item['uid'];
+	if (! can_write_wall($a, $item['uid'])) {
-
+		logger('like: unable to write on wall ' . $item['uid']);
-	if (! can_write_wall($a,$owner_uid)) {
 		return false;
 	}
 
-	$remote_owner = null;
+	// Retrieves the local post owner
-
+	$owners = q("SELECT `contact`.* FROM `contact`
-	if(! $item['wall']) {
+		WHERE `contact`.`self` = 1
-		// The top level post may have been written by somebody on another system
+		AND `contact`.`uid` = %d",
-		$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-			intval($item['contact-id']),
 		intval($item['uid'])
 	);
-		if (! dbm::is_result($r)) {
+	if (dbm::is_result($owners)) {
-			return false;
+		$owner_self_contact = $owners[0];
-		}
-		if (! $r[0]['self']) {
-			$remote_owner = $r[0];
-		}
-	}
-
-	// this represents the post owner on this system.
-
-	$r = q("SELECT `contact`.*, `user`.`nickname` FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
-		WHERE `contact`.`self` = 1 AND `contact`.`uid` = %d LIMIT 1",
-		intval($owner_uid)
-	);
-	if (dbm::is_result($r)) {
-		$owner = $r[0];
-	}
-
-	if (! $owner) {
-		logger('like: no owner');
-		return false;
-	}
-
-	if (! $remote_owner) {
-		$remote_owner = $owner;
-	}
-
-	// This represents the person posting
-
-	if ((local_user()) && (local_user() == $owner_uid)) {
-		$contact = $owner;
 	} else {
-		$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+		logger('like: unknown owner ' . $item['uid']);
-			intval($_SESSION['visitor_id']),
-			intval($owner_uid)
-		);
-		if (dbm::is_result($r)) {
-			$contact = $r[0];
-		}
-	}
-	if (! $contact) {
 		return false;
 	}
 
+	// Retrieve the current logged in user's public contact
+	$author_id = public_contact();
 
-	$verbs = " '".dbesc($activity)."' ";
+	$contacts = q("SELECT * FROM `contact` WHERE `id` = %d",
+		intval($author_id)
+	);
+	if (dbm::is_result($contacts)) {
+		$author_contact = $contacts[0];
+	} else {
+		logger('like: unknown author ' . $author_id);
+		return false;
+	}
 
+	// Contact-id is the uid-dependant author contact
+	if (local_user() == $item['uid']) {
+		$item_contact_id = $owner_self_contact['id'];
+		$item_contact = $owner_self_contact;
+	} else {
+		$item_contact_id = get_contact($author_contact['url'], $item['uid']);
+
+		$contacts = q("SELECT * FROM `contact` WHERE `id` = %d",
+			intval($item_contact_id)
+		);
+		if (dbm::is_result($contacts)) {
+			$item_contact = $contacts[0];
+		} else {
+			logger('like: unknown item contact ' . $item_contact_id);
+			return false;
+		}
+	}
+
+	// Look for an existing verb row
 	// event participation are essentially radio toggles. If you make a subsequent choice,
 	// we need to eradicate your first choice.
-	if ($activity === ACTIVITY_ATTEND || $activity === ACTIVITY_ATTENDNO || $activity === ACTIVITY_ATTENDMAYBE) {
+	if ($event_verb_flag) {
-		$verbs = " '" . dbesc(ACTIVITY_ATTEND) . "','" . dbesc(ACTIVITY_ATTENDNO) . "','" . dbesc(ACTIVITY_ATTENDMAYBE) . "' ";
+		$verbs = "'" . dbesc(ACTIVITY_ATTEND) . "', '" . dbesc(ACTIVITY_ATTENDNO) . "', '" . dbesc(ACTIVITY_ATTENDMAYBE) . "'";
+	} else {
+		$verbs = "'".dbesc($activity)."'";
 	}
 
-	$r = q("SELECT `id`, `guid` FROM `item` WHERE `verb` IN ( $verbs ) AND `deleted` = 0
+	$existing_like = q("SELECT `id`, `guid`, `verb` FROM `item`
-		AND `contact-id` = %d AND `uid` = %d
+		WHERE `verb` IN ($verbs)
-		AND (`parent` = '%s' OR `parent-uri` = '%s' OR `thr-parent` = '%s') LIMIT 1",
+		AND `deleted` = 0
-		intval($contact['id']), intval($owner_uid),
+		AND `author-id` = %d
+		AND `uid` = %d
+		AND (`parent` = '%s' OR `parent-uri` = '%s' OR `thr-parent` = '%s')
+		LIMIT 1",
+		intval($author_contact['id']),
+		intval($item['uid']),
 		dbesc($item_id), dbesc($item_id), dbesc($item['uri'])
 	);
 
-	if (dbm::is_result($r)) {
+	// If it exists, mark it as deleted
-		$like_item = $r[0];
+	if (dbm::is_result($existing_like)) {
+		$like_item = $existing_like[0];
 
 		// Already voted, undo it
-		$r = q("UPDATE `item` SET `deleted` = 1, `unseen` = 1, `changed` = '%s' WHERE `id` = %d",
+		q("UPDATE `item` SET `deleted` = 1, `unseen` = 1, `changed` = '%s' WHERE `id` = %d",
 			dbesc(datetime_convert()),
 			intval($like_item['id'])
 		);
 
-
 		// Clean up the Diaspora signatures for this like
 		// Go ahead and do it even if Diaspora support is disabled. We still want to clean up
 		// if it had been enabled in the past
-		$r = q("DELETE FROM `sign` WHERE `iid` = %d",
+		q("DELETE FROM `sign` WHERE `iid` = %d",
 			intval($like_item['id'])
 		);
 
 		$like_item_id = $like_item['id'];
 		proc_run(PRIORITY_HIGH, "include/notifier.php", "like", $like_item_id);
 
+		if (!$event_verb_flag || $like_item['verb'] == $activity) {
+			return true;
+		}
+	}
+
+	// Verb is "un-something", just trying to delete existing entries
+	if (strpos($verb, 'un') === 0) {
 		return true;
 	}
 
-	$uri = item_new_uri($a->get_hostname(),$owner_uid);
+	// Else or if event verb different from existing row, create a new item row
-
 	$post_type = (($item['resource-id']) ? t('photo') : t('status'));
 	if ($item['object-type'] === ACTIVITY_OBJ_EVENT) {
 		$post_type = t('event');
 	}
-	$objtype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
+	$objtype = $item['resource-id'] ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE ;
-	$link = xmlify('<link rel="alternate" type="text/html" href="' . App::get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
+	$link = xmlify('<link rel="alternate" type="text/html" href="' . App::get_baseurl() . '/display/' . $owner_self_contact['nick'] . '/' . $item['id'] . '" />' . "\n") ;
 	$body = $item['body'];
 
 	$obj = <<< EOT
@@ -180,80 +194,62 @@ function do_like($item_id, $verb) {
 		<content>$body</content>
 	</object>
 EOT;
-	if ($verb === 'like') {
-		$bodyverb = t('%1$s likes %2$s\'s %3$s');
-	}
-	if ($verb === 'dislike') {
-		$bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s');
-	}
-	if ($verb === 'attendyes') {
-		$bodyverb = t('%1$s is attending %2$s\'s %3$s');
-	}
-	if ($verb === 'attendno') {
-		$bodyverb = t('%1$s is not attending %2$s\'s %3$s');
-	}
-	if ($verb === 'attendmaybe') {
-		$bodyverb = t('%1$s may attend %2$s\'s %3$s');
-	}
 
-	if (! isset($bodyverb)) {
+	$ulink = '[url=' . $author_contact['url'] . ']' . $author_contact['name'] . '[/url]';
-		return false;
-	}
-
-	$ulink = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]';
 	$alink = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
-	$plink = '[url=' . App::get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . ']' . $post_type . '[/url]';
+	$plink = '[url=' . App::get_baseurl() . '/display/' . $owner_self_contact['nick'] . '/' . $item['id'] . ']' . $post_type . '[/url]';
 
-	/// @TODO Or rewrite this to multi-line initialization of the array?
+	$new_item = array(
-	$arr = array();
+		'guid'          => get_guid(32),
+		'uri'           => item_new_uri($a->get_hostname(), $item['uid']),
+		'uid'           => $item['uid'],
+		'contact-id'    => $item_contact_id,
+		'type'          => 'activity',
+		'wall'          => $item['wall'],
+		'origin'        => 1,
+		'gravity'       => GRAVITY_LIKE,
+		'parent'        => $item['id'],
+		'parent-uri'    => $item['uri'],
+		'thr-parent'    => $item['uri'],
+		'owner-id'      => $item['owner-id'],
+		'owner-name'    => $item['owner-name'],
+		'owner-link'    => $item['owner-link'],
+		'owner-avatar'  => $item['owner-avatar'],
+		'author-id'     => $author_contact['id'],
+		'author-name'   => $author_contact['name'],
+		'author-link'   => $author_contact['url'],
+		'author-avatar' => $author_contact['thumb'],
+		'body'          => sprintf($bodyverb, $ulink, $alink, $plink),
+		'verb'          => $activity,
+		'object-type'   => $objtype,
+		'object'        => $obj,
+		'allow_cid'     => $item['allow_cid'],
+		'allow_gid'     => $item['allow_gid'],
+		'deny_cid'      => $item['deny_cid'],
+		'deny_gid'      => $item['deny_gid'],
+		'visible'       => 1,
+		'unseen'        => 1,
+		'last-child'    => 0
+	);
 
-	$arr['guid'] = get_guid(32);
+	$new_item_id = item_store($new_item);
-	$arr['uri'] = $uri;
-	$arr['uid'] = $owner_uid;
-	$arr['contact-id'] = $contact['id'];
-	$arr['type'] = 'activity';
-	$arr['wall'] = $item['wall'];
-	$arr['origin'] = 1;
-	$arr['gravity'] = GRAVITY_LIKE;
-	$arr['parent'] = $item['id'];
-	$arr['parent-uri'] = $item['uri'];
-	$arr['thr-parent'] = $item['uri'];
-	$arr['owner-name'] = $remote_owner['name'];
-	$arr['owner-link'] = $remote_owner['url'];
-	$arr['owner-avatar'] = $remote_owner['thumb'];
-	$arr['author-name'] = $contact['name'];
-	$arr['author-link'] = $contact['url'];
-	$arr['author-avatar'] = $contact['thumb'];
-	$arr['body'] =  sprintf( $bodyverb, $ulink, $alink, $plink );
-	$arr['verb'] = $activity;
-	$arr['object-type'] = $objtype;
-	$arr['object'] = $obj;
-	$arr['allow_cid'] = $item['allow_cid'];
-	$arr['allow_gid'] = $item['allow_gid'];
-	$arr['deny_cid'] = $item['deny_cid'];
-	$arr['deny_gid'] = $item['deny_gid'];
-	$arr['visible'] = 1;
-	$arr['unseen'] = 1;
-	$arr['last-child'] = 0;
-
-	$post_id = item_store($arr);
 
+	// @todo: Explain this block
 	if (! $item['visible']) {
-		$r = q("UPDATE `item` SET `visible` = 1 WHERE `id` = %d AND `uid` = %d",
+		q("UPDATE `item` SET `visible` = 1 WHERE `id` = %d AND `uid` = %d",
 			intval($item['id']),
-			intval($owner_uid)
+			intval($item['uid'])
 		);
 	}
 
-
 	// Save the author information for the like in case we need to relay to Diaspora
-	Diaspora::store_like_signature($contact, $post_id);
+	Diaspora::store_like_signature($item_contact, $new_item_id);
 
-	$arr['id'] = $post_id;
+	$new_item['id'] = $new_item_id;
 
-	call_hooks('post_local_end', $arr);
+	call_hooks('post_local_end', $new_item);
 
-	proc_run(PRIORITY_HIGH, "include/notifier.php", "like", $post_id);
+	proc_run(PRIORITY_HIGH, "include/notifier.php", "like", $new_item_id);
 
 	return true;
 }

include/text.php

@@ -268,90 +268,89 @@ function hex2bin($s) {
 }}
 
 
-if(! function_exists('paginate_data')) {
 /**
- * Automatica pagination data.
+ * @brief Paginator function. Pushes relevant links in a pager array structure.
+ *
+ * Links are generated depending on the current page and the total number of items.
+ * Inactive links (like "first" and "prev" on page 1) are given the "disabled" class.
+ * Current page link is given the "active" CSS class
  *
  * @param App $a App instance
- * @param int $count [optional] item count (used with alt pager)
+ * @param int $count [optional] item count (used with minimal pager)
  * @return Array data for pagination template
  */
-function paginate_data(App $a, $count=null) {
+function paginate_data(App $a, $count = null) {
-	$stripped = preg_replace('/([&?]page=[0-9]*)/','',$a->query_string);
+	$stripped = preg_replace('/([&?]page=[0-9]*)/', '', $a->query_string);
 
-	$stripped = str_replace('q=','',$stripped);
+	$stripped = str_replace('q=', '', $stripped);
-	$stripped = trim($stripped,'/');
+	$stripped = trim($stripped, '/');
 	$pagenum = $a->pager['page'];
 
-	if (($a->page_offset != "") AND !preg_match('/[?&].offset=/', $stripped))
+	if (($a->page_offset != '') AND !preg_match('/[?&].offset=/', $stripped)) {
-		$stripped .= "&offset=".urlencode($a->page_offset);
+		$stripped .= '&offset=' . urlencode($a->page_offset);
+	}
 
 	$url = $stripped;
 
 	$data = array();
-	function _l(&$d, $name, $url, $text, $class="") {
+	function _l(&$d, $name, $url, $text, $class = '') {
-		if (!strpos($url, "?")) {
+		if (strpos($url, '?') === false && ($pos = strpos($url, '&')) !== false) {
-			if ($pos = strpos($url, "&"))
+			$url = substr($url, 0, $pos) . '?' . substr($url, $pos + 1);
-				$url = substr($url, 0, $pos)."?".substr($url, $pos + 1);
 		}
 
-		$d[$name] = array('url'=>$url, 'text'=>$text, 'class'=>$class);
+		$d[$name] = array('url' => $url, 'text' => $text, 'class' => $class);
 	}
 
-	if (!is_null($count)){
+	if (!is_null($count)) {
-		// alt pager
+		// minimal pager (newer / older)
-		if($a->pager['page']>1)
+		$data['class'] = 'pager';
-			_l($data,  "prev", $url.'&page='.($a->pager['page'] - 1), t('newer'));
+		_l($data, 'prev', $url . '&page=' . ($a->pager['page'] - 1), t('newer'), 'previous' . ($a->pager['page'] == 1 ? ' disabled' : ''));
-		if($count>0)
+		_l($data, 'next', $url . '&page=' . ($a->pager['page'] + 1), t('older'), 'next' . ($count <= 0 ? ' disabled' : ''));
-			_l($data,  "next", $url.'&page='.($a->pager['page'] + 1), t('older'));
 	} else {
-		// full pager
+		// full pager (first / prev / 1 / 2 / ... / 14 / 15 / next / last)
-		if($a->pager['total'] > $a->pager['itemspage']) {
+		$data['class'] = 'pagination';
-			if($a->pager['page'] != 1)
+		if ($a->pager['total'] > $a->pager['itemspage']) {
-				_l($data,  "prev", $url.'&page='.($a->pager['page'] - 1), t('prev'));
+			_l($data, 'first', $url . '&page=1',  t('first'), $a->pager['page'] == 1 ? 'disabled' : '');
-
+			_l($data, 'prev', $url . '&page=' . ($a->pager['page'] - 1), t('prev'), $a->pager['page'] == 1 ? 'disabled' : '');
-			_l($data, "first", $url."&page=1",  t('first'));
-
 
 			$numpages = $a->pager['total'] / $a->pager['itemspage'];
 
 			$numstart = 1;
 			$numstop = $numpages;
 
-			if($numpages > 14) {
+			if ($numpages > 14) {
 				$numstart = (($pagenum > 7) ? ($pagenum - 7) : 1);
 				$numstop = (($pagenum > ($numpages - 7)) ? $numpages : ($numstart + 14));
 			}
 
 			$pages = array();
 
-			for($i = $numstart; $i <= $numstop; $i++){
+			for ($i = $numstart; $i <= $numstop; $i++) {
-				if($i == $a->pager['page'])
+				if ($i == $a->pager['page']) {
-					_l($pages, $i, "#",  $i, "current");
+					_l($pages, $i, '#',  $i, 'current active');
-				else
+				} else {
-					_l($pages, $i, $url."&page=$i", $i, "n");
+					_l($pages, $i, $url . '&page='. $i, $i, 'n');
+				}
 			}
 
-			if(($a->pager['total'] % $a->pager['itemspage']) != 0) {
+			if (($a->pager['total'] % $a->pager['itemspage']) != 0) {
-				if($i == $a->pager['page'])
+				if ($i == $a->pager['page']) {
-					_l($pages, $i, "#",  $i, "current");
+					_l($pages, $i, '#',  $i, 'current active');
-				else
+				} else {
-					_l($pages, $i, $url."&page=$i", $i, "n");
+					_l($pages, $i, $url . '&page=' . $i, $i, 'n');
+				}
 			}
 
 			$data['pages'] = $pages;
 
 			$lastpage = (($numpages > intval($numpages)) ? intval($numpages)+1 : $numpages);
-			_l($data, "last", $url."&page=$lastpage", t('last'));
+			_l($data, 'next', $url . '&page=' . ($a->pager['page'] + 1), t('next'), $a->pager['page'] == $lastpage ? 'disabled' : '');
-
+			_l($data, 'last', $url . '&page=' . $lastpage, t('last'), $a->pager['page'] == $lastpage ? 'disabled' : '');
-			if(($a->pager['total'] - ($a->pager['itemspage'] * $a->pager['page'])) > 0)
-				_l($data, "next", $url."&page=".($a->pager['page'] + 1), t('next'));
-
 		}
 	}
+
 	return $data;
-
+}
-}}
 
 if(! function_exists('paginate')) {
 /**

mod/admin.php

@@ -660,7 +660,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']))		: '');
@@ -811,7 +810,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);
@@ -1055,7 +1053,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.")),

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)) {
@@ -105,13 +84,9 @@ function community_content(App $a, $update = 0) {
 
 	// we behave the same in message lists as the search module
 
-	$o .= conversation($a,$s,'community',$update);
+	$o .= conversation($a, $s, 'community', $update);
 
-	if(!get_config('system', 'old_pager')) {
+        $o .= alt_pager($a, count($r));
-	        $o .= alt_pager($a,count($r));
-	} else {
-	        $o .= paginate($a);
-	}
 
 	return $o;
 }

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) {
@@ -788,15 +773,13 @@ function network_content(App $a, $update = 0) {
 
 	$mode = (($nouveau) ? 'network-new' : 'network');
 
-	$o .= conversation($a,$items,$mode,$update);
+	$o .= conversation($a, $items, $mode, $update);
 
 	if (!$update) {
-		if (get_pconfig(local_user(),'system','infinite_scroll')) {
+		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));
 		}
 	}
 

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) {
@@ -335,14 +318,10 @@ function profile_content(App $a, $update = 0) {
 		);
 	}
 
-	$o .= conversation($a,$items,'profile',$update);
+	$o .= conversation($a, $items, 'profile', $update);
 
-	if(! $update) {
+	if (!$update) {
-		if(!get_config('system', 'old_pager')) {
+		$o .= alt_pager($a, count($items));
-			$o .= alt_pager($a,count($items));
-		} else {
-			$o .= paginate($a);
-		}
 	}
 
 	return $o;

view/templates/admin_site.tpl

@@ -151,7 +151,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>

view/templates/paginate.tpl

@@ -2,7 +2,7 @@
 	{{if $pager}}
 	{{if $pager.prev}}<span class="pager_prev {{$pager.prev.class}}"><a href="{{$pager.prev.url}}">{{$pager.prev.text}}</a></span>{{/if}}
 
-	{{if $pager.first}}<span class="pager_first $pager.first.class"><a href="{{$pager.first.url}}">{{$pager.first.text}}</a></span>{{/if}}
+	{{if $pager.first}}<span class="pager_first {{$pager.first.class}}"><a href="{{$pager.first.url}}">{{$pager.first.text}}</a></span>{{/if}}
 
 	{{foreach $pager.pages as $p}}<span class="pager_{{$p.class}}"><a href="{{$p.url}}">{{$p.text}}</a></span>{{/foreach}}
 

view/theme/duepuntozero/style.css

@@ -1552,6 +1552,9 @@ blockquote.shared_content {
   clear:left;
 }
 
+.pager .disabled {
+	display: none;
+}
 
 .pager_first,
 .pager_last,

view/theme/frio/css/style.css

@@ -2508,6 +2508,24 @@ body .tread-wrapper .hovercard:hover .hover-card-content a {
     color: $link_color !important;
 }
 
+/* Pagination improvements */
+.pagination > li > a,
+.pagination > li > span {
+	color: $link_color;
+}
+.pagination>.active>a,
+.pagination>.active>a:focus,
+.pagination>.active>a:hover,
+.pagination>.active>span,
+.pagination>.active>span:focus,
+.pagination>.active>span:hover {
+	background-color: $link_color;
+    border-color: $link_color;
+}
+.disabled > a {
+	pointer-events: none;
+}
+
 /*
  * some temporary workarounds until this will solved
  * elsewhere (e.g. new templates)

view/theme/frio/templates/paginate.tpl

@@ -0,0 +1,14 @@
+{{* Pager template, uses output of paginate_data() in include/text.php *}}
+{{if $pager}}
+<div class="{{$pager.class}}">
+	{{if $pager.first}}<li class="pager_first {{$pager.first.class}}"><a href="{{$pager.first.url}}">{{$pager.first.text}}</a></li>{{/if}}
+
+	{{if $pager.prev}}<li class="pager_prev {{$pager.prev.class}}"><a href="{{$pager.prev.url}}">{{$pager.prev.text}}</a></li>{{/if}}
+
+	{{foreach $pager.pages as $p}}<li class="pager_{{$p.class}}"><a href="{{$p.url}}">{{$p.text}}</a></li>{{/foreach}}
+
+	{{if $pager.next}}<li class="pager_next {{$pager.next.class}}"><a href="{{$pager.next.url}}">{{$pager.next.text}}</a></li>{{/if}}
+
+	{{if $pager.last}}&nbsp;<li class="pager_last {{$pager.last.class}}"><a href="{{$pager.last.url}}">{{$pager.last.text}}</a></li>{{/if}}
+</div>
+{{/if}}

view/theme/frost-mobile/style.css

@@ -1909,6 +1909,9 @@ input#profile-jot-email {
 	-webkit-border-radius: 10px;
 }
 
+.pager .disabled {
+	display: none;
+}
 
 .pager_first,
 .pager_last,

view/theme/frost/style.css

@@ -1866,6 +1866,9 @@ input#dfrn-url {
 	-webkit-border-radius: 10px;
 }
 
+.pager .disabled {
+	display: none;
+}
 
 .pager_first,
 .pager_last,

view/theme/quattro/green/style.css

@@ -2481,6 +2481,9 @@ footer {
   margin-top: 25px;
   clear: both;
 }
+.pager .disabled {
+	display: none;
+}
 /**
  * ADMIN
  */

view/theme/quattro/lilac/style.css

@@ -2481,6 +2481,9 @@ footer {
   margin-top: 25px;
   clear: both;
 }
+.pager .disabled {
+	display: none;
+}
 /**
  * ADMIN
  */

view/theme/quattro/quattro.less

@@ -1675,6 +1675,9 @@ footer { height: 100px; display: table-row; }
         margin-top: 25px;
         clear: both;
 }
+.pager .disabled {
+	display: none;
+}
 
 /**
  * ADMIN

view/theme/smoothly/style.css

@@ -396,6 +396,10 @@ ul.menu-popup li a:hover {
 	margin: 4px;
 }
 
+.pager .disabled {
+	display: none;
+}
+
 .pager_current {
 	background-color: #1873a2;
 	color: #ffffff;

view/theme/vier/style.css

@@ -247,6 +247,10 @@ div.pager {
   float: left;
 }
 
+.pager .disabled {
+	display: none;
+}
+
 .hide-comments-outer {
   margin-left: 80px;
   margin-bottom: 5px;