Merge branch 'origin' into 'develop'

Update 4.0.2

See merge request harukin/core!48

include/features.php

@@ -360,14 +360,6 @@ function get_features($filtered = true, $level = (-1)) {
 				get_config('feature_lock','personal_tab')
 			],
 
-			[
-				'suggest',    	
-				t('Suggest Channels'),			
-				t('Show friend and connection suggestions'),
-				false,
-				get_config('feature_lock','suggest')
-			],
-
 			[
 				'network_list_mode',
 				t('Use blog/list mode'),

include/hubloc.php

@@ -311,7 +311,9 @@ function z6_discover() {
 
 	// find unregistered zot6 clone hublocs
 
-	$c = q("select channel_hash, portable_id from channel where channel_deleted = 0");
+	$c = q("select channel_hash, channel_portable_id from channel where channel_deleted = '%s'",
+		dbesc(NULL_DATE)
+	);
 	if ($c) {
 		foreach ($c as $entry) {
 			$q1 = q("select * from hubloc left join site on hubloc_url = site_url where hubloc_deleted = 0 and site_dead = 0 and hubloc_hash = '%s' and hubloc_url != '%s'",
@@ -325,19 +327,19 @@ function z6_discover() {
 			// does this particular server have a zot6 clone registered on our site for this channel?
 			foreach ($q1 as $q) {
 				$q2 = q("select * from hubloc left join site on hubloc_url = site_url where hubloc_deleted = 0 and site_dead = 0 and hubloc_hash = '%s' and hubloc_url = '%s'",
-					dbesc($entry['portable_id']),
+					dbesc($entry['channel_portable_id']),
 					dbesc($q['hubloc_url'])
 				);
 				if ($q2) {
 					continue;
 				}
 				// zot6 hubloc not found. 
-				if(strpos($entry['site_project'],'hubzilla') !== false && version_compare($entry['site_version'],'4.0') >= 0) {
+				if(strpos($q['site_project'],'hubzilla') !== false && version_compare($q['site_version'],'4.0') >= 0) {
 					// probe and store results - only for zot6 (over-ride the zot default)
-					discover_by_webbie($entry['hubloc_addr'],'zot6');
+					discover_by_webbie($q['hubloc_addr'],'zot6');
 				}
 			}
 		}
 	}
 
-}
+}

include/import.php

@@ -1155,6 +1155,9 @@ function sync_files($channel, $files) {
 	require_once('include/attach.php');
 
 	if($channel && $files) {
+
+		$limit = service_class_fetch($channel['channel_id'], 'attach_upload_limit');
+
 		foreach($files as $f) {
 			if(! $f)
 				continue;
@@ -1275,6 +1278,17 @@ function sync_files($channel, $files) {
 					}
 					else {
 						logger('sync_files attach does not exists: ' . print_r($att,true), LOGGER_DEBUG);
+
+				        if($limit !== false) {
+				            $r = q("select sum(filesize) as total from attach where aid = %d ",
+                				intval($channel['channel_account_id'])
+            				);
+				            if(($r) &&  (($r[0]['total'] + $att['filesize']) > $limit)) {
+								logger('service class limit exceeded');
+                				continue;
+							}
+						}
+
 						create_table_from_array('attach',$att);
 					}
 

include/items.php

@@ -1930,11 +1930,21 @@ function item_store($arr, $allow_exec = false, $deliver = true) {
 	if($parent_deleted)
 		$arr['item_deleted'] = 1;
 
-	$r = q("SELECT id FROM item WHERE mid = '%s' AND uid = %d and revision = %d LIMIT 1",
-		dbesc($arr['mid']),
-		intval($arr['uid']),
-		intval($arr['revision'])
-	);
+	if($arr['uuid']) {
+		$r = q("SELECT id FROM item WHERE uuid = '%s' AND uid = %d and revision = %d LIMIT 1",
+			dbesc($arr['uuid']),
+			intval($arr['uid']),
+			intval($arr['revision'])
+		);
+	}
+	else {
+		$r = q("SELECT id FROM item WHERE mid = '%s' AND uid = %d and revision = %d LIMIT 1",
+			dbesc($arr['mid']),
+			intval($arr['uid']),
+			intval($arr['revision'])
+		);
+	}
+
 	if($r) {
 		logger('duplicate item ignored. ' . print_r($arr,true));
 		$ret['message'] = 'duplicate post.';

include/message.php

@@ -220,8 +220,8 @@ function send_message($uid = 0, $recipient = '', $body = '', $subject = '', $rep
 		foreach($images as $image) {
 			if(! stristr($image,z_root() . '/photo/'))
 				continue;
-			$image_uri = substr($image,strrpos($image,'/') + 1);
-			$image_uri = substr($image_uri,0, strpos($image_uri,'-'));
+			$image_uri = substr($image, strrpos($image, '/') + 1);
+			$image_uri = substr($image_uri, 0, strpos($image_uri, '.') - 2);
 			$r = q("UPDATE photo SET allow_cid = '%s' WHERE resource_id = '%s' AND uid = %d and allow_cid = '%s'",
 				dbesc('<' . $recipient . '>'),
 				dbesc($image_uri),

include/permissions.php

@@ -192,7 +192,7 @@ function get_all_perms($uid, $observer_xchan, $check_siteblock = true, $default_
 
 		// They are in your address book, but haven't been approved
 
-		if($channel_perm & PERMS_PENDING) {
+		if($channel_perm & PERMS_PENDING && (! intval($x[0]['abook_pseudo']))) {
 			$ret[$perm_name] = true;
 			continue;
 		}
@@ -316,6 +316,7 @@ function perm_is_allowed($uid, $observer_xchan, $permission, $check_siteblock =
 
 			if(! $x) {
 				// not in address book and no guest token, see if they've got an xchan
+
 				$y = q("select xchan_network from xchan where xchan_hash = '%s' limit 1",
 					dbesc($observer_xchan)
 				);
@@ -327,7 +328,6 @@ function perm_is_allowed($uid, $observer_xchan, $permission, $check_siteblock =
 		}
 		$abperms = load_abconfig($uid,$observer_xchan,'my_perms');
 	}
-	
 
 	// system is blocked to anybody who is not authenticated
 
@@ -382,7 +382,7 @@ function perm_is_allowed($uid, $observer_xchan, $permission, $check_siteblock =
 
 	// They are in your address book, but haven't been approved
 
-	if($channel_perm & PERMS_PENDING) {
+	if($channel_perm & PERMS_PENDING && (! intval($x[0]['abook_pseudo']))) {
 		return true;
 	}