aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-09-18 06:20:18 -0700
committerFriendika <info@friendika.com>2011-09-18 06:20:18 -0700
commit5899c9f406eb52c41c6b4ff87b0b313c26786cfe (patch)
tree7ef911c2ea32873a3dc9c7d1a91d92d8c3e54b52
parentda05ef2ae48beb0f3475cc705fde9a69e5947426 (diff)
downloadvolse-hubzilla-5899c9f406eb52c41c6b4ff87b0b313c26786cfe.tar.gz
volse-hubzilla-5899c9f406eb52c41c6b4ff87b0b313c26786cfe.tar.bz2
volse-hubzilla-5899c9f406eb52c41c6b4ff87b0b313c26786cfe.zip
bug #157 - allow deleted group to be revived, but warn of side effects
-rw-r--r--include/group.php20
1 files changed, 19 insertions, 1 deletions
diff --git a/include/group.php b/include/group.php
index d92e24e20..4f3d5ee91 100644
--- a/include/group.php
+++ b/include/group.php
@@ -6,8 +6,26 @@ function group_add($uid,$name) {
$ret = false;
if(x($uid) && x($name)) {
$r = group_byname($uid,$name); // check for dups
- if($r !== false)
+ if($r !== false) {
+
+ // This could be a problem.
+ // Let's assume we've just created a group which we once deleted
+ // all the old members are gone, but the group remains so we don't break any security
+ // access lists. What we're doing here is reviving the dead group, but old content which
+ // was restricted to this group may now be seen by the new group members.
+
+ $z = q("SELECT * FROM `group` WHERE `id` = %d LIMIT 1",
+ intval($r)
+ );
+ if(count($z) && $z[0]['deleted']) {
+ $r = q("UPDATE `group` SET `deleted` = 0 WHERE `uid` = %d AND `name` = '%s' LIMIT 1",
+ intval($uid),
+ dbesc($name)
+ );
+ notice( t('A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name.') . EOL);
+ }
return true;
+ }
$r = q("INSERT INTO `group` ( `uid`, `name` )
VALUES( %d, '%s' ) ",
intval($uid),