X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fgroup.php;h=a6f649bf399989ce967059b65af068f38ecb45ba;hb=e7be87df93895de47414a5a788cd6487adb98a29;hp=970fbba299e0a1703aeb65c25bee7962522f19e6;hpb=a0f65ca7a1b1fbc1a2d0f823940211377fc6e13e;p=friendica.git diff --git a/mod/group.php b/mod/group.php index 970fbba299..a6f649bf39 100644 --- a/mod/group.php +++ b/mod/group.php @@ -11,16 +11,14 @@ use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\PConfig; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\Model; use Friendica\Module; -use Friendica\Util\Security; use Friendica\Util\Strings; function group_init(App $a) { if (local_user()) { - $a->page['aside'] = Model\Group::sidebarWidget('contacts', 'group', 'extended', (($a->argc > 1) ? $a->argv[1] : 'everyone')); + $a->page['aside'] = Model\Group::sidebarWidget('contact', 'group', 'extended', (($a->argc > 1) ? $a->argv[1] : 'everyone')); } } @@ -34,7 +32,7 @@ function group_post(App $a) { if (($a->argc == 2) && ($a->argv[1] === 'new')) { BaseModule::checkFormSecurityTokenRedirectOnError('/group/new', 'group_edit'); - $name = Strings::removeTags(trim($_POST['groupname'])); + $name = Strings::escapeTags(trim($_POST['groupname'])); $r = Model\Group::create(local_user(), $name); if ($r) { info(L10n::t('Group created.') . EOL); @@ -62,7 +60,7 @@ function group_post(App $a) { return; // NOTREACHED } $group = $r[0]; - $groupname = Strings::removeTags(trim($_POST['groupname'])); + $groupname = Strings::escapeTags(trim($_POST['groupname'])); if (strlen($groupname) && ($groupname != $group['name'])) { $r = q("UPDATE `group` SET `name` = '%s' WHERE `uid` = %d AND `id` = %d", DBA::escape($groupname), @@ -129,7 +127,6 @@ function group_content(App $a) { $members = []; $preselected = []; - $entry = []; $context = $context + [ '$title' => $group['name'], @@ -191,8 +188,6 @@ function group_content(App $a) { $group = $r[0]; $members = Model\Contact::getByGroupId($group['id']); $preselected = []; - $entry = []; - $id = 0; if (count($members)) { foreach ($members as $member) { @@ -310,7 +305,7 @@ function group_content(App $a) { if ($change) { $tpl = Renderer::getMarkupTemplate('groupeditor.tpl'); echo Renderer::replaceMacros($tpl, $context); - killme(); + exit(); } return Renderer::replaceMacros($tpl, $context);