mirror of
https://framagit.org/hubzilla/core.git
synced 2026-06-23 01:36:14 -04:00
Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
09e143dc1f | ||
|
|
62ad32cf2e | ||
|
|
092c1c8c4c | ||
|
|
98541beee3 | ||
|
|
ff2935e70c |
@@ -38,7 +38,11 @@ class Site {
|
||||
$site_sellpage = ((x($_POST,'site_sellpage')) ? notags(trim($_POST['site_sellpage'])) : '');
|
||||
$site_location = ((x($_POST,'site_location')) ? notags(trim($_POST['site_location'])) : '');
|
||||
$frontpage = ((x($_POST,'frontpage')) ? notags(trim($_POST['frontpage'])) : '');
|
||||
$firstpage = ((x(trim($_POST,'firstpage'))) ? notags(trim($_POST['firstpage'])) : 'profiles');
|
||||
$firstpage = ((x($_POST,'firstpage')) ? notags(trim($_POST['firstpage'])) : 'profiles');
|
||||
// check value after trim
|
||||
if(! $firstpage) {
|
||||
$firstpage = 'profiles';
|
||||
}
|
||||
$mirror_frontpage = ((x($_POST,'mirror_frontpage')) ? intval(trim($_POST['mirror_frontpage'])) : 0);
|
||||
$directory_server = ((x($_POST,'directory_server')) ? trim($_POST['directory_server']) : '');
|
||||
$allowed_sites = ((x($_POST,'allowed_sites')) ? notags(trim($_POST['allowed_sites'])) : '');
|
||||
|
||||
@@ -830,6 +830,12 @@ class Item extends \Zotlabs\Web\Controller {
|
||||
$datarray['plink'] = $plink;
|
||||
$datarray['route'] = $route;
|
||||
|
||||
|
||||
// A specific ACL over-rides public_policy completely
|
||||
|
||||
if(! empty_acl($datarray))
|
||||
$datarray['public_policy'] = '';
|
||||
|
||||
if($iconfig)
|
||||
$datarray['iconfig'] = $iconfig;
|
||||
|
||||
|
||||
@@ -969,6 +969,10 @@ function import_author_unknown($x) {
|
||||
return false;
|
||||
}
|
||||
|
||||
function empty_acl($item) {
|
||||
return (($item['allow_cid'] === EMPTY_STR && $item['allow_gid'] === EMPTY_STR && $item['deny_cid'] === EMPTY_STR && $item['deny_gid'] === EMPTY_STR) ? true : false);
|
||||
}
|
||||
|
||||
function encode_item($item,$mirror = false) {
|
||||
$x = array();
|
||||
$x['type'] = 'activity';
|
||||
|
||||
@@ -659,13 +659,10 @@ CREATE TABLE IF NOT EXISTS `item` (
|
||||
KEY `uid_item_retained` (`uid`, `item_retained`),
|
||||
KEY `uid_item_private` (`uid`, `item_private`),
|
||||
KEY `uid_resource_type` (`uid`, `resource_type`),
|
||||
KEY `aid` (`aid`),
|
||||
KEY `owner_xchan` (`owner_xchan`),
|
||||
KEY `author_xchan` (`author_xchan`),
|
||||
KEY `resource_id` (`resource_id`),
|
||||
KEY `resource_type` (`resource_type`),
|
||||
KEY `item_restrict` (`item_restrict`),
|
||||
KEY `item_flags` (`item_flags`),
|
||||
KEY `commented` (`commented`),
|
||||
KEY `verb` (`verb`),
|
||||
KEY `obj_type` (`obj_type`),
|
||||
|
||||
@@ -15,7 +15,7 @@ msgstr ""
|
||||
"Project-Id-Version: Redmatrix\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2018-03-01 08:51+0100\n"
|
||||
"PO-Revision-Date: 2018-03-02 17:15+0000\n"
|
||||
"PO-Revision-Date: 2018-03-10 11:43+0000\n"
|
||||
"Last-Translator: Manuel Jiménez Friaza <mjfriaza@disroot.org>\n"
|
||||
"Language-Team: Spanish (Spain) (http://www.transifex.com/Friendica/red-matrix/language/es_ES/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
@@ -13338,7 +13338,7 @@ msgstr "ficha"
|
||||
|
||||
#: ../../include/bbcode.php:337
|
||||
msgid "article"
|
||||
msgstr "artículo"
|
||||
msgstr "el artículo"
|
||||
|
||||
#: ../../include/bbcode.php:420 ../../include/bbcode.php:428
|
||||
msgid "Click to open/close"
|
||||
@@ -13350,7 +13350,7 @@ msgstr "spoiler"
|
||||
|
||||
#: ../../include/bbcode.php:441
|
||||
msgid "View article"
|
||||
msgstr "Ver artículo"
|
||||
msgstr "Ver el artículo"
|
||||
|
||||
#: ../../include/bbcode.php:441
|
||||
msgid "View summary"
|
||||
|
||||
@@ -3014,10 +3014,10 @@ App::$strings["Encrypted content"] = "Contenido cifrado";
|
||||
App::$strings["Install %1\$s element %2\$s"] = "Instalar el elemento de%1\$s%2\$s";
|
||||
App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Esta entrada contiene el elemento instalable %s, sin embargo le faltan permisos para instalarlo en este sitio.";
|
||||
App::$strings["card"] = "ficha";
|
||||
App::$strings["article"] = "artículo";
|
||||
App::$strings["article"] = "el artículo";
|
||||
App::$strings["Click to open/close"] = "Pulsar para abrir/cerrar";
|
||||
App::$strings["spoiler"] = "spoiler";
|
||||
App::$strings["View article"] = "Ver artículo";
|
||||
App::$strings["View article"] = "Ver el artículo";
|
||||
App::$strings["View summary"] = "Ver sumario";
|
||||
App::$strings["$1 wrote:"] = "$1 escribió:";
|
||||
App::$strings[" by "] = "por";
|
||||
|
||||
Reference in New Issue
Block a user