Merge remote-tracking branch 'upstream/dev' into plugin-repo
This commit is contained in:
Andrew Manning
commit
2db86b950e
@ -228,7 +228,7 @@ class Admin extends \Zotlabs\Web\Controller {
|
||||
'$pending' => array( t('Pending registrations'), $pending),
|
||||
'$channels' => array( t('Registered channels'), $channels),
|
||||
'$plugins' => array( t('Active plugins'), $plugins ),
|
||||
'$version' => array( t('Version'), RED_VERSION),
|
||||
'$version' => array( t('Version'), STD_VERSION),
|
||||
'$build' => get_config('system', 'db_version')
|
||||
));
|
||||
}
|
||||
@ -575,27 +575,33 @@ class Admin extends \Zotlabs\Web\Controller {
|
||||
$block_public = ((x($_POST,'block_public')) ? True : False);
|
||||
set_config('system','block_public',$block_public);
|
||||
|
||||
$ws = trim_array_elems(explode("\n",$_POST['whitelisted_sites']));
|
||||
$ws = $this->trim_array_elems(explode("\n",$_POST['whitelisted_sites']));
|
||||
set_config('system','whitelisted_sites',$ws);
|
||||
|
||||
$bs = trim_array_elems(explode("\n",$_POST['blacklisted_sites']));
|
||||
$bs = $this->trim_array_elems(explode("\n",$_POST['blacklisted_sites']));
|
||||
set_config('system','blacklisted_sites',$bs);
|
||||
|
||||
$wc = trim_array_elems(explode("\n",$_POST['whitelisted_channels']));
|
||||
$wc = $this->trim_array_elems(explode("\n",$_POST['whitelisted_channels']));
|
||||
set_config('system','whitelisted_channels',$wc);
|
||||
|
||||
$bc = trim_array_elems(explode("\n",$_POST['blacklisted_channels']));
|
||||
$bc = $this->trim_array_elems(explode("\n",$_POST['blacklisted_channels']));
|
||||
set_config('system','blacklisted_channels',$bc);
|
||||
|
||||
$embed_coop = ((x($_POST,'embed_coop')) ? True : False);
|
||||
set_config('system','embed_coop',$embed_coop);
|
||||
$embed_sslonly = ((x($_POST,'embed_sslonly')) ? True : False);
|
||||
set_config('system','embed_sslonly',$embed_sslonly);
|
||||
|
||||
$we = trim_array_elems(explode("\n",$_POST['embed_allow']));
|
||||
$we = $this->trim_array_elems(explode("\n",$_POST['embed_allow']));
|
||||
set_config('system','embed_allow',$we);
|
||||
|
||||
$be = trim_array_elems(explode("\n",$_POST['embed_deny']));
|
||||
$be = $this->trim_array_elems(explode("\n",$_POST['embed_deny']));
|
||||
set_config('system','embed_deny',$be);
|
||||
|
||||
$ts = ((x($_POST,'transport_security')) ? True : False);
|
||||
set_config('system','transport_security_header',$ts);
|
||||
|
||||
$cs = ((x($_POST,'content_security')) ? True : False);
|
||||
set_config('system','content_security_policy',$cs);
|
||||
|
||||
goaway(z_root() . '/admin/security');
|
||||
}
|
||||
|
||||
@ -715,9 +721,13 @@ class Admin extends \Zotlabs\Web\Controller {
|
||||
|
||||
$embed_coop = intval(get_config('system','embed_coop'));
|
||||
|
||||
// wait to implement this until we have a co-op in place.
|
||||
// if((! $whiteembeds) && (! $blackembeds) && (! $embed_coop))
|
||||
// $whiteembeds_str = "youtube.com\nyoutu.be\ntwitter.com\nvimeo.com\nsoundcloud.com\nwikipedia.com";
|
||||
if((! $whiteembeds) && (! $blackembeds)) {
|
||||
$embedhelp1 = t("By default, unfiltered HTML is allowed in embedded media. This is inherently insecure.");
|
||||
}
|
||||
|
||||
$embedhelp2 = t("The recommended setting is to only allow unfiltered HTML from the following sites:");
|
||||
$embedhelp3 = t("https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/<br />https://vimeo.com/<br />https://soundcloud.com/<br />");
|
||||
$embedhelp4 = t("All other embedded content will be filtered, <strong>unless</strong> embedded content from that site is explicitly blocked.");
|
||||
|
||||
$t = get_markup_template('admin_security.tpl');
|
||||
return replace_macros($t, array(
|
||||
@ -725,14 +735,18 @@ class Admin extends \Zotlabs\Web\Controller {
|
||||
'$page' => t('Security'),
|
||||
'$form_security_token' => get_form_security_token('admin_security'),
|
||||
'$block_public' => array('block_public', t("Block public"), get_config('system','block_public'), t("Check to block public access to all otherwise public personal pages on this site unless you are currently authenticated.")),
|
||||
'$transport_security' => array('transport_security', t('Set "Transport Security" HTTP header'),intval(get_config('system','transport_security_header')),''),
|
||||
'$content_security' => array('content_security', t('Set "Content Security Policy" HTTP header'),intval(get_config('system','content_security_policy')),''),
|
||||
'$whitelisted_sites' => array('whitelisted_sites', t('Allow communications only from these sites'), $whitesites_str, t('One site per line. Leave empty to allow communication from anywhere by default')),
|
||||
'$blacklisted_sites' => array('blacklisted_sites', t('Block communications from these sites'), $blacksites_str, ''),
|
||||
'$whitelisted_channels' => array('whitelisted_channels', t('Allow communications only from these channels'), $whitechannels_str, t('One channel (hash) per line. Leave empty to allow from any channel by default')),
|
||||
'$blacklisted_channels' => array('blacklisted_channels', t('Block communications from these channels'), $blackchannels_str, ''),
|
||||
'$embed_allow' => array('embed_allow', t('Allow embedded HTML content only from these domains'), $whiteembeds_str, t('One site per line. Leave empty to allow from any site by default')),
|
||||
'$embed_sslonly' => array('embed_sslonly',t('Only allow embeds from secure (SSL) websites and links.'), intval(get_config('system','embed_sslonly')),''),
|
||||
'$embed_allow' => array('embed_allow', t('Allow unfiltered embedded HTML content only from these domains'), $whiteembeds_str, t('One site per line. By default embedded content is filtered.')),
|
||||
'$embed_deny' => array('embed_deny', t('Block embedded HTML from these domains'), $blackembeds_str, ''),
|
||||
|
||||
// '$embed_coop' => array('embed_coop', t('Cooperative embed security'), $embed_coop, t('Enable to share embed security with other compatible sites/hubs')),
|
||||
|
||||
'$submit' => t('Submit')
|
||||
));
|
||||
}
|
||||
@ -1334,6 +1348,9 @@ class Admin extends \Zotlabs\Web\Controller {
|
||||
}
|
||||
}
|
||||
|
||||
usort($plugins,'self::plugin_sort');
|
||||
|
||||
|
||||
$admin_plugins_add_repo_form= replace_macros(
|
||||
get_markup_template('admin_plugins_addrepo.tpl'), array(
|
||||
'$post' => 'admin/plugins/addrepo',
|
||||
@ -1359,6 +1376,11 @@ class Admin extends \Zotlabs\Web\Controller {
|
||||
));
|
||||
}
|
||||
|
||||
static public function plugin_sort($a,$b) {
|
||||
return(strcmp(strtolower($a[2]['name']),strtolower($b[2]['name'])));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param array $themes
|
||||
* @param string $th
|
||||
|
||||
@ -220,7 +220,7 @@ class Oep extends \Zotlabs\Web\Controller {
|
||||
$ret['width'] = intval($width);
|
||||
$ret['height'] = intval($height);
|
||||
|
||||
$ret['html'] = get_zcard($c,get_observer_hash(),array('width' => $width, 'height' => $height));
|
||||
$ret['html'] = get_zcard_embed($c,get_observer_hash(),array('width' => $width, 'height' => $height));
|
||||
|
||||
return $ret;
|
||||
|
||||
|
||||
@ -17,6 +17,7 @@ class Sources extends \Zotlabs\Web\Controller {
|
||||
$words = $_REQUEST['words'];
|
||||
$frequency = $_REQUEST['frequency'];
|
||||
$name = $_REQUEST['name'];
|
||||
$tags = $_REQUEST['tags'];
|
||||
|
||||
$channel = \App::get_channel();
|
||||
|
||||
@ -38,12 +39,13 @@ class Sources extends \Zotlabs\Web\Controller {
|
||||
}
|
||||
|
||||
if(! $source) {
|
||||
$r = q("insert into source ( src_channel_id, src_channel_xchan, src_xchan, src_patt )
|
||||
values ( %d, '%s', '%s', '%s' ) ",
|
||||
$r = q("insert into source ( src_channel_id, src_channel_xchan, src_xchan, src_patt, src_tag )
|
||||
values ( %d, '%s', '%s', '%s', '%s' ) ",
|
||||
intval(local_channel()),
|
||||
dbesc($channel['channel_hash']),
|
||||
dbesc($xchan),
|
||||
dbesc($words)
|
||||
dbesc($words),
|
||||
dbesc($tags)
|
||||
);
|
||||
if($r) {
|
||||
info( t('Source created.') . EOL);
|
||||
@ -51,9 +53,10 @@ class Sources extends \Zotlabs\Web\Controller {
|
||||
goaway(z_root() . '/sources');
|
||||
}
|
||||
else {
|
||||
$r = q("update source set src_xchan = '%s', src_patt = '%s' where src_channel_id = %d and src_id = %d",
|
||||
$r = q("update source set src_xchan = '%s', src_patt = '%s', src_tag = '%s' where src_channel_id = %d and src_id = %d",
|
||||
dbesc($xchan),
|
||||
dbesc($words),
|
||||
dbesc($tags),
|
||||
intval(local_channel()),
|
||||
intval($source)
|
||||
);
|
||||
@ -62,6 +65,7 @@ class Sources extends \Zotlabs\Web\Controller {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -105,6 +109,8 @@ class Sources extends \Zotlabs\Web\Controller {
|
||||
'$desc' => t('Import all or selected content from the following channel into this channel and distribute it according to your channel settings.'),
|
||||
'$words' => array( 'words', t('Only import content with these words (one per line)'),'',t('Leave blank to import all public content')),
|
||||
'$name' => array( 'name', t('Channel Name'), '', ''),
|
||||
'$tags' => array('tags', t('Add the following categories to posts imported from this source (comma separated)'),'',t('Optional')),
|
||||
|
||||
'$submit' => t('Submit')
|
||||
));
|
||||
return $o;
|
||||
@ -138,6 +144,7 @@ class Sources extends \Zotlabs\Web\Controller {
|
||||
'$words' => array( 'words', t('Only import content with these words (one per line)'),$r[0]['src_patt'],t('Leave blank to import all public content')),
|
||||
'$xchan' => $r[0]['src_xchan'],
|
||||
'$abook' => $x[0]['abook_id'],
|
||||
'$tags' => array('tags', t('Add the following categories to posts imported from this source (comma separated)'),$r[0]['src_tag'],t('Optional')),
|
||||
'$name' => array( 'name', t('Channel Name'), $r[0]['xchan_name'], ''),
|
||||
'$submit' => t('Submit')
|
||||
));
|
||||
|
||||
@ -4,56 +4,51 @@ namespace Zotlabs\Project;
|
||||
|
||||
class System {
|
||||
|
||||
function get_platform_name() {
|
||||
static public function get_platform_name() {
|
||||
if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['platform_name'])
|
||||
return \App::$config['system']['platform_name'];
|
||||
return PLATFORM_NAME;
|
||||
}
|
||||
|
||||
function get_site_name() {
|
||||
static public function get_site_name() {
|
||||
if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['sitename'])
|
||||
return \App::$config['system']['sitename'];
|
||||
return '';
|
||||
}
|
||||
|
||||
function get_project_version() {
|
||||
static public function get_project_version() {
|
||||
if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['hide_version'])
|
||||
return '';
|
||||
return RED_VERSION;
|
||||
return self::get_std_version();
|
||||
}
|
||||
|
||||
function get_update_version() {
|
||||
static public function get_update_version() {
|
||||
if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['hide_version'])
|
||||
return '';
|
||||
return DB_UPDATE_VERSION;
|
||||
}
|
||||
|
||||
|
||||
function get_notify_icon() {
|
||||
static public function get_notify_icon() {
|
||||
if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['email_notify_icon_url'])
|
||||
return \App::$config['system']['email_notify_icon_url'];
|
||||
return z_root() . '/images/hz-white-32.png';
|
||||
}
|
||||
|
||||
function get_site_icon() {
|
||||
static public function get_site_icon() {
|
||||
if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['site_icon_url'])
|
||||
return \App::$config['system']['site_icon_url'];
|
||||
return z_root() . '/images/hz-32.png';
|
||||
}
|
||||
|
||||
|
||||
function get_server_role() {
|
||||
static public function get_server_role() {
|
||||
if(UNO)
|
||||
return 'basic';
|
||||
return 'advanced';
|
||||
}
|
||||
|
||||
// return the standardised version. Since we can't easily compare
|
||||
// before the STD_VERSION definition was applied, we have to treat
|
||||
// all prior release versions the same. You can dig through them
|
||||
// with other means (such as RED_VERSION) if necessary.
|
||||
|
||||
function get_std_version() {
|
||||
static public function get_std_version() {
|
||||
if(defined('STD_VERSION'))
|
||||
return STD_VERSION;
|
||||
return '0.0.0';
|
||||
|
||||
3
boot.php
3
boot.php
@ -46,11 +46,10 @@ require_once('include/account.php');
|
||||
|
||||
|
||||
define ( 'PLATFORM_NAME', 'hubzilla' );
|
||||
define ( 'RED_VERSION', trim(file_get_contents('version.inc')));
|
||||
define ( 'STD_VERSION', '1.4.4' );
|
||||
define ( 'ZOT_REVISION', 1 );
|
||||
|
||||
define ( 'DB_UPDATE_VERSION', 1166 );
|
||||
define ( 'DB_UPDATE_VERSION', 1167 );
|
||||
|
||||
|
||||
/**
|
||||
|
||||
36
doc/context/es/admin/logs/help.html
Normal file
36
doc/context/es/admin/logs/help.html
Normal file
@ -0,0 +1,36 @@
|
||||
<html>
|
||||
<head>
|
||||
<meta content="text/html; charset=windows-1252" http-equiv="content-type">
|
||||
</head>
|
||||
<body>
|
||||
<dl class="dl-horizontal">
|
||||
<dt>General</dt>
|
||||
<dd><span id="result_box" class="" lang="es"><span>Esta página</span> <span>le
|
||||
permite ajustar</span> <span>los parámetros de los informes del
|
||||
sistema (logs)</span> <span>y para</span> <span>ver uno</span> <span>existente</span><span
|
||||
class="">.</span></span></dd>
|
||||
<dt>Ajustes de los informes (logs)</dt>
|
||||
<dd><span id="result_box" class="" lang="es"><span>Cuando se habilita la</span>
|
||||
<span>opción de depuración</span><span>,</span> el <span>sistema de</span>
|
||||
<span>información</span> <span class="">comenzará</span> a <span>añadir
|
||||
</span>los informes (logs) <span>en el archivo especificado</span> <span>en
|
||||
el cuadro</span> <span>"</span><span>Fichero de informes</span><span>"</span>
|
||||
<span>(la </span><span class="">ruta es relativa</span> <span class="">al
|
||||
directorio raíz del servidor</span><span>,</span> <span>por
|
||||
ejemplo,</span> <span>/</span><span>var</span> <span>/</span><span>www</span><span
|
||||
class="">)</span><span>.</span> <span>Tenga en cuenta que</span> <span
|
||||
class="">este archivo</span> <span class="">tiene que</span> <span
|
||||
class="">ser modificable por el</span> <span>servidor web</span><span>.</span></span></dd>
|
||||
<dt>Nivel de depuración</dt>
|
||||
<dd><span id="result_box" class="" lang="es"><span>La opción de</span> <span>nivel
|
||||
de depuración</span> <span>le permite establecer</span> <span>la
|
||||
cantidad de información</span> <span>que se</span> <span>anexa al
|
||||
fichero de informes (logs)</span><span>.</span> <span>Advertencia</span><span>:</span>
|
||||
<span>El aumento de</span> <span>este nivel</span> <span>puede
|
||||
aumentar</span> <span>rápidamente el tamaño</span> <span>de este
|
||||
fichero hasta en más de</span><span></span> <span>100 MB</span><span>,
|
||||
especialmente</span> <span>en</span> <span>los hubs</span> <span>con</span>
|
||||
<span>más que unos pocos</span> <span>miembros</span><span class="">.</span></span></dd>
|
||||
</dl>
|
||||
</body>
|
||||
</html>
|
||||
17
doc/context/es/admin/queue/help.html
Normal file
17
doc/context/es/admin/queue/help.html
Normal file
@ -0,0 +1,17 @@
|
||||
<html>
|
||||
<head>
|
||||
<meta content="text/html; charset=windows-1252" http-equiv="content-type">
|
||||
</head>
|
||||
<body>
|
||||
<dl class="dl-horizontal">
|
||||
<dt>General</dt>
|
||||
<dd><span id="result_box" class="" lang="es"><span>Las estadísticas</span>
|
||||
<span>de la cola muestran</span> <span>cuántos</span> <span>mensajes</span>
|
||||
<span>están en</span> <span>la cola</span> <span>para su entrega a</span>
|
||||
<span>otros hubs</span><span>.</span> <span class="">La prioridad</span>
|
||||
<span>está relacionada con</span> <span>la cantidad de veces</span>
|
||||
que <span>la entrega</span> <span>se ha intentado</span><span>, sin
|
||||
éxito</span><span>.</span></span></dd>
|
||||
</dl>
|
||||
</body>
|
||||
</html>
|
||||
17
doc/context/es/admin/security/help.html
Normal file
17
doc/context/es/admin/security/help.html
Normal file
@ -0,0 +1,17 @@
|
||||
<html>
|
||||
<head>
|
||||
<meta content="text/html; charset=windows-1252" http-equiv="content-type">
|
||||
</head>
|
||||
<body>
|
||||
<dl class="dl-horizontal">
|
||||
<dt>General</dt>
|
||||
<dd><span id="result_box" class="" lang="es"><span>Esta página</span> <span>contiene</span>
|
||||
<span class="">varios ajustes</span> </span><span id="result_box" class=""
|
||||
lang="es"><span>para el administrador</span> </span><span id="result_box"
|
||||
class="" lang="es"><span class="">relacionados con la seguridad</span>.
|
||||
<span>Para</span> <span class="">guardar los cambios que</span> <span
|
||||
class="">realice en</span> <span>estos ajustes</span><span>, debe
|
||||
pulsar</span> <span class="">el botón Enviar.</span></span></dd>
|
||||
</dl>
|
||||
</body>
|
||||
</html>
|
||||
35
doc/context/es/channel/help.html
Normal file
35
doc/context/es/channel/help.html
Normal file
@ -0,0 +1,35 @@
|
||||
<html>
|
||||
<head>
|
||||
<meta content="text/html; charset=windows-1252" http-equiv="content-type">
|
||||
</head>
|
||||
<body>
|
||||
<dl class="dl-horizontal">
|
||||
<dt>General</dt>
|
||||
<dd><span id="result_box" class="" lang="es"><span>Esta</span> <span>es
|
||||
la</span> <span>página principal de un</span> <span>canal.</span>
|
||||
<span>Es similar</span> <span>al "muro" del perfil </span><span></span><span></span><span></span>
|
||||
<span>de una persona</span> <span>en un contexto</span> de <span>red
|
||||
social</span><span>.</span> <span>Las entradas</span> <span>creadas
|
||||
por</span> <span>el canal</span> <span>se</span> <span>muestran
|
||||
de acuerdo con</span> <span>los permisos de visualización</span> <span
|
||||
class="">del observador</span><span>.</span></span></dd>
|
||||
<dt>Crear una entrada</dt>
|
||||
<dd><span id="result_box" class="" lang="es"><span>Si tiene permiso</span>
|
||||
<span>para crear</span> <span>entradas en</span> <span>la página del
|
||||
canal</span><span>,</span> <span>a continuación,</span> <span>podrá
|
||||
ver el</span> <span>editor de entradas</span> <span>en la parte
|
||||
superior</span><span class="">.</span></span></dd>
|
||||
<dt><a href="#" onclick='contextualHelpFocus("#tabs-collapse-1", 0); return false;'
|
||||
title="Pulsar sobre el elemento resaltado...">Pestañas de los
|
||||
contenidos del canal</a></dt>
|
||||
<dd><span id="result_box" class="" lang="es"><span>Las</span> <span>pestañas</span>
|
||||
<span>de los contenidos</span> <span>del canal</span> <span>son</span>
|
||||
<span>enlaces a otros contenidos</span> <span>publicados por el</span>
|
||||
<span>canal.</span> La pestaña "<span style="font-weight: bold;">Mi
|
||||
perfil</span>" enlaza con el perfil del canal. La pestaña "<span style="font-weight: bold;">Fotos</span>"
|
||||
enlaza con las galerías de fotos. La pestaña "<span style="font-weight: bold;">Ficheros</span>"
|
||||
enlaza con los ficheros de cualquier tipo compartidos por el canal.<span
|
||||
class=""></span></span></dd>
|
||||
</dl>
|
||||
</body>
|
||||
</html>
|
||||
30
doc/context/es/chat/help.html
Normal file
30
doc/context/es/chat/help.html
Normal file
@ -0,0 +1,30 @@
|
||||
<html>
|
||||
<head>
|
||||
<meta content="text/html; charset=windows-1252" http-equiv="content-type">
|
||||
</head>
|
||||
<body>
|
||||
<dl class="dl-horizontal">
|
||||
<dt>General</dt>
|
||||
<dd><span id="result_box" class="" lang="es"><span>Creación y uso de</span>
|
||||
<span>salas de chat para</span> <span>comunicarse en tiempo</span> <span>real,
|
||||
utilizando</span> <span class="">el sistema de</span> <span>permisos</span>
|
||||
<span>Hubzilla</span> <span>estándar para el</span> <span>control de
|
||||
acceso a</span> <span class="">la sala de chat</span><span>.</span></span></dd>
|
||||
<dt>Create una nueva sala de chat</dt>
|
||||
<dd><span id="result_box" class="" lang="es"><span>Utilice</span> <span>el
|
||||
botón</span> <span>"</span><span class="">Crear" para</span> <span>crear
|
||||
una nueva</span> <span class="">sala de chat</span><span>.</span> <span
|
||||
class="">Introduzca un nombre y</span> <span class="">cuánto tiempo
|
||||
se deben conservar los mensajes.</span><span class=""></span></span></dd>
|
||||
<dt>Chatear</dt>
|
||||
<dd><span id="result_box" class="" lang="es"><span>Introduzca su mensaje
|
||||
en</span> <span>el cuadro de mensaje</span> <span>y pulse</span> <span>"Enviar".</span>
|
||||
<span>Se puede establecer un</span> <span>estado</span> <span>seleccionando
|
||||
el</span> <span>botón de menú</span> <span>sala de chat</span> <span>junto
|
||||
al botón</span> <span>Enviar.</span> <span>Si hay otras personas</span>
|
||||
<span>"en la sala</span><span>",</span> <span>serán visibles en</span>
|
||||
<span>el panel lateral</span>, <span>en</span><span></span> <span>"</span><span
|
||||
class="">Miembros del chat</span><span>"</span><span class="">.</span></span></dd>
|
||||
</dl>
|
||||
</body>
|
||||
</html>
|
||||
30
doc/context/es/cloud/help.html
Normal file
30
doc/context/es/cloud/help.html
Normal file
@ -0,0 +1,30 @@
|
||||
<html>
|
||||
<head>
|
||||
<meta content="text/html; charset=windows-1252" http-equiv="content-type">
|
||||
</head>
|
||||
<body>
|
||||
<dl class="dl-horizontal">
|
||||
<dt>General</dt>
|
||||
<dd><span id="result_box" class="" lang="es"><span>Esta página</span> <span>muestra
|
||||
los ficheros en la</span> <span>"nube"</span> <span>de un canal</span><span>.</span>
|
||||
<span>Los</span> <span>archivos visibles</span> <span>para el
|
||||
observador</span> <span>dependen de</span> <span>los permisos de
|
||||
archivo</span> <span>individuales</span> <span>establecidas por</span>
|
||||
<span>el propietario del canal</span><span>.</span> <span>Si tiene
|
||||
permiso</span> <span>para crear</span> <span>o</span> <span>cargar
|
||||
ficheros,</span> <span>verá</span> <span>botones de control</span>
|
||||
<span>por encima de la</span> <span class="">lista de ficheros.</span></span></dd>
|
||||
<dt><a href="#" onclick='contextualHelpFocus("#tabs-collapse-1", 0); return false;'
|
||||
title="Pulsar en el elemento resaltado...">Pestañas de los contenidos
|
||||
del canal<br>
|
||||
</a></dt>
|
||||
<dd><span id="result_box" class="" lang="es"><span>Las</span> <span>pestañas</span>
|
||||
<span>de los contenidos</span> <span>del canal</span> <span>son</span>
|
||||
<span>enlaces a otros contenidos</span> <span>publicados por el</span>
|
||||
<span>canal.</span> La pestaña "<span style="font-weight: bold;">Mi
|
||||
perfil</span>" enlaza con el perfil del canal. La pestaña "<span style="font-weight: bold;">Fotos</span>"
|
||||
enlaza con las galerías de fotos. La pestaña "Ficheros" enlaza con los
|
||||
ficheros de cualquier tipo compartidos por el canal.</span></dd>
|
||||
</dl>
|
||||
</body>
|
||||
</html>
|
||||
8
doc/context/es/connections/help.html
Normal file
8
doc/context/es/connections/help.html
Normal file
@ -0,0 +1,8 @@
|
||||
<dl class="dl-horizontal">
|
||||
<dt>General</dt>
|
||||
<dd>This page displays a list of all this channel's connections. The list can be <a href='#' onclick='contextualHelpFocus(".section-title-wrapper", 0); return false;' title="Click to highlight element...">sorted and filtered using the menu button beside the search button</a>. </dd>
|
||||
<dt>Connection Details</dt>
|
||||
<dd>Each list entry shows the details of a specific connection. A translucent avatar image indicates an archived connection.</dd>
|
||||
<dt>Connection Status</dt>
|
||||
<dd>A connection can be in different states: <ul><li>Archived</li><li>Ignored</li><li>Blocked</li><li>Hidden</li></ul></dd>
|
||||
</dl>
|
||||
31
doc/context/es/connections/ifpending/help.html
Normal file
31
doc/context/es/connections/ifpending/help.html
Normal file
@ -0,0 +1,31 @@
|
||||
<html>
|
||||
<head>
|
||||
<meta content="text/html; charset=windows-1252" http-equiv="content-type">
|
||||
</head>
|
||||
<body>
|
||||
<dl class="dl-horizontal">
|
||||
<dt>General</dt>
|
||||
<dd><span id="result_box" class="" lang="es"><span>Esta página</span> <span>muestra
|
||||
una lista de</span> <span>todas</span> <span>las conexiones</span>
|
||||
<span class="">de este canal</span><span class="">.</span> <span class="">La</span>
|
||||
<span class="">lista se puede </span></span><a href="#" onclick='contextualHelpFocus(".section-title-wrapper", 0); return false;'
|
||||
title="Pulsar sobre el elemento resaltado...">ordenar y filtrar usando
|
||||
el botón de menú al lado del botón de búsqueda</a>. </dd>
|
||||
<dt>Detalles de la conexión</dt>
|
||||
<dd><span id="result_box" class="" lang="es"><span>Cada</span> <span>entrada
|
||||
de la lista</span> <span>muestra los</span> <span>detalles de una
|
||||
conexión</span> <span>específica</span><span>.</span> <span>Una</span>
|
||||
<span>imagen de avatar</span> <span>translúcida</span> <span>indica
|
||||
una conexión</span> <span class="">archivada.</span></span></dd>
|
||||
<dt>Estado de la conexión</dt>
|
||||
<dd>Una conexión puede estar en diferentes estados:
|
||||
<ul>
|
||||
<li>Archivada</li>
|
||||
<li>Ignorada</li>
|
||||
<li>Bloqueada</li>
|
||||
<li>Oculta</li>
|
||||
</ul>
|
||||
</dd>
|
||||
</dl>
|
||||
</body>
|
||||
</html>
|
||||
23
doc/context/es/events/help.html
Normal file
23
doc/context/es/events/help.html
Normal file
@ -0,0 +1,23 @@
|
||||
<html>
|
||||
<head>
|
||||
<meta content="text/html; charset=windows-1252" http-equiv="content-type">
|
||||
</head>
|
||||
<body>
|
||||
<dl class="dl-horizontal">
|
||||
<dt>General</dt>
|
||||
<dd><span id="result_box" class="" lang="es"><span>Esta página</span> <span>muestra
|
||||
un calendario</span> <span>de eventos tanto</span> <span>de su
|
||||
propiedad como</span> <span class="">compartido con usted</span> <span
|
||||
class="">desde otros canales.</span></span></dd>
|
||||
<dt><a href="#" onclick='contextualHelpFocus("#title", 0); return false;'
|
||||
title="Pulsar en el elemento resaltado...">Vistas del calendario</a></dt>
|
||||
<dd><span id="result_box" class="" lang="es"><span>El calendario</span> <span>se
|
||||
puede mostrar en</span> <span>modo mensual</span><span>, semanal o</span>
|
||||
diario<span> usando</span> <span>las opciones del</span> <span class="">panel
|
||||
lateral</span><span class="">.</span></span></dd>
|
||||
<dt>Exportar/Importar</dt>
|
||||
<dd>Exportar o importar eventos del calendario usando el formato estándar
|
||||
de los ficheros de iCalendar (.ics).</dd>
|
||||
</dl>
|
||||
</body>
|
||||
</html>
|
||||
38
doc/context/es/mail/help.html
Normal file
38
doc/context/es/mail/help.html
Normal file
@ -0,0 +1,38 @@
|
||||
<html>
|
||||
<head>
|
||||
<meta content="text/html; charset=windows-1252" http-equiv="content-type">
|
||||
</head>
|
||||
<body>
|
||||
<dl class="dl-horizontal">
|
||||
<dt>General</dt>
|
||||
<dd><span id="result_box" class="" lang="es"><span>Los mensajes que
|
||||
aparecen</span> <span>en</span> <span>el correo privado</span> <span>son</span>
|
||||
<span>visibles sólo para</span> <span>usted y un</span> <span class="">único
|
||||
destinatario.</span></span></dd>
|
||||
<dt>Vista combinada</dt>
|
||||
<dd><span id="result_box" class="" lang="es"><span>Las conversaciones</span>
|
||||
<span>completas</span> <span>se pueden ver en</span> <span>un hilo
|
||||
continuo</span> <span>seleccionando</span><span></span> "<span><span
|
||||
style="font-weight: bold;">Vista combinada</span>"</span><span>.</span>
|
||||
<span>Las conversaciones</span> <span>disponibles se muestran</span>
|
||||
<span>debajo del menú</span> <span>en el</span> <span class="">panel
|
||||
lateral</span><span class="">.</span></span></dd>
|
||||
<dt>Bandeja de entrada/Bandeja de salida</dt>
|
||||
<dd>Los mensajes individuales enviados son visibles seleccionando la <span
|
||||
style="font-weight: bold;">Bandeja de salida</span> y los mensajes
|
||||
recibidos se pueden ver usando el filtro de la <span style="font-weight: bold;">Bandeja
|
||||
de entrada</span>.<br>
|
||||
</dd>
|
||||
<dt>Mensaje nuevo</dt>
|
||||
<dd><span id="result_box" class="" lang="es"><span>Los mensajes
|
||||
individuales</span> <span>tienen</span> <span>informes de entrega</span>
|
||||
<span>que se pueden ver</span> <span>usando</span> <span>el menú</span>
|
||||
<span>desplegable.</span> <span>Los mensajes también</span> <span>se
|
||||
pueden revocar</span> <span>desde el mismo menú</span><span>, lo
|
||||
que puede</span> <span>evitar que el destinatario</span> <span>vea
|
||||
el mensaje</span><span>, <span style="font-style: italic;">si</span></span><span
|
||||
style="font-style: italic;"> <span>aún no lo ha</span> </span><span
|
||||
class=""><span style="font-style: italic;">leído</span>.</span></span></dd>
|
||||
</dl>
|
||||
</body>
|
||||
</html>
|
||||
71
doc/context/es/network/help.html
Normal file
71
doc/context/es/network/help.html
Normal file
@ -0,0 +1,71 @@
|
||||
<html>
|
||||
<head>
|
||||
<meta content="text/html; charset=windows-1252" http-equiv="content-type">
|
||||
</head>
|
||||
<body>
|
||||
<dl class="dl-horizontal">
|
||||
<dt>General</dt>
|
||||
<dd><span id="result_box" class="" lang="es"><span>La</span> <span>página
|
||||
de</span> <span>Mi red muestra</span> <span>un flujo</span> <span>de</span>
|
||||
<span>entradas</span> <span>y conversaciones</span><span>,</span> <span>normalmente</span>
|
||||
<span>ordenadas según la</span> <span>actualización más reciente</span><span>.</span>
|
||||
<span>Esta página</span> <span>es</span> <span>altamente
|
||||
personalizable</span><span class="">.</span></span></dd>
|
||||
<dt><a href="#" onclick='contextualHelpFocus("#profile-jot-wrapper", 0); return false;'
|
||||
title="Pulsar sobre el elemento resaltado...">Crear una entrada<br>
|
||||
</a></dt>
|
||||
<dd><span id="result_box" class="" lang="es"><span>En la parte superior</span>
|
||||
<span>de la</span> <span>página hay un</span> <span>cuadro de texto
|
||||
que</span> <span>dice</span> <span>"</span><span style="font-weight: bold;">Compartir</span><span>"</span><span>.</span>
|
||||
<span>Al hacer clic en</span> <span>esta casilla</span> <span>se
|
||||
abre</span> <span>un nuevo</span> <span>editor de entradas</span><span>.</span>
|
||||
<span>El</span> <span>editor de entradas</span> <span>es
|
||||
personalizable</span><span>,</span> <span>pero el</span> <span>editor
|
||||
básico</span> <span>proporciona</span> <span>campos para</span> <span>el
|
||||
cuerpo de la publicación y un</span><span></span> <span>título</span>
|
||||
<span>opcional.</span> <span>Los botones que hay debajo de la</span>
|
||||
<span>zona de</span> <span>texto, a la izquierda,</span> <span>proporcionan</span>
|
||||
<span>accesos directos para el</span> <span><span style="font-weight: bold;">Formato</span>
|
||||
de texto</span> <span>y para insertar</span> <span>enlaces</span><span>,
|
||||
imágenes y</span> <span>otros</span> <span>datos en</span> <span>la
|
||||
entrada</span><span>.</span> <span>Los</span> <span>botones a la
|
||||
derecha</span> <span>proporcionan una</span> <span class="">vista
|
||||
previa del</span> <span class="">mensaje</span><span class="">,</span>
|
||||
<span>los ajustes</span><span> de permisos</span> <span>de la entrada</span><span>,</span>
|
||||
<span>y</span> <span>un botón <span style="font-weight: bold;">Enviar</span></span>
|
||||
<span>para publicarla</span><span></span><span>.</span></span></dd>
|
||||
<dt><a href="#" onclick='contextualHelpFocus("#group-sidebar", 1); return false;'
|
||||
title="Pulsar sobre el elemento resaltado...">Grupos de canales<br>
|
||||
</a></dt>
|
||||
<dd><span id="result_box" class="" lang="es"><span>Los</span> <span>grupos
|
||||
de canales</span> <span>que ha creado</span> <span>se muestran en
|
||||
el</span> <span>panel lateral</span><span>.</span> <span class="">Seleccionándolos,
|
||||
se</span><span class=""> filtran</span> <span class="">las entradas</span>
|
||||
<span></span><span>creadas por</span> <span>los canales incluidos en
|
||||
el</span> <span>grupo elegido</span><span class="">.</span></span></dd>
|
||||
<dt><a href="#" onclick='$("#dbtn-acl").click(); return false;' title="Pulsar sobre el elemento resaltado...">Permisos
|
||||
de una entrada<br>
|
||||
</a></dt>
|
||||
<dd><span id="result_box" class="" lang="es"><span>La lista</span> <span>de
|
||||
control de acceso</span> <span>(</span><span>ACL) es</span> <span>lo
|
||||
que se utiliza</span> <span>para establecer</span> <span>quién
|
||||
puede ver su</span> <span>nueva entrada</span><span>.</span> <span>Al
|
||||
pulsar el</span> <span>botón ACL</span>, <span>al lado del</span>
|
||||
<span>botón Enviar,</span> <span>se mostrará</span> <span>un cuadro
|
||||
de diálogo</span> <span>en</span> <span>el que puede seleccionar</span>
|
||||
<span>qué canales</span> <span>y /</span> <span>o</span> <span>grupos
|
||||
de canales</span> <span>pueden ver el</span> <span>mensaje</span><span>.</span>
|
||||
<span>También puede seleccionar</span> <span>a quién se le niega</span>
|
||||
<span>el acceso explícitamente</span><span>.</span> <span>Por ejemplo</span><span>,
|
||||
digamos que usted</span> <span>está planeando</span> <span>una
|
||||
fiesta sorpresa para</span> <span>un amigo</span><span>.</span> <span>Puede
|
||||
enviar un</span> <span>mensaje</span> <span>de invitación</span> <span>a</span>
|
||||
<span>todos los miembros de</span> <span>su grupo de</span> <span style="font-weight: bold;">Amigos</span><span>,
|
||||
excepto el</span> <span>amigo al que quiere sorprender</span><span
|
||||
class="">.</span> <span class="">En este caso,</span> <span>"se
|
||||
mostrará" </span> <span>al grupo de</span> <span>amigos, pero</span>
|
||||
<span>"</span><span>no se mostrará</span><span>"</span> <span>a esa
|
||||
única</span><span class=""> persona.</span></span></dd>
|
||||
</dl>
|
||||
</body>
|
||||
</html>
|
||||
27
doc/context/es/photos/help.html
Normal file
27
doc/context/es/photos/help.html
Normal file
@ -0,0 +1,27 @@
|
||||
<html>
|
||||
<head>
|
||||
<meta content="text/html; charset=windows-1252" http-equiv="content-type">
|
||||
</head>
|
||||
<body>
|
||||
<dl class="dl-horizontal">
|
||||
<dt>General</dt>
|
||||
<dd><span id="result_box" class="" lang="es"><span>Esta página</span> <span>muestra</span>
|
||||
<span class="">los álbumes de fotos</span> <span class="">de un canal</span><span>.</span>
|
||||
<span>Las</span> <span>imágenes visibles</span> <span class="">para
|
||||
el observador</span> <span class="">dependen de</span> <span class="">los
|
||||
permisos</span> <span class="">individuales de cada imagen</span><span
|
||||
class="">.</span></span></dd>
|
||||
<dt><a href="#" onclick='contextualHelpFocus("#tabs-collapse-1", 0); return false;'
|
||||
title="Pulsar sobre el elemento resaltado...">Pestañas de los
|
||||
contenidos del canal<br>
|
||||
</a></dt>
|
||||
<dd><span id="result_box" class="" lang="es"><span>Las</span> <span>pestañas</span>
|
||||
<span>de los contenidos</span> <span>del canal</span> <span>son</span>
|
||||
<span>enlaces a otros contenidos</span> <span>publicados por el</span>
|
||||
<span>canal.</span> La pestaña "<span style="font-weight: bold;">Mi
|
||||
perfil</span>" enlaza con el perfil del canal. La pestaña "<span style="font-weight: bold;">Fotos</span>"
|
||||
enlaza con las galerías de fotos. La pestaña "<span style="font-weight: bold;">Ficheros</span>"
|
||||
enlaza con los ficheros de cualquier tipo compartidos por el canal.</span></dd>
|
||||
</dl>
|
||||
</body>
|
||||
</html>
|
||||
32
doc/context/es/profile/help.html
Normal file
32
doc/context/es/profile/help.html
Normal file
@ -0,0 +1,32 @@
|
||||
<html>
|
||||
<head>
|
||||
<meta content="text/html; charset=windows-1252" http-equiv="content-type">
|
||||
</head>
|
||||
<body>
|
||||
<dl class="dl-horizontal">
|
||||
<dt>General</dt>
|
||||
<dd><span id="result_box" class="" lang="es"><span>Esta</span> <span>es
|
||||
la página de</span> <span>perfil</span> <span>de un canal</span><span>.</span>
|
||||
<span>Por lo general</span> <span>muestra</span> la <span>información
|
||||
que describe el</span> <span>canal.</span> <span>Si el canal</span>
|
||||
<span>representa a una persona</span> <span>en una red social</span><span>,
|
||||
por ejemplo</span><span>, el perfil</span> <span>podría
|
||||
proporcionar</span> <span>información de contacto y</span> <span>otros</span>
|
||||
<span>datos personales</span><span></span><span>.</span> <span>Los
|
||||
canales pueden</span> <span>tener varios perfiles</span><span>,</span>
|
||||
<span>en cuyo caso el</span> <span>perfil que se muestra</span> <span
|
||||
class="">depende del observador</span><span>.</span></span></dd>
|
||||
<dt><a href="#" onclick='contextualHelpFocus("#tabs-collapse-1", 0); return false;'
|
||||
title="Pulsar sobre el elemento resaltado...">Pestañas de los
|
||||
contenidos del canal<br>
|
||||
</a></dt>
|
||||
<dd><span id="result_box" class="" lang="es"><span>Las</span> <span>pestañas</span>
|
||||
<span>de los contenidos</span> <span>del canal</span> <span>son</span>
|
||||
<span>enlaces a otros contenidos</span> <span>publicados por el</span>
|
||||
<span>canal.</span> La pestaña "<span style="font-weight: bold;">Mi
|
||||
perfil</span>" enlaza con el perfil del canal. La pestaña "<span style="font-weight: bold;">Fotos</span>"
|
||||
enlaza con las galerías de fotos. La pestaña "<span style="font-weight: bold;">Ficheros</span>"
|
||||
enlaza con los ficheros de cualquier tipo compartidos por el canal.</span></dd>
|
||||
</dl>
|
||||
</body>
|
||||
</html>
|
||||
@ -356,6 +356,9 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the
|
||||
[zrl=[baseurl]/help/hook/obj_verbs]obj_verbs[/zrl]
|
||||
Called when creating the list of verbs available for profile "things".
|
||||
|
||||
[zrl=[baseurl]/help/hook/oembed_action]oembed_action[/zrl]
|
||||
Called when deciding if an oembed url is to be filter, blocked, or approved
|
||||
|
||||
[zrl=[baseurl]/help/hook/oembed_probe]oembed_probe[/zrl]
|
||||
Called when performing an oembed content lookup
|
||||
|
||||
|
||||
@ -2108,7 +2108,7 @@ require_once('include/api_auth.php');
|
||||
'shorturllength' => '30',
|
||||
'hubzilla' => array(
|
||||
'PLATFORM_NAME' => Zotlabs\Project\System::get_platform_name(),
|
||||
'RED_VERSION' => Zotlabs\Project\System::get_project_version(),
|
||||
'STD_VERSION' => Zotlabs\Project\System::get_project_version(),
|
||||
'ZOT_REVISION' => ZOT_REVISION,
|
||||
'DB_UPDATE_VERSION' => Zotlabs\Project\System::get_update_version()
|
||||
)
|
||||
|
||||
@ -629,7 +629,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false)
|
||||
}
|
||||
if($tryoembed) {
|
||||
if (strpos($Text,'[/url]') !== false) {
|
||||
$Text = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism", 'tryoembed', $Text);
|
||||
$Text = preg_replace_callback("/[^\^]\[url\]([$URLSearchString]*)\[\/url\]/ism", 'tryoembed', $Text);
|
||||
}
|
||||
}
|
||||
if (strpos($Text,'[/url]') !== false) {
|
||||
|
||||
@ -491,7 +491,7 @@ function identity_basic_export($channel_id, $items = false) {
|
||||
|
||||
// use constants here as otherwise we will have no idea if we can import from a site
|
||||
// with a non-standard platform and version.
|
||||
$ret['compatibility'] = array('project' => PLATFORM_NAME, 'version' => RED_VERSION, 'database' => DB_UPDATE_VERSION, 'server_role' => Zotlabs\Project\System::get_server_role());
|
||||
$ret['compatibility'] = array('project' => PLATFORM_NAME, 'version' => STD_VERSION, 'database' => DB_UPDATE_VERSION, 'server_role' => Zotlabs\Project\System::get_server_role());
|
||||
|
||||
$r = q("select * from channel where channel_id = %d limit 1",
|
||||
intval($channel_id)
|
||||
@ -1878,3 +1878,65 @@ function get_zcard($channel,$observer_hash = '',$args = array()) {
|
||||
return $o;
|
||||
|
||||
}
|
||||
|
||||
|
||||
function get_zcard_embed($channel,$observer_hash = '',$args = array()) {
|
||||
|
||||
logger('get_zcard_embed');
|
||||
|
||||
$maxwidth = (($args['width']) ? intval($args['width']) : 0);
|
||||
$maxheight = (($args['height']) ? intval($args['height']) : 0);
|
||||
|
||||
|
||||
if(($maxwidth > 1200) || ($maxwidth < 1))
|
||||
$maxwidth = 1200;
|
||||
|
||||
if($maxwidth <= 425) {
|
||||
$width = 425;
|
||||
$size = 'hz_small';
|
||||
$cover_size = PHOTO_RES_COVER_425;
|
||||
$pphoto = array('type' => $channel['xchan_photo_mimetype'], 'width' => 80 , 'height' => 80, 'href' => $channel['xchan_photo_m']);
|
||||
}
|
||||
elseif($maxwidth <= 900) {
|
||||
$width = 900;
|
||||
$size = 'hz_medium';
|
||||
$cover_size = PHOTO_RES_COVER_850;
|
||||
$pphoto = array('type' => $channel['xchan_photo_mimetype'], 'width' => 160 , 'height' => 160, 'href' => $channel['xchan_photo_l']);
|
||||
}
|
||||
elseif($maxwidth <= 1200) {
|
||||
$width = 1200;
|
||||
$size = 'hz_large';
|
||||
$cover_size = PHOTO_RES_COVER_1200;
|
||||
$pphoto = array('type' => $channel['xchan_photo_mimetype'], 'width' => 300 , 'height' => 300, 'href' => $channel['xchan_photo_l']);
|
||||
}
|
||||
|
||||
$channel['channel_addr'] = $channel['channel_address'] . '@' . App::get_hostname();
|
||||
$zcard = array('chan' => $channel);
|
||||
|
||||
$r = q("select height, width, resource_id, scale, type from photo where uid = %d and scale = %d and photo_usage = %d",
|
||||
intval($channel['channel_id']),
|
||||
intval($cover_size),
|
||||
intval(PHOTO_COVER)
|
||||
);
|
||||
|
||||
if($r) {
|
||||
$cover = $r[0];
|
||||
$cover['href'] = z_root() . '/photo/' . $r[0]['resource_id'] . '-' . $r[0]['scale'];
|
||||
}
|
||||
else {
|
||||
$cover = $pphoto;
|
||||
}
|
||||
|
||||
$o .= replace_macros(get_markup_template('zcard_embed.tpl'),array(
|
||||
'$maxwidth' => $maxwidth,
|
||||
'$scale' => $scale,
|
||||
'$translate' => $translate,
|
||||
'$size' => $size,
|
||||
'$cover' => $cover,
|
||||
'$pphoto' => $pphoto,
|
||||
'$zcard' => $zcard
|
||||
));
|
||||
|
||||
return $o;
|
||||
|
||||
}
|
||||
|
||||
@ -3400,6 +3400,37 @@ function tgroup_check($uid,$item) {
|
||||
*/
|
||||
function start_delivery_chain($channel, $item, $item_id, $parent) {
|
||||
|
||||
$sourced = check_item_source($channel['channel_id'],$item);
|
||||
|
||||
if($sourced) {
|
||||
$r = q("select * from source where src_channel_id = %d and ( src_xchan = '%s' or src_xchan = '*' ) limit 1",
|
||||
intval($channel['channel_id']),
|
||||
dbesc(($item['source_xchan']) ? $item['source_xchan'] : $item['owner_xchan'])
|
||||
);
|
||||
if($r) {
|
||||
$t = trim($r[0]['src_tag']);
|
||||
if($t) {
|
||||
$tags = explode(',',$t);
|
||||
if($tags) {
|
||||
foreach($tags as $tt) {
|
||||
$tt = trim($tt);
|
||||
if($tt) {
|
||||
q("insert into term (uid,oid,otype,type,term,url)
|
||||
values(%d,%d,%d,%d,'%s','%s') ",
|
||||
intval($channel['channel_id']),
|
||||
intval($item_id),
|
||||
intval(TERM_OBJ_POST),
|
||||
intval(TERM_CATEGORY),
|
||||
dbesc($tt),
|
||||
dbesc(z_root() . '/channel/' . $channel['channel_address'] . '?f=&cat=' . urlencode($tt))
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Change this copy of the post to a forum head message and deliver to all the tgroup members
|
||||
// also reset all the privacy bits to the forum default permissions
|
||||
|
||||
@ -3459,6 +3490,9 @@ function start_delivery_chain($channel, $item, $item_id, $parent) {
|
||||
intval($item_id)
|
||||
);
|
||||
|
||||
|
||||
|
||||
|
||||
if($r)
|
||||
proc_run('php','include/notifier.php','tgroup',$item_id);
|
||||
else {
|
||||
|
||||
@ -1,70 +1,107 @@
|
||||
<?php /** @file */
|
||||
|
||||
|
||||
function oembed_replacecb($matches){
|
||||
|
||||
$embedurl=$matches[1];
|
||||
|
||||
|
||||
// site white/black list
|
||||
|
||||
if(($x = get_config('system','embed_deny'))) {
|
||||
$l = explode("\n",$x);
|
||||
if($l) {
|
||||
foreach($l as $ll) {
|
||||
if(trim($ll) && strpos($embedurl,trim($ll)) !== false)
|
||||
return '<a href="' . $embedurl . '">' . $embedurl . '</a>';
|
||||
}
|
||||
}
|
||||
}
|
||||
if(($x = get_config('system','embed_allow'))) {
|
||||
$found = false;
|
||||
$l = explode("\n",$x);
|
||||
if($l) {
|
||||
foreach($l as $ll) {
|
||||
if(trim($ll) && strpos($embedurl,trim($ll)) !== false) {
|
||||
$found = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if(! $found) {
|
||||
return '<a href="' . $embedurl . '">' . $embedurl . '</a>';
|
||||
}
|
||||
$result = oembed_action($embedurl);
|
||||
if($result['action'] === 'block') {
|
||||
return '<a href="' . $result['url'] . '">' . $result['url'] . '</a>';
|
||||
}
|
||||
|
||||
// implements a personal embed white/black list for logged in members
|
||||
if(local_channel()) {
|
||||
if(($x = get_pconfig(local_channel(),'system','embed_deny'))) {
|
||||
$l = explode("\n",$x);
|
||||
if($l) {
|
||||
foreach($l as $ll) {
|
||||
if(trim($ll) && strpos($embedurl,trim($ll)) !== false)
|
||||
return '<a href="' . $embedurl . '">' . $embedurl . '</a>';
|
||||
}
|
||||
}
|
||||
}
|
||||
if(($x = get_pconfig(local_channel(),'system','embed_allow'))) {
|
||||
$found = false;
|
||||
$l = explode("\n",$x);
|
||||
if($l) {
|
||||
foreach($l as $ll) {
|
||||
if(trim($ll) && strpos($embedurl,trim($ll)) !== false) {
|
||||
$found = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if(! $found) {
|
||||
return '<a href="' . $embedurl . '">' . $embedurl . '</a>';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$j = oembed_fetch_url($embedurl);
|
||||
$j = oembed_fetch_url($result['url']);
|
||||
$s = oembed_format_object($j);
|
||||
return $s;
|
||||
}
|
||||
|
||||
|
||||
function oembed_action($embedurl) {
|
||||
|
||||
$host = '';
|
||||
$action = 'filter';
|
||||
|
||||
$embedurl = trim(str_replace('&','&', $embedurl));
|
||||
|
||||
logger('oembed_action: ' . $embedurl, LOGGER_DEBUG, LOG_INFO);
|
||||
|
||||
// These media files should now be caught in bbcode.php
|
||||
// left here as a fallback in case this is called from another source
|
||||
|
||||
$noexts = array("mp3","mp4","ogg","ogv","oga","ogm","webm","opus");
|
||||
$ext = pathinfo(strtolower($embedurl),PATHINFO_EXTENSION);
|
||||
|
||||
if(strpos($embedurl,'http://') === 0) {
|
||||
if(intval(get_config('system','embed_sslonly'))) {
|
||||
$action = 'block';
|
||||
}
|
||||
}
|
||||
|
||||
// site white/black list
|
||||
|
||||
if(($x = get_config('system','embed_deny'))) {
|
||||
if(($x) && (! is_array($x)))
|
||||
$x = explode("\n",$x);
|
||||
if($x) {
|
||||
foreach($x as $ll) {
|
||||
$t = trim($ll);
|
||||
if(($t) && (strpos($embedurl,$t) !== false)) {
|
||||
$action = 'block';
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$found = false;
|
||||
|
||||
if(($x = get_config('system','embed_allow'))) {
|
||||
if(($x) && (! is_array($x)))
|
||||
$x = explode("\n",$x);
|
||||
if($x) {
|
||||
foreach($x as $ll) {
|
||||
$t = trim($ll);
|
||||
if(($t) && (strpos($embedurl,$t) !== false) && ($action !== 'block')) {
|
||||
$found = true;
|
||||
$action = 'allow';
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if((! $found) && ($action !== 'block')) {
|
||||
$action = 'filter';
|
||||
}
|
||||
}
|
||||
|
||||
// allow individual members to block something that wasn't blocked already.
|
||||
// They cannot over-ride the site to allow or change the filtering on an
|
||||
// embed that is not allowed by the site admin.
|
||||
|
||||
if(local_channel()) {
|
||||
if(($x = get_pconfig(local_channel(),'system','embed_deny'))) {
|
||||
if(($x) && (! is_array($x)))
|
||||
$x = explode("\n",$x);
|
||||
if($x) {
|
||||
foreach($x as $ll) {
|
||||
$t = trim($ll);
|
||||
if(($t) && (strpos($embedurl,$t) !== false)) {
|
||||
$action = 'block';
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$arr = array('url' => $embedurl, 'action' => $action);
|
||||
call_hooks('oembed_action',$arr);
|
||||
|
||||
logger('action: ' . $arr['action'] . ' url: ' . $arr['url'], LOGGER_DEBUG,LOG_DEBUG);
|
||||
|
||||
return $arr;
|
||||
|
||||
}
|
||||
|
||||
// if the url is embeddable with oembed, return the bbcode link.
|
||||
|
||||
function oembed_process($url) {
|
||||
@ -79,42 +116,49 @@ function oembed_process($url) {
|
||||
|
||||
function oembed_fetch_url($embedurl){
|
||||
|
||||
$a = get_app();
|
||||
|
||||
$embedurl = str_replace('&','&', $embedurl);
|
||||
|
||||
// logger('fetch: ' . $embedurl);
|
||||
|
||||
$txt = Cache::get(App::$videowidth . $embedurl);
|
||||
|
||||
if(strstr($txt,'youtu') && strstr(z_root(),'https:')) {
|
||||
$txt = str_replace('http:','https:',$txt);
|
||||
}
|
||||
|
||||
// These media files should now be caught in bbcode.php
|
||||
// left here as a fallback in case this is called from another source
|
||||
|
||||
$noexts = array("mp3","mp4","ogg","ogv","oga","ogm","webm","opus");
|
||||
$ext = pathinfo(strtolower($embedurl),PATHINFO_EXTENSION);
|
||||
|
||||
$result = oembed_action($embedurl);
|
||||
|
||||
if(is_null($txt)){
|
||||
$txt = "";
|
||||
$embedurl = $result['url'];
|
||||
$action = $result['action'];
|
||||
|
||||
if (in_array($ext, $noexts)) {
|
||||
require_once('include/hubloc.php');
|
||||
$zrl = is_matrix_url($embedurl);
|
||||
if($zrl)
|
||||
$embedurl = zid($embedurl);
|
||||
$txt = null;
|
||||
|
||||
if($action !== 'block') {
|
||||
$txt = Cache::get(App::$videowidth . $embedurl);
|
||||
|
||||
if(strstr($txt,'youtu') && strstr(z_root(),'https:')) {
|
||||
$txt = str_replace('http:','https:',$txt);
|
||||
}
|
||||
else {
|
||||
}
|
||||
|
||||
if(is_null($txt)) {
|
||||
|
||||
$txt = "";
|
||||
$furl = $embedurl;
|
||||
$zrl = false;
|
||||
|
||||
if(local_channel()) {
|
||||
require_once('include/hubloc.php');
|
||||
$zrl = is_matrix_url($furl);
|
||||
if($zrl)
|
||||
$furl = zid($furl);
|
||||
}
|
||||
|
||||
|
||||
if (! in_array($ext, $noexts) && $action !== 'block') {
|
||||
// try oembed autodiscovery
|
||||
$redirects = 0;
|
||||
$result = z_fetch_url($embedurl, false, $redirects, array('timeout' => 15, 'accept_content' => "text/*", 'novalidate' => true ));
|
||||
$result = z_fetch_url($furl, false, $redirects, array('timeout' => 15, 'accept_content' => "text/*", 'novalidate' => true ));
|
||||
if($result['success'])
|
||||
$html_text = $result['body'];
|
||||
|
||||
if($html_text){
|
||||
if($html_text) {
|
||||
$dom = @DOMDocument::loadHTML($html_text);
|
||||
if ($dom){
|
||||
$xpath = new DOMXPath($dom);
|
||||
@ -149,6 +193,7 @@ function oembed_fetch_url($embedurl){
|
||||
}
|
||||
|
||||
$txt=trim($txt);
|
||||
|
||||
if ($txt[0]!="{") $txt='{"type":"error"}';
|
||||
|
||||
//save in cache
|
||||
@ -160,6 +205,18 @@ function oembed_fetch_url($embedurl){
|
||||
|
||||
|
||||
$j = json_decode($txt);
|
||||
|
||||
if($action === 'filter') {
|
||||
if($j->html) {
|
||||
$orig = $j->html;
|
||||
$allow_position = (($zrl) ? true : false);
|
||||
$j->html = purify_html($j->html,$allow_position);
|
||||
if($j->html != $orig) {
|
||||
logger('oembed html was purified. original: ' . $orig . ' purified: ' . $j->html, LOGGER_DEBUG, LOG_INFO);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$j->embedurl = $embedurl;
|
||||
|
||||
// logger('fetch return: ' . print_r($j,true));
|
||||
|
||||
@ -122,7 +122,7 @@ function z_input_filter($channel_id,$s,$type = 'text/bbcode') {
|
||||
|
||||
|
||||
|
||||
function purify_html($s) {
|
||||
function purify_html($s, $allow_position = false) {
|
||||
require_once('library/HTMLPurifier.auto.php');
|
||||
require_once('include/html2bbcode.php');
|
||||
|
||||
@ -202,6 +202,35 @@ function purify_html($s) {
|
||||
$def->addElement('header', 'Block', 'Flow', 'Common');
|
||||
$def->addElement('footer', 'Block', 'Flow', 'Common');
|
||||
|
||||
|
||||
if($allow_position) {
|
||||
$cssDefinition = $config->getCSSDefinition();
|
||||
|
||||
$cssDefinition->info['position'] = new HTMLPurifier_AttrDef_Enum(array('absolute', 'fixed', 'relative', 'static', 'inherit'), false);
|
||||
|
||||
$cssDefinition->info['left'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
|
||||
new HTMLPurifier_AttrDef_CSS_Length(),
|
||||
new HTMLPurifier_AttrDef_CSS_Percentage()
|
||||
));
|
||||
|
||||
$cssDefinition->info['right'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
|
||||
new HTMLPurifier_AttrDef_CSS_Length(),
|
||||
new HTMLPurifier_AttrDef_CSS_Percentage()
|
||||
));
|
||||
|
||||
$cssDefinition->info['top'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
|
||||
new HTMLPurifier_AttrDef_CSS_Length(),
|
||||
new HTMLPurifier_AttrDef_CSS_Percentage()
|
||||
));
|
||||
|
||||
$cssDefinition->info['bottom'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
|
||||
new HTMLPurifier_AttrDef_CSS_Length(),
|
||||
new HTMLPurifier_AttrDef_CSS_Percentage()
|
||||
));
|
||||
|
||||
}
|
||||
|
||||
|
||||
$purifier = new HTMLPurifier($config);
|
||||
|
||||
return $purifier->purify($s);
|
||||
|
||||
@ -3914,7 +3914,7 @@ function zotinfo($arr) {
|
||||
$ret['site']['channels'] = channel_total();
|
||||
|
||||
|
||||
$ret['site']['version'] = Zotlabs\Project\System::get_platform_name() . ' ' . RED_VERSION . '[' . DB_UPDATE_VERSION . ']';
|
||||
$ret['site']['version'] = Zotlabs\Project\System::get_platform_name() . ' ' . STD_VERSION . '[' . DB_UPDATE_VERSION . ']';
|
||||
|
||||
$ret['site']['admin'] = get_config('system','admin_email');
|
||||
|
||||
|
||||
@ -1181,6 +1181,7 @@ CREATE TABLE IF NOT EXISTS `source` (
|
||||
`src_channel_xchan` char(255) NOT NULL DEFAULT '',
|
||||
`src_xchan` char(255) NOT NULL DEFAULT '',
|
||||
`src_patt` mediumtext NOT NULL,
|
||||
`src_tag` mediumtext NOT NULL,
|
||||
PRIMARY KEY (`src_id`),
|
||||
KEY `src_channel_id` (`src_channel_id`),
|
||||
KEY `src_channel_xchan` (`src_channel_xchan`),
|
||||
|
||||
@ -1166,7 +1166,8 @@ CREATE TABLE "source" (
|
||||
"src_channel_id" bigint NOT NULL DEFAULT '0',
|
||||
"src_channel_xchan" text NOT NULL DEFAULT '',
|
||||
"src_xchan" text NOT NULL DEFAULT '',
|
||||
"src_patt" text NOT NULL,
|
||||
"src_patt" text NOT NULL DEFAULT '',
|
||||
"src_tag" text NOT NULL DEFAULT '',
|
||||
PRIMARY KEY ("src_id")
|
||||
);
|
||||
create index "src_channel_id" on "source" ("src_channel_id");
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
define( 'UPDATE_VERSION' , 1166 );
|
||||
define( 'UPDATE_VERSION' , 1167 );
|
||||
|
||||
/**
|
||||
*
|
||||
@ -2071,3 +2071,12 @@ function update_r1165() {
|
||||
return UPDATE_FAILED;
|
||||
}
|
||||
|
||||
function update_r1166() {
|
||||
|
||||
$r = q("alter table source add src_tag text not null default '' ");
|
||||
if($r)
|
||||
return UPDATE_SUCCESS;
|
||||
return UPDATE_FAILED;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -1 +0,0 @@
|
||||
2016-04-29.1381H
|
||||
@ -7,7 +7,9 @@
|
||||
|
||||
|
||||
{{include file="field_checkbox.tpl" field=$block_public}}
|
||||
|
||||
{{include file="field_checkbox.tpl" field=$transport_security}}
|
||||
{{include file="field_checkbox.tpl" field=$content_security}}
|
||||
{{include file="field_checkbox.tpl" field=$embed_sslonly}}
|
||||
|
||||
{{include file="field_textarea.tpl" field=$whitelisted_sites}}
|
||||
{{include file="field_textarea.tpl" field=$blacklisted_sites}}
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
<input type="hidden" name="source" value="{{$id}}" />
|
||||
<input type="hidden" id="id_abook" name="abook" value="{{$abook}}" />
|
||||
{{include file="field_input.tpl" field=$name}}
|
||||
{{include file="field_input.tpl" field=$tags}}
|
||||
{{include file="field_textarea.tpl" field=$words}}
|
||||
|
||||
<div class="sources-submit-wrapper" >
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
<form action="sources" method="post">
|
||||
<input type="hidden" id="id_abook" name="abook" value="{{$abook}}" />
|
||||
{{include file="field_input.tpl" field=$name}}
|
||||
{{include file="field_input.tpl" field=$tags}}
|
||||
{{include file="field_textarea.tpl" field=$words}}
|
||||
|
||||
<div class="sources-submit-wrapper" >
|
||||
|
||||
8
view/tpl/zcard_embed.tpl
Normal file
8
view/tpl/zcard_embed.tpl
Normal file
@ -0,0 +1,8 @@
|
||||
<div class="hz_card {{$size}}">
|
||||
<div class="hz_cover_photo" style="max-width: 100;"><img src="{{$cover.href}}" alt="{{$zcard.chan.xchan_name}}" />
|
||||
<div style="position: relative;top: -40px;left: 120px;color: #fff;font-size: 18px;text-rendering: optimizelegibility;text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);" >{{$zcard.chan.xchan_name}}</div>
|
||||
<div style="position: relative;top: -40px;left: 120px;color: #fff;font-size: 10px;text-rendering: optimizelegibility;text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);" >{{$zcard.chan.channel_addr}}</div>
|
||||
</div>
|
||||
<div style="position:relative;top: -75px;left: 20px;background-color: white;border: 1px solid #ddd;padding: 3px;width: 80px;height: 80px;"><img src="{{$pphoto.href}}" alt="{{$zcard.chan.xchan_name}}" /></div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user