Friendica/friendica
Friendica/friendica
1
0
Fork 1
mirror of https://git.friendi.ca/friendica/friendica.git synced 2025-06-17 02:45:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

eradicate redundant get_uid function

Browse source
This commit is contained in:
Mike Macgirvin 2010-10-18 14:34:59 -07:00
parent 103814ab8e
commit ac824fe83e
18 changed files with 79 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

18
mod/group.php
View file

@ -22,10 +22,10 @@ function group_post(&$a) {
if(($a->argc == 2) && ($a->argv[1] === 'new')) {
$name = notags(trim($_POST['groupname']));
$r = group_add(get_uid(),$name);
$r = group_add(local_user(),$name);
if($r) {
notice( t('Group created.') . EOL );
$r = group_byname(get_uid(),$name);
$r = group_byname(local_user(),$name);
if($r)
goaway($a->get_baseurl() . '/group/' . $r);
}
@ -37,7 +37,7 @@ function group_post(&$a) {
if(($a->argc == 2) && (intval($a->argv[1]))) {
$r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($a->argv[1]),
intval(get_uid())
intval(local_user())
);
if(! count($r)) {
notice( t('Group not found.') . EOL );
@ -49,7 +49,7 @@ function group_post(&$a) {
if((strlen($groupname)) && ($groupname != $group['name'])) {
$r = q("UPDATE `group` SET `name` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1",
dbesc($groupname),
intval(get_uid()),
intval(local_user()),
intval($group['id'])
);
if($r)
@ -59,14 +59,14 @@ function group_post(&$a) {
array_walk($members,'validate_members');
$r = q("DELETE FROM `group_member` WHERE `gid` = %d AND `uid` = %d",
intval($a->argv[1]),
intval(get_uid())
intval(local_user())
);
$result = true;
if(count($members)) {
foreach($members as $member) {
$r = q("INSERT INTO `group_member` ( `uid`, `gid`, `contact-id`)
VALUES ( %d, %d, %d )",
intval(get_uid()),
intval(local_user()),
intval($group['id']),
intval($member)
);
@ -98,10 +98,10 @@ function group_content(&$a) {
if(intval($a->argv[2])) {
$r = q("SELECT `name` FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($a->argv[2]),
intval(get_uid())
intval(local_user())
);
if(count($r))
$result = group_rmv(get_uid(),$r[0]['name']);
$result = group_rmv(local_user(),$r[0]['name']);
if($result)
notice( t('Group removed.') . EOL);
else
@ -116,7 +116,7 @@ function group_content(&$a) {
require_once('view/acl_selectors.php');
$r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($a->argv[1]),
intval(get_uid())
intval(local_user())
);
if(! count($r)) {
notice( t('Group not found.') . EOL );