aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-07-18 18:29:44 +0000
committerben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-07-18 18:29:44 +0000
commitf3711a1ebee80f0e922f5447b064718c77f979ec (patch)
tree4d9c8310e37a2e430dc42ac41298a21821c589a6
parent361bff59658e6119b76e7ff31cd67c6054c93c8f (diff)
downloadelgg-f3711a1ebee80f0e922f5447b064718c77f979ec.tar.gz
elgg-f3711a1ebee80f0e922f5447b064718c77f979ec.tar.bz2
Moved can_write_to_container into elgglib
git-svn-id: https://code.elgg.org/elgg/trunk@1474 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/entities.php41
-rw-r--r--engine/lib/group.php32
2 files changed, 40 insertions, 33 deletions
diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index ad793b907..7d7551a3d 100644
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -994,6 +994,42 @@
}
}
+ }
+
+ /**
+ * Determine whether a given user is able to write to a given container.
+ *
+ * @param int $user_guid The user guid, or 0 for $_SESSION['user']->getGUID()
+ * @param int $container_guid The container, or 0 for the current page owner.
+ */
+ function can_write_to_container($user_guid = 0, $container_guid = 0)
+ {
+ global $CONFIG;
+
+ $user_guid = (int)$user_guid;
+ if (!$user_guid) $user_guid = $_SESSION['user']->getGUID();
+ $user = get_entity($user_guid);
+
+ $container_guid = (int)$container_guid;
+ if (!$container_guid) $container_guid = page_owner();
+
+ $container = get_entity($container_guid);
+
+ if (($container) && ($user))
+ {
+ // Basics, see if the user is a member of the group.
+ if ($container instanceof ElggGroup)
+ if (!$container->isMember($user)) return false;
+
+ // If the user can edit the container, they can also write to it
+ if ($container->canEdit()) return true;
+
+ // See if anyone else has anything to say
+ return trigger_plugin_hook('container_permissions_check',$entity->type,array('container' => $container, 'user' => $user), false);
+
+ }
+
+ return false;
}
/**
@@ -1018,7 +1054,10 @@
if ($site_guid == 0)
$site_guid = $CONFIG->site_guid;
$site_guid = (int) $site_guid;
-
+ if ($container_guid == 0) $container_guid = $owner_guid;
+
+ if (!can_write_to_container($owner_guid, $container_guid)) return false;
+
if ($type=="") throw new InvalidParameterException(elgg_echo('InvalidParameterException:EntityTypeNotSet'));
return insert_data("INSERT into {$CONFIG->dbprefix}entities (type, subtype, owner_guid, site_guid, container_guid, access_id, time_created, time_updated) values ('$type',$subtype, $owner_guid, $site_guid, $container_guid, $access_id, $time, $time)");
diff --git a/engine/lib/group.php b/engine/lib/group.php
index 90ee650f3..f0ceb92fc 100644
--- a/engine/lib/group.php
+++ b/engine/lib/group.php
@@ -276,38 +276,6 @@
}
/**
- * Determine whether a given user is able to write to a given group.
- *
- * @param int $user_guid The user guid, or 0 for $_SESSION['user']->getGUID()
- * @param int $container_guid The container, or 0 for the current page owner.
- */
- function can_write_to_container($user_guid = 0, $container_guid = 0)
- {
- global $CONFIG;
-
- $user_guid = (int)$user_guid;
- if (!$user_guid) $user_guid = $_SESSION['user']->getGUID();
- $user = get_entity($user_guid);
-
- $container_guid = (int)$container_guid;
- if (!$container_guid) $container_guid = page_owner();
- $container = get_entity($container_guid);
-
- if (($container) && ($user))
- {
- // Basics, see if the user is a member of the group.
- if ($container instanceof ElggGroup)
- if (!$container->isMember($user)) return false;
-
- // See if anyone else has anything to say
- return trigger_plugin_hook('group_permissions_check',$entity->type,array('container' => $container, 'user' => $user), false);
-
- }
-
- return false;
- }
-
- /**
* Get the group entity.
*
* @param int $guid