aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-10-09 21:13:58 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-10-09 21:13:58 +0000
commit4aace687f6d7d5f5b603c4bda74f2c2bd0e3dca5 (patch)
tree250663a145b49747d656d7db592b592ca7153891
parent34e28b1ccb73cb488f36cec692c854f9502cdd18 (diff)
downloadelgg-4aace687f6d7d5f5b603c4bda74f2c2bd0e3dca5.tar.gz
elgg-4aace687f6d7d5f5b603c4bda74f2c2bd0e3dca5.tar.bz2
Standardized actions.php
git-svn-id: http://code.elgg.org/elgg/trunk@3522 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/actions.php490
1 files changed, 242 insertions, 248 deletions
diff --git a/engine/lib/actions.php b/engine/lib/actions.php
index f06f6f0aa..2a9b930b2 100644
--- a/engine/lib/actions.php
+++ b/engine/lib/actions.php
@@ -1,253 +1,247 @@
<?php
+/**
+ * Elgg actions
+ * Allows system modules to specify actions
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
- /**
- * Elgg actions
- * Allows system modules to specify actions
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-
- // Action setting and run *************************************************
-
- /**
- * Loads an action script, if it exists, then forwards elsewhere
- *
- * @param string $action The requested action
- * @param string $forwarder Optionally, the location to forward to
- */
-
- function action($action, $forwarder = "") {
-
- global $CONFIG;
-
-
- $query = parse_url($_SERVER['REQUEST_URI']);
- if (isset($query['query'])) {
- $query = $query['query'];
- $query = rawurldecode($query);
- $query = explode('&',$query);
- if (sizeof($query) > 0) {
- foreach($query as $queryelement) {
- $vals = explode('=',$queryelement, 2);
- if (sizeof($vals) > 1) {
- set_input(trim($vals[0]),trim($vals[1]));
- }
+// Action setting and run *************************************************
+
+/**
+* Loads an action script, if it exists, then forwards elsewhere
+*
+* @param string $action The requested action
+* @param string $forwarder Optionally, the location to forward to
+*/
+
+function action($action, $forwarder = "") {
+ global $CONFIG;
+
+ $query = parse_url($_SERVER['REQUEST_URI']);
+ if (isset($query['query'])) {
+ $query = $query['query'];
+ $query = rawurldecode($query);
+ $query = explode('&',$query);
+ if (sizeof($query) > 0) {
+ foreach($query as $queryelement) {
+ $vals = explode('=',$queryelement, 2);
+ if (sizeof($vals) > 1) {
+ set_input(trim($vals[0]),trim($vals[1]));
+ }
+ }
+ }
+ }
+
+ $forwarder = str_replace($CONFIG->url, "", $forwarder);
+ $forwarder = str_replace("http://", "", $forwarder);
+ $forwarder = str_replace("@", "", $forwarder);
+
+ if (substr($forwarder,0,1) == "/") {
+ $forwarder = substr($forwarder,1);
+ }
+
+ if (isset($CONFIG->actions[$action])) {
+ if (
+ (isadminloggedin()) ||
+ (!$CONFIG->actions[$action]['admin'])
+ ) {
+ if ($CONFIG->actions[$action]['public'] || $_SESSION['id'] != -1) {
+
+ // Trigger action event TODO: This is only called before the primary action is called. We need to rethink actions for 1.5
+ $event_result = true;
+ $event_result = trigger_plugin_hook('action', $action, null, $event_result);
+
+ // Include action
+ // Event_result being false doesn't produce an error -
+ // since i assume this will be handled in the hook itself.
+ // TODO make this better!
+ if ($event_result) {
+ /** Refs #749: We now warn if action token is missing. Later this will be replaced with action_gatekeeper() as detailed in #750 */
+ if (!validate_action_token(false)) {
+ // Display a temporary warning message -
+ // in future versions this will be a hard fail via an action gatekeeper.
+ $message = "WARNING: Action $action was called without an action token. It is stongly recommended that you consider doing this. Plugin authors should use 'input/form' or pass is_action=true to 'output/confirmlink' or 'output/url'.";
+
+ //if ((!isset($CONFIG->disable_action_token_warning)) || (!$CONFIG->disable_action_token_warning))
+ // register_error($message);
+
+ error_log($message);
+ }
+
+ if (!include($CONFIG->actions[$action]['file'])) {
+ register_error(sprintf(elgg_echo('actionundefined'),$action));
}
}
+ } else {
+ register_error(elgg_echo('actionloggedout'));
}
-
- $forwarder = str_replace($CONFIG->url, "", $forwarder);
- $forwarder = str_replace("http://", "", $forwarder);
- $forwarder = str_replace("@", "", $forwarder);
-
- if (substr($forwarder,0,1) == "/") {
- $forwarder = substr($forwarder,1);
- }
-
- if (isset($CONFIG->actions[$action])) {
- if (
- (isadminloggedin()) ||
- (!$CONFIG->actions[$action]['admin'])
- ) {
- if ($CONFIG->actions[$action]['public'] || $_SESSION['id'] != -1) {
-
- // Trigger action event TODO: This is only called before the primary action is called. We need to rethink actions for 1.5
- $event_result = true;
- $event_result = trigger_plugin_hook('action', $action, null, $event_result);
-
- // Include action
- if ($event_result) // Event_result being false doesn't produce an error - since i assume this will be handled in the hook itself. TODO make this better!
- {
- /** Refs #749: We now warn if action token is missing. Later this will be replaced with action_gatekeeper() as detailed in #750 */
- if (!validate_action_token(false))
- {
- // Display a temporary warning message - in future versions this will be a hard fail via an action gatekeeper.
- $message = "WARNING: Action $action was called without an action token. It is stongly recommended that you consider doing this. Plugin authors should use 'input/form' or pass is_action=true to 'output/confirmlink' or 'output/url'.";
-
- //if ((!isset($CONFIG->disable_action_token_warning)) || (!$CONFIG->disable_action_token_warning))
- // register_error($message);
-
- error_log($message);
- }
-
- if (include($CONFIG->actions[$action]['file'])) {
- } else {
- register_error(sprintf(elgg_echo('actionundefined'),$action));
- }
- }
- } else {
- register_error(elgg_echo('actionloggedout'));
- }
- }
- } else {
- register_error(sprintf(elgg_echo('actionundefined'),$action));
- }
-
-
- forward($CONFIG->url . $forwarder);
-
- }
-
- /**
- * Registers a particular action in memory
- *
- * @param string $action The name of the action (eg "register", "account/settings/save")
- * @param boolean $public Can this action be accessed by people not logged into the system?
- * @param string $filename Optionally, the filename where this action is located
- * @param boolean $admin_only Whether this action is only available to admin users.
- */
-
- function register_action($action, $public = false, $filename = "", $admin_only = false) {
- global $CONFIG;
-
- if (!isset($CONFIG->actions)) {
- $CONFIG->actions = array();
- }
-
- if (empty($filename)) {
- $path = "";
- if (isset($CONFIG->path)) $path = $CONFIG->path;
-
- $filename = $path . "actions/" . $action . ".php";
- }
-
- $CONFIG->actions[$action] = array('file' => $filename, 'public' => $public, 'admin' => $admin_only);
- return true;
- }
-
- /**
- * Actions to perform on initialisation
- *
- * @param string $event Events API required parameters
- * @param string $object_type Events API required parameters
- * @param string $object Events API required parameters
- */
-
- function actions_init($event, $object_type, $object) {
- register_action("error");
- return true;
- }
-
- /**
- * Validate an action token, returning true if valid and false if not
- *
- * @return unknown
- */
- function validate_action_token($visibleerrors = true)
- {
- $token = get_input('__elgg_token');
- $ts = get_input('__elgg_ts');
- $session_id = session_id();
-
- if (($token) && ($ts) && ($session_id))
- {
- // generate token, check with input and forward if invalid
- $generated_token = generate_action_token($ts);
-
- // Validate token
- if (strcmp($token, $generated_token)==0)
- {
- $hour = 60*60;
- $now = time();
-
- // Validate time to ensure its not crazy
- if (($ts>$now-$hour) && ($ts<$now+$hour))
- {
- $returnval = true; // We have already got this far, so unless anything else says something to the contry we assume we're ok
-
- $returnval = trigger_plugin_hook('action_gatekeeper:permissions:check', 'all', array(
- 'token' => $token,
- 'time' => $ts
- ), $returnval);
-
- if ($returnval)
- return true;
- else if ($visibleerrors)
- register_error(elgg_echo('actiongatekeeper:pluginprevents'));
- }
- else if ($visibleerrors)
- register_error(elgg_echo('actiongatekeeper:timeerror'));
- }
- else if ($visibleerrors)
- register_error(elgg_echo('actiongatekeeper:tokeninvalid'));
- }
- else if ($visibleerrors)
- register_error(elgg_echo('actiongatekeeper:missingfields'));
-
- return false;
- }
-
- /**
- * Action gatekeeper.
- * This function verifies form input for security features (like a generated token), and forwards
- * the page if they are invalid.
- *
- * Place at the head of actions.
- */
- function action_gatekeeper()
- {
- if (validate_action_token())
- return true;
-
- forward();
- exit;
- }
-
- /**
- * Generate a token for the current user suitable for being placed in a hidden field in action forms.
- *
- * @param int $timestamp Unix timestamp
- */
- function generate_action_token($timestamp)
- {
- // Get input values
- $site_secret = get_site_secret();
-
- // Current session id
- $session_id = session_id();
-
- // Get user agent
- $ua = $_SERVER['HTTP_USER_AGENT'];
-
- // Session token
- $st = $_SESSION['__elgg_session'];
-
- if (($site_secret) && ($session_id))
- return md5($site_secret.$timestamp.$session_id.$ua.$st);
-
- return false;
- }
-
- /**
- * Initialise the site secret.
- *
- */
- function init_site_secret()
- {
- $secret = md5(rand().microtime());
- if (datalist_set('__site_secret__', $secret))
- return $secret;
-
- return false;
- }
-
- /**
- * Retrieve the site secret.
- *
- */
- function get_site_secret()
- {
- $secret = datalist_get('__site_secret__');
- if (!$secret) $secret = init_site_secret();
-
- return $secret;
- }
-
- // Register some actions ***************************************************
-
- register_elgg_event_handler("init","system","actions_init");
-
-?> \ No newline at end of file
+ }
+ } else {
+ register_error(sprintf(elgg_echo('actionundefined'),$action));
+ }
+
+ forward($CONFIG->url . $forwarder);
+}
+
+/**
+ * Registers a particular action in memory
+ *
+ * @param string $action The name of the action (eg "register", "account/settings/save")
+ * @param boolean $public Can this action be accessed by people not logged into the system?
+ * @param string $filename Optionally, the filename where this action is located
+ * @param boolean $admin_only Whether this action is only available to admin users.
+ */
+function register_action($action, $public = false, $filename = "", $admin_only = false) {
+ global $CONFIG;
+
+ if (!isset($CONFIG->actions)) {
+ $CONFIG->actions = array();
+ }
+
+ if (empty($filename)) {
+ $path = "";
+ if (isset($CONFIG->path)) {
+ $path = $CONFIG->path;
+ }
+
+ $filename = $path . "actions/" . $action . ".php";
+ }
+
+ $CONFIG->actions[$action] = array('file' => $filename, 'public' => $public, 'admin' => $admin_only);
+ return true;
+}
+
+/**
+ * Actions to perform on initialisation
+ *
+ * @param string $event Events API required parameters
+ * @param string $object_type Events API required parameters
+ * @param string $object Events API required parameters
+ */
+function actions_init($event, $object_type, $object) {
+ register_action("error");
+ return true;
+}
+
+/**
+ * Validate an action token, returning true if valid and false if not
+ *
+ * @return unknown
+ */
+function validate_action_token($visibleerrors = true) {
+ $token = get_input('__elgg_token');
+ $ts = get_input('__elgg_ts');
+ $session_id = session_id();
+
+ if (($token) && ($ts) && ($session_id)) {
+ // generate token, check with input and forward if invalid
+ $generated_token = generate_action_token($ts);
+
+ // Validate token
+ if (strcmp($token, $generated_token)==0) {
+ $hour = 60*60;
+ $now = time();
+
+ // Validate time to ensure its not crazy
+ if (($ts>$now-$hour) && ($ts<$now+$hour)) {
+ // We have already got this far, so unless anything
+ // else says something to the contry we assume we're ok
+ $returnval = true;
+
+ $returnval = trigger_plugin_hook('action_gatekeeper:permissions:check', 'all', array(
+ 'token' => $token,
+ 'time' => $ts
+ ), $returnval);
+
+ if ($returnval) {
+ return true;
+ } else if ($visibleerrors) {
+ register_error(elgg_echo('actiongatekeeper:pluginprevents'));
+ }
+ } else if ($visibleerrors) {
+ register_error(elgg_echo('actiongatekeeper:timeerror'));
+ }
+ } else if ($visibleerrors) {
+ register_error(elgg_echo('actiongatekeeper:tokeninvalid'));
+ }
+ }
+ else if ($visibleerrors) {
+ register_error(elgg_echo('actiongatekeeper:missingfields'));
+ }
+
+ return false;
+}
+
+/**
+* Action gatekeeper.
+* This function verifies form input for security features (like a generated token), and forwards
+* the page if they are invalid.
+*
+* Place at the head of actions.
+*/
+function action_gatekeeper() {
+ if (validate_action_token()) {
+ return true;
+ }
+
+ forward();
+ exit;
+}
+
+/**
+ * Generate a token for the current user suitable for being placed in a hidden field in action forms.
+ *
+ * @param int $timestamp Unix timestamp
+ */
+function generate_action_token($timestamp) {
+ // Get input values
+ $site_secret = get_site_secret();
+
+ // Current session id
+ $session_id = session_id();
+
+ // Get user agent
+ $ua = $_SERVER['HTTP_USER_AGENT'];
+
+ // Session token
+ $st = $_SESSION['__elgg_session'];
+
+ if (($site_secret) && ($session_id)) {
+ return md5($site_secret.$timestamp.$session_id.$ua.$st);
+ }
+
+ return false;
+}
+
+/**
+ * Initialise the site secret.
+ *
+ */
+function init_site_secret() {
+ $secret = md5(rand().microtime());
+ if (datalist_set('__site_secret__', $secret)) {
+ return $secret;
+ }
+
+ return false;
+}
+
+/**
+ * Retrieve the site secret.
+ *
+ */
+function get_site_secret() {
+ $secret = datalist_get('__site_secret__');
+ if (!$secret) {
+ $secret = init_site_secret();
+ }
+
+ return $secret;
+}
+
+// Register some actions ***************************************************
+register_elgg_event_handler("init","system","actions_init");