clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix formatting in Model\Group 

- Improve logging call
- Replace removed App->getDatabase call
This commit is contained in:
Hypolite Petovan 2019-07-28 09:39:45 -04:00
parent cb38fe4e72
commit f010beaa95
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/Model/Group.php
View File

@ -2,6 +2,7 @@
/** /**
* @file src/Model/Group.php * @file src/Model/Group.php
*/ */
namespace Friendica\Model; namespace Friendica\Model;
use Friendica\BaseModule; use Friendica\BaseModule;
@ -22,17 +23,13 @@ class Group extends BaseObject
public static function getByUserId($uid, $includesDeleted = false) public static function getByUserId($uid, $includesDeleted = false)
{ {
$DB = self::getApp()->getDatabase();
$conditions = ['uid' => $uid]; $conditions = ['uid' => $uid];
if (!$includesDeleted) { if (!$includesDeleted) {
$conditions['deleted'] = false; $conditions['deleted'] = false;
} }
$groupsStmt = $DB->select('group', [], $conditions); return DBA::selectToArray('group', [], $conditions);
return $DB->toArray($groupsStmt);
} }
/** /**
@ -93,8 +90,8 @@ class Group extends BaseObject
/** /**
* Update group information. * Update group information.
* *
* @param int $id Group ID * @param int $id Group ID
* @param string $name Group name * @param string $name Group name
* *
* @return bool Was the update successful? * @return bool Was the update successful?
* @throws \Exception * @throws \Exception
@ -186,8 +183,9 @@ class Group extends BaseObject
* @return boolean * @return boolean
* @throws \Exception * @throws \Exception
*/ */
public static function remove($gid) { public static function remove($gid)
if (! $gid) { {
if (!$gid) {
return false; return false;
} }
@ -231,14 +229,15 @@ 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 * @param string $name
* @return bool * @return bool
* @throws \Exception * @throws \Exception
* @deprecated Use Group::remove instead
*
*/ */
public static function removeByName($uid, $name) { public static function removeByName($uid, $name)
{
$return = false; $return = false;
if (!empty($uid) && !empty($name)) { if (!empty($uid) && !empty($name)) {
$gid = self::getIdByName($uid, $name); $gid = self::getIdByName($uid, $name);
@ -296,13 +295,13 @@ 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 string $name
* @param int $cid * @param int $cid
* @return boolean * @return boolean
* @throws \Exception * @throws \Exception
* @deprecated Use Group::removeMember instead
*
*/ */
public static function removeMemberByName($uid, $name, $cid) public static function removeMemberByName($uid, $name, $cid)
{ {
@ -361,7 +360,7 @@ class Group extends BaseObject
} }
$stmt = DBA::select('group_member', ['contact-id'], ['gid' => $group_ids]); $stmt = DBA::select('group_member', ['contact-id'], ['gid' => $group_ids]);
while($group_member = DBA::fetch($stmt)) { while ($group_member = DBA::fetch($stmt)) {
$return[] = $group_member['contact-id']; $return[] = $group_member['contact-id'];
} }
DBA::close($stmt); DBA::close($stmt);
@ -402,7 +401,7 @@ class Group extends BaseObject
} }
DBA::close($stmt); DBA::close($stmt);
Logger::info('groups: ' . print_r($display_groups, true)); Logger::info('Got groups', $display_groups);
if ($label == '') { if ($label == '') {
$label = L10n::t('Default privacy group for new contacts'); $label = L10n::t('Default privacy group for new contacts');