X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FGroup.php;h=d9caac32daed9b102d4f48e0eeffead99971f554;hb=1fb47b96aa80d33b062fad42320065dd405be5e7;hp=e9d4020ead04ea658945ab315f07282d4c8ba3b2;hpb=5dfee31108fc92a7abca5f99b8fdf1b34aec5dd5;p=friendica.git

diff --git a/src/Module/Group.php b/src/Module/Group.php
index e9d4020ead..d9caac32da 100644
--- a/src/Module/Group.php
+++ b/src/Module/Group.php
@@ -1,13 +1,27 @@
 <?php
 /**
- * @file src/Module/Group.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 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;
@@ -39,7 +53,6 @@ class Group extends BaseModule
 			$name = Strings::escapeTags(trim($_POST['groupname']));
 			$r = Model\Group::create(local_user(), $name);
 			if ($r) {
-				info(DI::l10n()->t('Group created.'));
 				$r = Model\Group::getIdByName(local_user(), $name);
 				if ($r) {
 					DI::baseUrl()->redirect('group/' . $r);
@@ -61,8 +74,8 @@ class Group extends BaseModule
 			}
 			$groupname = Strings::escapeTags(trim($_POST['groupname']));
 			if (strlen($groupname) && ($groupname != $group['name'])) {
-				if (Model\Group::update($group['id'], $groupname)) {
-					info(DI::l10n()->t('Group name changed.'));
+				if (!Model\Group::update($group['id'], $groupname)) {
+					notice(DI::l10n()->t('Group name was not changed.'));
 				}
 			}
 		}
@@ -147,7 +160,7 @@ class Group extends BaseModule
 		// 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');
@@ -202,9 +215,7 @@ class Group extends BaseModule
 					DI::baseUrl()->redirect('contact');
 				}
 
-				if (Model\Group::remove($a->argv[2])) {
-					info(DI::l10n()->t('Group removed.'));
-				} else {
+				if (!Model\Group::remove($a->argv[2])) {
 					notice(DI::l10n()->t('Unable to remove group.'));
 				}
 			}
@@ -228,7 +239,7 @@ class Group extends BaseModule
 				DI::baseUrl()->redirect('contact');
 			}
 
-			$members = Model\Contact::getByGroupId($group['id']);
+			$members = Model\Contact\Group::getById($group['id']);
 			$preselected = [];
 
 			if (count($members)) {
@@ -244,7 +255,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) {
@@ -305,7 +316,7 @@ 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],