aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Macgirvin <mike@macgirvin.com>2010-07-13 04:18:57 -0700
committerMike Macgirvin <mike@macgirvin.com>2010-07-13 04:18:57 -0700
commite4325bc56580a8e6df7aca64b9d101f10c5fc782 (patch)
tree69fdf6544e79db80ec564735633ad7be805d1b50
parentc3273dfcdc6d4dec893e7ae755a647e88665c815 (diff)
downloadvolse-hubzilla-e4325bc56580a8e6df7aca64b9d101f10c5fc782.tar.gz
volse-hubzilla-e4325bc56580a8e6df7aca64b9d101f10c5fc782.tar.bz2
volse-hubzilla-e4325bc56580a8e6df7aca64b9d101f10c5fc782.zip
.
-rw-r--r--mod/group.php12
-rw-r--r--wip/todo18
2 files changed, 19 insertions, 11 deletions
diff --git a/mod/group.php b/mod/group.php
index 4ab810242..099ae7dd3 100644
--- a/mod/group.php
+++ b/mod/group.php
@@ -6,7 +6,7 @@ function validate_members(&$item) {
function group_init(&$a) {
require_once('include/group.php');
- $a->page['aside'] .= group_side();
+ $a->page['aside'] = group_side();
}
@@ -30,7 +30,7 @@ function group_post(&$a) {
}
else
notice("Could not create group." . EOL );
-// goaway($a->get_baseurl() . '/group');
+ goaway($a->get_baseurl() . '/group');
return; // NOTREACHED
}
if(($a->argc == 2) && (intval($a->argv[1]))) {
@@ -50,6 +50,8 @@ function group_post(&$a) {
intval($_SESSION['uid']),
intval($group['id'])
);
+ if($r)
+ notice("Group name changed." . EOL );
}
$members = $_POST['group_members_select'];
array_walk($members,'validate_members');
@@ -57,6 +59,7 @@ function group_post(&$a) {
intval($a->argv[1]),
intval($_SESSION['uid'])
);
+ $result = true;
if(count($members)) {
foreach($members as $member) {
$r = q("INSERT INTO `group_member` ( `uid`, `gid`, `contact-id`)
@@ -65,8 +68,13 @@ function group_post(&$a) {
intval($group['id']),
intval($member)
);
+ if(! $r)
+ $result = false;
}
}
+ if($result)
+ notice("Membership list updated." . EOL);
+ $a->page['aside'] = group_side();
}
}
diff --git a/wip/todo b/wip/todo
index ca5c298ae..be2a38159 100644
--- a/wip/todo
+++ b/wip/todo
@@ -7,13 +7,13 @@ profile photo to self contact page? - resolve profile photo inconsistency
use photo hash to notify of changes?
-contact editor
- block photo
+>>>>>>>>contact editor
+>>>>>>>> block photo
-profile "you name it" field
+>>>>>>>>profile "you name it" field
-group - delete, theme
+group - delete (keep id in acl lists to prvent them from breaking security)
pager - photos
@@ -21,13 +21,13 @@ photos/albums/ java uploader
item delete
-item edit
+>>>>>>>>item edit
dfrn_poll - import items
-local/remote indicator
+>>>>>>>>local/remote indicator
-side/text
+>>>>>>>>side/text
notififier abstraction
@@ -48,9 +48,9 @@ email
chat
-plugin api
+>>>>>>>>plugin api
-theme api
+>>>>>>>>theme api
ajax