Merge remote-tracking branch 'upstream/dev' into dev
This commit is contained in:
zottel
commit
8088185a43
@ -580,8 +580,8 @@ class Admin extends \Zotlabs\Web\Controller {
|
||||
$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 = $this->trim_array_elems(explode("\n",$_POST['embed_allow']));
|
||||
set_config('system','embed_allow',$we);
|
||||
@ -589,6 +589,12 @@ class Admin extends \Zotlabs\Web\Controller {
|
||||
$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');
|
||||
}
|
||||
|
||||
@ -713,7 +719,7 @@ class Admin extends \Zotlabs\Web\Controller {
|
||||
}
|
||||
|
||||
$embedhelp2 = t("The recommended setting is to only allow unfiltered HTML from the following sites:");
|
||||
$embedhelp3 = t("youtube.com<br />youtu.be<br />twitter.com<br />vimeo.com<br />soundcloud.com<br />wikipedia.com<br />");
|
||||
$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');
|
||||
@ -722,18 +728,17 @@ 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 unfiltered 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')),
|
||||
'$embedhelp1' => $embedhelp1,
|
||||
'$embedhelp2' => $embedhelp2,
|
||||
'$embedhelp3' => $embedhelp3,
|
||||
'$embedhelp4' => $embedhelp4,
|
||||
|
||||
'$submit' => t('Submit')
|
||||
));
|
||||
|
||||
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
|
||||
|
||||
|
||||
@ -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) {
|
||||
|
||||
@ -1,14 +1,16 @@
|
||||
<?php /** @file */
|
||||
|
||||
|
||||
function oembed_replacecb($matches){
|
||||
|
||||
$embedurl=$matches[1];
|
||||
|
||||
$action = oembed_action($embedurl);
|
||||
if($action === 'block') {
|
||||
return '<a href="' . $embedurl . '">' . $embedurl . '</a>';
|
||||
$result = oembed_action($embedurl);
|
||||
if($result['action'] === 'block') {
|
||||
return '<a href="' . $result['url'] . '">' . $result['url'] . '</a>';
|
||||
}
|
||||
|
||||
$j = oembed_fetch_url($embedurl);
|
||||
$j = oembed_fetch_url($result['url']);
|
||||
$s = oembed_format_object($j);
|
||||
return $s;
|
||||
}
|
||||
@ -17,22 +19,11 @@ function oembed_replacecb($matches){
|
||||
function oembed_action($embedurl) {
|
||||
|
||||
$host = '';
|
||||
$action = 'filter';
|
||||
|
||||
$action = 'allow';
|
||||
$embedurl = trim(str_replace('&','&', $embedurl));
|
||||
|
||||
// The default action is 'allow'. This is insecure. We might want to
|
||||
// change this to 'filter' except it will be a support burden because
|
||||
// then youtube videos won't work out of the box and will need to be
|
||||
// explicitly enabled.
|
||||
|
||||
$embedurl = str_replace('&','&', $embedurl);
|
||||
|
||||
logger('oembed_action: ' . $embedurl);
|
||||
|
||||
$p = parse_url($embedurl);
|
||||
|
||||
if($p)
|
||||
$host = $p['host'];
|
||||
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
|
||||
@ -40,6 +31,11 @@ function oembed_action($embedurl) {
|
||||
$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
|
||||
|
||||
@ -49,11 +45,7 @@ function oembed_action($embedurl) {
|
||||
if($x) {
|
||||
foreach($x as $ll) {
|
||||
$t = trim($ll);
|
||||
|
||||
// don't allow somebody to provide a url like https://foobar.com/something/youtube
|
||||
// to bypass a block or allow of youtube
|
||||
|
||||
if($t && (strpos($embedurl,$t) !== false || strpos($t,$host) !== false)) {
|
||||
if(($t) && (strpos($embedurl,$t) !== false)) {
|
||||
$action = 'block';
|
||||
break;
|
||||
}
|
||||
@ -69,11 +61,7 @@ function oembed_action($embedurl) {
|
||||
if($x) {
|
||||
foreach($x as $ll) {
|
||||
$t = trim($ll);
|
||||
|
||||
// don't allow somebody to provide a url like https://foobar.com/something/youtube
|
||||
// to bypass a block or allow of youtube
|
||||
|
||||
if($t && (strpos($embedurl,$t) !== false || strpos($t,$host) !== false)) {
|
||||
if(($t) && (strpos($embedurl,$t) !== false) && ($action !== 'block')) {
|
||||
$found = true;
|
||||
$action = 'allow';
|
||||
break;
|
||||
@ -87,7 +75,7 @@ function oembed_action($embedurl) {
|
||||
|
||||
// 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.
|
||||
// embed that is not allowed by the site admin.
|
||||
|
||||
if(local_channel()) {
|
||||
if(($x = get_pconfig(local_channel(),'system','embed_deny'))) {
|
||||
@ -96,11 +84,7 @@ function oembed_action($embedurl) {
|
||||
if($x) {
|
||||
foreach($x as $ll) {
|
||||
$t = trim($ll);
|
||||
|
||||
// don't allow somebody to provide a url like https://foobar.com/something/youtube
|
||||
// to bypass a block or allow of youtube
|
||||
|
||||
if($t && (strpos($embedurl,$t) !== false || strpos($t,$host) !== false)) {
|
||||
if(($t) && (strpos($embedurl,$t) !== false)) {
|
||||
$action = 'block';
|
||||
break;
|
||||
}
|
||||
@ -109,9 +93,12 @@ function oembed_action($embedurl) {
|
||||
}
|
||||
}
|
||||
|
||||
logger('action: ' . $action . ' url: ' . $embedurl, LOGGER_DEBUG,LOG_DEBUG);
|
||||
$arr = array('url' => $embedurl, 'action' => $action);
|
||||
call_hooks('oembed_action',$arr);
|
||||
|
||||
return $action;
|
||||
logger('action: ' . $arr['action'] . ' url: ' . $arr['url'], LOGGER_DEBUG,LOG_DEBUG);
|
||||
|
||||
return $arr;
|
||||
|
||||
}
|
||||
|
||||
@ -135,9 +122,10 @@ function oembed_fetch_url($embedurl){
|
||||
$noexts = array("mp3","mp4","ogg","ogv","oga","ogm","webm","opus");
|
||||
$ext = pathinfo(strtolower($embedurl),PATHINFO_EXTENSION);
|
||||
|
||||
$action = oembed_action($embedurl);
|
||||
$result = oembed_action($embedurl);
|
||||
|
||||
$embedurl = str_replace('&','&', $embedurl);
|
||||
$embedurl = $result['url'];
|
||||
$action = $result['action'];
|
||||
|
||||
$txt = null;
|
||||
|
||||
@ -218,12 +206,14 @@ function oembed_fetch_url($embedurl){
|
||||
|
||||
$j = json_decode($txt);
|
||||
|
||||
if($j->html && $action === 'filter') {
|
||||
$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);
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -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}}
|
||||
@ -15,18 +17,6 @@
|
||||
{{include file="field_textarea.tpl" field=$whitelisted_channels}}
|
||||
{{include file="field_textarea.tpl" field=$blacklisted_channels}}
|
||||
|
||||
{{if $embedhelp1}}
|
||||
<div class="section-content-info-wrapper">{{$embedhelp1}}</div>
|
||||
{{/if}}
|
||||
|
||||
<div style="margin-left: 15px; margin-bottom: 10px;">
|
||||
<div class="descriptive-text">{{$embedhelp2}}</div>
|
||||
<div style="margin-left: 15px;">
|
||||
<div class="descriptive-text">{{$embedhelp3}}</div>
|
||||
</div>
|
||||
<div class="descriptive-text">{{$embedhelp4}}</div>
|
||||
</div>
|
||||
|
||||
{{include file="field_textarea.tpl" field=$embed_allow}}
|
||||
{{include file="field_textarea.tpl" field=$embed_deny}}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user