version 3.4.2

(cherry picked from commit eb322e8312)

README.md

@@ -5,7 +5,7 @@ Hubzilla - Community Server
 
 
 <p align="center" markdown="1">
-<em><a href="https://github.com/redmatrix/hubzilla/blob/master/install/INSTALL.txt">Installing Hubzilla</a></em> 
+<em><a href="install/INSTALL.txt">Installing Hubzilla</a></em> 
 </p>
 
 **What is Hubzilla?**

Zotlabs/Lib/Share.php

@@ -107,7 +107,7 @@ class Share {
 	}
 
 	public function bbcode() {
-		$bb = NULL_STR;
+		$bb = EMPTY_STR;
 
 		if(! $this->item)
 			return $bb;
@@ -140,4 +140,4 @@ class Share {
 
 	}
 
-}
+}

Zotlabs/Module/Channel.php

@@ -312,8 +312,8 @@ class Channel extends \Zotlabs\Web\Controller {
 				'$uid' => ((\App::$profile['profile_uid']) ? \App::$profile['profile_uid'] : '0'),
 				'$gid' => '0',
 				'$cid' => '0',
-				'$cmin' => '0',
-				'$cmax' => '0',
+				'$cmin' => '(-1)',
+				'$cmax' => '(-1)',
 				'$star' => '0',
 				'$liked' => '0',
 				'$conv' => '0',

Zotlabs/Module/Display.php

@@ -213,8 +213,8 @@ class Display extends \Zotlabs\Web\Controller {
 				'$uid'     => '0',
 				'$gid'     => '0',
 				'$cid'     => '0',
-				'$cmin'    => '0',
-				'$cmax'    => '99',
+				'$cmin'    => '(-1)',
+				'$cmax'    => '(-1)',
 				'$star'    => '0',
 				'$liked'   => '0',
 				'$conv'    => '0',

Zotlabs/Module/Magic.php

@@ -14,12 +14,18 @@ class Magic extends \Zotlabs\Web\Controller {
 		logger('mod_magic: args: ' . print_r($_REQUEST,true),LOGGER_DATA);
 	
 		$addr = ((x($_REQUEST,'addr')) ? $_REQUEST['addr'] : '');
+		$bdest = ((x($_REQUEST,'bdest')) ? $_REQUEST['bdest'] : '');
 		$dest = ((x($_REQUEST,'dest')) ? $_REQUEST['dest'] : '');
 		$test = ((x($_REQUEST,'test')) ? intval($_REQUEST['test']) : 0);
 		$rev  = ((x($_REQUEST,'rev'))  ? intval($_REQUEST['rev'])  : 0);
 		$owa  = ((x($_REQUEST,'owa'))  ? intval($_REQUEST['owa'])  : 0);
 		$delegate = ((x($_REQUEST,'delegate')) ? $_REQUEST['delegate']  : '');
-	
+
+		if($bdest)
+			$dest = hex2bin($bdest);
+
+		$dest = html_entity_decode($dest);	
+
 		$parsed = parse_url($dest);
 		if(! $parsed) {
 			if($test) {

Zotlabs/Module/Network.php

@@ -107,9 +107,8 @@ class Network extends \Zotlabs\Web\Controller {
 			$def_acl    = array('allow_gid' => '<' . $r[0]['hash'] . '>');
 		}
 	
-	
-		$default_cmin = ((feature_enabled(local_channel(),'affinity')) ? get_pconfig(local_channel(),'affinity','cmin',0) : 0);
-		$default_cmax = ((feature_enabled(local_channel(),'affinity')) ? get_pconfig(local_channel(),'affinity','cmax',99) : 99);
+		$default_cmin = ((feature_enabled(local_channel(),'affinity')) ? get_pconfig(local_channel(),'affinity','cmin',0) : (-1));
+		$default_cmax = ((feature_enabled(local_channel(),'affinity')) ? get_pconfig(local_channel(),'affinity','cmax',99) : (-1));
 
 	
 		// if no tabs are selected, defaults to comments
@@ -130,6 +129,7 @@ class Network extends \Zotlabs\Web\Controller {
 	
 		if(x($_GET,'search') || x($_GET,'file'))
 			$nouveau = true;
+
 		if($cid) {
 			$r = q("SELECT abook_xchan FROM abook WHERE abook_id = %d AND abook_channel = %d LIMIT 1",
 				intval($cid),
@@ -316,8 +316,8 @@ class Network extends \Zotlabs\Web\Controller {
 				'$uid'     => ((local_channel()) ? local_channel() : '0'),
 				'$gid'     => (($gid) ? $gid : '0'),
 				'$cid'     => (($cid) ? $cid : '0'),
-				'$cmin'    => (($cmin) ? $cmin : '0'),
-				'$cmax'    => (($cmax) ? $cmax : '0'),
+				'$cmin'    => (($cmin) ? $cmin : '(-1)'),
+				'$cmax'    => (($cmax) ? $cmax : '(-1)'),
 				'$star'    => (($star) ? $star : '0'),
 				'$liked'   => (($liked) ? $liked : '0'),
 				'$conv'    => (($conv) ? $conv : '0'),
@@ -395,8 +395,9 @@ class Network extends \Zotlabs\Web\Controller {
 			$pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(\App::$pager['itemspage']), intval(\App::$pager['start']));
 		}
 	
-	
-		if(($cmin != 0) || ($cmax != 99)) {
+		// cmin and cmax are both -1 when the affinity tool is disabled
+
+		if(($cmin != (-1)) || ($cmax != (-1))) {
 	
 			// Not everybody who shows up in the network stream will be in your address book.
 			// By default those that aren't are assumed to have closeness = 99; but this isn't

Zotlabs/Module/Pubstream.php

@@ -118,8 +118,8 @@ class Pubstream extends \Zotlabs\Web\Controller {
 				'$uid'     => ((local_channel()) ? local_channel() : '0'),
 				'$gid'     => '0',
 				'$cid'     => '0',
-				'$cmin'    => '0',
-				'$cmax'    => '99',
+				'$cmin'    => '(-1)',
+				'$cmax'    => '(-1)',
 				'$star'    => '0',
 				'$liked'   => '0',
 				'$conv'    => '0',

Zotlabs/Module/Search.php

@@ -121,8 +121,8 @@ class Search extends \Zotlabs\Web\Controller {
 				'$uid' => ((\App::$profile['profile_uid']) ? \App::$profile['profile_uid'] : '0'),
 				'$gid' => '0',
 				'$cid' => '0',
-				'$cmin' => '0',
-				'$cmax' => '0',
+				'$cmin' => '(-1)',
+				'$cmax' => '(-1)',
 				'$star' => '0',
 				'$liked' => '0',
 				'$conv' => '0',

boot.php

@@ -50,7 +50,7 @@ require_once('include/attach.php');
 require_once('include/bbcode.php');
 
 define ( 'PLATFORM_NAME',           'hubzilla' );
-define ( 'STD_VERSION',             '3.4.1' );
+define ( 'STD_VERSION',             '3.4.2' );
 define ( 'ZOT_REVISION',            '6.0a' );
 
 

doc/es

@@ -1 +1 @@
-es-es
+doc/es-es

include/attach.php

@@ -2325,6 +2325,7 @@ function attach_move($channel_id, $resource_id, $new_folder_hash) {
 			return false;
 
 		$newdirname = $n[0]['filename'];
+		$newalbumname = $n[0]['display_path'];
 		$newstorepath = dbunescbin($n[0]['content']) . '/' . $resource_id;
 	}
 	else {
@@ -2332,6 +2333,7 @@ function attach_move($channel_id, $resource_id, $new_folder_hash) {
 		// root directory
 
 		$newdirname = EMPTY_STR;
+		$newalbumname = EMPTY_STR;
 		$newstorepath = 'store/' . $c['channel_address'] . '/' . $resource_id;
 	}
 
@@ -2419,7 +2421,7 @@ function attach_move($channel_id, $resource_id, $new_folder_hash) {
 	if($r[0]['is_photo']) {
 		$t = q("update photo set album = '%s', filename = '%s', os_path = '%s', display_path = '%s'
 			where resource_id = '%s' and uid = %d",
-			dbesc($newdirname),
+			dbesc($newalbumname),
 			dbesc($filename),
 			dbesc($x['os_path']),
 			dbesc($x['path']),

include/channel.php

@@ -2343,6 +2343,7 @@ function channel_store_lowlevel($arr) {
 		'channel_dirdate'         => ((array_key_exists('channel_dirdate',$arr))         ? $arr['channel_dirdate']         : NULL_DATE),
 		'channel_lastpost'        => ((array_key_exists('channel_lastpost',$arr))        ? $arr['channel_lastpost']        : NULL_DATE),
 		'channel_deleted'         => ((array_key_exists('channel_deleted',$arr))         ? $arr['channel_deleted']         : NULL_DATE),
+		'channel_active'          => ((array_key_exists('channel_active',$arr))          ? $arr['channel_active']          : NULL_DATE),
 		'channel_max_anon_mail'   => ((array_key_exists('channel_max_anon_mail',$arr))   ? $arr['channel_max_anon_mail']   : '10'),
 		'channel_max_friend_req'  => ((array_key_exists('channel_max_friend_req',$arr))  ? $arr['channel_max_friend_req']  : '10'),
 		'channel_expire_days'     => ((array_key_exists('channel_expire_days',$arr))     ? $arr['channel_expire_days']     : '0'),

include/items.php

@@ -3765,10 +3765,7 @@ function delete_item_lowlevel($item, $stage = DROPITEM_NORMAL, $force = false) {
 				);
 			}
 			else {
-				$r = q("UPDATE item SET item_deleted = 1, body = '', title = '',
-					changed = '%s', edited = '%s'  WHERE id = %d",
-					dbesc(datetime_convert()),
-					dbesc(datetime_convert()),
+				$r = q("DELETE FROM item WHERE id = %d",
 					intval($item['id'])
 				);
 			}

include/zot.php

@@ -3543,15 +3543,12 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
 
 
 			if(array_key_exists('channel_pageflags',$arr['channel']) && intval($arr['channel']['channel_pageflags'])) {
-				// These flags cannot be sync'd.
-				// remove the bits from the incoming flags.
+				// Several pageflags are site-specific and cannot be sync'd.
+				// Only allow those bits which are shareable from the remote and then 
+				// logically OR with the local flags
 
-				// These correspond to PAGE_REMOVED and PAGE_SYSTEM on redmatrix
-
-				if($arr['channel']['channel_pageflags'] & 0x8000)
-					$arr['channel']['channel_pageflags'] = $arr['channel']['channel_pageflags'] - 0x8000;
-				if($arr['channel']['channel_pageflags'] & 0x1000)
-					$arr['channel']['channel_pageflags'] = $arr['channel']['channel_pageflags'] - 0x1000;
+				$arr['channel']['channel_pageflags'] = $arr['channel']['channel_pageflags'] & (PAGE_HIDDEN|PAGE_AUTOCONNECT|PAGE_APPLICATION|PAGE_PREMIUM|PAGE_ADULT);
+				$arr['channel']['channel_pageflags'] = $arr['channel']['channel_pageflags'] | $channel['channel_pageflags'];
 			}
 
 			$disallowed = [

view/it/hmessages.po

@@ -6545,7 +6545,7 @@ msgstr "Homepage del progetto"
 
 #: ../../Zotlabs/Module/Siteinfo.php:32
 msgid "Developer homepage"
-msgstr "Homepege dello sviluppatore"
+msgstr "Homepage dello sviluppatore"
 
 #: ../../Zotlabs/Module/Ratings.php:70
 msgid "No ratings"

view/it/hstrings.php

@@ -1393,7 +1393,7 @@ App::$strings["This site is powered by \$Projectname"] = "Questo sito è costrui
 App::$strings["Federated and decentralised networking and identity services provided by Zot"] = "";
 App::$strings["Version %s"] = "Versione %s";
 App::$strings["Project homepage"] = "Homepage del progetto";
-App::$strings["Developer homepage"] = "Homepege dello sviluppatore";
+App::$strings["Developer homepage"] = "Homepage dello sviluppatore";
 App::$strings["No ratings"] = "Nessuna valutazione";
 App::$strings["Ratings"] = "Valutazioni";
 App::$strings["Rating: "] = "Valutazione:";

view/ru/hmessages.po

@@ -18,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : (n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2))\n
 
 #: ../../include/dba/dba_driver.php:50
 #, php-format

view/tpl/build_query.tpl

@@ -35,8 +35,8 @@
 		var udargs = ((page_load) ? "/load" : "");
 		var bCmd = bParam_cmd + udargs + "?f=" ;
 		if(bParam_uid) bCmd = bCmd + "&p=" + bParam_uid;
-		if(bParam_cmin != 0) bCmd = bCmd + "&cmin=" + bParam_cmin;
-		if(bParam_cmax != 99) bCmd = bCmd + "&cmax=" + bParam_cmax;
+		if(bParam_cmin != (-1)) bCmd = bCmd + "&cmin=" + bParam_cmin;
+		if(bParam_cmax != (-1)) bCmd = bCmd + "&cmax=" + bParam_cmax;
 		if(bParam_gid != 0) { bCmd = bCmd + "&gid=" + bParam_gid; } else
 		if(bParam_cid != 0) { bCmd = bCmd + "&cid=" + bParam_cid; }
 		if(bParam_static != 0) { bCmd = bCmd + "&static=" + bParam_static; }