X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FGroup.php;h=0af10995b4a70e698105993a58ad8b9678930834;hb=08da1ed038c9b193ded0ca70b3b1c1085bb7e90a;hp=b32b61e103036659e17956ac04f8cd6a1988ec07;hpb=8821d33f73785884cfce83e7b23d3ef19cc1bc11;p=friendica.git diff --git a/src/Model/Group.php b/src/Model/Group.php index b32b61e103..0af10995b4 100644 --- a/src/Model/Group.php +++ b/src/Model/Group.php @@ -10,11 +10,6 @@ use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\Renderer; use Friendica\Database\DBA; -use Friendica\Util\Security; - -require_once 'boot.php'; -require_once 'include/dba.php'; -require_once 'include/text.php'; /** * @brief functions for interacting with the group database table @@ -26,14 +21,15 @@ class Group extends BaseObject * * Note: If we found a deleted group with the same name, we restore it * - * @param int $uid + * @param int $uid * @param string $name * @return boolean + * @throws \Exception */ public static function create($uid, $name) { $return = false; - if (x($uid) && x($name)) { + if (!empty($uid) && !empty($name)) { $gid = self::getIdByName($uid, $name); // check for dupes if ($gid !== false) { // This could be a problem. @@ -60,10 +56,11 @@ class Group extends BaseObject /** * Update group information. * - * @param int $id Group ID + * @param int $id Group ID * @param string $name Group name * * @return bool Was the update successful? + * @throws \Exception */ public static function update($id, $name) { @@ -75,6 +72,7 @@ class Group extends BaseObject * * @param int $cid * @return array + * @throws \Exception */ public static function getIdsByContactId($cid) { @@ -96,9 +94,10 @@ class Group extends BaseObject * Count unread items of each groups of the local user * * @return array - * 'id' => group id - * 'name' => group name - * 'count' => counted unseen group items + * 'id' => group id + * 'name' => group name + * 'count' => counted unseen group items + * @throws \Exception */ public static function countUnseen() { @@ -125,9 +124,10 @@ class Group extends BaseObject * * Returns false if no group has been found. * - * @param int $uid + * @param int $uid * @param string $name * @return int|boolean + * @throws \Exception */ public static function getIdByName($uid, $name) { @@ -148,6 +148,7 @@ class Group extends BaseObject * * @param int $gid * @return boolean + * @throws \Exception */ public static function remove($gid) { if (! $gid) { @@ -192,17 +193,18 @@ class Group extends BaseObject } /** - * @brief Mark a group as deleted based on its name + * @brief Mark a group as deleted based on its name * * @deprecated Use Group::remove instead * - * @param int $uid + * @param int $uid * @param string $name * @return bool + * @throws \Exception */ public static function removeByName($uid, $name) { $return = false; - if (x($uid) && x($name)) { + if (!empty($uid) && !empty($name)) { $gid = self::getIdByName($uid, $name); $return = self::remove($gid); @@ -217,6 +219,7 @@ class Group extends BaseObject * @param int $gid * @param int $cid * @return boolean + * @throws \Exception */ public static function addMember($gid, $cid) { @@ -241,6 +244,7 @@ class Group extends BaseObject * @param int $gid * @param int $cid * @return boolean + * @throws \Exception */ public static function removeMember($gid, $cid) { @@ -254,14 +258,15 @@ class Group extends BaseObject } /** - * @brief Removes a contact from a group based on its name + * @brief Removes a contact from a group based on its name * * @deprecated Use Group::removeMember instead * - * @param int $uid + * @param int $uid * @param string $name - * @param int $cid + * @param int $cid * @return boolean + * @throws \Exception */ public static function removeMemberByName($uid, $name, $cid) { @@ -275,9 +280,10 @@ class Group extends BaseObject /** * @brief Returns the combined list of contact ids from a group id list * - * @param array $group_ids + * @param array $group_ids * @param boolean $check_dead * @return array + * @throws \Exception */ public static function expand($group_ids, $check_dead = false) { @@ -302,15 +308,14 @@ class Group extends BaseObject /** * @brief Returns a templated group selection list * - * @param int $uid - * @param int $gid An optional pre-selected group + * @param int $uid + * @param int $gid An optional pre-selected group * @param string $label An optional label of the list * @return string + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function displayGroupSelection($uid, $gid = 0, $label = '') { - $o = ''; - $stmt = DBA::select('group', [], ['deleted' => 0, 'uid' => $uid], ['order' => ['name']]); $display_groups = [ @@ -346,17 +351,16 @@ class Group extends BaseObject * @param string $every * @param string $each * @param string $editmode - * 'standard' => include link 'Edit groups' - * 'extended' => include link 'Create new group' - * 'full' => include link 'Create new group' and provide for each group a link to edit this group - * @param int $group_id - * @param int $cid + * 'standard' => include link 'Edit groups' + * 'extended' => include link 'Create new group' + * 'full' => include link 'Create new group' and provide for each group a link to edit this group + * @param string $group_id + * @param int $cid * @return string + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function sidebarWidget($every = 'contact', $each = 'group', $editmode = 'standard', $group_id = '', $cid = 0) { - $o = ''; - if (!local_user()) { return ''; } @@ -400,6 +404,11 @@ class Group extends BaseObject ]; } + // Don't show the groups on the network page when there is only one + if ((count($display_groups) <= 2) && ($each == 'network')) { + return ''; + } + $tpl = Renderer::getMarkupTemplate('group_side.tpl'); $o = Renderer::replaceMacros($tpl, [ '$add' => L10n::t('add'),