Merge remote-tracking branch 'upstream/master'

README.md

@@ -2,8 +2,8 @@
 Hubzilla - Community Server
 ===========================
 
-Websites. Redefined.
+Help us redefine the web - using integrated and united community websites. 
---------------------
+--------------------------------------------------------------------------
 
 ![Hubzilla](images/hubzilla_house_arrows.png)
 

boot.php

@@ -50,7 +50,7 @@ define ( 'PLATFORM_NAME',           'hubzilla' );
 define ( 'RED_VERSION',             trim(file_get_contents('version.inc')) . 'H');
 define ( 'ZOT_REVISION',            1     );
 
-define ( 'DB_UPDATE_VERSION',       1152  );
+define ( 'DB_UPDATE_VERSION',       1153  );
 
 /**
  * @brief Constant with a HTML line break.

doc/to_do_code.bb

@@ -6,6 +6,7 @@ We need much more than this, but here are areas where developers can help. Pleas
 [li]Include TOS link in registration/verification email[/li]
 [li]Auto preview posts/comments (configurable timer kicks in the preview if not 0)[/li]
 [li]Create bug tracker module[/li]
+[li]delivery tracking/reporting[/li]
 [li]Filing posts - provide a dropdown menu integrated with the 'post actions menu'[/li]
 [li]integrate Mozilla Persona (possibly via plugin) https://github.com/mozilla/id-specs/blob/prod/browserid/index.md and become an idP[/li]
 [li]translation plugins - moses or apertium[/li]
@@ -30,7 +31,7 @@ We need much more than this, but here are areas where developers can help. Pleas
 [li]External post connectors, add popular services[/li]
 [li](in progress Habeas Codice) service classes - provide a pluggable subscription payment gateway for premium accounts[/li]
 [li](in progress Habeas Codice) service classes - account overview page showing resources consumed by channel. With special consideration this page can also be accessed at a meta level by the site admin to drill down on problematic accounts/channels.[/li]
-[li]Events module - fix permissions on events, and provide JS translation support for the calendar overview (done); integrate with calDAV[/li]
+[li]implement CalDAV/CardDAV sync[/li]
 [li]Uploads - integrate #^[url=https://github.com/blueimp/jQuery-File-Upload]https://github.com/blueimp/jQuery-File-Upload[/url][/li]
 [li]Import/export - include events, things, etc.[/li]
 [li]API extensions, for Twitter API - search, friending, threading. For Red API, lots of stuff[/li]

include/attach.php

@@ -1132,7 +1132,7 @@ function attach_mkdirp($channel, $observer_hash, $arr = null) {
  */
 function attach_change_permissions($channel_id, $resource, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $recurse = false) {
 
-	$r = q("select hash, flags, is_dir from attach where hash = '%s' and uid = %d limit 1",
+	$r = q("select hash, flags, is_dir, is_photo from attach where hash = '%s' and uid = %d limit 1",
 		dbesc($resource),
 		intval($channel_id)
 	);
@@ -1162,6 +1162,16 @@ function attach_change_permissions($channel_id, $resource, $allow_cid, $allow_gi
 		dbesc($resource),
 		intval($channel_id)
 	);
+	if($r[0]['is_photo']) {
+		$x = q("update photo set allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s' where resource_id = '%s' and uid = %d",
+			dbesc($allow_cid),
+			dbesc($allow_gid),
+			dbesc($deny_cid),
+			dbesc($deny_gid),
+			dbesc($resource),
+			intval($channel_id)
+		);
+	}
 }
 
 /**

include/gprobe.php

@@ -14,6 +14,9 @@ function gprobe_run($argv, $argc){
 
 	$url = hex2bin($argv[1]);
 
+	if(! strpos($url,'@'))
+		return;
+
 	$r = q("select * from xchan where xchan_addr = '%s' limit 1",
 		dbesc($url)
 	);

include/zot.php

@@ -296,13 +296,17 @@ function zot_refresh($them, $channel = null, $force = false) {
 	} else {
 		$r = null;
 
+		// if they re-installed the server we could end up with the wrong record - pointing to the old install.
+		// We'll order by reverse id to try and pick off the newest one first and hopefully end up with the
+		// correct hubloc. If this doesn't work we may have to re-write this section to try them all. 
+
 		if(array_key_exists('xchan_addr',$them) && $them['xchan_addr']) {
-			$r = q("select hubloc_url, hubloc_primary from hubloc where hubloc_addr = '%s'",
+			$r = q("select hubloc_url, hubloc_primary from hubloc where hubloc_addr = '%s' order by hubloc_id desc",
 				dbesc($them['xchan_addr'])
 			);
 		}
 		if(! $r) {
-			$r = q("select hubloc_url, hubloc_primary from hubloc where hubloc_hash = '%s'",
+			$r = q("select hubloc_url, hubloc_primary from hubloc where hubloc_hash = '%s' order by hubloc_id desc",
 				dbesc($them['xchan_hash'])
 			);
 		}
@@ -1527,6 +1531,8 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $
 
 	$result = array();
 
+	$result['site'] = z_root();
+
 	// We've validated the sender. Now make sure that the sender is the owner or author
 
 	if(! $public) {

install/schema_mysql.sql

@@ -350,6 +350,23 @@ CREATE TABLE IF NOT EXISTS `conv` (
   KEY `updated` (`updated`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
+CREATE TABLE IF NOT EXISTS `dreport` (
+  `dreport_id` int(11) NOT NULL AUTO_INCREMENT,
+  `dreport_channel` int(11) NOT NULL DEFAULT '0',
+  `dreport_mid` char(255) NOT NULL DEFAULT '',
+  `dreport_site` char(255) NOT NULL DEFAULT '',
+  `dreport_recip` char(255) NOT NULL DEFAULT '',
+  `dreport_result` char(255) NOT NULL DEFAULT '',
+  `dreport_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `dreport_xchan` char(255) NOT NULL DEFAULT '',
+  PRIMARY KEY (`dreport_id`),
+  KEY `dreport_mid` (`dreport_mid`),
+  KEY `dreport_site` (`dreport_site`),
+  KEY `dreport_time` (`dreport_time`),
+  KEY `dreport_xchan` (`dreport_xchan`),
+  KEY `dreport_channel` (`dreport_channel`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
 CREATE TABLE IF NOT EXISTS `event` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `aid` int(10) unsigned NOT NULL DEFAULT '0',

install/schema_postgres.sql

@@ -341,6 +341,28 @@ CREATE TABLE "conv" (
 create index "conv_created_idx" on conv ("created");
 create index "conv_updated_idx" on conv ("updated");
 
+CREATE TABLE IF NOT EXISTS "dreport" (
+  "dreport_id" int(11) NOT NULL,
+  "dreport_channel" int(11) NOT NULL DEFAULT '0',
+  "dreport_mid" char(255) NOT NULL DEFAULT '',
+  "dreport_site" char(255) NOT NULL DEFAULT '',
+  "dreport_recip" char(255) NOT NULL DEFAULT '',
+  "dreport_result" char(255) NOT NULL DEFAULT '',
+  "dreport_time" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
+  "dreport_xchan" char(255) NOT NULL DEFAULT '',
+  PRIMARY KEY ("dreport_id")
+);
+
+create index "dreport_mid" on dreport ("dreport_mid");
+create index "dreport_site" on dreport ("dreport_site");
+create index "dreport_time" on dreport ("dreport_time");
+create index "dreport_xchan" on dreport ("dreport_xchan");
+create index "dreport_channel" on dreport ("dreport_channel");
+
+
+
+
+
 CREATE TABLE "event" (
   "id" serial NOT NULL,
   "aid" bigint  NOT NULL DEFAULT '0',

install/update.php

@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1152 );
+define( 'UPDATE_VERSION' , 1153 );
 
 /**
  *
@@ -1804,3 +1804,53 @@ function update_r1151() {
 	return UPDATE_SUCCESS;
 
 }
+
+function update_r1152() {
+
+	if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) { 
+
+		$r1 = q("CREATE TABLE IF NOT EXISTS \"dreport\" (
+  \"dreport_id\" int(11) NOT NULL,
+  \"dreport_channel\" int(11) NOT NULL DEFAULT '0',
+  \"dreport_mid\" char(255) NOT NULL DEFAULT '',
+  \"dreport_site\" char(255) NOT NULL DEFAULT '',
+  \"dreport_recip\" char(255) NOT NULL DEFAULT '',
+  \"dreport_result\" char(255) NOT NULL DEFAULT '',
+  \"dreport_time\" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
+  \"dreport_xchan\" char(255) NOT NULL DEFAULT '',
+  PRIMARY KEY (\"dreport_id\") ");
+
+	$r2 = q("create index \"dreport_mid\" on dreport (\"dreport_mid\") ");
+	$r3 = q("create index \"dreport_site\" on dreport (\"dreport_site\") ");
+	$r4 = q("create index \"dreport_time\" on dreport (\"dreport_time\") ");
+	$r5 = q("create index \"dreport_xchan\" on dreport (\"dreport_xchan\") ");
+	$r6 = q("create index \"dreport_channel\" on dreport (\"dreport_channel\") ");
+
+	$r = $r1 && $r2 && $r3 && $r4 && $r5 && $r6;
+
+	}
+	else {
+		$r = q("CREATE TABLE IF NOT EXISTS `dreport` (
+  `dreport_id` int(11) NOT NULL AUTO_INCREMENT,
+  `dreport_channel` int(11) NOT NULL DEFAULT '0',
+  `dreport_mid` char(255) NOT NULL DEFAULT '',
+  `dreport_site` char(255) NOT NULL DEFAULT '',
+  `dreport_recip` char(255) NOT NULL DEFAULT '',
+  `dreport_result` char(255) NOT NULL DEFAULT '',
+  `dreport_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `dreport_xchan` char(255) NOT NULL DEFAULT '',
+  PRIMARY KEY (`dreport_id`),
+  KEY `dreport_mid` (`dreport_mid`),
+  KEY `dreport_site` (`dreport_site`),
+  KEY `dreport_time` (`dreport_time`),
+  KEY `dreport_xchan` (`dreport_xchan`),
+  KEY `dreport_channel` (`dreport_channel`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ");
+
+	}
+
+    if($r)
+        return UPDATE_SUCCESS;
+    return UPDATE_FAILED;
+
+}

library/readmore.js/readmore.js

@@ -62,7 +62,7 @@
 
   function setBoxHeights(element) {
     var el = element,
-        expandedHeight = el.outerHeight(),
+        expandedHeight = el.outerHeight(true),
         cssMaxHeight = parseInt(el.css({maxHeight: ''}).css('max-height').replace(/[^-\d\.]/g, ''), 10),
         defaultHeight = element.data('defaultHeight');
 

mod/photos.php

@@ -770,7 +770,7 @@ function photos_content(&$a) {
 
 		// fetch image, item containing image, then comments
 
-		$ph = q("SELECT aid,uid,xchan,resource_id,created,edited,title,`description`,album,filename,`type`,height,width,`size`,scale,photo_usage,is_nsfw,allow_cid,allow_gid,deny_cid,deny_gid FROM `photo` WHERE `uid` = %d AND `resource_id` = '%s' 
+		$ph = q("SELECT id,aid,uid,xchan,resource_id,created,edited,title,`description`,album,filename,`type`,height,width,`size`,scale,photo_usage,is_nsfw,allow_cid,allow_gid,deny_cid,deny_gid FROM `photo` WHERE `uid` = %d AND `resource_id` = '%s' 
 			$sql_extra ORDER BY `scale` ASC ",
 			intval($owner_uid),
 			dbesc($datum)
@@ -1147,7 +1147,7 @@ function photos_content(&$a) {
 
 		$photo_tpl = get_markup_template('photo_view.tpl');
 		$o .= replace_macros($photo_tpl, array(
-			'$id' => $link_item['id'], //$ph[0]['id'],
+			'$id' => $ph[0]['id'],
 			'$album' => $album_e,
 			'$tools' => $tools,
 			'$lock' => $lockstate[1],

version.inc

@@ -1 +1 @@
-2015-09-16.1157
+2015-09-18.1159

view/css/choklet.css

@@ -1,5 +1,6 @@
 header #banner {
 	position: fixed;
+	top: 0px;
 	width: 33%;
 	margin-left: 33%;
 	margin-right: 33%;

view/css/choklet_bannertwo.css

@@ -1,5 +1,6 @@
 header #banner {
 	position: fixed;
+	top: 0px;
 	width: 33%;
 	margin-left: 33%;
 	margin-right: 33%;

view/css/choklet_edgesthree.css

@@ -1,5 +1,6 @@
 header #banner {
 	position: fixed;
+	top: 0px;
 	width: 33%;
 	margin-left: 33%;
 	margin-right: 33%;

view/css/choklet_edgestwo.css

@@ -1,5 +1,6 @@
 header #banner {
 	position: fixed;
+	top: 0px;
 	width: 33%;
 	margin-left: 33%;
 	margin-right: 33%;

view/css/choklet_three.css

@@ -1,5 +1,6 @@
 header #banner {
 	position: fixed;
+	top: 0px;
 	width: 33%;
 	margin-left: 33%;
 	margin-right: 33%;

view/css/conversation.css

@@ -122,12 +122,15 @@ a.wall-item-name-link {
 	overflow: auto;
 }
 
-.wall-item-content h1,  .wall-item-content h2 {
+.wall-item-content h1,
-   font-size: 1.319em;
+.wall-item-content h2 {
+	font-size: 1.319em;
 }
 
-.wall-item-title h3, .wall-item-content h3,  .wall-item-content h4 {
+.wall-item-title h3,
-   font-size: 1.112em;
+.wall-item-content h3,
+.wall-item-content h4 {
+	font-size: 1.112em;
 }
 
 .wall-item-content img {

view/css/default.css

@@ -1,5 +1,6 @@
 header #banner {
 	position: fixed;
+	top: 0px;
 	width: 33%;
 	margin-left: 33%;
 	margin-right: 33%;

view/css/full.css

@@ -1,5 +1,6 @@
 header #banner {
 	position: fixed;
+	top: 0px;
 	width: 33%;
 	margin-left: 33%;
 	margin-right: 33%;

view/es/messages.po

@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-11 00:05-0700\n"
-"PO-Revision-Date: 2015-09-14 11:47+0000\n"
+"PO-Revision-Date: 2015-09-14 18:21+0000\n"
 "Last-Translator: Manuel Jiménez Friaza <mjfriaza@openmailbox.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/red-matrix/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -2507,7 +2507,7 @@ msgstr "Privado"
 
 #: ../../include/permissions.php:894
 msgid "Community Forum"
-msgstr "Foro de la comunidad"
+msgstr "Foro de discusión"
 
 #: ../../include/permissions.php:895
 msgid "Feed Republish"
@@ -8604,7 +8604,7 @@ msgstr "O <a href=\"import\">importar un canal existente</a> de otro lugar"
 msgid ""
 "Please choose a channel type (such as social networking or community forum) "
 "and privacy requirements so we can select the best permissions for you"
-msgstr "Elija el tipo de canal (como red social o foro de comunidad) y la privacidad que requiera, así podremos seleccionar el mejor conjunto de permisos para usted"
+msgstr "Elija el tipo de canal (como red social o foro de discusión) y la privacidad que requiera, así podremos seleccionar el mejor conjunto de permisos para usted"
 
 #: ../../mod/new_channel.php:119
 msgid "Channel Type"

view/es/strings.php

@@ -579,7 +579,7 @@ $a->strings["Social Networking"] = "Redes sociales";
 $a->strings["Mostly Public"] = "Público en su mayor parte";
 $a->strings["Restricted"] = "Restringido";
 $a->strings["Private"] = "Privado";
-$a->strings["Community Forum"] = "Foro de la comunidad";
+$a->strings["Community Forum"] = "Foro de discusión";
 $a->strings["Feed Republish"] = "Republicar un \"feed\"";
 $a->strings["Special Purpose"] = "Propósito especial";
 $a->strings["Celebrity/Soapbox"] = "Página para fans";
@@ -2031,7 +2031,7 @@ $a->strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"A
 $a->strings["Choose a short nickname"] = "Elija un alias corto";
 $a->strings["Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others."] = "Su alias podrá usarse para crear una dirección de canal fácilmente memorizable (como una dirección de correo electrónico) que puede ser compartido con otros.";
 $a->strings["Or <a href=\"import\">import an existing channel</a> from another location"] = "O <a href=\"import\">importar un canal existente</a> de otro lugar";
-$a->strings["Please choose a channel type (such as social networking or community forum) and privacy requirements so we can select the best permissions for you"] = "Elija el tipo de canal (como red social o foro de comunidad) y la privacidad que requiera, así podremos seleccionar el mejor conjunto de permisos para usted";
+$a->strings["Please choose a channel type (such as social networking or community forum) and privacy requirements so we can select the best permissions for you"] = "Elija el tipo de canal (como red social o foro de discusión) y la privacidad que requiera, así podremos seleccionar el mejor conjunto de permisos para usted";
 $a->strings["Channel Type"] = "Tipo de canal";
 $a->strings["Read more about roles"] = "Leer más sobre los roles";
 $a->strings["App installed."] = "Aplicación instalada.";

view/js/main.js

@@ -615,7 +615,7 @@ function updateConvItems(mode,data) {
 
 
 function collapseHeight() {
-	$(".wall-item-body, .directory-collapse").each(function() {
+	$(".wall-item-content, .directory-collapse").each(function() {
 		var orgHeight = $(this).height();
 		if(orgHeight > divmore_height + 10) {
 			if(! $(this).hasClass('divmore')) {

view/tpl/photo_view.tpl

@@ -15,7 +15,7 @@
 				<i class="icon-pencil btn btn-default btn-xs" title="{{$edit.edit}}" onclick="openClose('photo-edit');"></i>
 				{{/if}}
 				{{if $lock}}
-				<i id="lockview" class="icon-lock btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" title="{{$lock}}" onclick="lockview('item',{{$id}});" ></i><ul id="panel-{{$id}}" class="lockview-panel dropdown-menu"></ul>
+				<i id="lockview" class="icon-lock btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" title="{{$lock}}" onclick="lockview('photo',{{$id}});" ></i><ul id="panel-{{$id}}" class="lockview-panel dropdown-menu"></ul>
 				{{/if}}
 			</div>
 			<div class="btn-group btn-group">