elgg_clear_sticky_form(), elgg_is_sticky_form(), and elgg_get_sticky_value().
+Version 1.7.2
+(xxxxx from http://code.elgg.org/elgg/branches/1.7)
+
+ UI Changes:
+ * Group "widgets" have been standardized with new blog and bookmark widgets.
+ * New group member listing page.
+ * Group forum topics can be edited including title and status.
+ * Added a group creation river entry.
+
+ Bugfixes:
+ * Fixed preview and draft saving for blog plugin.
+ * Page titles are now editable.
+ * Fixed several bugs with the new elgg_get* and elgg_list* functions.
+ * Groups do not show up as personal friend collections anymore.
+ * Fixed an upgrade issue with utf8 usernames.
+ * Encoding of & in group forums is fixed.
+
+ API changes:
+ * Added elgg_list_entities_from_metadata().
+ * Added elgg_send_email().
+ * Added remove_from_river_by_id().
+ * Added remove_from_register() for removing menu items.
+ * Added elgg_get_excerpt().
+ * Added elgg_get_friendly_title() and elgg_get_friendly_time().
+
+
Version 1.7.1
(April 21, 2010 from http://code.elgg.org/elgg/branches/1.7)
$method = get_input('method');
gatekeeper();
+$current_settings = get_user_notification_settings();
+
$result = false;
foreach ($method as $k => $v) {
- $result = set_user_notification_setting($_SESSION['user']->guid, $k, ($v == 'yes') ? true : false);
+ // check if setting has changed and skip if not
+ if ($current_settings->$k == ($v == 'yes')) {
+ continue;
+ }
+
+ $result = set_user_notification_setting(get_loggedin_userid(), $k, ($v == 'yes') ? true : false);
if (!$result) {
register_error(elgg_echo('notifications:usersettings:save:fail'));
if ($result) {
system_message(elgg_echo('notifications:usersettings:save:ok'));
-} else {
- register_error(elgg_echo('notifications:usersettings:save:fail'));
-}
\ No newline at end of file
+}
if ($user) {
$current_default_access = $user->getPrivateSetting('elgg_default_access');
- if ($default_access != $current_default_access) {
- if ($user->setPrivateSetting('elgg_default_access',$default_access)) {
+ if ($default_access !== $current_default_access) {
+ if ($user->setPrivateSetting('elgg_default_access', $default_access)) {
system_message(elgg_echo('user:default_access:success'));
} else {
register_error(elgg_echo('user:default_access:fail'));
* Override the default behaviour and allow results to show hidden entities as well.
* THIS IS A HACK.
*
- * TODO: Replace this with query object!
+ * @todo Replace this with query object!
*/
$ENTITY_SHOW_HIDDEN_OVERRIDE = false;
* Returns an SQL fragment that is true (or optionally false) if the given user has
* added an annotation with the given name to the given entity.
*
- * TODO: This is fairly generic so perhaps it could be moved to annotations.php
+ * @todo This is fairly generic so perhaps it could be moved to annotations.php
*
* @param string $annotation_name name of the annotation
- * @param string $entity_guid SQL string that evaluates to the GUID of the entity the annotation should be attached to
- * @param string $owner_guid SQL string that evaluates to the GUID of the owner of the annotation *
- * @param boolean $exists If set to true, will return true if the annotation exists, otherwise returns false
- * @return string An SQL fragment suitable for inserting into a WHERE clause
+ * @param string $entity_guid SQL string that evaluates to the GUID of the entity the annotation should be attached to
+ * @param string $owner_guid SQL string that evaluates to the GUID of the owner of the annotation *
+ * @param boolean $exists If set to true, will return true if the annotation exists, otherwise returns false
+ * @return string An SQL fragment suitable for inserting into a WHERE clause
*/
function get_annotation_sql($annotation_name, $entity_guid, $owner_guid, $exists) {
global $CONFIG;
/**
* Add access restriction sql code to a given query.
* Note that if this code is executed in privileged mode it will return blank.
- * @TODO: DELETE once Query classes are fully integrated
+ * @todo DELETE once Query classes are fully integrated
*
* @param string $table_prefix Optional table. prefix for the access code.
* @param int $owner
* @param int $collection_id
* @param array $options @see elgg_get_entities()
* @return array
- * @since 1.7
+ * @since 1.7.0
*/
function elgg_get_entities_from_access_id(array $options=array()) {
// restrict the resultset to access collection provided
*
* @param $entity_accessid (int) The entity's access id
* @return string e.g. Public, Private etc
- **/
+ * @since 1.7.0
+ */
function get_readable_access_level($entity_accessid){
$access = (int) $entity_accessid;
//get the access level for object in readable string
* Set if entity access system should be ignored.
*
* @return bool Previous ignore_access setting.
+ * @since 1.7.0
*/
function elgg_set_ignore_access($ignore = true) {
$elgg_access = elgg_get_access_object();
* Get current ignore access setting.
*
* @return bool
+ * @since 1.7.0
*/
function elgg_get_ignore_access() {
return elgg_get_access_object()->get_ignore_access();
* Decides if the access system is being ignored.
*
* @return bool
+ * @since 1.7.0
*/
function elgg_check_access_overrides($user_guid = null) {
if (!$user_guid || $user_guid <= 0) {
* Returns the ElggAccess object.
*
* @return ElggAccess
+ * @since 1.7.0
*/
function elgg_get_access_object() {
static $elgg_access;
* Override permissions system
*
* @return true|null
+ * @since 1.7.0
*/
function elgg_override_permissions_hook($hook, $type, $returnval, $params) {
$user_guid = get_loggedin_userid();
if ((isadminloggedin()) || (!$CONFIG->actions[$action]['admin'])) {
if ($CONFIG->actions[$action]['public'] || get_loggedin_userid()) {
- // Trigger action event TODO: This is only called before the primary action is called. We need to rethink actions for 1.5
+ // 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!
+ // @todo make this better!
if ($event_result) {
if (!include($CONFIG->actions[$action]['file'])) {
register_error(sprintf(elgg_echo('actionundefined'),$action));
* annotation_owner_guids => NULL|ARR guids for annotaiton owners
*
* @return array
+ * @since 1.7.0
*/
function elgg_get_entities_from_annotations(array $options = array()) {
$defaults = array(
/**
* Unregister an API method
* @param string $method The api name that was exposed
+ * @since 1.7.0
*/
function unexpose_function($method) {
global $API_METHODS;
* @param string $method The api name that was exposed
* @return true or throws an exception
* @throws APIException
+ * @since 1.7.0
*/
function authenticate_method($method) {
global $API_METHODS;
/**
* This fixes the post parameters that are munged due to page handler
+ * @since 1.7.0
*/
function include_post_data() {
* @param $parameters
* @return true on success or exception
* @throws APIException
+ * @since 1.7.0
*/
function verify_parameters($method, $parameters) {
global $API_METHODS;
* @param array $parameters Array of parameters
* @return string or exception
* @throws APIException
+ * @since 1.7.0
*/
function serialise_parameters($method, $parameters) {
global $API_METHODS;
* PAM: Confirm that the call includes a valid API key
* @return true if good API key - otherwise throws exception
* @throws APIException
+ * @since 1.7.0
*/
function api_auth_key() {
global $CONFIG;
* PAM: Confirm the HMAC signature
* @return true if success - otherwise throws exception
* @throws SecurityException
+ * @since 1.7.0
*/
function api_auth_hmac() {
global $CONFIG;
function map_api_hash($algo) {
$algo = strtolower(sanitise_string($algo));
$supported_algos = array(
- "md5" => "md5", // TODO: Consider phasing this out
+ "md5" => "md5", // @todo Consider phasing this out
"sha" => "sha1", // alias for sha1
"sha1" => "sha1",
"sha256" => "sha256"
/**
* Calculate a hash for some post data.
*
- * TODO: Work out how to handle really large bits of data.
+ * @todo Work out how to handle really large bits of data.
*
* @param string $postdata string The post data.
* @param string $algo The algorithm used.
* @param int $site_guid The ID of the site (default is current site)
* @return false if none available or array of stdClass objects
* (see users_apisessions schema for available variables in objects)
+ * @since 1.7.0
*/
function get_user_tokens($user_guid, $site_guid) {
global $CONFIG;
* @param string $token
* @param int $site_guid The ID of the site (default is current site)
* @return bool
+ * @since 1.7.0
*/
function remove_user_token($token, $site_guid) {
global $CONFIG;
* Remove expired tokens
*
* @return bool
+ * @since 1.7.0
*/
function remove_expired_user_tokens() {
global $CONFIG;
* @param string $handler web services type
* @param string $function Your function name
* @return true|false Depending on success
+ * @since 1.7.0
*/
function register_service_handler($handler, $function) {
global $CONFIG;
* with register_service_handler().
*
* @param string $handler web services type
+ * @return 1.7.0
*/
function unregister_service_handler($handler) {
global $CONFIG;
* @param string $filename
*/
protected function sanitise_filename($filename) {
- // TODO : Writeme
+ // @todo : Writeme
return $filename;
}
}
public function clear() {
- // TODO : writeme
+ // @todo writeme
}
public function __destruct() {
- // TODO: Check size and age, clean up accordingly
+ // @todo Check size and age, clean up accordingly
$size = 0;
$dir = $this->get_variable("cache_path");
unlink($dir.$f);
}
- // TODO: Size
+ // @todo Size
}
}
}
* This function, called by validate_platform(), will check whether the installed version of
* MySQL meets the minimum required.
*
- * TODO: If multiple dbs are supported check which db is supported and use the appropriate code to validate
+ * @todo If multiple dbs are supported check which db is supported and use the appropriate code to validate
* the appropriate version.
*
* @return bool
/**
* This is a factory function which produces an ElggCache object suitable for caching file load paths.
*
- * TODO: Can this be done in a cleaner way?
- * TODO: Swap to memcache etc?
+ * @todo Can this be done in a cleaner way?
+ * @todo Swap to memcache etc?
*/
function elgg_get_filepath_cache() {
global $CONFIG;
* @param string $register_name The name of the top-level register
* @param string $subregister_name The name of the subregister
* @return true|false Depending on success
+ * @since 1.7.0
*/
function remove_from_register($register_name, $subregister_name) {
global $CONFIG;
* @param string $event The event type
* @param string $object_type The object type
* @param string $function The function name
+ * @since 1.7.0
*/
function unregister_elgg_event_handler($event, $object_type, $function) {
global $CONFIG;
* @param string $hook The name of the hook
* @param string $entity_type The name of the type of entity (eg "user", "object" etc)
* @param string $function The name of a valid function to be run
+ * @since 1.7.0
*/
function unregister_plugin_hook($hook, $entity_type, $function) {
global $CONFIG;
switch ($errno) {
case E_USER_ERROR:
- error_log("ERROR: $error");
+ error_log("PHP ERROR: $error");
register_error("ERROR: $error");
// Since this is a fatal error, we want to stop any further execution but do so gracefully.
case E_WARNING :
case E_USER_WARNING :
- error_log("WARNING: $error");
+ error_log("PHP WARNING: $error");
break;
default:
global $CONFIG;
if (isset($CONFIG->debug) && $CONFIG->debug === 'NOTICE') {
- error_log("NOTICE: $error");
+ error_log("PHP NOTICE: $error");
}
}
* @param str $message User message
* @param str $level NOTICE | WARNING | ERROR | DEBUG
* @return bool
+ * @since 1.7.0
*/
function elgg_log($message, $level='NOTICE') {
global $CONFIG;
* @param bool $to_screen
* @param string $level
* @return void
+ * @since 1.7.0
*/
function elgg_dump($value, $to_screen = TRUE, $level = 'NOTICE') {
global $CONFIG;
* @param str $version human-readable *release* version the function was deprecated. No bloody A, B, (R)C, or D.
*
* @return bool
+ * @since 1.7.0
*/
function elgg_deprecated_notice($msg, $dep_version) {
// if it's a major release behind, visual and logged
* @param $options
* @param $singulars
* @return array
+ * @since 1.7.0
*/
function elgg_normalise_plural_options_array($options, $singulars) {
foreach ($singulars as $singular) {
* Useful function found in the comments on the PHP man page for ip2long.
* Returns 1 if an IP matches a given range.
*
- * TODO: Check licence... assuming this is PD since it was found several places on the interwebs..
+ * @todo Check licence... assuming this is PD since it was found several places on the interwebs..
* please check or rewrite.
*
* Matches:
* @param array $parts Associative array of URL components like parse_url() returns
* @param bool $htmlencode HTML Encode the url?
* @return str Full URL
- * @since 1.7
+ * @since 1.7.0
*/
function elgg_http_build_url(array $parts, $html_encode = TRUE) {
// build only what's given to us.
* @param str $link Full action URL
* @param bool $htmlencode html encode the url?
* @return str URL with action tokens
- * @since 1.7
+ * @since 1.7.0
*/
function elgg_add_action_tokens_to_url($url, $html_encode = TRUE) {
$components = parse_url($url);
* @param string $url
* @param string $element
* @return string
+ * @since 1.7.0
*/
function elgg_http_remove_url_query_element($url, $element) {
$url_array = parse_url($url);
* @param str $url
* @param array $elements k/v pairs.
* @return str
+ * @since 1.7.0
*/
function elgg_http_add_url_query_elements($url, array $elements) {
$url_array = parse_url($url);
*
* @param str $setting
* @return int
- * @since 1.7
+ * @since 1.7.0
* @link http://www.php.net/manual/en/function.ini-get.php
*/
function elgg_get_ini_setting_in_bytes($setting) {
define('ACCESS_FRIENDS', -2);
/**
- * @since 1.7
+ * @since 1.7.0
*/
define('ELGG_ENTITIES_ANY_VALUE', NULL);
define('ELGG_ENTITIES_NO_VALUE', 0);
/// Cache subtype searches
$SUBTYPE_CACHE = NULL;
-/// Require the locatable interface TODO: Move this into start.php?
+/// Require the locatable interface
+// @todo Move this into start.php?
require_once('location.php');
/**
throw new IOException(elgg_echo('IOException:BaseEntitySaveFailed'));
}
- // Save any unsaved metadata TODO: How to capture extra information (access id etc)
+ // Save any unsaved metadata
+ // @todo How to capture extra information (access id etc)
if (sizeof($this->temp_metadata) > 0) {
foreach($this->temp_metadata as $name => $value) {
$this->$name = $value;
}
}
- // Save any unsaved annotations metadata. TODO: How to capture extra information (access id etc)
+ // Save any unsaved annotations metadata.
+ // @todo How to capture extra information (access id etc)
if (sizeof($this->temp_annotations) > 0) {
foreach($this->temp_annotations as $name => $value) {
$this->annotate($name, $value);
global $ENTITY_CACHE;
if (!$ENTITY_CACHE) {
- //select_default_memcache('entity_cache'); // TODO: Replace with memcache?
+ //select_default_memcache('entity_cache'); // @todo Replace with memcache?
$ENTITY_CACHE = array();
}
}
/**
* Return the integer ID for a given subtype, or false.
*
- * TODO: Move to a nicer place?
+ * @todo Move to a nicer place?
*
* @param string $type
* @param string $subtype
/**
* For a given subtype ID, return its identifier text.
*
- * TODO: Move to a nicer place?
+ * @todo Move to a nicer place?
*
* @param int $subtype_id
*/
*
* @return if count, int
* if not count, array or false if no entities
+ * @since 1.7.0
*/
function elgg_get_entities(array $options = array()) {
global $CONFIG;
* @param NULL|array $subtypes
* @param NULL|array $pairs
* @return FALSE|string
+ * @since 1.7.0
*/
function elgg_get_entity_type_subtype_where_sql($table, $types, $subtypes, $pairs) {
// subtype depends upon type.
* @param str $table
* @param NULL|array $owner_guids
* @return FALSE|str
+ * @since 1.7.0
*/
function elgg_get_entity_owner_where_sql($table, $owner_guids) {
// short circuit if nothing requested
* @param string $table entity table prefix
* @param NULL|array $container_guids
* @return FALSE|string
+ * @since 1.7.0
*/
function elgg_get_entity_container_where_sql($table, $container_guids) {
// short circuit if nothing is requested.
* @param NULL|int $time_updated_lower
*
* @return FALSE|str FALSE on fail, string on success.
+ * @since 1.7.0
*/
function elgg_get_entity_time_where_sql($table, $time_created_upper = NULL, $time_created_lower = NULL,
$time_updated_upper = NULL, $time_updated_lower = NULL) {
* @param string $table entity table name
* @param NULL|array $site_guids
* @return FALSE|string
+ * @since 1.7.0
*/
function elgg_get_entity_site_where_sql($table, $site_guids) {
// short circuit if nothing requested
* pagination => BOOL Display pagination links
*
* @return str
+ * @since 1.7.0
*/
function elgg_list_entities($options) {
$defaults = array(
}
if ($recursive) {
- // Temporary token overriding access controls TODO: Do this better.
+ // Temporary token overriding access controls
+ // @todo Do this better.
static $__RECURSIVE_DELETE_TOKEN;
// Make it slightly harder to guess
$__RECURSIVE_DELETE_TOKEN = md5(get_loggedin_userid());
// Delete contained owned and otherwise releated objects (depth first)
if ($recursive) {
- // Temporary token overriding access controls TODO: Do this better.
+ // Temporary token overriding access controls
+ // @todo Do this better.
static $__RECURSIVE_DELETE_TOKEN;
// Make it slightly harder to guess
$__RECURSIVE_DELETE_TOKEN = md5(get_loggedin_userid());
* pagination => BOOL Display pagination links
*
* @return string A viewable list of entities
+ * @since 1.7.0
*/
function elgg_list_registered_entities($options) {
$defaults = array(
register_plugin_hook('unit_test', 'system', 'entities_test');
// Allow a permission override for recursive entity deletion
- // TODO: Can this be done better?
+ // @todo Can this be done better?
register_plugin_hook('permissions_check','all','recursive_delete_permissions_check');
register_plugin_hook('permissions_check:metadata','all','recursive_delete_permissions_check');
* Return the owner entity
*
* @return mixed
+ * @since 1.7.0
*/
public function getOwnerEntity() {
return get_user($this->owner_guid);
* Detect the value_type for a given value.
* Currently this is very crude.
*
- * TODO: Make better!
+ * @todo Make better!
*
* @param mixed $value
* @param string $value_type If specified, overrides the detection.
return $this->mimetype;
}
- // TODO : Guess mimetype if not here
+ // @todo Guess mimetype if not here
}
/**
return $this->filestore;
}
- // If filestore meta set then retrieve filestore TODO: Better way of doing this?
+ // If filestore meta set then retrieve filestore
+ // @todo Better way of doing this?
$metas = get_metadata_for_entity($this->guid);
$parameters = array();
if (is_array($metas)) {
* @param string $label Used for the group edit form
* @param boolean $default_on True if this option should be active by default
*
- **/
-
+ */
function add_group_tool_option($name,$label,$default_on=true) {
global $CONFIG;
throw new ConfigurationException(elgg_echo('ConfigurationException:BadPHPVersion'));
}
- // TODO: Consider checking for installed modules etc
+ // @todo Consider checking for installed modules etc
return true;
}
* @param string $dbname
* @param string $host
* @return bool
+ * @since 1.7.1
*/
function db_check_settings($user, $password, $dbname, $host) {
$mysql_dblink = mysql_connect($host, $user, $password, true);
* This is only called by functions which need to know all possible translations, namely the
* statistic gathering ones.
*
- * TODO: Better on demand loading based on language_paths array
+ * @todo Better on demand loading based on language_paths array
*
* @return bool
*/
define("MILE", 0.01515);
define("KILOMETER", 0.00932);
-// TODO: get objects within x miles by entities, metadata and relationship
+// @todo get objects within x miles by entities, metadata and relationship
-// TODO: List
\ No newline at end of file
+// @todo List
\ No newline at end of file
*
* @param str $str
* @return array
+ * @since 1.7.0
*/
function elgg_parse_str($str) {
if (is_callable('mb_parse_str')) {
eval($eval_statement);
-// TODO: Other wrapper functions
\ No newline at end of file
+// @todo Other wrapper functions
\ No newline at end of file
// DISABLE clearing for now - you must use delete on a specific key.
return true;
- //TODO: Namespaces as in #532
+ // @todo Namespaces as in #532
}
}
* metadata_owner_guids => NULL|ARR guids for metadata owners
*
* @return array
+ * @since 1.7.0
*/
function elgg_get_entities_from_metadata(array $options = array()) {
$defaults = array(
* @param array $options Options
*
* @return array
+ * @since 1.7.0
*/
function elgg_entities_get_metastrings_options($type, $options) {
$valid_types = array('metadata', 'annotation');
* @param BOOL $case_sensitive
* @param ARR|NULL $order_by_metadata array of names / direction
* @return FALSE|array False on fail, array('joins', 'wheres')
+ * @since 1.7.0
*/
function elgg_get_entity_metadata_where_sql($e_table, $n_table, $names = NULL, $values = NULL, $pairs = NULL, $pair_operator = 'AND', $case_sensitive = TRUE, $order_by_metadata = NULL, $owner_guids = NULL) {
global $CONFIG;
* @see elgg_get_entities_from_metadata
*
* @param array $options
+ * @since 1.7.0
*/
function elgg_list_entities_from_metadata($options) {
$defaults = array(
* This function unregisters a handler for a given notification type (eg "email")
*
* @param string $method The method
+ * @since 1.7.1
*/
function unregister_notification_handler($method) {
global $NOTIFICATION_HANDLERS;
* @param string $body The message body
* @param array $params Optional parameters (none used in this function)
* @return bool
+ * @since 1.7.2
*/
function elgg_send_email($from, $to, $subject, $body, array $params = NULL) {
global $CONFIG;
* THIS FUNCTION IS DEPRECATED.
*
* Delete a object's extra data.
- *
+ * @todo - this should be removed - was deprecated in 1.5 or earlier
* @param int $guid
*/
function delete_object_entity($guid) {
*
* @param string $handler The PAM handler function name
* @param string $policy - the policy type, default is "user"
+ * @since 1.7.0
*/
function unregister_pam_handler($handler, $policy = "user") {
global $_PAM_HANDLERS;
* Clear all plugin settings.
*
* @param string $plugin_name Optional plugin name, if not specified then it is detected from where you are calling from.
+ * @since 1.7.0
*/
function clear_all_plugin_settings($plugin_name = "") {
$plugin = find_plugin_settings($plugin_name);
// Note: currently get_access_sql_suffix is hardwired to use
// $acl_field = "access_id", $object_owner_table = $acl_table, and
// $object_owner_id_field = "owner_guid"
- // TODO: recode get_access_sql_suffix to make it possible to specify alternate field names
+ // @todo recode get_access_sql_suffix to make it possible to specify alternate field names
return "and ".get_access_sql_suffix($this->acl_table); // Add access controls
//return "and ({$this->acl_table}.{$this->acl_field} in {$access} or ({$this->acl_table}.{$this->acl_field} = 0 and {$this->object_owner_table}.{$this->object_owner_id_field} = {$_SESSION['id']}))";
* inverse_relationship => BOOL Inverse the relationship
*
* @return array
+ * @since 1.7.0
*/
function elgg_get_entities_from_relationship($options) {
$defaults = array(
* @param $relationship relationship string
* @param $entity_guid entity guid to check
* @return mixed
+ * @since 1.7.0
*/
function elgg_get_entity_relationship_where_sql($table, $relationship = NULL, $relationship_guid = NULL, $inverse_relationship = FALSE) {
if ($relationship == NULL && $entity_guid == NULL) {
*
* @param int annotation_id The ID of the annotation
* @return true|false Depending on success
+ * @since 1.7.0
*/
function remove_from_river_by_annotation($annotation_id) {
// Sanitise
*
* @param $user_guid
* @return bool
+ * @since 1.7.1
*/
function elgg_is_admin_user($user_guid) {
global $CONFIG;
* THIS FUNCTION IS DEPRECATED.
*
* Delete a site's extra data.
- *
+ * @todo remove
* @param int $guid
*/
function delete_site_entity($guid) {
*
* Supports similar arguments as elgg_get_entities()
*
- * @since 1.7.1
*
* @param array $options Array in format:
*
*
* @return false/array - if no tags or error, false
* otherwise, array of objects with ->tag and ->total values
+ * @since 1.7.1
*/
function elgg_get_tags(array $options = array()) {
global $CONFIG;
/**
* Returns viewable tagcloud
*
- * @since 1.7.1
*
* @see elgg_get_tags
*
* subtype => must be single entity subtype
*
* @return string
- *
+ * @since 1.7.1
*/
function elgg_view_tagcloud(array $options = array()) {
* This is required if you are using a non-standard metadata name
* for your tags.
*
- * @since 1.7
*
* @param string $name
- * @return TRUE
+ * @return bool
+ * @since 1.7.0
*/
function elgg_register_tag_metadata_name($name) {
global $CONFIG;
/**
* Returns an array of valid metadata names for tags.
*
- * @since 1.7
- *
* @return array
+ * @since 1.7.0
*/
function elgg_get_registered_tag_metadata_names() {
global $CONFIG;
* THIS FUNCTION IS DEPRECATED.
*
* Delete a user's extra data.
- *
+ * @todo remove
* @param int $guid
*/
function delete_user_entity($guid) {
* @return bool
*/
function is_email_address($address) {
- // TODO: Make this better!
+ // @todo Make this better!
if (strpos($address, '@')=== false) {
return false;
throw new RegistrationException(elgg_echo('registration:invalidchars'));
}
- // Belts and braces TODO: Tidy into main unicode
+ // Belts and braces
+ // @todo Tidy into main unicode
$blacklist2 = '\'/\\"*& ?#%^(){}[]~?<>;|¬`@-+=';
for ($n=0; $n < strlen($blacklist2); $n++) {
if (strpos($username, $blacklist2[$n])!==false) {
* A permissions plugin hook that grants access to users if they are newly created - allows
* for email activation.
*
- * TODO: Do this in a better way!
+ * @todo Do this in a better way!
*
* @param unknown_type $hook
* @param unknown_type $entity_type
register_elgg_event_handler('create', 'user', 'user_create_hook_add_site_relationship');
// Handle a special case for newly created users when the user is not logged in
- // TODO: handle this better!
+ // @todo handle this better!
register_plugin_hook('permissions_check','all','new_user_enable_permissions_check');
}
* @param string $dir
* @param string $base
* @return array
- * @since 1.7
+ * @since 1.7.0
*/
function elgg_get_views($dir, $base) {
$return = array();
* @param string $view_extension This view is added to $view
* @param int $priority The priority, from 0 to 1000, to add at (lowest numbers displayed first)
* @param string $viewtype Not used
+ * @since 1.7.0
*/
function elgg_extend_view($view, $view_extension, $priority = 501, $viewtype = '') {
global $CONFIG;
* @param string $folder The folder to begin looking in
* @param string $base_location_path The base views directory to use with set_view_location
* @param string $viewtype The type of view we're looking at (default, rss, etc)
+ * @since 1.7.0
*/
function autoregister_views($view_base, $folder, $base_location_path, $viewtype) {
if (!isset($i)) {
*
* @param string $view_type
* @return bool
+ * @since 1.7.2
*/
function elgg_is_valid_view_type($view_type) {
global $CONFIG;
* Remove a widget type
*
* @param string $handler The identifier for the widget handler
+ * @since 1.7.1
*/
function remove_widget_type($handler) {
global $CONFIG;
'guid','owner_guid','site_guid'
))) {
if (is_array($value)) {
- // TODO: Handle arrays securely
+ // @todo Handle arrays securely
$widget->setMetaData($name, $value, "", true);
} else {
$widget->$name = $value;
case 'value':
return xmlrpc_scalar_value($object->children[0]);
default:
- // TODO unsupported, throw an error
+ // @todo unsupported, throw an error
return false;
}
}
'friends:of:owned' => "People who have made %s a friend",
- 'friends:num_display' => "Number of friends to display",
- 'friends:icon_size' => "Icon size",
- 'friends:tiny' => "tiny",
- 'friends:small' => "small",
'friends:of' => "Friends of",
'friends:collections' => "Collections of friends",
'friends:collections:add' => "New friends collection",
'friends:collections:members' => "Collection members",
'friends:collections:edit' => "Edit collection",
- 'friends:river:created' => "%s added the friends widget.",
- 'friends:river:updated' => "%s updated their friends widget.",
- 'friends:river:delete' => "%s removed their friends widget.",
'friends:river:add' => "%s is now a friend with",
'friendspicker:chararray' => 'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
+++ /dev/null
-<?php
-
- /**
- * Elgg add a collection of friends
- *
- * @package ElggFriends
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Curverider Ltd <info@elgg.com>
- * @copyright Curverider Ltd 2008-2010
- * @link http://elgg.org/
- */
-
- // Start engine
- require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-
- // You need to be logged in for this one
- gatekeeper();
-
- $area1 = elgg_view_title(elgg_echo('friends:new'));
-
- $area2 = elgg_view('friends/forms/edit', array('friends' => get_user_friends($_SESSION['user']->getGUID(),"",9999)));
-
- // Format page
- $body = elgg_view_layout('two_column_left_sidebar',$area1, $area2);
-
- // Draw it
- page_draw(elgg_echo('friends:add'),$body);
-
-?>
\ No newline at end of file
+++ /dev/null
-<?php
-
- /**
- * Elgg collections of friends
- *
- * @package ElggFriends
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Curverider Ltd <info@elgg.com>
- * @copyright Curverider Ltd 2008-2010
- * @link http://elgg.org/
- */
-
- // Start engine
- require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-
- // You need to be logged in for this one
- gatekeeper();
-
- $area1 = elgg_view_title(elgg_echo('friends:new'));
-
- $area2 = elgg_view_access_collections($_SESSION['user']->getGUID());
-
- // Format page
- $body = elgg_view_layout('two_column_left_sidebar',$area1, $area2);
-
- // Draw it
- page_draw(elgg_echo('friends:add'),$body);
-
-?>
\ No newline at end of file
+++ /dev/null
-<?php
-
- /**
- * Elgg add a collection of friends
- *
- * @package ElggFriends
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Curverider Ltd <info@elgg.com>
- * @copyright Curverider Ltd 2008-2010
- * @link http://elgg.org/
- */
-
- // Start engine
- require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-
- // You need to be logged in for this one
- gatekeeper();
-
- //set the title
- $area1 = elgg_view_title(elgg_echo('friends:collectionedit'), false);
-
- //grab the collection id passed to the edit form
- $collection_id = get_input('collection');
-
- //get the full collection
- $collection = get_access_collection($collection_id);
- //get all members of the collection
- $collection_members = get_members_of_access_collection($collection_id);
-
- $area2 = elgg_view('friends/forms/edit', array('collection' => $collection, 'collection_members' => $collection_members));
-
- // Format page
- $body = elgg_view_layout('two_column_left_sidebar',$area1. $area2);
-
- // Draw it
- page_draw(elgg_echo('friends:add'),$body);
-
-?>
\ No newline at end of file
<?php
- $english = array(
-
- /**
- * Friends widget
- */
- 'friends:widget:description' => "Displays some of your friends.",
-
-
- );
-
- add_translation("en",$english);
+$english = array(
-?>
\ No newline at end of file
+ /**
+ * Friends widget
+ */
+ 'friends:widget:description' => "Displays some of your friends.",
+ 'friends:num_display' => "Number of friends to display",
+ 'friends:icon_size' => "Icon size",
+ 'friends:tiny' => "tiny",
+ 'friends:small' => "small",
+);
+
+add_translation("en", $english);
<?php
- /**
- * Elgg Friends widget
- * This plugin allows users to put a list of their friends, on their profile
- *
- * @package ElggFriends
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Curverider Ltd <info@elgg.com>
- * @copyright Curverider Ltd 2008-2010
- * @link http://elgg.com/
- */
-
- function friends_init() {
-
- // Load system configuration
- global $CONFIG;
-
- //add a widget
- add_widget_type('friends',elgg_echo("friends"),elgg_echo('friends:widget:description'));
-
- }
-
- register_elgg_event_handler('init','system','friends_init');
-
-?>
\ No newline at end of file
+/**
+ * Elgg Friends widget
+ * This plugin allows users to put a list of their friends on their profile
+ *
+ * @package ElggFriends
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd <info@elgg.com>
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ */
+
+function friends_init() {
+ add_widget_type('friends', elgg_echo("friends"), elgg_echo('friends:widget:description'));
+}
+
+register_elgg_event_handler('init', 'system', 'friends_init');
<?php
- /**
- * Elgg Friends
- * Friend widget options
- *
- * @package ElggFriends
- * @subpackage Core
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Curverider Ltd
- * @copyright Curverider Ltd 2008-2010
- * @link http://elgg.org/
- */
-
+/**
+ * Elgg Friends
+ * Friend widget options
+ *
+ * @package ElggFriends
+ * @subpackage Core
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.org/
+ */
+
+$selections = array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 15, 20, 30, 50, 100);
+$icon_sizes = array('small', 'tiny');
+
+// set defaults
+if (!isset($vars['entity']->num_display)) {
+ $vars['entity']->num_display = 12;
+ $vars['entity']->icon_size = 'small';
+}
+
+// handle upgrade to 1.7.2 from previous versions
+if ($vars['entity']->icon_size == 1) {
+ $vars['entity']->icon_size = 'small';
+} elseif ($vars['entity']->icon_size == 2) {
+ $vars['entity']->icon_size = 'tiny';
+}
?>
<p>
- <?php echo elgg_echo("friends:num_display"); ?>:
- <select name="params[num_display]">
- <option value="1" <?php if($vars['entity']->num_display == 1) echo "SELECTED"; ?>>1</option>
- <option value="2" <?php if($vars['entity']->num_display == 2) echo "SELECTED"; ?>>2</option>
- <option value="3" <?php if($vars['entity']->num_display == 3) echo "SELECTED"; ?>>3</option>
- <option value="4" <?php if($vars['entity']->num_display == 4) echo "SELECTED"; ?>>4</option>
- <option value="5" <?php if($vars['entity']->num_display == 5) echo "SELECTED"; ?>>5</option>
- <option value="6" <?php if($vars['entity']->num_display == 6) echo "SELECTED"; ?>>6</option>
- <option value="7" <?php if($vars['entity']->num_display == 7) echo "SELECTED"; ?>>7</option>
- <option value="8" <?php if($vars['entity']->num_display == 8) echo "SELECTED"; ?>>8</option>
- <option value="9" <?php if($vars['entity']->num_display == 9) echo "SELECTED"; ?>>9</option>
- <option value="10" <?php if($vars['entity']->num_display == 10) echo "SELECTED"; ?>>10</option>
- <option value="15" <?php if($vars['entity']->num_display == 15) echo "SELECTED"; ?>>15</option>
- <option value="20" <?php if($vars['entity']->num_display == 20) echo "SELECTED"; ?>>20</option>
- <option value="30" <?php if($vars['entity']->num_display == 30) echo "SELECTED"; ?>>30</option>
- <option value="50" <?php if($vars['entity']->num_display == 50) echo "SELECTED"; ?>>50</option>
- <option value="100" <?php if($vars['entity']->num_display == 100) echo "SELECTED"; ?>>100</option>
- </select>
+ <?php echo elgg_echo("friends:num_display"); ?>:
+ <select name="params[num_display]">
+<?php
+foreach ($selections as $selection) {
+ $selected = '';
+ if ($vars['entity']->num_display == $selection) {
+ $selected = 'selected="selected"';
+ }
+ echo "<option value=\"$selection\" $selected>$selection</option>";
+}
+?>
+ </select>
</p>
<p>
- <?php echo elgg_echo("friends:icon_size"); ?>
- <select name="params[icon_size]">
- <option value="1" <?php if($vars['entity']->icon_size == 1) echo "SELECTED"; ?>><?php echo elgg_echo("friends:small"); ?></option>
- <option value="2" <?php if($vars['entity']->icon_size == 2) echo "SELECTED"; ?>><?php echo elgg_echo("friends:tiny"); ?></option>
- </select>
-</p>
\ No newline at end of file
+ <?php echo elgg_echo("friends:icon_size"); ?>
+ <select name="params[icon_size]">
+<?php
+foreach ($icon_sizes as $size) {
+ $selected = '';
+ if ($vars['entity']->icon_size == $size) {
+ $selected = 'selected="selected"';
+ }
+ $label = elgg_echo("friends:$size");
+ echo "<option value=\"$size\" $selected>$label</option>";
+}
+?>
+ </select>
+</p>
<?php
- /**
- * Elgg Friends
- * Friend widget options
- *
- * @package ElggFriends
- * @subpackage Core
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Curverider Ltd
- * @copyright Curverider Ltd 2008-2010
- * @link http://elgg.org/
- */
-
-
- //the page owner
- $owner = get_user($vars['entity']->owner_guid);
-
- //the number of files to display
- $num = (int) $vars['entity']->num_display;
- if (!$num)
- $num = 8;
-
- //get the correct size
- $size = (int) $vars['entity']->icon_size;
- if (!$size || $size == 1){
- $size_value = "small";
- }else{
- $size_value = "tiny";
- }
-
- // Get the users friends
- $friends = $owner->getFriends("", $num, $offset = 0);
-
- // If there are any $friend to view, view them
- if (is_array($friends) && sizeof($friends) > 0) {
+/**
+ * Elgg Friends
+ * Friend widget display view
+ *
+ * @package ElggFriends
+ * @subpackage Core
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.org/
+ */
+
+
+// owner of the profile page
+$owner = get_user($vars['entity']->owner_guid);
+
+// the number of friends to display
+$num = (int) $vars['entity']->num_display;
- echo "<div id=\"widget_friends_list\">";
+// get the correct size
+$size = $vars['entity']->icon_size;
- foreach($friends as $friend) {
- echo "<div class=\"widget_friends_singlefriend\" >";
- echo elgg_view("profile/icon",array('entity' => get_user($friend->guid), 'size' => $size_value));
- echo "</div>";
- }
+// Get the user's friends
+$friends = $owner->getFriends("", $num);
+// If there are any friends to view, view them
+if (is_array($friends) && sizeof($friends) > 0) {
+
+ echo "<div id=\"widget_friends_list\">";
+
+ foreach($friends as $friend) {
+ echo "<div class=\"widget_friends_singlefriend\" >";
+ echo elgg_view("profile/icon",array('entity' => get_user($friend->guid), 'size' => $size));
echo "</div>";
-
- }
-
-?>
\ No newline at end of file
+ }
+
+ echo "</div>";
+}
*
*/
function htmlawed_init() {
- /** For now declare allowed tags and protocols here, TODO: Make this configurable */
+ /** For now declare allowed tags and protocols here, @todo Make this configurable */
global $CONFIG;
$CONFIG->htmlawed_config = array(
// seems to handle about everything we need.
* @param unknown_type $object_type
* @param unknown_type $object
*/
-
function messages_init() {
// Load system configuration
//add submenu options
if (get_context() == "messages") {
- add_submenu_item(elgg_echo('messages:inbox'), $CONFIG->wwwroot . "pg/messages/" . $_SESSION['user']->username);
+ add_submenu_item(elgg_echo('messages:inbox'), $CONFIG->wwwroot . "pg/messages/" . get_loggedin_user()->username);
add_submenu_item(elgg_echo('messages:sentmessages'), $CONFIG->wwwroot . "mod/messages/sent.php");
}
// Register a notification handler for site messages
register_notification_handler("site", "messages_site_notify_handler");
register_plugin_hook('notify:entity:message','object','messages_notification_msg');
- if (is_callable('register_notification_object'))
- register_notification_object('object','messages',elgg_echo('messages:new'));
-
- // Shares widget
- // add_widget_type('messages',elgg_echo("messages:recent"),elgg_echo("messages:widget:description"));
-
+ register_notification_object('object','messages',elgg_echo('messages:new'));
+
// Override metadata permissions
register_plugin_hook('permissions_check:metadata','object','messages_can_edit_metadata');
//get the users inbox messages
//$num_messages = get_entities_from_metadata("toId", $_SESSION['user']->getGUID(), "object", "messages", 0, 10, 0, "", 0, false);
$num_messages = elgg_get_entities_from_metadata(array('metadata_name_value_pairs' => array(
- 'toId' => $_SESSION['user']->guid,
+ 'toId' => get_loggedin_userid(),
'readYet' => 0,
'msg' => 1
- ), 'owner_guid' => $_SESSION['user']->guid));
+ ), 'owner_guid' => get_loggedin_userid()));
if (is_array($num_messages))
$counter = sizeof($num_messages);
+++ /dev/null
-
- <?php
-
- $num_messages = count_unread_messages();
-
- if($num_messages == 0)
- echo "<h3 class=\"new_messages_count\">You have no new messages.</h3>";
- else {
- echo "<h3 class=\"new_messages_count\">" . $num_messages . " new message(s).</h3>";
- echo "<a href=\"" . $vars['url'] . "pg/messages/" . $_SESSION['user']->username ."\">check them out</a>";
- }
-
- ?>
* Status and error messages
*/
'pages:noaccess' => 'No access to page',
- 'pages:cantedit' => 'You can not edit this page',
- 'pages:saved' => 'Pages saved',
+ 'pages:cantedit' => 'You cannot edit this page',
+ 'pages:saved' => 'Page saved',
'pages:notsaved' => 'Page could not be saved',
'pages:notitle' => 'You must specify a title for your page.',
- 'pages:delete:success' => 'Your page was successfully deleted.',
+ 'pages:delete:success' => 'The page was successfully deleted.',
'pages:delete:failure' => 'The page could not be deleted.',
/**
'river:clustered' => 'Clustered',
'river:type' => 'Would you like the activity stream to be in classic format (chronological) or clustered?',
'river:widget:description' => "Show your latest activity.",
- 'river:widget:title:friends' => "Friends' activity",
- 'river:widget:description:friends' => "Show what your friends are up to.",
'river:widgets:friends' => "Friends",
'river:widgets:mine' => "Mine",
'river:friends' => "My friends' activity",
$uuid = guid_to_uuid($entity->getGUID()) . "$type/$id_or_name/";
switch ($type) {
- case 'attr' : // TODO: Do this better? - This is a bit of a hack...
+ case 'attr' : // @todo: Do this better? - This is a bit of a hack...
$v = $entity->get($id_or_name);
if (!$v) {
throw new InvalidParameterException(sprintf(elgg_echo('InvalidParameterException:IdNotExistForGUID'), $id_or_name, $guid));
*/
$admin_option = false;
-if (($_SESSION['user']->isAdmin()) && ($vars['show_admin'])) {
+if ((get_loggedin_user()->isAdmin()) && ($vars['show_admin'])) {
$admin_option = true;
}
echo "<li><h2>";
//as collections are private, check that the logged in user is the owner
-if($coll->owner_guid == $_SESSION['user']->getGUID()) {
+if ($coll->owner_guid == get_loggedin_userid()) {
echo "<div class=\"friends_collections_controls\">";
echo elgg_view('output/confirmlink', array(
'href' => $vars['url'] . 'action/friends/deletecollection?collection=' . $coll->id,
echo " (<span id=\"friends_membership_count{$vars['friendspicker']}\">{$count}</span>) </h2>";
// individual collection panels
-if($friends = $vars['collection']->entities) {
- $content = elgg_view('friends/collectiontabs', array('owner' => $_SESSION['user'], 'collection' => $vars['collection'], 'friendspicker' => $vars['friendspicker']));
+if ($friends = $vars['collection']->entities) {
+ $content = elgg_view('friends/collectiontabs', array('owner' => get_loggedin_user(), 'collection' => $vars['collection'], 'friendspicker' => $vars['friendspicker']));
echo elgg_view('friends/picker',array('entities' => $friends, 'value' => $members, 'content' => $content, 'replacement' => '', 'friendspicker' => $vars['friendspicker']));
?>
<script type="text/javascript">
$(document).ready(function () {
- $('#friends_picker_placeholder<?php echo $vars['friendspicker']; ?>').load('<?php echo $vars['url']; ?>friends/pickercallback.php?username=<?php echo $_SESSION['user']->username; ?>&type=list&collection=<?php echo $vars['collection']->id; ?>');
+ $('#friends_picker_placeholder<?php echo $vars['friendspicker']; ?>').load('<?php echo $vars['url']; ?>friends/pickercallback.php?username=<?php echo get_loggedin_user()->username; ?>&type=list&collection=<?php echo $vars['collection']->id; ?>');
});
</script>
$('a.collectionmembers<?php echo $friendspicker; ?>').click(function () {
// load collection members pane
- $('#friends_picker_placeholder<?php echo $friendspicker; ?>').load('<?php echo $vars['url']; ?>friends/pickercallback.php?username=<?php echo $_SESSION['user']->username; ?>&type=list&collection=<?php echo $collectionid; ?>&friendspicker=<?php echo $friendspicker; ?>');
+ $('#friends_picker_placeholder<?php echo $friendspicker; ?>').load('<?php echo $vars['url']; ?>friends/pickercallback.php?username=<?php echo get_loggedin_user()->username; ?>&type=list&collection=<?php echo $collectionid; ?>&friendspicker=<?php echo $friendspicker; ?>');
// remove selected state from previous tab
$(this).parent().parent().find("li.selected").removeClass("selected");
$('a.editmembers<?php echo $friendspicker; ?>').click(function () {
// load friends picker pane
- $('#friends_picker_placeholder<?php echo $friendspicker; ?>').load('<?php echo $vars['url']; ?>friends/pickercallback.php?username=<?php echo $_SESSION['user']->username; ?>&type=picker&collection=<?php echo $collectionid; ?>&friendspicker=<?php echo $friendspicker; ?>');
+ $('#friends_picker_placeholder<?php echo $friendspicker; ?>').load('<?php echo $vars['url']; ?>friends/pickercallback.php?username=<?php echo get_loggedin_user()->username; ?>&type=picker&collection=<?php echo $collectionid; ?>&friendspicker=<?php echo $friendspicker; ?>');
// remove selected state from previous tab
$(this).parent().parent().find("li.selected").removeClass("selected");
* @author Curverider Ltd
* @link http://elgg.org/
*
- * @TODO: This currently only works for ONE AUTOCOMPLETE TEXT FIELD on a page.
+ * @todo This currently only works for ONE AUTOCOMPLETE TEXT FIELD on a page.
*
* @uses $vars['value'] The current value, if any
* @uses $vars['js'] Any Javascript to enter into the input tag
*/
$page_owner = page_owner();
-$page_owner_user = get_entity($page_owner);
+$page_owner_entity = get_entity($page_owner);
-$submenu = get_submenu(); // elgg_view('canvas_header/submenu');
+$display = "<h2>" . $vars['title'] . "</h2>";
+
+$submenu = get_submenu();
if (!empty($submenu)) {
$submenu = "<ul class='submenu extended'>" . $submenu . "</ul>";
}
-if (($_SESSION['guid']) && ($page_owner && $page_owner_user->guid != $_SESSION['user']->getGUID())) {
- $info = "<h2>" . $vars['title'] . "</h2>";
- if($page_owner_user instanceOf ElggGroup) {
- $display = $info;
- } else {
- $display = $info;
- }
- if (!empty($submenu) && $vars['submenu'] == true) {
- // plugins can extend this to add menu options
- $display .= $submenu;
- }
-} else {
- $info = "<h2>" . $vars['title'] . "</h2>";
- if($page_owner_user instanceOf ElggGroup) {
- $display = $info;
- } else {
- $display = $info;
- }
- if (!empty($submenu) && $vars['submenu'] == true) {
- // plugins can extend this to add menu options
- $display .= $submenu;
- }
+if (!empty($submenu) && $vars['submenu'] == true) {
+ // plugins can extend this to add menu options
+ $display .= $submenu;
}
-
-//print to screen
echo $display;
\ No newline at end of file
$user_guid = $details['user_guid'];
if ($user_guid) {
- $user_guid = $_SESSION['user']->guid;
+ $user_guid = get_loggedin_userid();
}
if (elgg_view("usersettings/{$plugin}/edit")) {
*/
// Get entity statistics
-$entity_stats = get_entity_statistics($_SESSION['user']->guid);
+$entity_stats = get_entity_statistics(get_loggedin_userid());
if ($entity_stats) {
?>
* @link http://elgg.org/
*/
-$user = $_SESSION['user'];
+$user = get_loggedin_user();
$logged_in = 0;
-$log = get_system_log($_SESSION['user']->guid, "login", "", 'user', '', 1);
+$log = get_system_log($user->guid, "login", "", 'user', '', 1);
if ($log) {
- $logged_in=$log[0]->time_created;
+ $logged_in = $log[0]->time_created;
}
?>
projects / lorea / elgg.git / commitdiff