X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FGroup.php;h=3cd8166f1fadc2a37275b27b39787c29fc7ef917;hb=1ae7cac23667a7e43a0ca5e66ad6fd58011542d0;hp=6542cc74a8b02abc984fbdc128a74cc368487bd3;hpb=800694e9b36bc261a671a80b7ca787f27564a7ac;p=friendica.git diff --git a/src/Module/Group.php b/src/Module/Group.php index 6542cc74a8..3cd8166f1f 100644 --- a/src/Module/Group.php +++ b/src/Module/Group.php @@ -1,124 +1,138 @@ . + * */ namespace Friendica\Module; use Friendica\BaseModule; -use Friendica\Core\Config; -use Friendica\Core\L10n; use Friendica\Core\Renderer; use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model; -use Friendica\Util\Strings; require_once 'boot.php'; class Group extends BaseModule { - public static function post(array $parameters = []) + protected function post(array $request = []) { - $a = DI::app(); - if (DI::mode()->isAjax()) { - self::ajaxPost(); + $this->ajaxPost(); } if (!local_user()) { - notice(L10n::t('Permission denied.')); + notice(DI::l10n()->t('Permission denied.')); DI::baseUrl()->redirect(); } // @TODO: Replace with parameter from router - if (($a->argc == 2) && ($a->argv[1] === 'new')) { + if ((DI::args()->getArgc() == 2) && (DI::args()->getArgv()[1] === 'new')) { BaseModule::checkFormSecurityTokenRedirectOnError('/group/new', 'group_edit'); - $name = Strings::escapeTags(trim($_POST['groupname'])); + $name = trim($request['groupname']); $r = Model\Group::create(local_user(), $name); if ($r) { - info(L10n::t('Group created.')); $r = Model\Group::getIdByName(local_user(), $name); if ($r) { DI::baseUrl()->redirect('group/' . $r); } } else { - notice(L10n::t('Could not create group.')); + notice(DI::l10n()->t('Could not create group.')); } DI::baseUrl()->redirect('group'); } // @TODO: Replace with parameter from router - if (($a->argc == 2) && intval($a->argv[1])) { + if ((DI::args()->getArgc() == 2) && intval(DI::args()->getArgv()[1])) { BaseModule::checkFormSecurityTokenRedirectOnError('/group', 'group_edit'); - $group = DBA::selectFirst('group', ['id', 'name'], ['id' => $a->argv[1], 'uid' => local_user()]); + $group = DBA::selectFirst('group', ['id', 'name'], ['id' => DI::args()->getArgv()[1], 'uid' => local_user()]); if (!DBA::isResult($group)) { - notice(L10n::t('Group not found.')); + notice(DI::l10n()->t('Group not found.')); DI::baseUrl()->redirect('contact'); } - $groupname = Strings::escapeTags(trim($_POST['groupname'])); + $groupname = trim($_POST['groupname']); if (strlen($groupname) && ($groupname != $group['name'])) { - if (Model\Group::update($group['id'], $groupname)) { - info(L10n::t('Group name changed.')); + if (!Model\Group::update($group['id'], $groupname)) { + notice(DI::l10n()->t('Group name was not changed.')); } } } } - public static function ajaxPost() + public function ajaxPost() { try { - $a = DI::app(); - if (!local_user()) { - throw new \Exception(L10n::t('Permission denied.'), 403); + throw new \Exception(DI::l10n()->t('Permission denied.'), 403); } - // POST /group/123/add/123 - // POST /group/123/remove/123 - // @TODO: Replace with parameter from router - if ($a->argc == 4) { - list($group_id, $command, $contact_id) = array_slice($a->argv, 1); + if (isset($this->parameters['command'])) { + $group_id = $this->parameters['group']; + $contact_id = $this->parameters['contact']; if (!Model\Group::exists($group_id, local_user())) { - throw new \Exception(L10n::t('Unknown group.'), 404); + throw new \Exception(DI::l10n()->t('Unknown group.'), 404); } - $contact = DBA::selectFirst('contact', ['deleted'], ['id' => $contact_id, 'uid' => local_user()]); + // @TODO Backward compatibility with user contacts, remove by version 2022.03 + $cdata = Model\Contact::getPublicAndUserContactID($contact_id, local_user()); + if (empty($cdata['public'])) { + throw new \Exception(DI::l10n()->t('Contact not found.'), 404); + } + + if (empty($cdata['user'])) { + throw new \Exception(DI::l10n()->t('Invalid contact.'), 404); + } + + $contact = Model\Contact::getById($cdata['user'], ['deleted']); if (!DBA::isResult($contact)) { - throw new \Exception(L10n::t('Contact not found.'), 404); + throw new \Exception(DI::l10n()->t('Contact not found.'), 404); } if ($contact['deleted']) { - throw new \Exception(L10n::t('Contact is deleted.'), 410); + throw new \Exception(DI::l10n()->t('Contact is deleted.'), 410); } - switch($command) { + switch($this->parameters['command']) { case 'add': - if (!Model\Group::addMember($group_id, $contact_id)) { - throw new \Exception(L10n::t('Unable to add the contact to the group.'), 500); + if (!Model\Group::addMember($group_id, $cdata['user'])) { + throw new \Exception(DI::l10n()->t('Unable to add the contact to the group.'), 500); } - $message = L10n::t('Contact successfully added to group.'); + $message = DI::l10n()->t('Contact successfully added to group.'); break; case 'remove': - if (!Model\Group::removeMember($group_id, $contact_id)) { - throw new \Exception(L10n::t('Unable to remove the contact from the group.'), 500); + if (!Model\Group::removeMember($group_id, $cdata['user'])) { + throw new \Exception(DI::l10n()->t('Unable to remove the contact from the group.'), 500); } - $message = L10n::t('Contact successfully removed from group.'); + $message = DI::l10n()->t('Contact successfully removed from group.'); break; - default: - throw new \Exception(L10n::t('Unknown group command.'), 400); } } else { - throw new \Exception(L10n::t('Bad request.'), 400); + throw new \Exception(DI::l10n()->t('Bad request.'), 400); } - notice($message); + info($message); System::jsonExit(['status' => 'OK', 'message' => $message]); } catch (\Exception $e) { notice($e->getMessage()); @@ -126,7 +140,7 @@ class Group extends BaseModule } } - public static function content(array $parameters = []) + protected function content(array $request = []): string { $change = false; @@ -136,33 +150,33 @@ class Group extends BaseModule $a = DI::app(); - DI::page()['aside'] = Model\Group::sidebarWidget('contact', 'group', 'extended', (($a->argc > 1) ? $a->argv[1] : 'everyone')); + DI::page()['aside'] = Model\Group::sidebarWidget('contact', 'group', 'extended', ((DI::args()->getArgc() > 1) ? DI::args()->getArgv()[1] : 'everyone')); // With no group number provided we jump to the unassigned contacts as a starting point // @TODO: Replace with parameter from router - if ($a->argc == 1) { + if (DI::args()->getArgc() == 1) { DI::baseUrl()->redirect('group/none'); } // Switch to text mode interface if we have more than 'n' contacts or group members $switchtotext = DI::pConfig()->get(local_user(), 'system', 'groupedit_image_limit'); if (is_null($switchtotext)) { - $switchtotext = Config::get('system', 'groupedit_image_limit', 200); + $switchtotext = DI::config()->get('system', 'groupedit_image_limit', 200); } $tpl = Renderer::getMarkupTemplate('group_edit.tpl'); $context = [ - '$submit' => L10n::t('Save Group'), - '$submit_filter' => L10n::t('Filter'), + '$submit' => DI::l10n()->t('Save Group'), + '$submit_filter' => DI::l10n()->t('Filter'), ]; // @TODO: Replace with parameter from router - if (($a->argc == 2) && ($a->argv[1] === 'new')) { + if ((DI::args()->getArgc() == 2) && (DI::args()->getArgv()[1] === 'new')) { return Renderer::replaceMacros($tpl, $context + [ - '$title' => L10n::t('Create a group of contacts/friends.'), - '$gname' => ['groupname', L10n::t('Group Name: '), '', ''], + '$title' => DI::l10n()->t('Create a group of contacts/friends.'), + '$gname' => ['groupname', DI::l10n()->t('Group Name: '), '', ''], '$gid' => 'new', '$form_security_token' => BaseModule::getFormSecurityToken("group_edit"), ]); @@ -171,13 +185,13 @@ class Group extends BaseModule $nogroup = false; // @TODO: Replace with parameter from router - if (($a->argc == 2) && ($a->argv[1] === 'none') || - ($a->argc == 1) && ($a->argv[0] === 'nogroup')) { + if ((DI::args()->getArgc() == 2) && (DI::args()->getArgv()[1] === 'none') || + (DI::args()->getArgc() == 1) && (DI::args()->getArgv()[0] === 'nogroup')) { $id = -1; $nogroup = true; $group = [ 'id' => $id, - 'name' => L10n::t('Contacts not in any group'), + 'name' => DI::l10n()->t('Contacts not in any group'), ]; $members = []; @@ -185,50 +199,48 @@ class Group extends BaseModule $context = $context + [ '$title' => $group['name'], - '$gname' => ['groupname', L10n::t('Group Name: '), $group['name'], ''], + '$gname' => ['groupname', DI::l10n()->t('Group Name: '), $group['name'], ''], '$gid' => $id, '$editable' => 0, ]; } // @TODO: Replace with parameter from router - if (($a->argc == 3) && ($a->argv[1] === 'drop')) { + if ((DI::args()->getArgc() == 3) && (DI::args()->getArgv()[1] === 'drop')) { BaseModule::checkFormSecurityTokenRedirectOnError('/group', 'group_drop', 't'); // @TODO: Replace with parameter from router - if (intval($a->argv[2])) { - if (!Model\Group::exists($a->argv[2], local_user())) { - notice(L10n::t('Group not found.')); + if (intval(DI::args()->getArgv()[2])) { + if (!Model\Group::exists(DI::args()->getArgv()[2], local_user())) { + notice(DI::l10n()->t('Group not found.')); DI::baseUrl()->redirect('contact'); } - if (Model\Group::remove($a->argv[2])) { - info(L10n::t('Group removed.')); - } else { - notice(L10n::t('Unable to remove group.')); + if (!Model\Group::remove(DI::args()->getArgv()[2])) { + notice(DI::l10n()->t('Unable to remove group.')); } } DI::baseUrl()->redirect('group'); } // @TODO: Replace with parameter from router - if (($a->argc > 2) && intval($a->argv[1]) && intval($a->argv[2])) { + if ((DI::args()->getArgc() > 2) && intval(DI::args()->getArgv()[1]) && intval(DI::args()->getArgv()[2])) { BaseModule::checkFormSecurityTokenForbiddenOnError('group_member_change', 't'); - if (DBA::exists('contact', ['id' => $a->argv[2], 'uid' => local_user(), 'self' => false, 'pending' => false, 'blocked' => false])) { - $change = intval($a->argv[2]); + if (DBA::exists('contact', ['id' => DI::args()->getArgv()[2], 'uid' => local_user(), 'self' => false, 'pending' => false, 'blocked' => false])) { + $change = intval(DI::args()->getArgv()[2]); } } // @TODO: Replace with parameter from router - if (($a->argc > 1) && intval($a->argv[1])) { - $group = DBA::selectFirst('group', ['id', 'name'], ['id' => $a->argv[1], 'uid' => local_user(), 'deleted' => false]); + if ((DI::args()->getArgc() > 1) && intval(DI::args()->getArgv()[1])) { + $group = DBA::selectFirst('group', ['id', 'name'], ['id' => DI::args()->getArgv()[1], 'uid' => local_user(), 'deleted' => false]); if (!DBA::isResult($group)) { - notice(L10n::t('Group not found.')); + notice(DI::l10n()->t('Group not found.')); DI::baseUrl()->redirect('contact'); } - $members = Model\Contact::getByGroupId($group['id']); + $members = Model\Contact\Group::getById($group['id']); $preselected = []; if (count($members)) { @@ -244,7 +256,7 @@ class Group extends BaseModule Model\Group::addMember($group['id'], $change); } - $members = Model\Contact::getByGroupId($group['id']); + $members = Model\Contact\Group::getById($group['id']); $preselected = []; if (count($members)) { foreach ($members as $member) { @@ -256,17 +268,17 @@ class Group extends BaseModule $drop_tpl = Renderer::getMarkupTemplate('group_drop.tpl'); $drop_txt = Renderer::replaceMacros($drop_tpl, [ '$id' => $group['id'], - '$delete' => L10n::t('Delete Group'), + '$delete' => DI::l10n()->t('Delete Group'), '$form_security_token' => BaseModule::getFormSecurityToken("group_drop"), ]); $context = $context + [ '$title' => $group['name'], - '$gname' => ['groupname', L10n::t('Group Name: '), $group['name'], ''], + '$gname' => ['groupname', DI::l10n()->t('Group Name: '), $group['name'], ''], '$gid' => $group['id'], '$drop' => $drop_txt, '$form_security_token' => BaseModule::getFormSecurityToken('group_edit'), - '$edit_name' => L10n::t('Edit Group Name'), + '$edit_name' => DI::l10n()->t('Edit Group Name'), '$editable' => 1, ]; } @@ -276,10 +288,10 @@ class Group extends BaseModule } $groupeditor = [ - 'label_members' => L10n::t('Members'), + 'label_members' => DI::l10n()->t('Members'), 'members' => [], - 'label_contacts' => L10n::t('All Contacts'), - 'group_is_empty' => L10n::t('Group is empty'), + 'label_contacts' => DI::l10n()->t('All Contacts'), + 'group_is_empty' => DI::l10n()->t('Group is empty'), 'contacts' => [], ]; @@ -292,7 +304,7 @@ class Group extends BaseModule $entry['label'] = 'members'; $entry['photo_menu'] = ''; $entry['change_member'] = [ - 'title' => L10n::t("Remove contact from group"), + 'title' => DI::l10n()->t("Remove contact from group"), 'gid' => $group['id'], 'cid' => $member['id'], 'sec_token' => $sec_token @@ -305,14 +317,15 @@ class Group extends BaseModule } if ($nogroup) { - $contacts = Model\Contact::getUngroupedList(local_user()); + $contacts = Model\Contact\Group::listUngrouped(local_user()); } else { $contacts_stmt = DBA::select('contact', [], - ['uid' => local_user(), 'pending' => false, 'blocked' => false, 'self' => false], + ['rel' => [Model\Contact::FOLLOWER, Model\Contact::FRIEND, Model\Contact::SHARING], + 'uid' => local_user(), 'pending' => false, 'blocked' => false, 'failed' => false, 'self' => false], ['order' => ['name']] ); $contacts = DBA::toArray($contacts_stmt); - $context['$desc'] = L10n::t('Click on a contact to add or remove.'); + $context['$desc'] = DI::l10n()->t('Click on a contact to add or remove.'); } if (DBA::isResult($contacts)) { @@ -326,7 +339,7 @@ class Group extends BaseModule if (!$nogroup) { $entry['change_member'] = [ - 'title' => L10n::t("Add contact to group"), + 'title' => DI::l10n()->t("Add contact to group"), 'gid' => $group['id'], 'cid' => $member['id'], 'sec_token' => $sec_token