Merge branch 'develop' into item-activities
This commit is contained in:
Michael Vogel
GitHub
commit
ff5ee74ecf
60 changed files with 2256 additions and 748 deletions
|
|
@ -975,6 +975,7 @@ function admin_page_site_post(App $a)
|
|||
|
||||
$allowed_sites = ((x($_POST,'allowed_sites')) ? notags(trim($_POST['allowed_sites'])) : '');
|
||||
$allowed_email = ((x($_POST,'allowed_email')) ? notags(trim($_POST['allowed_email'])) : '');
|
||||
$forbidden_nicknames = ((x($_POST,'forbidden_nicknames')) ? strtolower(notags(trim($_POST['forbidden_nicknames']))) : '');
|
||||
$no_oembed_rich_content = x($_POST,'no_oembed_rich_content');
|
||||
$allowed_oembed = ((x($_POST,'allowed_oembed')) ? notags(trim($_POST['allowed_oembed'])) : '');
|
||||
$block_public = ((x($_POST,'block_public')) ? True : False);
|
||||
|
|
@ -1143,6 +1144,7 @@ function admin_page_site_post(App $a)
|
|||
Config::set('config', 'register_text', $register_text);
|
||||
Config::set('system', 'allowed_sites', $allowed_sites);
|
||||
Config::set('system', 'allowed_email', $allowed_email);
|
||||
Config::set('system', 'forbidden_nicknames', $forbidden_nicknames);
|
||||
Config::set('system', 'no_oembed_rich_content', $no_oembed_rich_content);
|
||||
Config::set('system', 'allowed_oembed', $allowed_oembed);
|
||||
Config::set('system', 'block_public', $block_public);
|
||||
|
|
@ -1349,6 +1351,8 @@ function admin_page_site(App $a)
|
|||
if ($optimize_max_tablesize <= 0) {
|
||||
$optimize_max_tablesize = -1;
|
||||
}
|
||||
// Default list of forbidden names, classic role names from RFC 2142
|
||||
$default_forbidden_nicknames = 'info, marketing, sales, support, abuse, noc, security, postmaster, hostmaster, usenet, news, webmaster, www, uucp, ftp, root, sysop';
|
||||
|
||||
$t = get_markup_template('admin/site.tpl');
|
||||
return replace_macros($t, [
|
||||
|
|
@ -1388,6 +1392,7 @@ function admin_page_site(App $a)
|
|||
'$register_policy' => ['register_policy', L10n::t("Register policy"), $a->config['register_policy'], "", $register_choices],
|
||||
'$daily_registrations' => ['max_daily_registrations', L10n::t("Maximum Daily Registrations"), Config::get('system', 'max_daily_registrations'), L10n::t("If registration is permitted above, this sets the maximum number of new user registrations to accept per day. If register is set to closed, this setting has no effect.")],
|
||||
'$register_text' => ['register_text', L10n::t("Register text"), $a->config['register_text'], L10n::t("Will be displayed prominently on the registration page. You can use BBCode here.")],
|
||||
'$forbidden_nicknames' => ['forbidden_nicknames', L10n::t('Forbidden Nicknames'), Config::get('system', 'forbidden_nicknames', $default_forbidden_nicknames), L10n::t('Comma separated list of nicknames that are forbidden from registration. Preset is a list of role names according RFC 2142.')],
|
||||
'$abandon_days' => ['abandon_days', L10n::t('Accounts abandoned after x days'), Config::get('system','account_abandon_days'), L10n::t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')],
|
||||
'$allowed_sites' => ['allowed_sites', L10n::t("Allowed friend domains"), Config::get('system','allowed_sites'), L10n::t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")],
|
||||
'$allowed_email' => ['allowed_email', L10n::t("Allowed email domains"), Config::get('system','allowed_email'), L10n::t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")],
|
||||
|
|
|
|||
22
mod/item.php
22
mod/item.php
|
|
@ -178,6 +178,8 @@ function item_post(App $a) {
|
|||
return;
|
||||
}
|
||||
|
||||
$categories = '';
|
||||
|
||||
if ($orig_post) {
|
||||
$str_group_allow = $orig_post['allow_gid'];
|
||||
$str_contact_allow = $orig_post['allow_cid'];
|
||||
|
|
@ -223,13 +225,13 @@ function item_post(App $a) {
|
|||
$str_contact_deny = perms2str($_REQUEST['contact_deny']);
|
||||
}
|
||||
|
||||
$title = notags(trim($_REQUEST['title']));
|
||||
$location = notags(trim($_REQUEST['location']));
|
||||
$coord = notags(trim($_REQUEST['coord']));
|
||||
$verb = notags(trim($_REQUEST['verb']));
|
||||
$emailcc = notags(trim($_REQUEST['emailcc']));
|
||||
$body = escape_tags(trim($_REQUEST['body']));
|
||||
$network = notags(trim(defaults($_REQUEST, 'network', NETWORK_DFRN)));
|
||||
$title = notags(trim(defaults($_REQUEST, 'title' , '')));
|
||||
$location = notags(trim(defaults($_REQUEST, 'location', '')));
|
||||
$coord = notags(trim(defaults($_REQUEST, 'coord' , '')));
|
||||
$verb = notags(trim(defaults($_REQUEST, 'verb' , '')));
|
||||
$emailcc = notags(trim(defaults($_REQUEST, 'emailcc' , '')));
|
||||
$body = escape_tags(trim(defaults($_REQUEST, 'body' , '')));
|
||||
$network = notags(trim(defaults($_REQUEST, 'network' , NETWORK_DFRN)));
|
||||
$guid = get_guid(32);
|
||||
|
||||
$postopts = defaults($_REQUEST, 'postopts', '');
|
||||
|
|
@ -279,15 +281,15 @@ function item_post(App $a) {
|
|||
}
|
||||
}
|
||||
|
||||
if (strlen($categories)) {
|
||||
if (!empty($categories)) {
|
||||
// get the "fileas" tags for this post
|
||||
$filedas = file_tag_file_to_list($categories, 'file');
|
||||
}
|
||||
// save old and new categories, so we can determine what needs to be deleted from pconfig
|
||||
$categories_old = $categories;
|
||||
$categories = file_tag_list_to_file(trim($_REQUEST['category']), 'category');
|
||||
$categories = file_tag_list_to_file(trim(defaults($_REQUEST, 'category', '')), 'category');
|
||||
$categories_new = $categories;
|
||||
if (strlen($filedas)) {
|
||||
if (!empty($filedas)) {
|
||||
// append the fileas stuff to the new categories list
|
||||
$categories .= file_tag_list_to_file($filedas, 'file');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -125,28 +125,36 @@ function wall_upload_post(App $a, $desktopmode = true)
|
|||
$filetype = $_FILES['userfile']['type'];
|
||||
|
||||
} elseif (x($_FILES, 'media')) {
|
||||
if (is_array($_FILES['media']['tmp_name'])) {
|
||||
$src = $_FILES['media']['tmp_name'][0];
|
||||
} else {
|
||||
$src = $_FILES['media']['tmp_name'];
|
||||
if (!empty($_FILES['media']['tmp_name'])) {
|
||||
if (is_array($_FILES['media']['tmp_name'])) {
|
||||
$src = $_FILES['media']['tmp_name'][0];
|
||||
} else {
|
||||
$src = $_FILES['media']['tmp_name'];
|
||||
}
|
||||
}
|
||||
|
||||
if (is_array($_FILES['media']['name'])) {
|
||||
$filename = basename($_FILES['media']['name'][0]);
|
||||
} else {
|
||||
$filename = basename($_FILES['media']['name']);
|
||||
if (!empty($_FILES['media']['name'])) {
|
||||
if (is_array($_FILES['media']['name'])) {
|
||||
$filename = basename($_FILES['media']['name'][0]);
|
||||
} else {
|
||||
$filename = basename($_FILES['media']['name']);
|
||||
}
|
||||
}
|
||||
|
||||
if (is_array($_FILES['media']['size'])) {
|
||||
$filesize = intval($_FILES['media']['size'][0]);
|
||||
} else {
|
||||
$filesize = intval($_FILES['media']['size']);
|
||||
if (!empty($_FILES['media']['size'])) {
|
||||
if (is_array($_FILES['media']['size'])) {
|
||||
$filesize = intval($_FILES['media']['size'][0]);
|
||||
} else {
|
||||
$filesize = intval($_FILES['media']['size']);
|
||||
}
|
||||
}
|
||||
|
||||
if (is_array($_FILES['media']['type'])) {
|
||||
$filetype = $_FILES['media']['type'][0];
|
||||
} else {
|
||||
$filetype = $_FILES['media']['type'];
|
||||
if (!empty($_FILES['media']['type'])) {
|
||||
if (is_array($_FILES['media']['type'])) {
|
||||
$filetype = $_FILES['media']['type'][0];
|
||||
} else {
|
||||
$filetype = $_FILES['media']['type'];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue