diff --git a/README.md b/README.md index 9de6393b1..7fbc14219 100644 --- a/README.md +++ b/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) diff --git a/boot.php b/boot.php index bc8baf818..ac2a26380 100755 --- a/boot.php +++ b/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. diff --git a/doc/to_do_code.bb b/doc/to_do_code.bb index 3050bea94..f66797d8b 100644 --- a/doc/to_do_code.bb +++ b/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] diff --git a/include/gprobe.php b/include/gprobe.php index 48c1c8e14..d8d893d9e 100644 --- a/include/gprobe.php +++ b/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) ); diff --git a/include/zot.php b/include/zot.php index ebdcb4cfb..6c5a8c289 100644 --- a/include/zot.php +++ b/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) { @@ -3691,4 +3697,4 @@ function zotinfo($arr) { } call_hooks('zot_finger',$ret); return($ret); -} \ No newline at end of file +} diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql index 1793f89c2..3bb3b7133 100644 --- a/install/schema_mysql.sql +++ b/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', diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql index d31c304eb..1298f3cb3 100644 --- a/install/schema_postgres.sql +++ b/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', diff --git a/install/update.php b/install/update.php index 339d0cb25..cf35698df 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ \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 importar un canal existente 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" diff --git a/view/es/strings.php b/view/es/strings.php index 749562004..1d91ed820 100644 --- a/view/es/strings.php +++ b/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 import an existing channel from another location"] = "O importar un canal existente 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."; diff --git a/view/js/main.js b/view/js/main.js index 77184465d..d3c7175d0 100644 --- a/view/js/main.js +++ b/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')) {