Merge remote branch 'upstream/master'

boot.php

@@ -10,7 +10,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1402' );
+define ( 'FRIENDICA_VERSION',      '3.0.1404' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1153      );
 

include/items.php

@@ -875,12 +875,14 @@ function item_store($arr,$force_parent = false) {
 	if((strpos($arr['body'],'<') !== false) || (strpos($arr['body'],'>') !== false)) 
 		$arr['body'] = strip_tags($arr['body']);
 
+
+	if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
 		require_once('Text/LanguageDetect.php');
 		$naked_body = preg_replace('/\[(.+?)\]/','',$arr['body']);
 		$l = new Text_LanguageDetect;
 		$lng = $l->detectConfidence($naked_body);
 		$arr['postopts'] = (($lng['language']) ? 'lang=' . $lng['language'] . ';' . $lng['confidence'] : '');
-
+	}
 
 	$arr['wall']          = ((x($arr,'wall'))          ? intval($arr['wall'])                : 0);
 	$arr['uri']           = ((x($arr,'uri'))           ? notags(trim($arr['uri']))           : random_string());

include/text.php

@@ -280,6 +280,31 @@ function paginate(&$a) {
 	return $o;
 }}
 
+if(! function_exists('alt_pager')) {
+function alt_pager(&$a, $i) {
+        $o = '';
+	$stripped = preg_replace('/(&page=[0-9]*)/','',$a->query_string);
+	$stripped = str_replace('q=','',$stripped);
+	$stripped = trim($stripped,'/');
+	$pagenum = $a->pager['page'];
+        $url = $a->get_baseurl() . '/' . $stripped;
+
+        $o .= '<div class="pager">';
+
+	if($a->pager['page']>1)
+	  $o .= "<a href=\"$url"."&page=".($a->pager['page'] - 1).'">' . t('newer') . '</a>';
+        if($i>0) {
+          if($a->pager['page']>1)
+	          $o .= "&nbsp;-&nbsp;";
+	  $o .= "<a href=\"$url"."&page=".($a->pager['page'] + 1).'">' . t('older') . '</a>';
+	}
+
+
+        $o .= '</div>'."\r\n";
+
+	return $o;
+}}
+
 // Turn user/group ACLs stored as angle bracketed text into arrays
 
 if(! function_exists('expand_acl')) {

mod/community.php

@@ -44,14 +44,14 @@ 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_pconfig(local_user(),'system','alt_pager')) {
-	$r = q("SELECT distinct(`item`.`uri`) AS `total`
+	        $r = q("SELECT COUNT(distinct(`item`.`uri`)) AS `total`
 		        FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
 		        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 AND `user`.`hidewall` = 0 
-		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 group by `item`.`uri` "
+		        AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0"
 	        );
 
 	        if(count($r))
@@ -62,6 +62,8 @@ function community_content(&$a, $update = 0) {
 		        return $o;
 	        }
 
+	}
+
 	$r = q("SELECT distinct(`item`.`uri`), `item`.*, `item`.`id` AS `item_id`, 
 		`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`,
 		`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, 
@@ -80,11 +82,21 @@ function community_content(&$a, $update = 0) {
 
 	);
 
+	if(! count($r)) {
+		info( t('No results.') . EOL);
+		return $o;
+	}
+
 	// we behave the same in message lists as the search module
 
 	$o .= conversation($a,$r,'community',$update);
 
+        if(! get_pconfig(local_user(),'system','alt_pager')) {
 	        $o .= paginate($a);
+	}
+	else {
+	        $o .= alt_pager($a,count($r));
+	}
 
 	return $o;
 }

mod/item.php

@@ -219,12 +219,18 @@ function item_post(&$a) {
 
 
 		$naked_body = preg_replace('/\[(.+?)\]/','',$body);
+
+		if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
 			$l = new Text_LanguageDetect;
 			$lng = $l->detectConfidence($naked_body);
 
 			$postopts = (($lng['language']) ? 'lang=' . $lng['language'] . ';' . $lng['confidence'] : '');
 
 			logger('mod_item: detect language' . print_r($lng,true) . $naked_body, LOGGER_DATA);
+		}
+		else
+			$postopts = '';
+
 
 		$private = ((strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) ? 1 : 0);
 

mod/network.php

@@ -563,6 +563,7 @@ function network_content(&$a, $update = 0) {
 
 	}
 	else {
+ 	        if(! get_pconfig(local_user(),'system','alt_pager')) {
 		        $r = q("SELECT COUNT(*) AS `total`
 			        FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 			        WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
@@ -574,9 +575,10 @@ function network_content(&$a, $update = 0) {
 
 		        if(count($r)) {
 			        $a->set_pager_total($r[0]['total']);
+		        }
+	         }
                 $itemspage_network = get_pconfig(local_user(),'system','itemspage_network');
                 $a->set_pager_itemspage(((intval($itemspage_network)) ? $itemspage_network : 40));
-		}
                 $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
 	}
 
@@ -688,8 +690,13 @@ function network_content(&$a, $update = 0) {
 	$o .= conversation($a,$items,$mode,$update);
 
 	if(! $update) {
+	        if(! get_pconfig(local_user(),'system','alt_pager')) {
 		        $o .= paginate($a);
 		}
+		else {
+		        $o .= alt_pager($a,count($items));
+		}
+	}
 
 	return $o;
 }

mod/profile.php

@@ -206,7 +206,6 @@ function profile_content(&$a, $update = 0) {
 			FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 			WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND
 			(`item`.`deleted` = 0 OR item.verb = '" . ACTIVITY_LIKE ."' OR item.verb = '" . ACTIVITY_DISLIKE . "')
-			WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
 			and `item`.`moderated` = 0 and `item`.`unseen` = 1
 			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
 			AND `item`.`wall` = 1
@@ -229,7 +228,7 @@ function profile_content(&$a, $update = 0) {
 			$sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2))));
 		}
 
-
+                if(! get_pconfig($a->profile['profile_uid'],'system','alt_pager')) {
 		        $r = q("SELECT COUNT(*) AS `total`
 			        FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 			        WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
@@ -241,8 +240,9 @@ function profile_content(&$a, $update = 0) {
 
 		        if(count($r)) {
 			        $a->set_pager_total($r[0]['total']);
-			$a->set_pager_itemspage(40);
 		}
+		}
+		$a->set_pager_itemspage(40);
 
 		$pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
 
@@ -313,8 +313,13 @@ function profile_content(&$a, $update = 0) {
 	$o .= conversation($a,$items,'profile',$update);
 
 	if(! $update) {
+	  if(! get_pconfig($a->profile['profile_uid'],'system','alt_pager')) {
 		        $o .= paginate($a);
 	        }
+	        else {
+	                $o .= alt_pager($a,count($items));
+	        }
+	}
 
 	return $o;
 }

mod/search.php

@@ -128,6 +128,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_pconfig(local_user(),'system','alt_pager')) {
 	        $r = q("SELECT distinct(`item`.`uri`) as `total`
 		        FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
 		        WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
@@ -140,10 +141,12 @@ function search_content(&$a) {
 
 	        if(count($r))
 		        $a->set_pager_total(count($r));
+
 	        if(! count($r)) {
 		        info( t('No results.') . EOL);
 		        return $o;
 	        }
+	}
 
 	$r = q("SELECT distinct(`item`.`uri`), `item`.*, `item`.`id` AS `item_id`, 
 		`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`,
@@ -165,6 +168,12 @@ function search_content(&$a) {
 
 	);
 
+	if(! count($r)) {
+		info( t('No results.') . EOL);
+		return $o;
+	}
+
+
 	if($tag) 
 		$o .= '<h2>Items tagged with: ' . $search . '</h2>';
 	else
@@ -172,7 +181,12 @@ function search_content(&$a) {
 
 	$o .= conversation($a,$r,'search',false);
 
+        if(! get_pconfig(local_user(),'system','alt_pager')) {
 	        $o .= paginate($a);
+	}
+	else {
+	        $o .= alt_pager($a,count($r));
+	}
 
 	return $o;
 }