Elgg / Elgg

engine/lib/input.php

Doc Comments +1 added lines, -1 removed lines

@@ -532,7 +532,7 @@
  * @param string[] $value  Test files
  * @param array    $params Hook params
  *
- * @return array
+ * @return string[]
  */
 function _elgg_htmlawed_test($hook, $type, $value, $params) {
 	$value[] = Paths::elgg() . 'engine/tests/ElggHtmLawedTest.php';

Spacing +7 added lines, -7 removed lines

@@ -67,10 +67,10 @@ 
 function current_page_url() {
 	$url = parse_url(elgg_get_site_url());
 
-	$page = $url['scheme'] . "://" . $url['host'];
+	$page = $url['scheme']."://".$url['host'];
 
 	if (isset($url['port']) && $url['port']) {
-		$page .= ":" . $url['port'];
+		$page .= ":".$url['port'];
 	}
 
 	$page = trim($page, "/");
@@ -280,7 +280,7 @@ 
 								'input_name' => $input_name,
 							]),
 						];
-						$results[$entity->name . rand(1, 100)] = $result;
+						$results[$entity->name.rand(1, 100)] = $result;
 					}
 				}
 				break;
@@ -327,7 +327,7 @@ 
 							'url' => $entity->getURL(),
 						];
 
-						$results[$entity->name . rand(1, 100)] = $result;
+						$results[$entity->name.rand(1, 100)] = $result;
 					}
 				}
 				break;
@@ -373,7 +373,7 @@ 
 								'input_name' => $input_name,
 							]),
 						];
-						$results[$entity->name . rand(1, 100)] = $result;
+						$results[$entity->name.rand(1, 100)] = $result;
 					}
 				}
 				break;
@@ -479,7 +479,7 @@ 
 		'font-weight', 'font-style', 'border', 'border-top', 'background-color',
 		'border-bottom', 'border-left', 'border-right',
 		'margin', 'margin-top', 'margin-bottom', 'margin-left',
-		'margin-right',	'padding', 'float', 'text-decoration'
+		'margin-right', 'padding', 'float', 'text-decoration'
 	];
 
 	$params = ['tag' => $element];
@@ -535,7 +535,7 @@ 
  * @return array
  */
 function _elgg_htmlawed_test($hook, $type, $value, $params) {
-	$value[] = Paths::elgg() . 'engine/tests/ElggHtmLawedTest.php';
+	$value[] = Paths::elgg().'engine/tests/ElggHtmLawedTest.php';
 	return $value;
 }
 

Indentation +312 added lines, -312 removed lines

@@ -27,7 +27,7 @@ 
  * @return mixed
  */
 function get_input($variable, $default = null, $filter_result = true) {
-	return _elgg_services()->input->get($variable, $default, $filter_result);
+    return _elgg_services()->input->get($variable, $default, $filter_result);
 }
 
 /**
@@ -41,7 +41,7 @@ 
  * @return void
  */
 function set_input($variable, $value) {
-	_elgg_services()->input->set($variable, $value);
+    _elgg_services()->input->set($variable, $value);
 }
 
 /**
@@ -54,8 +54,8 @@ 
  * @since 3.0
  */
 function elgg_get_title_input($variable = 'title', $default = '') {
-	$raw_input = get_input($variable, $default, false);
-	return htmlspecialchars($raw_input, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
+    $raw_input = get_input($variable, $default, false);
+    return htmlspecialchars($raw_input, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
 }
 
 /**
@@ -67,7 +67,7 @@ 
  * @return mixed The filtered result - everything will be strings
  */
 function filter_tags($var) {
-	return elgg_trigger_plugin_hook('validate', 'input', null, $var);
+    return elgg_trigger_plugin_hook('validate', 'input', null, $var);
 }
 
 /**
@@ -79,19 +79,19 @@ 
  * @return string The current page URL.
  */
 function current_page_url() {
-	$url = parse_url(elgg_get_site_url());
+    $url = parse_url(elgg_get_site_url());
 
-	$page = $url['scheme'] . "://" . $url['host'];
+    $page = $url['scheme'] . "://" . $url['host'];
 
-	if (isset($url['port']) && $url['port']) {
-		$page .= ":" . $url['port'];
-	}
+    if (isset($url['port']) && $url['port']) {
+        $page .= ":" . $url['port'];
+    }
 
-	$page = trim($page, "/");
+    $page = trim($page, "/");
 
-	$page .= _elgg_services()->request->getRequestUri();
+    $page .= _elgg_services()->request->getRequestUri();
 
-	return $page;
+    return $page;
 }
 
 /**
@@ -102,7 +102,7 @@ 
  * @return bool
  */
 function is_email_address($address) {
-	return filter_var($address, FILTER_VALIDATE_EMAIL) === $address;
+    return filter_var($address, FILTER_VALIDATE_EMAIL) === $address;
 }
 
 /**
@@ -117,7 +117,7 @@ 
  * @since 1.8.0
  */
 function elgg_make_sticky_form($form_name) {
-	_elgg_services()->stickyForms->makeStickyForm($form_name);
+    _elgg_services()->stickyForms->makeStickyForm($form_name);
 }
 
 /**
@@ -133,7 +133,7 @@ 
  * @since 1.8.0
  */
 function elgg_clear_sticky_form($form_name) {
-	_elgg_services()->stickyForms->clearStickyForm($form_name);
+    _elgg_services()->stickyForms->clearStickyForm($form_name);
 }
 
 /**
@@ -145,7 +145,7 @@ 
  * @since 1.8.0
  */
 function elgg_is_sticky_form($form_name) {
-	return _elgg_services()->stickyForms->isStickyForm($form_name);
+    return _elgg_services()->stickyForms->isStickyForm($form_name);
 }
 
 /**
@@ -162,7 +162,7 @@ 
  * @since 1.8.0
  */
 function elgg_get_sticky_value($form_name, $variable = '', $default = null, $filter_result = true) {
-	return _elgg_services()->stickyForms->getStickyValue($form_name, $variable, $default, $filter_result);
+    return _elgg_services()->stickyForms->getStickyValue($form_name, $variable, $default, $filter_result);
 }
 
 /**
@@ -175,7 +175,7 @@ 
  * @since 1.8.0
  */
 function elgg_get_sticky_values($form_name, $filter_result = true) {
-	return _elgg_services()->stickyForms->getStickyValues($form_name, $filter_result);
+    return _elgg_services()->stickyForms->getStickyValues($form_name, $filter_result);
 }
 
 /**
@@ -188,7 +188,7 @@ 
  * @since 1.8.0
  */
 function elgg_clear_sticky_value($form_name, $variable) {
-	_elgg_services()->stickyForms->clearStickyValue($form_name, $variable);
+    _elgg_services()->stickyForms->clearStickyValue($form_name, $variable);
 }
 
 /**
@@ -209,201 +209,201 @@ 
  * @access private
  */
 function input_livesearch_page_handler($page) {
-	$dbprefix = _elgg_config()->dbprefix;
-
-	// only return results to logged in users.
-	if (!$user = elgg_get_logged_in_user_entity()) {
-		exit;
-	}
-
-	if (!$q = get_input('term', get_input('q'))) {
-		exit;
-	}
-
-	$input_name = get_input('name', 'members');
-
-	$q = sanitise_string($q);
-
-	// replace mysql vars with escaped strings
-	$q = str_replace(['_', '%'], ['\_', '\%'], $q);
-
-	$match_on = get_input('match_on', 'all');
-
-	if (!is_array($match_on)) {
-		$match_on = [$match_on];
-	}
-
-	// all = users and groups
-	if (in_array('all', $match_on)) {
-		$match_on = ['users', 'groups'];
-	}
-
-	$owner_guid = ELGG_ENTITIES_ANY_VALUE;
-	if (get_input('match_owner', false)) {
-		$owner_guid = $user->getGUID();
-	}
-
-	$limit = sanitise_int(get_input('limit', _elgg_config()->default_limit));
-
-	// grab a list of entities and send them in json.
-	$results = [];
-	foreach ($match_on as $match_type) {
-		switch ($match_type) {
-			case 'users':
-				$options = [
-					'type' => 'user',
-					'limit' => $limit,
-					'joins' => ["JOIN {$dbprefix}users_entity ue ON e.guid = ue.guid"],
-					'wheres' => [
-						"ue.banned = 'no'",
-						"(ue.name LIKE '$q%' OR ue.name LIKE '% $q%' OR ue.username LIKE '$q%')"
-					]
-				];
+    $dbprefix = _elgg_config()->dbprefix;
+
+    // only return results to logged in users.
+    if (!$user = elgg_get_logged_in_user_entity()) {
+        exit;
+    }
+
+    if (!$q = get_input('term', get_input('q'))) {
+        exit;
+    }
+
+    $input_name = get_input('name', 'members');
+
+    $q = sanitise_string($q);
+
+    // replace mysql vars with escaped strings
+    $q = str_replace(['_', '%'], ['\_', '\%'], $q);
+
+    $match_on = get_input('match_on', 'all');
+
+    if (!is_array($match_on)) {
+        $match_on = [$match_on];
+    }
+
+    // all = users and groups
+    if (in_array('all', $match_on)) {
+        $match_on = ['users', 'groups'];
+    }
+
+    $owner_guid = ELGG_ENTITIES_ANY_VALUE;
+    if (get_input('match_owner', false)) {
+        $owner_guid = $user->getGUID();
+    }
+
+    $limit = sanitise_int(get_input('limit', _elgg_config()->default_limit));
+
+    // grab a list of entities and send them in json.
+    $results = [];
+    foreach ($match_on as $match_type) {
+        switch ($match_type) {
+            case 'users':
+                $options = [
+                    'type' => 'user',
+                    'limit' => $limit,
+                    'joins' => ["JOIN {$dbprefix}users_entity ue ON e.guid = ue.guid"],
+                    'wheres' => [
+                        "ue.banned = 'no'",
+                        "(ue.name LIKE '$q%' OR ue.name LIKE '% $q%' OR ue.username LIKE '$q%')"
+                    ]
+                ];
 				
-				$entities = elgg_get_entities($options);
-				if (!empty($entities)) {
-					foreach ($entities as $entity) {
-						if (in_array('groups', $match_on)) {
-							$value = $entity->guid;
-						} else {
-							$value = $entity->username;
-						}
-
-						$output = elgg_view_list_item($entity, [
-							'use_hover' => false,
-							'use_link' => false,
-							'class' => 'elgg-autocomplete-item',
-							'title' => $entity->name, // Default title would be a link
-						]);
-
-						$icon = elgg_view_entity_icon($entity, 'tiny', [
-							'use_hover' => false,
-						]);
-
-						$result = [
-							'type' => 'user',
-							'name' => $entity->name,
-							'desc' => $entity->username,
-							'guid' => $entity->guid,
-							'label' => $output,
-							'value' => $value,
-							'icon' => $icon,
-							'url' => $entity->getURL(),
-							'html' => elgg_view('input/userpicker/item', [
-								'entity' => $entity,
-								'input_name' => $input_name,
-							]),
-						];
-						$results[$entity->name . rand(1, 100)] = $result;
-					}
-				}
-				break;
-
-			case 'groups':
-				// don't return results if groups aren't enabled.
-				if (!elgg_is_active_plugin('groups')) {
-					continue;
-				}
+                $entities = elgg_get_entities($options);
+                if (!empty($entities)) {
+                    foreach ($entities as $entity) {
+                        if (in_array('groups', $match_on)) {
+                            $value = $entity->guid;
+                        } else {
+                            $value = $entity->username;
+                        }
+
+                        $output = elgg_view_list_item($entity, [
+                            'use_hover' => false,
+                            'use_link' => false,
+                            'class' => 'elgg-autocomplete-item',
+                            'title' => $entity->name, // Default title would be a link
+                        ]);
+
+                        $icon = elgg_view_entity_icon($entity, 'tiny', [
+                            'use_hover' => false,
+                        ]);
+
+                        $result = [
+                            'type' => 'user',
+                            'name' => $entity->name,
+                            'desc' => $entity->username,
+                            'guid' => $entity->guid,
+                            'label' => $output,
+                            'value' => $value,
+                            'icon' => $icon,
+                            'url' => $entity->getURL(),
+                            'html' => elgg_view('input/userpicker/item', [
+                                'entity' => $entity,
+                                'input_name' => $input_name,
+                            ]),
+                        ];
+                        $results[$entity->name . rand(1, 100)] = $result;
+                    }
+                }
+                break;
+
+            case 'groups':
+                // don't return results if groups aren't enabled.
+                if (!elgg_is_active_plugin('groups')) {
+                    continue;
+                }
 				
-				$options = [
-					'type' => 'group',
-					'limit' => $limit,
-					'owner_guid' => $owner_guid,
-					'joins' => ["JOIN {$dbprefix}groups_entity ge ON e.guid = ge.guid"],
-					'wheres' => [
-						"(ge.name LIKE '$q%' OR ge.name LIKE '% $q%' OR ge.description LIKE '% $q%')"
-					]
-				];
+                $options = [
+                    'type' => 'group',
+                    'limit' => $limit,
+                    'owner_guid' => $owner_guid,
+                    'joins' => ["JOIN {$dbprefix}groups_entity ge ON e.guid = ge.guid"],
+                    'wheres' => [
+                        "(ge.name LIKE '$q%' OR ge.name LIKE '% $q%' OR ge.description LIKE '% $q%')"
+                    ]
+                ];
 				
-				$entities = elgg_get_entities($options);
-				if (!empty($entities)) {
-					foreach ($entities as $entity) {
-						$output = elgg_view_list_item($entity, [
-							'use_hover' => false,
-							'class' => 'elgg-autocomplete-item',
-							'full_view' => false,
-							'href' => false,
-							'title' => $entity->name, // Default title would be a link
-						]);
-
-						$icon = elgg_view_entity_icon($entity, 'tiny', [
-							'use_hover' => false,
-						]);
-
-						$result = [
-							'type' => 'group',
-							'name' => $entity->name,
-							'desc' => strip_tags($entity->description),
-							'guid' => $entity->guid,
-							'label' => $output,
-							'value' => $entity->guid,
-							'icon' => $icon,
-							'url' => $entity->getURL(),
-						];
-
-						$results[$entity->name . rand(1, 100)] = $result;
-					}
-				}
-				break;
-
-			case 'friends':
-				$options = [
-					'type' => 'user',
-					'limit' => $limit,
-					'relationship' => 'friend',
-					'relationship_guid' => $user->getGUID(),
-					'joins' => ["JOIN {$dbprefix}users_entity ue ON e.guid = ue.guid"],
-					'wheres' => [
-						"ue.banned = 'no'",
-						"(ue.name LIKE '$q%' OR ue.name LIKE '% $q%' OR ue.username LIKE '$q%')"
-					]
-				];
+                $entities = elgg_get_entities($options);
+                if (!empty($entities)) {
+                    foreach ($entities as $entity) {
+                        $output = elgg_view_list_item($entity, [
+                            'use_hover' => false,
+                            'class' => 'elgg-autocomplete-item',
+                            'full_view' => false,
+                            'href' => false,
+                            'title' => $entity->name, // Default title would be a link
+                        ]);
+
+                        $icon = elgg_view_entity_icon($entity, 'tiny', [
+                            'use_hover' => false,
+                        ]);
+
+                        $result = [
+                            'type' => 'group',
+                            'name' => $entity->name,
+                            'desc' => strip_tags($entity->description),
+                            'guid' => $entity->guid,
+                            'label' => $output,
+                            'value' => $entity->guid,
+                            'icon' => $icon,
+                            'url' => $entity->getURL(),
+                        ];
+
+                        $results[$entity->name . rand(1, 100)] = $result;
+                    }
+                }
+                break;
+
+            case 'friends':
+                $options = [
+                    'type' => 'user',
+                    'limit' => $limit,
+                    'relationship' => 'friend',
+                    'relationship_guid' => $user->getGUID(),
+                    'joins' => ["JOIN {$dbprefix}users_entity ue ON e.guid = ue.guid"],
+                    'wheres' => [
+                        "ue.banned = 'no'",
+                        "(ue.name LIKE '$q%' OR ue.name LIKE '% $q%' OR ue.username LIKE '$q%')"
+                    ]
+                ];
 				
-				$entities = elgg_get_entities_from_relationship($options);
-				if (!empty($entities)) {
-					foreach ($entities as $entity) {
-						$output = elgg_view_list_item($entity, [
-							'use_hover' => false,
-							'use_link' => false,
-							'class' => 'elgg-autocomplete-item',
-							'title' => $entity->name, // Default title would be a link
-						]);
-
-						$icon = elgg_view_entity_icon($entity, 'tiny', [
-							'use_hover' => false,
-						]);
-
-						$result = [
-							'type' => 'user',
-							'name' => $entity->name,
-							'desc' => $entity->username,
-							'guid' => $entity->guid,
-							'label' => $output,
-							'value' => $entity->username,
-							'icon' => $icon,
-							'url' => $entity->getURL(),
-							'html' => elgg_view('input/userpicker/item', [
-								'entity' => $entity,
-								'input_name' => $input_name,
-							]),
-						];
-						$results[$entity->name . rand(1, 100)] = $result;
-					}
-				}
-				break;
-
-			default:
-				header("HTTP/1.0 400 Bad Request", true);
-				echo "livesearch: unknown match_on of $match_type";
-				exit;
-				break;
-		}
-	}
-
-	ksort($results);
-	header("Content-Type: application/json;charset=utf-8");
-	echo json_encode(array_values($results));
-	exit;
+                $entities = elgg_get_entities_from_relationship($options);
+                if (!empty($entities)) {
+                    foreach ($entities as $entity) {
+                        $output = elgg_view_list_item($entity, [
+                            'use_hover' => false,
+                            'use_link' => false,
+                            'class' => 'elgg-autocomplete-item',
+                            'title' => $entity->name, // Default title would be a link
+                        ]);
+
+                        $icon = elgg_view_entity_icon($entity, 'tiny', [
+                            'use_hover' => false,
+                        ]);
+
+                        $result = [
+                            'type' => 'user',
+                            'name' => $entity->name,
+                            'desc' => $entity->username,
+                            'guid' => $entity->guid,
+                            'label' => $output,
+                            'value' => $entity->username,
+                            'icon' => $icon,
+                            'url' => $entity->getURL(),
+                            'html' => elgg_view('input/userpicker/item', [
+                                'entity' => $entity,
+                                'input_name' => $input_name,
+                            ]),
+                        ];
+                        $results[$entity->name . rand(1, 100)] = $result;
+                    }
+                }
+                break;
+
+            default:
+                header("HTTP/1.0 400 Bad Request", true);
+                echo "livesearch: unknown match_on of $match_type";
+                exit;
+                break;
+        }
+    }
+
+    ksort($results);
+    header("Content-Type: application/json;charset=utf-8");
+    echo json_encode(array_values($results));
+    exit;
 }
 
 /**
@@ -425,38 +425,38 @@ 
  * @return mixed
  */
 function _elgg_htmlawed_filter_tags($hook, $type, $result, $params = null) {
-	$var = $result;
-
-	$config = [
-		// seems to handle about everything we need.
-		'safe' => true,
-
-		// remove comments/CDATA instead of converting to text
-		'comment' => 1,
-		'cdata' => 1,
-
-		'deny_attribute' => 'class, on*',
-		'hook_tag' => '_elgg_htmlawed_tag_post_processor',
-
-		'schemes' => '*:http,https,ftp,news,mailto,rtsp,teamspeak,gopher,mms,callto',
-		// apparent this doesn't work.
-		// 'style:color,cursor,text-align,font-size,font-weight,font-style,border,margin,padding,float'
-	];
-
-	// add nofollow to all links on output
-	if (!elgg_in_context('input')) {
-		$config['anti_link_spam'] = ['/./', ''];
-	}
-
-	$config = elgg_trigger_plugin_hook('config', 'htmlawed', null, $config);
-	$spec = elgg_trigger_plugin_hook('spec', 'htmlawed', null, '');
-
-	if (!is_array($var)) {
-		return Htmlawed::filter($var, $config, $spec);
-	} else {
-		array_walk_recursive($var, '_elgg_htmLawedArray', [$config, $spec]);
-		return $var;
-	}
+    $var = $result;
+
+    $config = [
+        // seems to handle about everything we need.
+        'safe' => true,
+
+        // remove comments/CDATA instead of converting to text
+        'comment' => 1,
+        'cdata' => 1,
+
+        'deny_attribute' => 'class, on*',
+        'hook_tag' => '_elgg_htmlawed_tag_post_processor',
+
+        'schemes' => '*:http,https,ftp,news,mailto,rtsp,teamspeak,gopher,mms,callto',
+        // apparent this doesn't work.
+        // 'style:color,cursor,text-align,font-size,font-weight,font-style,border,margin,padding,float'
+    ];
+
+    // add nofollow to all links on output
+    if (!elgg_in_context('input')) {
+        $config['anti_link_spam'] = ['/./', ''];
+    }
+
+    $config = elgg_trigger_plugin_hook('config', 'htmlawed', null, $config);
+    $spec = elgg_trigger_plugin_hook('spec', 'htmlawed', null, '');
+
+    if (!is_array($var)) {
+        return Htmlawed::filter($var, $config, $spec);
+    } else {
+        array_walk_recursive($var, '_elgg_htmLawedArray', [$config, $spec]);
+        return $var;
+    }
 }
 
 // @codingStandardsIgnoreStart
@@ -464,8 +464,8 @@ 
  * wrapper function for htmlawed for handling arrays
  */
 function _elgg_htmLawedArray(&$v, $k, $config_spec) {
-	list ($config, $spec) = $config_spec;
-	$v = Htmlawed::filter($v, $config, $spec);
+    list ($config, $spec) = $config_spec;
+    $v = Htmlawed::filter($v, $config, $spec);
 }
 // @codingStandardsIgnoreEnd
 
@@ -482,60 +482,60 @@ 
  * @return string
  */
 function _elgg_htmlawed_tag_post_processor($element, $attributes = false) {
-	if ($attributes === false) {
-		// This is a closing tag. Prevent further processing to avoid inserting a duplicate tag
-		return "</${element}>";
-	}
-
-	// this list should be coordinated with the WYSIWYG editor used (tinymce, ckeditor, etc.)
-	$allowed_styles = [
-		'color', 'cursor', 'text-align', 'vertical-align', 'font-size',
-		'font-weight', 'font-style', 'border', 'border-top', 'background-color',
-		'border-bottom', 'border-left', 'border-right',
-		'margin', 'margin-top', 'margin-bottom', 'margin-left',
-		'margin-right',	'padding', 'float', 'text-decoration'
-	];
-
-	$params = ['tag' => $element];
-	$allowed_styles = elgg_trigger_plugin_hook('allowed_styles', 'htmlawed', $params, $allowed_styles);
-
-	// must return something.
-	$string = '';
-
-	foreach ($attributes as $attr => $value) {
-		if ($attr == 'style') {
-			$styles = explode(';', $value);
-
-			$style_str = '';
-			foreach ($styles as $style) {
-				if (!trim($style)) {
-					continue;
-				}
-				list($style_attr, $style_value) = explode(':', trim($style));
-				$style_attr = trim($style_attr);
-				$style_value = trim($style_value);
-
-				if (in_array($style_attr, $allowed_styles)) {
-					$style_str .= "$style_attr: $style_value; ";
-				}
-			}
-
-			if ($style_str) {
-				$style_str = trim($style_str);
-				$string .= " style=\"$style_str\"";
-			}
-		} else {
-			$string .= " $attr=\"$value\"";
-		}
-	}
-
-	// Some WYSIWYG editors do not like tags like <p > so only add a space if needed.
-	if ($string = trim($string)) {
-		$string = " $string";
-	}
-
-	$r = "<$element$string>";
-	return $r;
+    if ($attributes === false) {
+        // This is a closing tag. Prevent further processing to avoid inserting a duplicate tag
+        return "</${element}>";
+    }
+
+    // this list should be coordinated with the WYSIWYG editor used (tinymce, ckeditor, etc.)
+    $allowed_styles = [
+        'color', 'cursor', 'text-align', 'vertical-align', 'font-size',
+        'font-weight', 'font-style', 'border', 'border-top', 'background-color',
+        'border-bottom', 'border-left', 'border-right',
+        'margin', 'margin-top', 'margin-bottom', 'margin-left',
+        'margin-right',	'padding', 'float', 'text-decoration'
+    ];
+
+    $params = ['tag' => $element];
+    $allowed_styles = elgg_trigger_plugin_hook('allowed_styles', 'htmlawed', $params, $allowed_styles);
+
+    // must return something.
+    $string = '';
+
+    foreach ($attributes as $attr => $value) {
+        if ($attr == 'style') {
+            $styles = explode(';', $value);
+
+            $style_str = '';
+            foreach ($styles as $style) {
+                if (!trim($style)) {
+                    continue;
+                }
+                list($style_attr, $style_value) = explode(':', trim($style));
+                $style_attr = trim($style_attr);
+                $style_value = trim($style_value);
+
+                if (in_array($style_attr, $allowed_styles)) {
+                    $style_str .= "$style_attr: $style_value; ";
+                }
+            }
+
+            if ($style_str) {
+                $style_str = trim($style_str);
+                $string .= " style=\"$style_str\"";
+            }
+        } else {
+            $string .= " $attr=\"$value\"";
+        }
+    }
+
+    // Some WYSIWYG editors do not like tags like <p > so only add a space if needed.
+    if ($string = trim($string)) {
+        $string = " $string";
+    }
+
+    $r = "<$element$string>";
+    return $r;
 }
 
 /**
@@ -549,8 +549,8 @@ 
  * @return array
  */
 function _elgg_htmlawed_test($hook, $type, $value, $params) {
-	$value[] = Paths::elgg() . 'engine/tests/ElggHtmLawedTest.php';
-	return $value;
+    $value[] = Paths::elgg() . 'engine/tests/ElggHtmLawedTest.php';
+    return $value;
 }
 
 /**
@@ -565,13 +565,13 @@ 
  */
 function _elgg_disable_password_autocomplete($hook, $type, $return_value, $params) {
 	
-	if (!_elgg_config()->security_disable_password_autocomplete) {
-		return;
-	}
+    if (!_elgg_config()->security_disable_password_autocomplete) {
+        return;
+    }
 	
-	$return_value['autocomplete'] = 'off';
+    $return_value['autocomplete'] = 'off';
 	
-	return $return_value;
+    return $return_value;
 }
 
 /**
@@ -581,19 +581,19 @@ 
  * @access private
  */
 function _elgg_input_init() {
-	// register an endpoint for live search / autocomplete.
-	elgg_register_page_handler('livesearch', 'input_livesearch_page_handler');
+    // register an endpoint for live search / autocomplete.
+    elgg_register_page_handler('livesearch', 'input_livesearch_page_handler');
 
-	elgg_register_plugin_hook_handler('validate', 'input', '_elgg_htmlawed_filter_tags', 1);
+    elgg_register_plugin_hook_handler('validate', 'input', '_elgg_htmlawed_filter_tags', 1);
 
-	elgg_register_plugin_hook_handler('unit_test', 'system', '_elgg_htmlawed_test');
+    elgg_register_plugin_hook_handler('unit_test', 'system', '_elgg_htmlawed_test');
 	
-	elgg_register_plugin_hook_handler('view_vars', 'input/password', '_elgg_disable_password_autocomplete');
+    elgg_register_plugin_hook_handler('view_vars', 'input/password', '_elgg_disable_password_autocomplete');
 }
 
 /**
  * @see \Elgg\Application::loadCore Do not do work here. Just register for events.
  */
 return function(\Elgg\EventsService $events, \Elgg\HooksRegistrationService $hooks) {
-	$events->registerHandler('init', 'system', '_elgg_input_init');
+    $events->registerHandler('init', 'system', '_elgg_input_init');
 };

engine/lib/users.php

Doc Comments +3 added lines, -3 removed lines

@@ -292,7 +292,7 @@ 
  * @param bool   $allow_multiple_emails Allow the same email address to be
  *                                      registered multiple times?
  *
- * @return int|false The new user's GUID; false on failure
+ * @return integer The new user's GUID; false on failure
  * @throws RegistrationException
  */
 function register_user($username, $password, $name, $email, $allow_multiple_emails = false) {
@@ -414,7 +414,7 @@ 
 /**
  * Sets the last action time of the given user to right now.
  *
- * @param ElggUser|int $user The user or GUID
+ * @param ElggUser $user The user or GUID
  * @return void
  */
 function set_last_action($user) {
@@ -695,7 +695,7 @@ 
  * /avatar/edit/<username>
  *
  * @param array $page
- * @return bool
+ * @return boolean|null
  * @access private
  */
 function elgg_avatar_page_handler($page) {

Spacing +12 added lines, -12 removed lines

@@ -204,13 +204,13 @@ 
 	}
 
 	// Blacklist for bad characters (partially nicked from mediawiki)
-	$blacklist = '/[' .
-		'\x{0080}-\x{009f}' . // iso-8859-1 control chars
-		'\x{00a0}' .          // non-breaking space
-		'\x{2000}-\x{200f}' . // various whitespace
-		'\x{2028}-\x{202f}' . // breaks and control chars
-		'\x{3000}' .          // ideographic space
-		'\x{e000}-\x{f8ff}' . // private use
+	$blacklist = '/['.
+		'\x{0080}-\x{009f}'.// iso-8859-1 control chars
+		'\x{00a0}'.// non-breaking space
+		'\x{2000}-\x{200f}'.// various whitespace
+		'\x{2028}-\x{202f}'.// breaks and control chars
+		'\x{3000}'.// ideographic space
+		'\x{e000}-\x{f8ff}'.// private use
 		']/u';
 
 	if (preg_match($blacklist, $username)) {
@@ -392,7 +392,7 @@ 
  */
 function elgg_get_registration_url(array $query = [], $fragment = '') {
 	$url = elgg_normalize_url('register');
-	$url = elgg_http_add_url_query_elements($url, $query) . $fragment;
+	$url = elgg_http_add_url_query_elements($url, $query).$fragment;
 	return elgg_trigger_plugin_hook('registration_url', 'site', $query, $url);
 }
 
@@ -407,7 +407,7 @@ 
  */
 function elgg_get_login_url(array $query = [], $fragment = '') {
 	$url = elgg_normalize_url('login');
-	$url = elgg_http_add_url_query_elements($url, $query) . $fragment;
+	$url = elgg_http_add_url_query_elements($url, $query).$fragment;
 	return elgg_trigger_plugin_hook('login_url', 'site', $query, $url);
 }
 
@@ -497,7 +497,7 @@ 
 			'text' => elgg_echo('avatar:edit'),
 			'icon' => 'image',
 			'href' => "avatar/edit/$user->username",
-			'section' => (elgg_get_logged_in_user_guid() == $user->guid)? 'action' : 'admin',
+			'section' => (elgg_get_logged_in_user_guid() == $user->guid) ? 'action' : 'admin',
 		]);
 	}
 
@@ -678,7 +678,7 @@ 
 
 	$return[] = \ElggMenuItem::factory([
 		'name' => 'account',
-		'text' => elgg_echo('account') . $toggle,
+		'text' => elgg_echo('account').$toggle,
 		'href' => $href,
 		'priority' => 800,
 		'section' => 'alt',
@@ -921,7 +921,7 @@ 
  * @access private
  */
 function users_test($hook, $type, $value, $params) {
-	$value[] = Paths::elgg() . "engine/tests/ElggUserTest.php";
+	$value[] = Paths::elgg()."engine/tests/ElggUserTest.php";
 	return $value;
 }
 

Indentation +414 added lines, -414 removed lines

@@ -17,7 +17,7 @@ 
  * @return bool Depending on success
  */
 function disable_user_entities($owner_guid) {
-	return _elgg_services()->usersTable->disableEntities($owner_guid);
+    return _elgg_services()->usersTable->disableEntities($owner_guid);
 }
 
 /**
@@ -29,7 +29,7 @@ 
  * @return bool
  */
 function ban_user($user_guid, $reason = "") {
-	return _elgg_services()->usersTable->ban($user_guid, $reason);
+    return _elgg_services()->usersTable->ban($user_guid, $reason);
 }
 
 /**
@@ -40,7 +40,7 @@ 
  * @return bool
  */
 function unban_user($user_guid) {
-	return _elgg_services()->usersTable->unban($user_guid);
+    return _elgg_services()->usersTable->unban($user_guid);
 }
 
 /**
@@ -51,7 +51,7 @@ 
  * @return bool
  */
 function make_user_admin($user_guid) {
-	return _elgg_services()->usersTable->makeAdmin($user_guid);
+    return _elgg_services()->usersTable->makeAdmin($user_guid);
 }
 
 /**
@@ -62,7 +62,7 @@ 
  * @return bool
  */
 function remove_user_admin($user_guid) {
-	return _elgg_services()->usersTable->removeAdmin($user_guid);
+    return _elgg_services()->usersTable->removeAdmin($user_guid);
 }
 
 /**
@@ -75,7 +75,7 @@ 
  * @return \ElggUser|false
  */
 function get_user($guid) {
-	return _elgg_services()->entityTable->get($guid, 'user');
+    return _elgg_services()->entityTable->get($guid, 'user');
 }
 
 /**
@@ -86,7 +86,7 @@ 
  * @return \ElggUser|false Depending on success
  */
 function get_user_by_username($username) {
-	return _elgg_services()->usersTable->getByUsername($username);
+    return _elgg_services()->usersTable->getByUsername($username);
 }
 
 /**
@@ -97,7 +97,7 @@ 
  * @return \ElggUser
  */
 function get_user_by_code($hash) {
-	return _elgg_services()->persistentLogin->getUserFromHash($hash);
+    return _elgg_services()->persistentLogin->getUserFromHash($hash);
 }
 
 /**
@@ -108,7 +108,7 @@ 
  * @return array
  */
 function get_user_by_email($email) {
-	return _elgg_services()->usersTable->getByEmail($email);
+    return _elgg_services()->usersTable->getByEmail($email);
 }
 
 /**
@@ -124,7 +124,7 @@ 
  * @return \ElggUser[]|int
  */
 function find_active_users(array $options = []) {
-	return _elgg_services()->usersTable->findActive($options);
+    return _elgg_services()->usersTable->findActive($options);
 }
 
 /**
@@ -135,7 +135,7 @@ 
  * @return bool
  */
 function send_new_password_request($user_guid) {
-	return _elgg_services()->passwords->sendNewPasswordRequest($user_guid);
+    return _elgg_services()->passwords->sendNewPasswordRequest($user_guid);
 }
 
 /**
@@ -149,7 +149,7 @@ 
  * @return bool
  */
 function force_user_password_reset($user_guid, $password) {
-	return _elgg_services()->passwords->forcePasswordReset($user_guid, $password);
+    return _elgg_services()->passwords->forcePasswordReset($user_guid, $password);
 }
 
 /**
@@ -162,7 +162,7 @@ 
  * @return bool True on success
  */
 function execute_new_password_request($user_guid, $conf_code, $password = null) {
-	return _elgg_services()->passwords->executeNewPasswordReset($user_guid, $conf_code, $password);
+    return _elgg_services()->passwords->executeNewPasswordReset($user_guid, $conf_code, $password);
 }
 
 /**
@@ -171,7 +171,7 @@ 
  * @return string
  */
 function generate_random_cleartext_password() {
-	return _elgg_services()->crypto->getRandomString(12, \ElggCrypto::CHARS_PASSWORD);
+    return _elgg_services()->crypto->getRandomString(12, \ElggCrypto::CHARS_PASSWORD);
 }
 
 /**
@@ -185,57 +185,57 @@ 
  * @throws RegistrationException on invalid
  */
 function validate_username($username) {
-	$config = _elgg_config();
-
-	// Basic, check length
-	if (!isset($config->minusername)) {
-		$config->minusername = 4;
-	}
-
-	if (strlen($username) < $config->minusername) {
-		$msg = elgg_echo('registration:usernametooshort', [$config->minusername]);
-		throw new \RegistrationException($msg);
-	}
-
-	// username in the database has a limit of 128 characters
-	if (strlen($username) > 128) {
-		$msg = elgg_echo('registration:usernametoolong', [128]);
-		throw new \RegistrationException($msg);
-	}
-
-	// Blacklist for bad characters (partially nicked from mediawiki)
-	$blacklist = '/[' .
-		'\x{0080}-\x{009f}' . // iso-8859-1 control chars
-		'\x{00a0}' .          // non-breaking space
-		'\x{2000}-\x{200f}' . // various whitespace
-		'\x{2028}-\x{202f}' . // breaks and control chars
-		'\x{3000}' .          // ideographic space
-		'\x{e000}-\x{f8ff}' . // private use
-		']/u';
-
-	if (preg_match($blacklist, $username)) {
-		// @todo error message needs work
-		throw new \RegistrationException(elgg_echo('registration:invalidchars'));
-	}
-
-	// Belts and braces
-	// @todo Tidy into main unicode
-	$blacklist2 = '\'/\\"*& ?#%^(){}[]~?<>;|¬`@+=';
-
-	$blacklist2 = elgg_trigger_plugin_hook('username:character_blacklist', 'user',
-		['blacklist' => $blacklist2], $blacklist2);
-
-	for ($n = 0; $n < strlen($blacklist2); $n++) {
-		if (strpos($username, $blacklist2[$n]) !== false) {
-			$msg = elgg_echo('registration:invalidchars', [$blacklist2[$n], $blacklist2]);
-			$msg = htmlspecialchars($msg, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
-			throw new \RegistrationException($msg);
-		}
-	}
-
-	$result = true;
-	return elgg_trigger_plugin_hook('registeruser:validate:username', 'all',
-		['username' => $username], $result);
+    $config = _elgg_config();
+
+    // Basic, check length
+    if (!isset($config->minusername)) {
+        $config->minusername = 4;
+    }
+
+    if (strlen($username) < $config->minusername) {
+        $msg = elgg_echo('registration:usernametooshort', [$config->minusername]);
+        throw new \RegistrationException($msg);
+    }
+
+    // username in the database has a limit of 128 characters
+    if (strlen($username) > 128) {
+        $msg = elgg_echo('registration:usernametoolong', [128]);
+        throw new \RegistrationException($msg);
+    }
+
+    // Blacklist for bad characters (partially nicked from mediawiki)
+    $blacklist = '/[' .
+        '\x{0080}-\x{009f}' . // iso-8859-1 control chars
+        '\x{00a0}' .          // non-breaking space
+        '\x{2000}-\x{200f}' . // various whitespace
+        '\x{2028}-\x{202f}' . // breaks and control chars
+        '\x{3000}' .          // ideographic space
+        '\x{e000}-\x{f8ff}' . // private use
+        ']/u';
+
+    if (preg_match($blacklist, $username)) {
+        // @todo error message needs work
+        throw new \RegistrationException(elgg_echo('registration:invalidchars'));
+    }
+
+    // Belts and braces
+    // @todo Tidy into main unicode
+    $blacklist2 = '\'/\\"*& ?#%^(){}[]~?<>;|¬`@+=';
+
+    $blacklist2 = elgg_trigger_plugin_hook('username:character_blacklist', 'user',
+        ['blacklist' => $blacklist2], $blacklist2);
+
+    for ($n = 0; $n < strlen($blacklist2); $n++) {
+        if (strpos($username, $blacklist2[$n]) !== false) {
+            $msg = elgg_echo('registration:invalidchars', [$blacklist2[$n], $blacklist2]);
+            $msg = htmlspecialchars($msg, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
+            throw new \RegistrationException($msg);
+        }
+    }
+
+    $result = true;
+    return elgg_trigger_plugin_hook('registeruser:validate:username', 'all',
+        ['username' => $username], $result);
 }
 
 /**
@@ -247,20 +247,20 @@ 
  * @throws RegistrationException on invalid
  */
 function validate_password($password) {
-	$config = _elgg_config();
+    $config = _elgg_config();
 
-	if (!isset($config->min_password_length)) {
-		$config->min_password_length = 6;
-	}
+    if (!isset($config->min_password_length)) {
+        $config->min_password_length = 6;
+    }
 
-	if (strlen($password) < $config->min_password_length) {
-		$msg = elgg_echo('registration:passwordtooshort', [$config->min_password_length]);
-		throw new \RegistrationException($msg);
-	}
+    if (strlen($password) < $config->min_password_length) {
+        $msg = elgg_echo('registration:passwordtooshort', [$config->min_password_length]);
+        throw new \RegistrationException($msg);
+    }
 
-	$result = true;
-	return elgg_trigger_plugin_hook('registeruser:validate:password', 'all',
-		['password' => $password], $result);
+    $result = true;
+    return elgg_trigger_plugin_hook('registeruser:validate:password', 'all',
+        ['password' => $password], $result);
 }
 
 /**
@@ -272,14 +272,14 @@ 
  * @return bool
  */
 function validate_email_address($address) {
-	if (!is_email_address($address)) {
-		throw new \RegistrationException(elgg_echo('registration:notemail'));
-	}
+    if (!is_email_address($address)) {
+        throw new \RegistrationException(elgg_echo('registration:notemail'));
+    }
 
-	// Got here, so lets try a hook (defaulting to ok)
-	$result = true;
-	return elgg_trigger_plugin_hook('registeruser:validate:email', 'all',
-		['email' => $address], $result);
+    // Got here, so lets try a hook (defaulting to ok)
+    $result = true;
+    return elgg_trigger_plugin_hook('registeruser:validate:email', 'all',
+        ['email' => $address], $result);
 }
 
 /**
@@ -296,7 +296,7 @@ 
  * @throws RegistrationException
  */
 function register_user($username, $password, $name, $email, $allow_multiple_emails = false) {
-	return _elgg_services()->usersTable->register($username, $password, $name, $email, $allow_multiple_emails);
+    return _elgg_services()->usersTable->register($username, $password, $name, $email, $allow_multiple_emails);
 }
 
 /**
@@ -308,7 +308,7 @@ 
  * @see elgg_validate_invite_code
  */
 function generate_invite_code($username) {
-	return _elgg_services()->usersTable->generateInviteCode($username);
+    return _elgg_services()->usersTable->generateInviteCode($username);
 }
 
 /**
@@ -322,7 +322,7 @@ 
  * @since 1.10
  */
 function elgg_validate_invite_code($username, $code) {
-	return _elgg_services()->usersTable->validateInviteCode($username, $code);
+    return _elgg_services()->usersTable->validateInviteCode($username, $code);
 }
 
 /**
@@ -335,7 +335,7 @@ 
  * @since 1.8.0
  */
 function elgg_set_user_validation_status($user_guid, $status, $method = '') {
-	return _elgg_services()->usersTable->setValidationStatus($user_guid, $status, $method);
+    return _elgg_services()->usersTable->setValidationStatus($user_guid, $status, $method);
 }
 
 /**
@@ -346,7 +346,7 @@ 
  * @since 1.8.0
  */
 function elgg_get_user_validation_status($user_guid) {
-	return _elgg_services()->usersTable->getValidationStatus($user_guid);
+    return _elgg_services()->usersTable->getValidationStatus($user_guid);
 }
 
 /**
@@ -360,24 +360,24 @@ 
  */
 function elgg_user_account_page_handler($page_elements, $handler) {
 
-	switch ($handler) {
-		case 'login':
-			echo elgg_view_resource("account/login");
-			break;
-		case 'forgotpassword':
-			echo elgg_view_resource("account/forgotten_password");
-			break;
-		case 'changepassword':
-			echo elgg_view_resource("account/change_password");
-			break;
-		case 'register':
-			echo elgg_view_resource("account/register");
-			break;
-		default:
-			return false;
-	}
+    switch ($handler) {
+        case 'login':
+            echo elgg_view_resource("account/login");
+            break;
+        case 'forgotpassword':
+            echo elgg_view_resource("account/forgotten_password");
+            break;
+        case 'changepassword':
+            echo elgg_view_resource("account/change_password");
+            break;
+        case 'register':
+            echo elgg_view_resource("account/register");
+            break;
+        default:
+            return false;
+    }
 
-	return true;
+    return true;
 }
 
 /**
@@ -391,9 +391,9 @@ 
  * @return string
  */
 function elgg_get_registration_url(array $query = [], $fragment = '') {
-	$url = elgg_normalize_url('register');
-	$url = elgg_http_add_url_query_elements($url, $query) . $fragment;
-	return elgg_trigger_plugin_hook('registration_url', 'site', $query, $url);
+    $url = elgg_normalize_url('register');
+    $url = elgg_http_add_url_query_elements($url, $query) . $fragment;
+    return elgg_trigger_plugin_hook('registration_url', 'site', $query, $url);
 }
 
 /**
@@ -406,9 +406,9 @@ 
  * @return string
  */
 function elgg_get_login_url(array $query = [], $fragment = '') {
-	$url = elgg_normalize_url('login');
-	$url = elgg_http_add_url_query_elements($url, $query) . $fragment;
-	return elgg_trigger_plugin_hook('login_url', 'site', $query, $url);
+    $url = elgg_normalize_url('login');
+    $url = elgg_http_add_url_query_elements($url, $query) . $fragment;
+    return elgg_trigger_plugin_hook('login_url', 'site', $query, $url);
 }
 
 /**
@@ -418,16 +418,16 @@ 
  * @return void
  */
 function set_last_action($user) {
-	if (!$user) {
-		return;
-	}
-	if (!$user instanceof ElggUser) {
-		$user = get_user($user);
-	}
-	if (!$user) {
-		return;
-	}
-	_elgg_services()->usersTable->setLastAction($user);
+    if (!$user) {
+        return;
+    }
+    if (!$user instanceof ElggUser) {
+        $user = get_user($user);
+    }
+    if (!$user) {
+        return;
+    }
+    _elgg_services()->usersTable->setLastAction($user);
 }
 
 /**
@@ -437,11 +437,11 @@ 
  * @return void
  */
 function set_last_login($user_guid) {
-	$user = get_user($user_guid);
-	if (!$user) {
-		return;
-	}
-	_elgg_services()->usersTable->setLastLogin($user);
+    $user = get_user($user_guid);
+    if (!$user) {
+        return;
+    }
+    _elgg_services()->usersTable->setLastLogin($user);
 }
 
 /**
@@ -456,23 +456,23 @@ 
  * @access private
  */
 function user_avatar_hook($hook, $type, $return, $params) {
-	$user = elgg_extract('entity', $params);
-	$size = elgg_extract('size', $params, 'medium');
+    $user = elgg_extract('entity', $params);
+    $size = elgg_extract('size', $params, 'medium');
 
-	if (!$user instanceof ElggUser) {
-		return;
-	}
+    if (!$user instanceof ElggUser) {
+        return;
+    }
 
-	if (_elgg_config()->walled_garden) {
-		return;
-	}
+    if (_elgg_config()->walled_garden) {
+        return;
+    }
 
-	if (!$user->hasIcon($size, 'icon')) {
-		return;
-	}
+    if (!$user->hasIcon($size, 'icon')) {
+        return;
+    }
 	
-	$icon = $user->getIcon($size, 'icon');
-	return elgg_get_inline_url($icon, false);
+    $icon = $user->getIcon($size, 'icon');
+    return elgg_get_inline_url($icon, false);
 }
 
 /**
@@ -480,104 +480,104 @@ 
  * @access private
  */
 function elgg_user_hover_menu($hook, $type, $return, $params) {
-	$user = elgg_extract('entity', $params);
-	/* @var \ElggUser $user */
-
-	if (!$user instanceof \ElggUser) {
-		return;
-	}
-
-	if (!elgg_is_logged_in()) {
-		return;
-	}
-	
-	if ($user->canEdit()) {
-		$return[] = ElggMenuItem::factory([
-			'name' => 'avatar:edit',
-			'text' => elgg_echo('avatar:edit'),
-			'icon' => 'image',
-			'href' => "avatar/edit/$user->username",
-			'section' => (elgg_get_logged_in_user_guid() == $user->guid)? 'action' : 'admin',
-		]);
-	}
-
-	// prevent admins from banning or deleting themselves
-	if (elgg_get_logged_in_user_guid() == $user->guid) {
-		return $return;
-	}
-
-	if (!elgg_is_admin_logged_in()) {
-		return $return;
-	}
-	
-	// following items are admin only
-	if (!$user->isBanned()) {
-		$return[] = ElggMenuItem::factory([
-			'name' => 'ban',
-			'text' => elgg_echo('ban'),
-			'icon' => 'ban',
-			'href' => "action/admin/user/ban?guid={$user->guid}",
-			'confirm' => true,
-			'section' => 'admin',
-		]);
-	} else {
-		$return[] = ElggMenuItem::factory([
-			'name' => 'unban',
-			'text' => elgg_echo('unban'),
-			'icon' => 'ban',
-			'href' => "action/admin/user/unban?guid={$user->guid}",
-			'confirm' => true,
-			'section' => 'admin',
-		]);
-	}
-	
-	$return[] = ElggMenuItem::factory([
-		'name' => 'delete',
-		'text' => elgg_echo('delete'),
-		'icon' => 'delete',
-		'href' => "action/admin/user/delete?guid={$user->guid}",
-		'confirm' => true,
-		'section' => 'admin',
-	]);
-	
-	$return[] = ElggMenuItem::factory([
-		'name' => 'resetpassword',
-		'text' => elgg_echo('resetpassword'),
-		'icon' => 'refresh',
-		'href' => "action/admin/user/resetpassword?guid={$user->guid}",
-		'confirm' => true,
-		'section' => 'admin',
-	]);
-	
-	if (!$user->isAdmin()) {
-		$return[] = ElggMenuItem::factory([
-			'name' => 'makeadmin',
-			'text' => elgg_echo('makeadmin'),
-			'icon' => 'level-up',
-			'href' => "action/admin/user/makeadmin?guid={$user->guid}",
-			'confirm' => true,
-			'section' => 'admin',
-		]);
-	} else {
-		$return[] = ElggMenuItem::factory([
-			'name' => 'removeadmin',
-			'text' => elgg_echo('removeadmin'),
-			'icon' => 'level-down',
-			'href' => "action/admin/user/removeadmin?guid={$user->guid}",
-			'confirm' => true,
-			'section' => 'admin',
-		]);
-	}
-	
-	$return[] = ElggMenuItem::factory([
-		'name' => 'settings:edit',
-		'text' => elgg_echo('settings:edit'),
-		'icon' => 'cogs',
-		'href' => "settings/user/$user->username",
-		'section' => 'admin',
-	]);
-
-	return $return;
+    $user = elgg_extract('entity', $params);
+    /* @var \ElggUser $user */
+
+    if (!$user instanceof \ElggUser) {
+        return;
+    }
+
+    if (!elgg_is_logged_in()) {
+        return;
+    }
+	
+    if ($user->canEdit()) {
+        $return[] = ElggMenuItem::factory([
+            'name' => 'avatar:edit',
+            'text' => elgg_echo('avatar:edit'),
+            'icon' => 'image',
+            'href' => "avatar/edit/$user->username",
+            'section' => (elgg_get_logged_in_user_guid() == $user->guid)? 'action' : 'admin',
+        ]);
+    }
+
+    // prevent admins from banning or deleting themselves
+    if (elgg_get_logged_in_user_guid() == $user->guid) {
+        return $return;
+    }
+
+    if (!elgg_is_admin_logged_in()) {
+        return $return;
+    }
+	
+    // following items are admin only
+    if (!$user->isBanned()) {
+        $return[] = ElggMenuItem::factory([
+            'name' => 'ban',
+            'text' => elgg_echo('ban'),
+            'icon' => 'ban',
+            'href' => "action/admin/user/ban?guid={$user->guid}",
+            'confirm' => true,
+            'section' => 'admin',
+        ]);
+    } else {
+        $return[] = ElggMenuItem::factory([
+            'name' => 'unban',
+            'text' => elgg_echo('unban'),
+            'icon' => 'ban',
+            'href' => "action/admin/user/unban?guid={$user->guid}",
+            'confirm' => true,
+            'section' => 'admin',
+        ]);
+    }
+	
+    $return[] = ElggMenuItem::factory([
+        'name' => 'delete',
+        'text' => elgg_echo('delete'),
+        'icon' => 'delete',
+        'href' => "action/admin/user/delete?guid={$user->guid}",
+        'confirm' => true,
+        'section' => 'admin',
+    ]);
+	
+    $return[] = ElggMenuItem::factory([
+        'name' => 'resetpassword',
+        'text' => elgg_echo('resetpassword'),
+        'icon' => 'refresh',
+        'href' => "action/admin/user/resetpassword?guid={$user->guid}",
+        'confirm' => true,
+        'section' => 'admin',
+    ]);
+	
+    if (!$user->isAdmin()) {
+        $return[] = ElggMenuItem::factory([
+            'name' => 'makeadmin',
+            'text' => elgg_echo('makeadmin'),
+            'icon' => 'level-up',
+            'href' => "action/admin/user/makeadmin?guid={$user->guid}",
+            'confirm' => true,
+            'section' => 'admin',
+        ]);
+    } else {
+        $return[] = ElggMenuItem::factory([
+            'name' => 'removeadmin',
+            'text' => elgg_echo('removeadmin'),
+            'icon' => 'level-down',
+            'href' => "action/admin/user/removeadmin?guid={$user->guid}",
+            'confirm' => true,
+            'section' => 'admin',
+        ]);
+    }
+	
+    $return[] = ElggMenuItem::factory([
+        'name' => 'settings:edit',
+        'text' => elgg_echo('settings:edit'),
+        'icon' => 'cogs',
+        'href' => "settings/user/$user->username",
+        'section' => 'admin',
+    ]);
+
+    return $return;
 }
 
 /**
@@ -590,15 +590,15 @@ 
  * @access private
  */
 function elgg_avatar_page_handler($page) {
-	$user = get_user_by_username(elgg_extract(1, $page));
-	if ($user) {
-		elgg_set_page_owner_guid($user->getGUID());
-	}
+    $user = get_user_by_username(elgg_extract(1, $page));
+    if ($user) {
+        elgg_set_page_owner_guid($user->getGUID());
+    }
 
-	if ($page[0] == 'edit') {
-		echo elgg_view_resource("avatar/edit");
-		return true;
-	}
+    if ($page[0] == 'edit') {
+        echo elgg_view_resource("avatar/edit");
+        return true;
+    }
 }
 
 /**
@@ -611,10 +611,10 @@ 
  * @access private
  */
 function _elgg_user_page_handler($page) {
-	echo elgg_view_resource('user/view', [
-		'guid' => (int) elgg_extract(1, $page),
-	]);
-	return true;
+    echo elgg_view_resource('user/view', [
+        'guid' => (int) elgg_extract(1, $page),
+    ]);
+    return true;
 }
 
 /**
@@ -633,20 +633,20 @@ 
  */
 function _elgg_user_page_menu($hook, $type, $return, $params) {
 	
-	$owner = elgg_get_page_owner_entity();
-	if (!$owner) {
-		return;
-	}
+    $owner = elgg_get_page_owner_entity();
+    if (!$owner) {
+        return;
+    }
 
-	$return[] = \ElggMenuItem::factory([
-		'name' => 'edit_avatar',
-		'href' => "avatar/edit/{$owner->username}",
-		'text' => elgg_echo('avatar:edit'),
-		'section' => '1_profile',
-		'contexts' => ['settings'],
-	]);
+    $return[] = \ElggMenuItem::factory([
+        'name' => 'edit_avatar',
+        'href' => "avatar/edit/{$owner->username}",
+        'text' => elgg_echo('avatar:edit'),
+        'section' => '1_profile',
+        'contexts' => ['settings'],
+    ]);
 	
-	return $return;
+    return $return;
 }
 
 /**
@@ -665,68 +665,68 @@ 
  */
 function _elgg_user_topbar_menu($hook, $type, $return, $params) {
 	
-	$viewer = elgg_get_logged_in_user_entity();
-	if (!$viewer) {
-		return;
-	}
-
-	$toggle = elgg_view_icon('chevron-down', ['class' => 'elgg-state-closed']);
-	$toggle .= elgg_view_icon('chevron-up', ['class' => 'elgg-state-opened']);
-
-	// If JS fails here, allow easy access to place where they can upgrade/flush caches
-	$href = elgg_is_admin_logged_in() ? 'admin' : '#';
-
-	$return[] = \ElggMenuItem::factory([
-		'name' => 'account',
-		'text' => elgg_echo('account') . $toggle,
-		'href' => $href,
-		'priority' => 800,
-		'section' => 'alt',
-		'child_menu' => [
-			'display' => 'dropdown',
-			'class' => 'elgg-topbar-child-menu',
-			'data-position' => json_encode([
-				'at' => 'right+10px bottom',
-				'my' => 'right top',
-				'collision' => 'fit fit',
-			]),
-		],
-	]);
-	
-	$return[] = \ElggMenuItem::factory([
-		'name' => 'usersettings',
-		'parent_name' => 'account',
-		'href' => "settings/user/{$viewer->username}",
-		'text' => elgg_echo('settings'),
-		'icon' => 'cogs',
-		'priority' => 300,
-		'section' => 'alt',
-	]);
-	
-	if ($viewer->isAdmin()) {
-		$return[] = \ElggMenuItem::factory([
-			'name' => 'administration',
-			'parent_name' => 'account',
-			'href' => 'admin',
-			'text' => elgg_echo('admin'),
-			'icon' => 'tasks',
-			'priority' => 800,
-			'section' => 'alt',
-		]);
-	}
-	
-	$return[] = \ElggMenuItem::factory([
-		'name' => 'logout',
-		'parent_name' => 'account',
-		'href' => 'action/logout',
-		'text' => elgg_echo('logout'),
-		'icon' => 'sign-out',
-		'is_action' => true,
-		'priority' => 900,
-		'section' => 'alt',
-	]);
-	
-	return $return;
+    $viewer = elgg_get_logged_in_user_entity();
+    if (!$viewer) {
+        return;
+    }
+
+    $toggle = elgg_view_icon('chevron-down', ['class' => 'elgg-state-closed']);
+    $toggle .= elgg_view_icon('chevron-up', ['class' => 'elgg-state-opened']);
+
+    // If JS fails here, allow easy access to place where they can upgrade/flush caches
+    $href = elgg_is_admin_logged_in() ? 'admin' : '#';
+
+    $return[] = \ElggMenuItem::factory([
+        'name' => 'account',
+        'text' => elgg_echo('account') . $toggle,
+        'href' => $href,
+        'priority' => 800,
+        'section' => 'alt',
+        'child_menu' => [
+            'display' => 'dropdown',
+            'class' => 'elgg-topbar-child-menu',
+            'data-position' => json_encode([
+                'at' => 'right+10px bottom',
+                'my' => 'right top',
+                'collision' => 'fit fit',
+            ]),
+        ],
+    ]);
+	
+    $return[] = \ElggMenuItem::factory([
+        'name' => 'usersettings',
+        'parent_name' => 'account',
+        'href' => "settings/user/{$viewer->username}",
+        'text' => elgg_echo('settings'),
+        'icon' => 'cogs',
+        'priority' => 300,
+        'section' => 'alt',
+    ]);
+	
+    if ($viewer->isAdmin()) {
+        $return[] = \ElggMenuItem::factory([
+            'name' => 'administration',
+            'parent_name' => 'account',
+            'href' => 'admin',
+            'text' => elgg_echo('admin'),
+            'icon' => 'tasks',
+            'priority' => 800,
+            'section' => 'alt',
+        ]);
+    }
+	
+    $return[] = \ElggMenuItem::factory([
+        'name' => 'logout',
+        'parent_name' => 'account',
+        'href' => 'action/logout',
+        'text' => elgg_echo('logout'),
+        'icon' => 'sign-out',
+        'is_action' => true,
+        'priority' => 900,
+        'section' => 'alt',
+    ]);
+	
+    return $return;
 }
 
 /**
@@ -740,13 +740,13 @@ 
  */
 function _elgg_user_set_icon_file($hook, $type, $icon, $params) {
 
-	$entity = elgg_extract('entity', $params);
-	$size = elgg_extract('size', $params, 'medium');
+    $entity = elgg_extract('entity', $params);
+    $size = elgg_extract('size', $params, 'medium');
 
-	$icon->owner_guid = $entity->guid;
-	$icon->setFilename("profile/{$entity->guid}{$size}.jpg");
+    $icon->owner_guid = $entity->guid;
+    $icon->setFilename("profile/{$entity->guid}{$size}.jpg");
 	
-	return $icon;
+    return $icon;
 }
 
 /**
@@ -761,27 +761,27 @@ 
  */
 function _elgg_user_get_subscriber_unban_action($hook, $type, $return_value, $params) {
 	
-	if (!_elgg_config()->security_notify_user_ban) {
-		return;
-	}
+    if (!_elgg_config()->security_notify_user_ban) {
+        return;
+    }
 	
-	$event = elgg_extract('event', $params);
-	if (!($event instanceof \Elgg\Notifications\Event)) {
-		return;
-	}
+    $event = elgg_extract('event', $params);
+    if (!($event instanceof \Elgg\Notifications\Event)) {
+        return;
+    }
 	
-	if ($event->getAction() !== 'unban') {
-		return;
-	}
+    if ($event->getAction() !== 'unban') {
+        return;
+    }
 	
-	$user = $event->getObject();
-	if (!($user instanceof \ElggUser)) {
-		return;
-	}
+    $user = $event->getObject();
+    if (!($user instanceof \ElggUser)) {
+        return;
+    }
 	
-	$return_value[$user->getGUID()] = ['email'];
+    $return_value[$user->getGUID()] = ['email'];
 	
-	return $return_value;
+    return $return_value;
 }
 
 /**
@@ -797,30 +797,30 @@ 
  */
 function _elgg_user_ban_notification($event, $type, $user) {
 	
-	if (!_elgg_config()->security_notify_user_ban) {
-		return;
-	}
+    if (!_elgg_config()->security_notify_user_ban) {
+        return;
+    }
 	
-	if (!($user instanceof \ElggUser)) {
-		return;
-	}
+    if (!($user instanceof \ElggUser)) {
+        return;
+    }
 	
-	$site = elgg_get_site_entity();
-	$language = $user->getLanguage();
+    $site = elgg_get_site_entity();
+    $language = $user->getLanguage();
 	
-	$subject = elgg_echo('user:notification:ban:subject', [$site->name], $language);
-	$body = elgg_echo('user:notification:ban:body', [
-		$user->name,
-		$site->name,
-		$site->getURL(),
-	], $language);
+    $subject = elgg_echo('user:notification:ban:subject', [$site->name], $language);
+    $body = elgg_echo('user:notification:ban:body', [
+        $user->name,
+        $site->name,
+        $site->getURL(),
+    ], $language);
 	
-	$params = [
-		'action' => 'ban',
-		'object' => $user,
-	];
+    $params = [
+        'action' => 'ban',
+        'object' => $user,
+    ];
 	
-	notify_user($user->getGUID(), $site->getGUID(), $subject, $body, $params, ['email']);
+    notify_user($user->getGUID(), $site->getGUID(), $subject, $body, $params, ['email']);
 }
 
 /**
@@ -835,34 +835,34 @@ 
  */
 function _elgg_user_prepare_unban_notification($hook, $type, $return_value, $params) {
 	
-	if (!($return_value instanceof \Elgg\Notifications\Notification)) {
-		return;
-	}
+    if (!($return_value instanceof \Elgg\Notifications\Notification)) {
+        return;
+    }
 	
-	$recipient = elgg_extract('recipient', $params);
-	$object = elgg_extract('object', $params);
-	$language = elgg_extract('language', $params);
+    $recipient = elgg_extract('recipient', $params);
+    $object = elgg_extract('object', $params);
+    $language = elgg_extract('language', $params);
 	
-	if (!($recipient instanceof ElggUser) || !($object instanceof ElggUser)) {
-		return;
-	}
+    if (!($recipient instanceof ElggUser) || !($object instanceof ElggUser)) {
+        return;
+    }
 	
-	if ($recipient->getGUID() !== $object->getGUID()) {
-		return;
-	}
+    if ($recipient->getGUID() !== $object->getGUID()) {
+        return;
+    }
 	
-	$site = elgg_get_site_entity();
+    $site = elgg_get_site_entity();
 	
-	$return_value->subject = elgg_echo('user:notification:unban:subject', [$site->name], $language);
-	$return_value->body = elgg_echo('user:notification:unban:body', [
-		$recipient->name,
-		$site->name,
-		$site->getURL(),
-	], $language);
+    $return_value->subject = elgg_echo('user:notification:unban:subject', [$site->name], $language);
+    $return_value->body = elgg_echo('user:notification:unban:body', [
+        $recipient->name,
+        $site->name,
+        $site->getURL(),
+    ], $language);
 
-	$return_value->url = $recipient->getURL();
+    $return_value->url = $recipient->getURL();
 	
-	return $return_value;
+    return $return_value;
 }
 
 /**
@@ -873,39 +873,39 @@ 
  */
 function users_init() {
 
-	elgg_register_page_handler('register', 'elgg_user_account_page_handler');
-	elgg_register_page_handler('forgotpassword', 'elgg_user_account_page_handler');
-	elgg_register_page_handler('changepassword', 'elgg_user_account_page_handler');
-	elgg_register_page_handler('login', 'elgg_user_account_page_handler');
-	elgg_register_page_handler('avatar', 'elgg_avatar_page_handler');
-	elgg_register_page_handler('user', '_elgg_user_page_handler');
+    elgg_register_page_handler('register', 'elgg_user_account_page_handler');
+    elgg_register_page_handler('forgotpassword', 'elgg_user_account_page_handler');
+    elgg_register_page_handler('changepassword', 'elgg_user_account_page_handler');
+    elgg_register_page_handler('login', 'elgg_user_account_page_handler');
+    elgg_register_page_handler('avatar', 'elgg_avatar_page_handler');
+    elgg_register_page_handler('user', '_elgg_user_page_handler');
 
-	elgg_register_plugin_hook_handler('register', 'menu:user_hover', 'elgg_user_hover_menu');
-	elgg_register_plugin_hook_handler('register', 'menu:page', '_elgg_user_page_menu');
-	elgg_register_plugin_hook_handler('register', 'menu:topbar', '_elgg_user_topbar_menu');
+    elgg_register_plugin_hook_handler('register', 'menu:user_hover', 'elgg_user_hover_menu');
+    elgg_register_plugin_hook_handler('register', 'menu:page', '_elgg_user_page_menu');
+    elgg_register_plugin_hook_handler('register', 'menu:topbar', '_elgg_user_topbar_menu');
 
-	elgg_register_action('login', '', 'public');
-	elgg_register_action('logout');
-	elgg_register_action('register', '', 'public');
-	elgg_register_action('useradd', '', 'admin');
-	elgg_register_action('avatar/upload');
-	elgg_register_action('avatar/crop');
-	elgg_register_action('avatar/remove');
+    elgg_register_action('login', '', 'public');
+    elgg_register_action('logout');
+    elgg_register_action('register', '', 'public');
+    elgg_register_action('useradd', '', 'admin');
+    elgg_register_action('avatar/upload');
+    elgg_register_action('avatar/crop');
+    elgg_register_action('avatar/remove');
 
-	elgg_register_plugin_hook_handler('entity:icon:url', 'user', 'user_avatar_hook');
+    elgg_register_plugin_hook_handler('entity:icon:url', 'user', 'user_avatar_hook');
 
-	elgg_register_action('user/changepassword', '', 'public');
-	elgg_register_action('user/requestnewpassword', '', 'public');
+    elgg_register_action('user/changepassword', '', 'public');
+    elgg_register_action('user/requestnewpassword', '', 'public');
 
-	// Register the user type
-	elgg_register_entity_type('user', '');
+    // Register the user type
+    elgg_register_entity_type('user', '');
 
-	elgg_register_plugin_hook_handler('entity:icon:file', 'user', '_elgg_user_set_icon_file');
+    elgg_register_plugin_hook_handler('entity:icon:file', 'user', '_elgg_user_set_icon_file');
 	
-	elgg_register_notification_event('user', '', ['unban']);
-	elgg_register_plugin_hook_handler('get', 'subscriptions', '_elgg_user_get_subscriber_ban_action');
-	elgg_register_event_handler('ban', 'user', '_elgg_user_ban_notification');
-	elgg_register_plugin_hook_handler('prepare', 'notification:unban:user:', '_elgg_user_prepare_unban_notification');
+    elgg_register_notification_event('user', '', ['unban']);
+    elgg_register_plugin_hook_handler('get', 'subscriptions', '_elgg_user_get_subscriber_ban_action');
+    elgg_register_event_handler('ban', 'user', '_elgg_user_ban_notification');
+    elgg_register_plugin_hook_handler('prepare', 'notification:unban:user:', '_elgg_user_prepare_unban_notification');
 	
 }
 
@@ -921,14 +921,14 @@ 
  * @access private
  */
 function users_test($hook, $type, $value, $params) {
-	$value[] = Paths::elgg() . "engine/tests/ElggUserTest.php";
-	return $value;
+    $value[] = Paths::elgg() . "engine/tests/ElggUserTest.php";
+    return $value;
 }
 
 /**
  * @see \Elgg\Application::loadCore Do not do work here. Just register for events.
  */
 return function(\Elgg\EventsService $events, \Elgg\HooksRegistrationService $hooks) {
-	$events->registerHandler('init', 'system', 'users_init', 0);
-	$hooks->registerHandler('unit_test', 'system', 'users_test');
+    $events->registerHandler('init', 'system', 'users_init', 0);
+    $hooks->registerHandler('unit_test', 'system', 'users_test');
 };

engine/classes/Elgg/Logger.php

Spacing +2 added lines, -2 removed lines

@@ -85,7 +85,7 @@ 
 			if ($level !== false) {
 				$this->level = $level;
 			} else {
-				$this->warn(__METHOD__ .": invalid level ignored.");
+				$this->warn(__METHOD__.": invalid level ignored.");
 			}
 			return;
 		}
@@ -93,7 +93,7 @@ 
 		if (isset(self::$levels[$level])) {
 			$this->level = $level;
 		} else {
-			$this->warn(__METHOD__ .": invalid level ignored.");
+			$this->warn(__METHOD__.": invalid level ignored.");
 		}
 	}
 

Indentation +277 added lines, -277 removed lines

@@ -14,284 +14,284 @@
  */
 class Logger {
 
-	const OFF = 0;
-	const ERROR = 400;
-	const WARNING = 300;
-	const NOTICE = 250;
-	const INFO = 200;
-
-	protected static $levels = [
-		0 => 'OFF',
-		200 => 'INFO',
-		250 => 'NOTICE',
-		300 => 'WARNING',
-		400 => 'ERROR',
-	];
-
-	/**
-	 * @var int The logging level
-	 */
-	protected $level = self::ERROR;
-
-	/**
-	 * @var bool Display to user?
-	 */
-	protected $display = false;
-
-	/**
-	 * @var PluginHooksService
-	 */
-	protected $hooks;
-
-	/**
-	 * @var Context
-	 */
-	private $context;
-
-	/**
-	 * @var array
-	 */
-	private $disabled_stack;
-
-	/**
-	 * Constructor
-	 *
-	 * @param PluginHooksService $hooks   Hooks service
-	 * @param Context            $context Context service
-	 */
-	public function __construct(PluginHooksService $hooks, Context $context) {
-		$this->hooks = $hooks;
-		$this->context = $context;
-	}
-
-	/**
-	 * Set the logging level
-	 *
-	 * @param int $level The logging level
-	 * @return void
-	 */
-	public function setLevel($level) {
-		if (!$level) {
-			// 0 or empty string
-			$this->level = self::OFF;
-			return;
-		}
-
-		// @todo Elgg has used string constants for logging levels
-		if (is_string($level)) {
-			$level = strtoupper($level);
-			$level = array_search($level, self::$levels);
-
-			if ($level !== false) {
-				$this->level = $level;
-			} else {
-				$this->warn(__METHOD__ .": invalid level ignored.");
-			}
-			return;
-		}
-
-		if (isset(self::$levels[$level])) {
-			$this->level = $level;
-		} else {
-			$this->warn(__METHOD__ .": invalid level ignored.");
-		}
-	}
-
-	/**
-	 * Get the current logging level
-	 *
-	 * @return int
-	 */
-	public function getLevel() {
-		return $this->level;
-	}
-
-	/**
-	 * Set whether the logging should be displayed to the user
-	 *
-	 * Whether data is actually displayed to the user depends on this setting
-	 * and other factors such as whether we are generating a JavaScript or CSS
-	 * file.
-	 *
-	 * @param bool $display Whether to display logging
-	 * @return void
-	 */
-	public function setDisplay($display) {
-		$this->display = $display;
-	}
-
-	/**
-	 * Add a message to the log
-	 *
-	 * @param string $message The message to log
-	 * @param int    $level   The logging level
-	 * @return bool Whether the messages was logged
-	 */
-	public function log($message, $level = self::NOTICE) {
-		if ($this->disabled_stack) {
-			// capture to top of stack
-			end($this->disabled_stack);
-			$key = key($this->disabled_stack);
-			$this->disabled_stack[$key][] = [
-				'message' => $message,
-				'level' => $level,
-			];
-		}
-
-		if ($this->level == self::OFF || $level < $this->level) {
-			return false;
-		}
-
-		if (!array_key_exists($level, self::$levels)) {
-			return false;
-		}
-
-		// when capturing, still use consistent return value
-		if ($this->disabled_stack) {
-			return true;
-		}
-
-		$levelString = self::$levels[$level];
-
-		// notices and below never displayed to user
-		$display = $this->display && $level > self::NOTICE;
-
-		$this->process("$levelString: $message", $display, $level);
-
-		return true;
-	}
-
-	/**
-	 * Log message at the ERROR level
-	 *
-	 * @param string $message The message to log
-	 * @return bool
-	 */
-	public function error($message) {
-		return $this->log($message, self::ERROR);
-	}
-
-	/**
-	 * Log message at the WARNING level
-	 *
-	 * @param string $message The message to log
-	 * @return bool
-	 */
-	public function warn($message) {
-		return $this->log($message, self::WARNING);
-	}
-
-	/**
-	 * Log message at the NOTICE level
-	 *
-	 * @param string $message The message to log
-	 * @return bool
-	 */
-	public function notice($message) {
-		return $this->log($message, self::NOTICE);
-	}
-
-	/**
-	 * Log message at the INFO level
-	 *
-	 * @param string $message The message to log
-	 * @return bool
-	 */
-	public function info($message) {
-		return $this->log($message, self::INFO);
-	}
-
-	/**
-	 * Dump data to log or screen
-	 *
-	 * @param mixed $data    The data to log
-	 * @param bool  $display Whether to include this in the HTML page
-	 * @return void
-	 */
-	public function dump($data, $display = true) {
-		$this->process($data, $display, self::ERROR);
-	}
-
-	/**
-	 * Process logging data
-	 *
-	 * @param mixed $data    The data to process
-	 * @param bool  $display Whether to display the data to the user. Otherwise log it.
-	 * @param int   $level   The logging level for this data
-	 * @return void
-	 */
-	protected function process($data, $display, $level) {
+    const OFF = 0;
+    const ERROR = 400;
+    const WARNING = 300;
+    const NOTICE = 250;
+    const INFO = 200;
+
+    protected static $levels = [
+        0 => 'OFF',
+        200 => 'INFO',
+        250 => 'NOTICE',
+        300 => 'WARNING',
+        400 => 'ERROR',
+    ];
+
+    /**
+     * @var int The logging level
+     */
+    protected $level = self::ERROR;
+
+    /**
+     * @var bool Display to user?
+     */
+    protected $display = false;
+
+    /**
+     * @var PluginHooksService
+     */
+    protected $hooks;
+
+    /**
+     * @var Context
+     */
+    private $context;
+
+    /**
+     * @var array
+     */
+    private $disabled_stack;
+
+    /**
+     * Constructor
+     *
+     * @param PluginHooksService $hooks   Hooks service
+     * @param Context            $context Context service
+     */
+    public function __construct(PluginHooksService $hooks, Context $context) {
+        $this->hooks = $hooks;
+        $this->context = $context;
+    }
+
+    /**
+     * Set the logging level
+     *
+     * @param int $level The logging level
+     * @return void
+     */
+    public function setLevel($level) {
+        if (!$level) {
+            // 0 or empty string
+            $this->level = self::OFF;
+            return;
+        }
+
+        // @todo Elgg has used string constants for logging levels
+        if (is_string($level)) {
+            $level = strtoupper($level);
+            $level = array_search($level, self::$levels);
+
+            if ($level !== false) {
+                $this->level = $level;
+            } else {
+                $this->warn(__METHOD__ .": invalid level ignored.");
+            }
+            return;
+        }
+
+        if (isset(self::$levels[$level])) {
+            $this->level = $level;
+        } else {
+            $this->warn(__METHOD__ .": invalid level ignored.");
+        }
+    }
+
+    /**
+     * Get the current logging level
+     *
+     * @return int
+     */
+    public function getLevel() {
+        return $this->level;
+    }
+
+    /**
+     * Set whether the logging should be displayed to the user
+     *
+     * Whether data is actually displayed to the user depends on this setting
+     * and other factors such as whether we are generating a JavaScript or CSS
+     * file.
+     *
+     * @param bool $display Whether to display logging
+     * @return void
+     */
+    public function setDisplay($display) {
+        $this->display = $display;
+    }
+
+    /**
+     * Add a message to the log
+     *
+     * @param string $message The message to log
+     * @param int    $level   The logging level
+     * @return bool Whether the messages was logged
+     */
+    public function log($message, $level = self::NOTICE) {
+        if ($this->disabled_stack) {
+            // capture to top of stack
+            end($this->disabled_stack);
+            $key = key($this->disabled_stack);
+            $this->disabled_stack[$key][] = [
+                'message' => $message,
+                'level' => $level,
+            ];
+        }
+
+        if ($this->level == self::OFF || $level < $this->level) {
+            return false;
+        }
+
+        if (!array_key_exists($level, self::$levels)) {
+            return false;
+        }
+
+        // when capturing, still use consistent return value
+        if ($this->disabled_stack) {
+            return true;
+        }
+
+        $levelString = self::$levels[$level];
+
+        // notices and below never displayed to user
+        $display = $this->display && $level > self::NOTICE;
+
+        $this->process("$levelString: $message", $display, $level);
+
+        return true;
+    }
+
+    /**
+     * Log message at the ERROR level
+     *
+     * @param string $message The message to log
+     * @return bool
+     */
+    public function error($message) {
+        return $this->log($message, self::ERROR);
+    }
+
+    /**
+     * Log message at the WARNING level
+     *
+     * @param string $message The message to log
+     * @return bool
+     */
+    public function warn($message) {
+        return $this->log($message, self::WARNING);
+    }
+
+    /**
+     * Log message at the NOTICE level
+     *
+     * @param string $message The message to log
+     * @return bool
+     */
+    public function notice($message) {
+        return $this->log($message, self::NOTICE);
+    }
+
+    /**
+     * Log message at the INFO level
+     *
+     * @param string $message The message to log
+     * @return bool
+     */
+    public function info($message) {
+        return $this->log($message, self::INFO);
+    }
+
+    /**
+     * Dump data to log or screen
+     *
+     * @param mixed $data    The data to log
+     * @param bool  $display Whether to include this in the HTML page
+     * @return void
+     */
+    public function dump($data, $display = true) {
+        $this->process($data, $display, self::ERROR);
+    }
+
+    /**
+     * Process logging data
+     *
+     * @param mixed $data    The data to process
+     * @param bool  $display Whether to display the data to the user. Otherwise log it.
+     * @param int   $level   The logging level for this data
+     * @return void
+     */
+    protected function process($data, $display, $level) {
 		
-		// plugin can return false to stop the default logging method
-		$params = [
-			'level' => $level,
-			'msg' => $data,
-			'display' => $display,
-			'to_screen' => $display,
-		];
-
-		if (!$this->hooks->trigger('debug', 'log', $params, true)) {
-			return;
-		}
-
-		// Do not want to write to JS or CSS pages
-		if ($this->context->contains('js') || $this->context->contains('css')) {
-			$display = false;
-		}
-
-		// don't display in simplecache requests
-		$path = substr(current_page_url(), strlen(elgg_get_site_url()));
-		if (preg_match('~^(cache|action|serve-file)/~', $path)) {
-			$display = false;
-		}
-
-		if ($display == true) {
-			echo '<pre class="elgg-logger-data">';
-			echo htmlspecialchars(print_r($data, true), ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
-			echo '</pre>';
-		}
+        // plugin can return false to stop the default logging method
+        $params = [
+            'level' => $level,
+            'msg' => $data,
+            'display' => $display,
+            'to_screen' => $display,
+        ];
+
+        if (!$this->hooks->trigger('debug', 'log', $params, true)) {
+            return;
+        }
+
+        // Do not want to write to JS or CSS pages
+        if ($this->context->contains('js') || $this->context->contains('css')) {
+            $display = false;
+        }
+
+        // don't display in simplecache requests
+        $path = substr(current_page_url(), strlen(elgg_get_site_url()));
+        if (preg_match('~^(cache|action|serve-file)/~', $path)) {
+            $display = false;
+        }
+
+        if ($display == true) {
+            echo '<pre class="elgg-logger-data">';
+            echo htmlspecialchars(print_r($data, true), ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
+            echo '</pre>';
+        }
 		
-		error_log(print_r($data, true));
-	}
-
-	/**
-	 * Temporarily disable logging and capture logs (before tests)
-	 *
-	 * Call disable() before your tests and enable() after. enable() will return a list of
-	 * calls to log() (and helper methods) that were not acted upon.
-	 *
-	 * @note This behaves like a stack. You must call enable() for each disable() call.
-	 *
-	 * @return void
-	 * @see enable
-	 * @access private
-	 * @internal
-	 */
-	public function disable() {
-		$this->disabled_stack[] = [];
-	}
-
-	/**
-	 * Restore logging and get record of log calls (after tests)
-	 *
-	 * @return array
-	 * @see disable
-	 * @access private
-	 * @internal
-	 */
-	public function enable() {
-		return array_pop($this->disabled_stack);
-	}
-
-	/**
-	 * Reset the hooks service for this instance (testing)
-	 *
-	 * @return void
-	 * @access private
-	 * @internal
-	 */
-	public function setHooks(PluginHooksService $hooks) {
-		$this->hooks = $hooks;
-	}
+        error_log(print_r($data, true));
+    }
+
+    /**
+     * Temporarily disable logging and capture logs (before tests)
+     *
+     * Call disable() before your tests and enable() after. enable() will return a list of
+     * calls to log() (and helper methods) that were not acted upon.
+     *
+     * @note This behaves like a stack. You must call enable() for each disable() call.
+     *
+     * @return void
+     * @see enable
+     * @access private
+     * @internal
+     */
+    public function disable() {
+        $this->disabled_stack[] = [];
+    }
+
+    /**
+     * Restore logging and get record of log calls (after tests)
+     *
+     * @return array
+     * @see disable
+     * @access private
+     * @internal
+     */
+    public function enable() {
+        return array_pop($this->disabled_stack);
+    }
+
+    /**
+     * Reset the hooks service for this instance (testing)
+     *
+     * @return void
+     * @access private
+     * @internal
+     */
+    public function setHooks(PluginHooksService $hooks) {
+        $this->hooks = $hooks;
+    }
 }
 

mod/pages/actions/pages/edit.php

Indentation +68 added lines, -68 removed lines

@@ -8,14 +8,14 @@ 
 $variables = elgg_get_config('pages');
 $input = [];
 foreach ($variables as $name => $type) {
-	if ($name == 'title') {
-		$input[$name] = elgg_get_title_input();
-	} else {
-		$input[$name] = get_input($name);
-	}
-	if ($type == 'tags') {
-		$input[$name] = string_to_tag_array($input[$name]);
-	}
+    if ($name == 'title') {
+        $input[$name] = elgg_get_title_input();
+    } else {
+        $input[$name] = get_input($name);
+    }
+    if ($type == 'tags') {
+        $input[$name] = string_to_tag_array($input[$name]);
+    }
 }
 
 // Get guids
@@ -26,78 +26,78 @@ 
 elgg_make_sticky_form('page');
 
 if (!$input['title']) {
-	register_error(elgg_echo('pages:error:no_title'));
-	forward(REFERER);
+    register_error(elgg_echo('pages:error:no_title'));
+    forward(REFERER);
 }
 
 if ($page_guid) {
-	$page = get_entity($page_guid);
-	if (!pages_is_page($page) || !$page->canEdit()) {
-		register_error(elgg_echo('pages:cantedit'));
-		forward(REFERER);
-	}
-	$new_page = false;
+    $page = get_entity($page_guid);
+    if (!pages_is_page($page) || !$page->canEdit()) {
+        register_error(elgg_echo('pages:cantedit'));
+        forward(REFERER);
+    }
+    $new_page = false;
 } else {
-	$page = new ElggObject();
-	if ($parent_guid) {
-		$page->subtype = 'page';
-	} else {
-		$page->subtype = 'page_top';
-	}
-	$new_page = true;
+    $page = new ElggObject();
+    if ($parent_guid) {
+        $page->subtype = 'page';
+    } else {
+        $page->subtype = 'page_top';
+    }
+    $new_page = true;
 }
 
 if (sizeof($input) > 0) {
-	// don't change access if not an owner/admin
-	$user = elgg_get_logged_in_user_entity();
-	$can_change_access = true;
+    // don't change access if not an owner/admin
+    $user = elgg_get_logged_in_user_entity();
+    $can_change_access = true;
 
-	if ($user && $page) {
-		$can_change_access = $user->isAdmin() || $user->getGUID() == $page->owner_guid;
-	}
+    if ($user && $page) {
+        $can_change_access = $user->isAdmin() || $user->getGUID() == $page->owner_guid;
+    }
 	
-	foreach ($input as $name => $value) {
-		if (($name == 'access_id' || $name == 'write_access_id') && !$can_change_access) {
-			continue;
-		}
-		if ($name == 'parent_guid') {
-			continue;
-		}
-
-		$page->$name = $value;
-	}
+    foreach ($input as $name => $value) {
+        if (($name == 'access_id' || $name == 'write_access_id') && !$can_change_access) {
+            continue;
+        }
+        if ($name == 'parent_guid') {
+            continue;
+        }
+
+        $page->$name = $value;
+    }
 }
 
 // need to add check to make sure user can write to container
 $page->container_guid = $container_guid;
 
 if ($parent_guid && $parent_guid != $page_guid) {
-	// Check if parent isn't below the page in the tree
-	if ($page_guid) {
-		$tree_page = get_entity($parent_guid);
-		while ($tree_page->parent_guid > 0 && $page_guid != $tree_page->guid) {
-			$tree_page = get_entity($tree_page->parent_guid);
-		}
-		// If is below, bring all child elements forward
-		if ($page_guid == $tree_page->guid) {
-			$previous_parent = $page->parent_guid;
-
-			$children = new ElggBatch('elgg_get_entities_from_metadata', [
-				'metadata_name' => 'parent_guid',
-				'metadata_value' => $page->guid,
-				'limit' => 0,
-			]);
-			foreach ($children as $child) {
-				$child->parent_guid = $previous_parent;
-			}
-		}
-	}
-	$page->parent_guid = $parent_guid;
+    // Check if parent isn't below the page in the tree
+    if ($page_guid) {
+        $tree_page = get_entity($parent_guid);
+        while ($tree_page->parent_guid > 0 && $page_guid != $tree_page->guid) {
+            $tree_page = get_entity($tree_page->parent_guid);
+        }
+        // If is below, bring all child elements forward
+        if ($page_guid == $tree_page->guid) {
+            $previous_parent = $page->parent_guid;
+
+            $children = new ElggBatch('elgg_get_entities_from_metadata', [
+                'metadata_name' => 'parent_guid',
+                'metadata_value' => $page->guid,
+                'limit' => 0,
+            ]);
+            foreach ($children as $child) {
+                $child->parent_guid = $previous_parent;
+            }
+        }
+    }
+    $page->parent_guid = $parent_guid;
 }
 
 if (!$page->save()) {
-	register_error(elgg_echo('pages:notsaved'));
-	forward(REFERER);
+    register_error(elgg_echo('pages:notsaved'));
+    forward(REFERER);
 }
 
 elgg_clear_sticky_form('page');
@@ -108,12 +108,12 @@ 
 system_message(elgg_echo('pages:saved'));
 
 if ($new_page) {
-	elgg_create_river_item([
-		'view' => 'river/object/page/create',
-		'action_type' => 'create',
-		'subject_guid' => elgg_get_logged_in_user_guid(),
-		'object_guid' => $page->guid,
-	]);
+    elgg_create_river_item([
+        'view' => 'river/object/page/create',
+        'action_type' => 'create',
+        'subject_guid' => elgg_get_logged_in_user_guid(),
+        'object_guid' => $page->guid,
+    ]);
 }
 
 forward($page->getURL());

mod/groups/actions/groups/edit.php

Indentation +109 added lines, -109 removed lines

@@ -13,33 +13,33 @@ 
 // Get group fields
 $input = [];
 foreach (elgg_get_config('group') as $shortname => $valuetype) {
-	$value = get_input($shortname);
-
-	if ($value === null) {
-		// only submitted fields should be updated
-		continue;
-	}
-
-	$input[$shortname] = $value;
-
-	// @todo treat profile fields as unescaped: don't filter, encode on output
-	if (is_array($input[$shortname])) {
-		array_walk_recursive($input[$shortname], function (&$v) {
-			$v = elgg_html_decode($v);
-		});
-	} else {
-		$input[$shortname] = elgg_html_decode($input[$shortname]);
-	}
-
-	if ($valuetype == 'tags') {
-		$input[$shortname] = string_to_tag_array($input[$shortname]);
-	}
+    $value = get_input($shortname);
+
+    if ($value === null) {
+        // only submitted fields should be updated
+        continue;
+    }
+
+    $input[$shortname] = $value;
+
+    // @todo treat profile fields as unescaped: don't filter, encode on output
+    if (is_array($input[$shortname])) {
+        array_walk_recursive($input[$shortname], function (&$v) {
+            $v = elgg_html_decode($v);
+        });
+    } else {
+        $input[$shortname] = elgg_html_decode($input[$shortname]);
+    }
+
+    if ($valuetype == 'tags') {
+        $input[$shortname] = string_to_tag_array($input[$shortname]);
+    }
 }
 
 // only set if submitted
 $name = elgg_get_title_input('name', null);
 if ($name !== null) {
-	$input['name'] = $name;
+    $input['name'] = $name;
 }
 
 $user = elgg_get_logged_in_user_entity();
@@ -47,78 +47,78 @@ 
 $group_guid = (int) get_input('group_guid');
 
 if ($group_guid) {
-	$is_new_group = false;
-	$group = get_entity($group_guid);
-	if (!$group instanceof ElggGroup || !$group->canEdit()) {
-		$error = elgg_echo('groups:cantedit');
-		return elgg_error_response($error);
-	}
+    $is_new_group = false;
+    $group = get_entity($group_guid);
+    if (!$group instanceof ElggGroup || !$group->canEdit()) {
+        $error = elgg_echo('groups:cantedit');
+        return elgg_error_response($error);
+    }
 } else {
-	if (elgg_get_plugin_setting('limited_groups', 'groups') == 'yes' && !$user->isAdmin()) {
-		$error = elgg_echo('groups:cantcreate');
-		return elgg_error_response($error);
-	}
+    if (elgg_get_plugin_setting('limited_groups', 'groups') == 'yes' && !$user->isAdmin()) {
+        $error = elgg_echo('groups:cantcreate');
+        return elgg_error_response($error);
+    }
 	
-	$container_guid = get_input('container_guid', $user->guid);
-	$container = get_entity($container_guid);
+    $container_guid = get_input('container_guid', $user->guid);
+    $container = get_entity($container_guid);
 	
-	if (!$container || !$container->canWriteToContainer($user->guid, 'group')) {
-		$error = elgg_echo('groups:cantcreate');
-		return elgg_error_response($error);
-	}
+    if (!$container || !$container->canWriteToContainer($user->guid, 'group')) {
+        $error = elgg_echo('groups:cantcreate');
+        return elgg_error_response($error);
+    }
 	
-	$is_new_group = true;
-	$group = new ElggGroup();
-	$group->container_guid = $container->guid;
+    $is_new_group = true;
+    $group = new ElggGroup();
+    $group->container_guid = $container->guid;
 }
 
 // Assume we can edit or this is a new group
 foreach ($input as $shortname => $value) {
-	if ($value === '' && !in_array($shortname, ['name', 'description'])) {
-		// The group profile displays all profile fields that have a value.
-		// We don't want to display fields with empty string value, so we
-		// remove the metadata completely.
-		$group->deleteMetadata($shortname);
-		continue;
-	}
-
-	$group->$shortname = $value;
+    if ($value === '' && !in_array($shortname, ['name', 'description'])) {
+        // The group profile displays all profile fields that have a value.
+        // We don't want to display fields with empty string value, so we
+        // remove the metadata completely.
+        $group->deleteMetadata($shortname);
+        continue;
+    }
+
+    $group->$shortname = $value;
 }
 
 // Validate create
 if (!$group->name) {
-	return elgg_error_response(elgg_echo('groups:notitle'));
+    return elgg_error_response(elgg_echo('groups:notitle'));
 }
 
 // Set group tool options (only pass along saved entities)
 $tool_entity = !$is_new_group ? $group : null;
 $tool_options = groups_get_group_tool_options($tool_entity);
 if ($tool_options) {
-	foreach ($tool_options as $group_option) {
-		$option_toggle_name = $group_option->name . "_enable";
-		$option_default = $group_option->default_on ? 'yes' : 'no';
-		$value = get_input($option_toggle_name);
-
-		// if already has option set, don't change if no submission
-		if ($group->$option_toggle_name && $value === null) {
-			continue;
-		}
-
-		$group->$option_toggle_name = $value ? $value : $option_default;
-	}
+    foreach ($tool_options as $group_option) {
+        $option_toggle_name = $group_option->name . "_enable";
+        $option_default = $group_option->default_on ? 'yes' : 'no';
+        $value = get_input($option_toggle_name);
+
+        // if already has option set, don't change if no submission
+        if ($group->$option_toggle_name && $value === null) {
+            continue;
+        }
+
+        $group->$option_toggle_name = $value ? $value : $option_default;
+    }
 }
 
 // Group membership - should these be treated with same constants as access permissions?
 $value = get_input('membership');
 if ($group->membership === null || $value !== null) {
-	$is_public_membership = ($value == ACCESS_PUBLIC);
-	$group->membership = $is_public_membership ? ACCESS_PUBLIC : ACCESS_PRIVATE;
+    $is_public_membership = ($value == ACCESS_PUBLIC);
+    $group->membership = $is_public_membership ? ACCESS_PUBLIC : ACCESS_PRIVATE;
 }
 
 $group->setContentAccessMode((string) get_input('content_access_mode'));
 
 if ($is_new_group) {
-	$group->access_id = ACCESS_PUBLIC;
+    $group->access_id = ACCESS_PUBLIC;
 }
 
 $old_owner_guid = $is_new_group ? 0 : $group->owner_guid;
@@ -127,24 +127,24 @@ 
 $new_owner_guid = ($value === null) ? $old_owner_guid : (int) $value;
 
 if (!$is_new_group && $new_owner_guid && $new_owner_guid != $old_owner_guid) {
-	// verify new owner is member and old owner/admin is logged in
-	if ($group->isMember(get_user($new_owner_guid)) && ($old_owner_guid == $user->guid || $user->isAdmin())) {
-		$group->owner_guid = $new_owner_guid;
-		if ($group->container_guid == $old_owner_guid) {
-			// Even though this action defaults container_guid to the logged in user guid,
-			// the group may have initially been created with a custom script that assigned
-			// a different container entity. We want to make sure we preserve the original
-			// container if it the group is not contained by the original owner.
-			$group->container_guid = $new_owner_guid;
-		}
-	}
+    // verify new owner is member and old owner/admin is logged in
+    if ($group->isMember(get_user($new_owner_guid)) && ($old_owner_guid == $user->guid || $user->isAdmin())) {
+        $group->owner_guid = $new_owner_guid;
+        if ($group->container_guid == $old_owner_guid) {
+            // Even though this action defaults container_guid to the logged in user guid,
+            // the group may have initially been created with a custom script that assigned
+            // a different container entity. We want to make sure we preserve the original
+            // container if it the group is not contained by the original owner.
+            $group->container_guid = $new_owner_guid;
+        }
+    }
 }
 
 if ($is_new_group) {
-	// if new group, we need to save so group acl gets set in event handler
-	if (!$group->save()) {
-		return elgg_error_response(elgg_echo('groups:save_error'));
-	}
+    // if new group, we need to save so group acl gets set in event handler
+    if (!$group->save()) {
+        return elgg_error_response(elgg_echo('groups:save_error'));
+    }
 }
 
 // Invisible group support
@@ -152,26 +152,26 @@ 
 // is an odd requirement and should be removed. Either the acl creation happens
 // in the action or the visibility moves to a plugin hook
 if (elgg_get_plugin_setting('hidden_groups', 'groups') == 'yes') {
-	$value = get_input('vis');
-	if ($is_new_group || $value !== null) {
-		$visibility = (int) $value;
-
-		if ($visibility == ACCESS_PRIVATE) {
-			// Make this group visible only to group members. We need to use
-			// ACCESS_PRIVATE on the form and convert it to group_acl here
-			// because new groups do not have acl until they have been saved once.
-			$visibility = $group->group_acl;
-
-			// Force all new group content to be available only to members
-			$group->setContentAccessMode(ElggGroup::CONTENT_ACCESS_MODE_MEMBERS_ONLY);
-		}
-
-		$group->access_id = $visibility;
-	}
+    $value = get_input('vis');
+    if ($is_new_group || $value !== null) {
+        $visibility = (int) $value;
+
+        if ($visibility == ACCESS_PRIVATE) {
+            // Make this group visible only to group members. We need to use
+            // ACCESS_PRIVATE on the form and convert it to group_acl here
+            // because new groups do not have acl until they have been saved once.
+            $visibility = $group->group_acl;
+
+            // Force all new group content to be available only to members
+            $group->setContentAccessMode(ElggGroup::CONTENT_ACCESS_MODE_MEMBERS_ONLY);
+        }
+
+        $group->access_id = $visibility;
+    }
 }
 
 if (!$group->save()) {
-	return elgg_error_response(elgg_echo('groups:save_error'));
+    return elgg_error_response(elgg_echo('groups:save_error'));
 }
 
 // group saved so clear sticky form
@@ -179,21 +179,21 @@ 
 
 // group creator needs to be member of new group and river entry created
 if ($is_new_group) {
-	// @todo this should not be necessary...
-	elgg_set_page_owner_guid($group->guid);
-
-	$group->join($user);
-	elgg_create_river_item([
-		'view' => 'river/group/create',
-		'action_type' => 'create',
-		'subject_guid' => $user->guid,
-		'object_guid' => $group->guid,
-	]);
+    // @todo this should not be necessary...
+    elgg_set_page_owner_guid($group->guid);
+
+    $group->join($user);
+    elgg_create_river_item([
+        'view' => 'river/group/create',
+        'action_type' => 'create',
+        'subject_guid' => $user->guid,
+        'object_guid' => $group->guid,
+    ]);
 }
 
 $group->saveIconFromUploadedFile('icon');
 
 $data = [
-	'entity' => $group,
+    'entity' => $group,
 ];
 return elgg_ok_response($data, elgg_echo('groups:saved'), $group->getURL());

views/default/page/upgrade.php

Indentation +8 added lines, -8 removed lines

@@ -11,13 +11,13 @@ 
  */
 
 $refresh_url = elgg_http_add_url_query_elements(elgg_get_site_url() . 'upgrade.php', [
-	'upgrade' => 'upgrade',
-	'forward' => elgg_extract('forward', $vars, '/admin')
+    'upgrade' => 'upgrade',
+    'forward' => elgg_extract('forward', $vars, '/admin')
 ]);
 
 if (elgg_get_config('security_protect_upgrade')) {
-	// sign the url in order to get past the protection
-	$refresh_url = elgg_http_get_signed_url($refresh_url);
+    // sign the url in order to get past the protection
+    $refresh_url = elgg_http_get_signed_url($refresh_url);
 }
 
 // render content before head so that JavaScript and CSS can be loaded. See #4032
@@ -25,10 +25,10 @@ 
 
 $head = elgg_view('page/elements/head', $vars['head']);
 $head .= elgg_format_element([
-	'#tag_name' => 'meta',
-	'#options' => ['is_xml' => true],
-	'http-equiv' => 'refresh',
-	'content' => '1;url=' . $refresh_url,
+    '#tag_name' => 'meta',
+    '#options' => ['is_xml' => true],
+    'http-equiv' => 'refresh',
+    'content' => '1;url=' . $refresh_url,
 ]);
 
 echo elgg_view("page/elements/html", ["head" => $head, "body" => $body]);

Spacing +3 added lines, -3 removed lines

@@ -10,7 +10,7 @@ 
  * @uses $var['forward']      A relative path to forward to after upgrade. Defaults to /admin
  */
 
-$refresh_url = elgg_http_add_url_query_elements(elgg_get_site_url() . 'upgrade.php', [
+$refresh_url = elgg_http_add_url_query_elements(elgg_get_site_url().'upgrade.php', [
 	'upgrade' => 'upgrade',
 	'forward' => elgg_extract('forward', $vars, '/admin')
 ]);
@@ -21,14 +21,14 @@ 
 }
 
 // render content before head so that JavaScript and CSS can be loaded. See #4032
-$body = "<div style='margin-top:200px'>" . elgg_view('graphics/ajax_loader', ['hidden' => false]) . "</div>";
+$body = "<div style='margin-top:200px'>".elgg_view('graphics/ajax_loader', ['hidden' => false])."</div>";
 
 $head = elgg_view('page/elements/head', $vars['head']);
 $head .= elgg_format_element([
 	'#tag_name' => 'meta',
 	'#options' => ['is_xml' => true],
 	'http-equiv' => 'refresh',
-	'content' => '1;url=' . $refresh_url,
+	'content' => '1;url='.$refresh_url,
 ]);
 
 echo elgg_view("page/elements/html", ["head" => $head, "body" => $body]);

views/default/input/userpicker.php

Indentation +19 added lines, -19 removed lines

@@ -18,7 +18,7 @@ 
  * When this happens, a hidden input is created to return the GUID in the array with the form
  */
 if (empty($vars['name'])) {
-	$vars['name'] = 'members';
+    $vars['name'] = 'members';
 }
 $name = $vars['name'];
 
@@ -29,10 +29,10 @@ 
 $limit = (int) elgg_extract('limit', $vars, 0);
 
 $attrs = [
-	'class' => 'elgg-user-picker',
-	'data-limit' => $limit,
-	'data-name' => $name,
-	'data-handler' => $handler,
+    'class' => 'elgg-user-picker',
+    'data-limit' => $limit,
+    'data-name' => $name,
+    'data-handler' => $handler,
 ];
 
 ?>
@@ -40,25 +40,25 @@ 
 	<input type="text" class="elgg-input-user-picker" size="30"/>
 	<?php echo elgg_view('input/hidden', ['name' => $vars['name']]); ?>
 	<?php
-	if (!elgg_extract('only_friends', $vars, false)) {
-		?>
+    if (!elgg_extract('only_friends', $vars, false)) {
+        ?>
 		<input type="checkbox" name="match_on" value="true" />
 		<label><?php echo elgg_echo('userpicker:only_friends'); ?></label>
 		<?php
-	}
-	?>
+    }
+    ?>
 	<ul class="elgg-list elgg-user-picker-list">
 		<?php
-		foreach ($guids as $guid) {
-			$entity = get_entity($guid);
-			if ($entity) {
-				echo elgg_view('input/userpicker/item', [
-					'entity' => $entity,
-					'input_name' => $vars['name'],
-				]);
-			}
-		}
-		?>
+        foreach ($guids as $guid) {
+            $entity = get_entity($guid);
+            if ($entity) {
+                echo elgg_view('input/userpicker/item', [
+                    'entity' => $entity,
+                    'input_name' => $vars['name'],
+                ]);
+            }
+        }
+        ?>
 	</ul>
 </div>
 <script>

views/default/output/email.php

Indentation +5 added lines, -5 removed lines

@@ -11,9 +11,9 @@
  */
 
 if (!empty($vars['value'])) {
-	echo elgg_view('output/url', [
-		'href' => 'mailto:' . $vars['value'],
-		'text' => $vars['value'],
-		'encode_text' => true,
-	]);
+    echo elgg_view('output/url', [
+        'href' => 'mailto:' . $vars['value'],
+        'text' => $vars['value'],
+        'encode_text' => true,
+    ]);
 }

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 if (!empty($vars['value'])) {
 	echo elgg_view('output/url', [
-		'href' => 'mailto:' . $vars['value'],
+		'href' => 'mailto:'.$vars['value'],
 		'text' => $vars['value'],
 		'encode_text' => true,
 	]);

engine/lib/output.php

Indentation +276 added lines, -276 removed lines

@@ -16,9 +16,9 @@ 
  */
 function parse_urls($text) {
 
-	$linkify = new \Misd\Linkify\Linkify();
+    $linkify = new \Misd\Linkify\Linkify();
 		
-	return $linkify->processUrls($text, ['attr' => ['rel' => 'nofollow']]);
+    return $linkify->processUrls($text, ['attr' => ['rel' => 'nofollow']]);
 }
 
 /**
@@ -31,9 +31,9 @@ 
  * @since 2.3
  */
 function elgg_parse_emails($text) {
-	$linkify = new \Misd\Linkify\Linkify();
+    $linkify = new \Misd\Linkify\Linkify();
 		
-	return $linkify->processEmails($text, ['attr' => ['rel' => 'nofollow']]);
+    return $linkify->processEmails($text, ['attr' => ['rel' => 'nofollow']]);
 }
 
 /**
@@ -44,12 +44,12 @@ 
  * @return string
  **/
 function elgg_autop($string) {
-	try {
-		return _elgg_services()->autoP->process($string);
-	} catch (\RuntimeException $e) {
-		_elgg_services()->logger->warn('ElggAutoP failed to process the string: ' . $e->getMessage());
-		return $string;
-	}
+    try {
+        return _elgg_services()->autoP->process($string);
+    } catch (\RuntimeException $e) {
+        _elgg_services()->logger->warn('ElggAutoP failed to process the string: ' . $e->getMessage());
+        return $string;
+    }
 }
 
 /**
@@ -65,14 +65,14 @@ 
  * @since 1.7.2
  */
 function elgg_get_excerpt($text, $num_chars = 250) {
-	$view = 'output/excerpt';
-	$vars = [
-		'text' => $text,
-		'num_chars' => $num_chars,
-	];
-	$viewtype = elgg_view_exists($view) ? '' : 'default';
-
-	return _elgg_view_under_viewtype($view, $vars, $viewtype);
+    $view = 'output/excerpt';
+    $vars = [
+        'text' => $text,
+        'num_chars' => $num_chars,
+    ];
+    $viewtype = elgg_view_exists($view) ? '' : 'default';
+
+    return _elgg_view_under_viewtype($view, $vars, $viewtype);
 }
 
 /**
@@ -86,14 +86,14 @@ 
  * @since 1.9.0
  */
 function elgg_format_bytes($size, $precision = 2) {
-	if (!$size || $size < 0) {
-		return false;
-	}
+    if (!$size || $size < 0) {
+        return false;
+    }
 
-	$base = log($size) / log(1024);
-	$suffixes = ['B', 'kB', 'MB', 'GB', 'TB'];
+    $base = log($size) / log(1024);
+    $suffixes = ['B', 'kB', 'MB', 'GB', 'TB'];
 
-	return round(pow(1024, $base - floor($base)), $precision) . ' ' . $suffixes[floor($base)];
+    return round(pow(1024, $base - floor($base)), $precision) . ' ' . $suffixes[floor($base)];
 }
 
 /**
@@ -120,52 +120,52 @@ 
  * @return string
  */
 function elgg_format_attributes(array $attrs = []) {
-	if (!is_array($attrs) || empty($attrs)) {
-		return '';
-	}
+    if (!is_array($attrs) || empty($attrs)) {
+        return '';
+    }
 
-	$attributes = [];
+    $attributes = [];
 
-	foreach ($attrs as $attr => $val) {
-		if (0 !== strpos($attr, 'data-') && false !== strpos($attr, '_')) {
-			// this is probably a view $vars variable not meant for output
-			continue;
-		}
+    foreach ($attrs as $attr => $val) {
+        if (0 !== strpos($attr, 'data-') && false !== strpos($attr, '_')) {
+            // this is probably a view $vars variable not meant for output
+            continue;
+        }
 
-		$attr = strtolower($attr);
+        $attr = strtolower($attr);
 
-		if (!isset($val) || $val === false) {
-			continue;
-		}
+        if (!isset($val) || $val === false) {
+            continue;
+        }
 
-		if ($val === true) {
-			$val = $attr; //e.g. checked => true ==> checked="checked"
-		}
+        if ($val === true) {
+            $val = $attr; //e.g. checked => true ==> checked="checked"
+        }
 
-		if (is_scalar($val)) {
-			$val = [$val];
-		}
+        if (is_scalar($val)) {
+            $val = [$val];
+        }
 
-		if (!is_array($val)) {
-			continue;
-		}
+        if (!is_array($val)) {
+            continue;
+        }
 
-		// Check if array contains non-scalar values and bail if so
-		$filtered_val = array_filter($val, function($e) {
-			return is_scalar($e);
-		});
+        // Check if array contains non-scalar values and bail if so
+        $filtered_val = array_filter($val, function($e) {
+            return is_scalar($e);
+        });
 
-		if (count($val) != count($filtered_val)) {
-			continue;
-		}
+        if (count($val) != count($filtered_val)) {
+            continue;
+        }
 
-		$val = implode(' ', $val);
+        $val = implode(' ', $val);
 
-		$val = htmlspecialchars($val, ENT_QUOTES, 'UTF-8', false);
-		$attributes[] = "$attr=\"$val\"";
-	}
+        $val = htmlspecialchars($val, ENT_QUOTES, 'UTF-8', false);
+        $attributes[] = "$attr=\"$val\"";
+    }
 
-	return implode(' ', $attributes);
+    return implode(' ', $attributes);
 }
 
 /**
@@ -199,60 +199,60 @@ 
  * @since 1.9.0
  */
 function elgg_format_element($tag_name, array $attributes = [], $text = '', array $options = []) {
-	if (is_array($tag_name)) {
-		$args = $tag_name;
-
-		if ($attributes !== [] || $text !== '' || $options !== []) {
-			throw new \InvalidArgumentException('If $tag_name is an array, the other arguments must not be set');
-		}
-
-		if (isset($args['#tag_name'])) {
-			$tag_name = $args['#tag_name'];
-		}
-		if (isset($args['#text'])) {
-			$text = $args['#text'];
-		}
-		if (isset($args['#options'])) {
-			$options = $args['#options'];
-		}
-
-		unset($args['#tag_name'], $args['#text'], $args['#options']);
-		$attributes = $args;
-	}
-
-	if (!is_string($tag_name) || $tag_name === '') {
-		throw new \InvalidArgumentException('$tag_name is required');
-	}
-
-	if (isset($options['is_void'])) {
-		$is_void = $options['is_void'];
-	} else {
-		// from http://www.w3.org/TR/html-markup/syntax.html#syntax-elements
-		$is_void = in_array(strtolower($tag_name), [
-			'area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'keygen', 'link', 'menuitem',
-			'meta', 'param', 'source', 'track', 'wbr'
-		]);
-	}
-
-	if (!empty($options['encode_text'])) {
-		$double_encode = empty($options['double_encode']) ? false : true;
-		$text = htmlspecialchars($text, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8', $double_encode);
-	}
-
-	if ($attributes) {
-		$attrs = elgg_format_attributes($attributes);
-		if ($attrs !== '') {
-			$attrs = " $attrs";
-		}
-	} else {
-		$attrs = '';
-	}
-
-	if ($is_void) {
-		return empty($options['is_xml']) ? "<{$tag_name}{$attrs}>" : "<{$tag_name}{$attrs} />";
-	} else {
-		return "<{$tag_name}{$attrs}>$text</$tag_name>";
-	}
+    if (is_array($tag_name)) {
+        $args = $tag_name;
+
+        if ($attributes !== [] || $text !== '' || $options !== []) {
+            throw new \InvalidArgumentException('If $tag_name is an array, the other arguments must not be set');
+        }
+
+        if (isset($args['#tag_name'])) {
+            $tag_name = $args['#tag_name'];
+        }
+        if (isset($args['#text'])) {
+            $text = $args['#text'];
+        }
+        if (isset($args['#options'])) {
+            $options = $args['#options'];
+        }
+
+        unset($args['#tag_name'], $args['#text'], $args['#options']);
+        $attributes = $args;
+    }
+
+    if (!is_string($tag_name) || $tag_name === '') {
+        throw new \InvalidArgumentException('$tag_name is required');
+    }
+
+    if (isset($options['is_void'])) {
+        $is_void = $options['is_void'];
+    } else {
+        // from http://www.w3.org/TR/html-markup/syntax.html#syntax-elements
+        $is_void = in_array(strtolower($tag_name), [
+            'area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'keygen', 'link', 'menuitem',
+            'meta', 'param', 'source', 'track', 'wbr'
+        ]);
+    }
+
+    if (!empty($options['encode_text'])) {
+        $double_encode = empty($options['double_encode']) ? false : true;
+        $text = htmlspecialchars($text, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8', $double_encode);
+    }
+
+    if ($attributes) {
+        $attrs = elgg_format_attributes($attributes);
+        if ($attrs !== '') {
+            $attrs = " $attrs";
+        }
+    } else {
+        $attrs = '';
+    }
+
+    if ($is_void) {
+        return empty($options['is_xml']) ? "<{$tag_name}{$attrs}>" : "<{$tag_name}{$attrs} />";
+    } else {
+        return "<{$tag_name}{$attrs}>$text</$tag_name>";
+    }
 }
 
 /**
@@ -270,40 +270,40 @@ 
  * @return string The absolute URL
  */
 function elgg_normalize_url($url) {
-	$url = str_replace(' ', '%20', $url);
-
-	if (_elgg_sane_validate_url($url)) {
-		return $url;
-	}
-
-	if (preg_match("#^([a-z]+)\\:#", $url, $m)) {
-		// we don't let http/https: URLs fail filter_var(), but anything else starting with a protocol
-		// is OK
-		if ($m[1] !== 'http' && $m[1] !== 'https') {
-			return $url;
-		}
-	}
-
-	if (preg_match("#^(\\#|\\?|//)#", $url)) {
-		// starts with '//' (protocol-relative link), query, or fragment
-		return $url;
-	}
-
-	if (preg_match("#^[^/]*\\.php(\\?.*)?$#", $url)) {
-		// root PHP scripts: 'install.php', 'install.php?step=step'. We don't want to confuse these
-		// for domain names.
-		return elgg_get_site_url() . $url;
-	}
-
-	if (preg_match("#^[^/?]*\\.#", $url)) {
-		// URLs starting with domain: 'example.com', 'example.com/subpage'
-		return "http://$url";
-	}
-
-	// 'page/handler', 'mod/plugin/file.php'
-	// trim off any leading / because the site URL is stored
-	// with a trailing /
-	return elgg_get_site_url() . ltrim($url, '/');
+    $url = str_replace(' ', '%20', $url);
+
+    if (_elgg_sane_validate_url($url)) {
+        return $url;
+    }
+
+    if (preg_match("#^([a-z]+)\\:#", $url, $m)) {
+        // we don't let http/https: URLs fail filter_var(), but anything else starting with a protocol
+        // is OK
+        if ($m[1] !== 'http' && $m[1] !== 'https') {
+            return $url;
+        }
+    }
+
+    if (preg_match("#^(\\#|\\?|//)#", $url)) {
+        // starts with '//' (protocol-relative link), query, or fragment
+        return $url;
+    }
+
+    if (preg_match("#^[^/]*\\.php(\\?.*)?$#", $url)) {
+        // root PHP scripts: 'install.php', 'install.php?step=step'. We don't want to confuse these
+        // for domain names.
+        return elgg_get_site_url() . $url;
+    }
+
+    if (preg_match("#^[^/?]*\\.#", $url)) {
+        // URLs starting with domain: 'example.com', 'example.com/subpage'
+        return "http://$url";
+    }
+
+    // 'page/handler', 'mod/plugin/file.php'
+    // trim off any leading / because the site URL is stored
+    // with a trailing /
+    return elgg_get_site_url() . ltrim($url, '/');
 }
 
 /**
@@ -316,16 +316,16 @@ 
  * @since 3.0.0
  */
 function elgg_normalize_site_url($unsafe_url) {
-	if (!is_string($unsafe_url)) {
-		return false;
-	}
+    if (!is_string($unsafe_url)) {
+        return false;
+    }
 
-	$unsafe_url = elgg_normalize_url($unsafe_url);
-	if (0 === strpos($unsafe_url, elgg_get_site_url())) {
-		return $unsafe_url;
-	}
+    $unsafe_url = elgg_normalize_url($unsafe_url);
+    if (0 === strpos($unsafe_url, elgg_get_site_url())) {
+        return $unsafe_url;
+    }
 
-	return false;
+    return false;
 }
 
 /**
@@ -338,19 +338,19 @@ 
  */
 function elgg_get_friendly_title($title) {
 
-	// return a URL friendly title to short circuit normal title formatting
-	$params = ['title' => $title];
-	$result = elgg_trigger_plugin_hook('format', 'friendly:title', $params, null);
-	if ($result) {
-		return $result;
-	}
+    // return a URL friendly title to short circuit normal title formatting
+    $params = ['title' => $title];
+    $result = elgg_trigger_plugin_hook('format', 'friendly:title', $params, null);
+    if ($result) {
+        return $result;
+    }
 
-	// titles are often stored HTML encoded
-	$title = html_entity_decode($title, ENT_QUOTES, 'UTF-8');
+    // titles are often stored HTML encoded
+    $title = html_entity_decode($title, ENT_QUOTES, 'UTF-8');
 	
-	$title = \Elgg\Translit::urlize($title);
+    $title = \Elgg\Translit::urlize($title);
 
-	return $title;
+    return $title;
 }
 
 /**
@@ -366,46 +366,46 @@ 
  */
 function elgg_get_friendly_time($time, $current_time = null) {
 	
-	if (!$current_time) {
-		$current_time = time();
-	}
-
-	// return a time string to short circuit normal time formatting
-	$params = ['time' => $time, 'current_time' => $current_time];
-	$result = elgg_trigger_plugin_hook('format', 'friendly:time', $params, null);
-	if ($result) {
-		return $result;
-	}
-
-	$diff = abs((int) $current_time - (int) $time);
-
-	$minute = 60;
-	$hour = $minute * 60;
-	$day = $hour * 24;
-
-	if ($diff < $minute) {
-		return elgg_echo("friendlytime:justnow");
-	}
+    if (!$current_time) {
+        $current_time = time();
+    }
+
+    // return a time string to short circuit normal time formatting
+    $params = ['time' => $time, 'current_time' => $current_time];
+    $result = elgg_trigger_plugin_hook('format', 'friendly:time', $params, null);
+    if ($result) {
+        return $result;
+    }
+
+    $diff = abs((int) $current_time - (int) $time);
+
+    $minute = 60;
+    $hour = $minute * 60;
+    $day = $hour * 24;
+
+    if ($diff < $minute) {
+        return elgg_echo("friendlytime:justnow");
+    }
 	
-	if ($diff < $hour) {
-		$granularity = ':minutes';
-		$diff = round($diff / $minute);
-	} else if ($diff < $day) {
-		$granularity = ':hours';
-		$diff = round($diff / $hour);
-	} else {
-		$granularity = ':days';
-		$diff = round($diff / $day);
-	}
-
-	if ($diff == 0) {
-		$diff = 1;
-	}
+    if ($diff < $hour) {
+        $granularity = ':minutes';
+        $diff = round($diff / $minute);
+    } else if ($diff < $day) {
+        $granularity = ':hours';
+        $diff = round($diff / $hour);
+    } else {
+        $granularity = ':days';
+        $diff = round($diff / $day);
+    }
+
+    if ($diff == 0) {
+        $diff = 1;
+    }
 	
-	$future = ((int) $current_time - (int) $time < 0) ? ':future' : '';
-	$singular = ($diff == 1) ? ':singular' : '';
+    $future = ((int) $current_time - (int) $time < 0) ? ':future' : '';
+    $singular = ($diff == 1) ? ':singular' : '';
 
-	return elgg_echo("friendlytime{$future}{$granularity}{$singular}", [$diff]);
+    return elgg_echo("friendlytime{$future}{$granularity}{$singular}", [$diff]);
 }
 
 /**
@@ -415,44 +415,44 @@ 
  * @return string
  */
 function elgg_get_friendly_upload_error($error_code) {
-	switch ($error_code) {
-		case UPLOAD_ERR_OK:
-			return '';
+    switch ($error_code) {
+        case UPLOAD_ERR_OK:
+            return '';
 			
-		case UPLOAD_ERR_INI_SIZE:
-			$key = 'ini_size';
-			break;
+        case UPLOAD_ERR_INI_SIZE:
+            $key = 'ini_size';
+            break;
 		
-		case UPLOAD_ERR_FORM_SIZE:
-			$key = 'form_size';
-			break;
+        case UPLOAD_ERR_FORM_SIZE:
+            $key = 'form_size';
+            break;
 
-		case UPLOAD_ERR_PARTIAL:
-			$key = 'partial';
-			break;
+        case UPLOAD_ERR_PARTIAL:
+            $key = 'partial';
+            break;
 
-		case UPLOAD_ERR_NO_FILE:
-			$key = 'no_file';
-			break;
+        case UPLOAD_ERR_NO_FILE:
+            $key = 'no_file';
+            break;
 
-		case UPLOAD_ERR_NO_TMP_DIR:
-			$key = 'no_tmp_dir';
-			break;
+        case UPLOAD_ERR_NO_TMP_DIR:
+            $key = 'no_tmp_dir';
+            break;
 
-		case UPLOAD_ERR_CANT_WRITE:
-			$key = 'cant_write';
-			break;
+        case UPLOAD_ERR_CANT_WRITE:
+            $key = 'cant_write';
+            break;
 
-		case UPLOAD_ERR_EXTENSION:
-			$key = 'extension';
-			break;
+        case UPLOAD_ERR_EXTENSION:
+            $key = 'extension';
+            break;
 		
-		default:
-			$key = 'unknown';
-			break;
-	}
+        default:
+            $key = 'unknown';
+            break;
+    }
 
-	return elgg_echo("upload:error:$key");
+    return elgg_echo("upload:error:$key");
 }
 
 
@@ -467,13 +467,13 @@ 
  * @return string String run through strip_tags() and any plugin hooks.
  */
 function elgg_strip_tags($string, $allowable_tags = null) {
-	$params['original_string'] = $string;
-	$params['allowable_tags'] = $allowable_tags;
+    $params['original_string'] = $string;
+    $params['allowable_tags'] = $allowable_tags;
 
-	$string = strip_tags($string, $allowable_tags);
-	$string = elgg_trigger_plugin_hook('format', 'strip_tags', $params, $string);
+    $string = strip_tags($string, $allowable_tags);
+    $string = elgg_trigger_plugin_hook('format', 'strip_tags', $params, $string);
 
-	return $string;
+    return $string;
 }
 
 /**
@@ -504,18 +504,18 @@ 
  * @license Released under dual-license GPL2/MIT by explicit permission of Pádraic Brady
  */
 function elgg_html_decode($string) {
-	$string = str_replace(
-		['&gt;', '&lt;', '&amp;', '&quot;', '&#039;'],
-		['&amp;gt;', '&amp;lt;', '&amp;amp;', '&amp;quot;', '&amp;#039;'],
-		$string
-	);
-	$string = html_entity_decode($string, ENT_NOQUOTES, 'UTF-8');
-	$string = str_replace(
-		['&amp;gt;', '&amp;lt;', '&amp;amp;', '&amp;quot;', '&amp;#039;'],
-		['&gt;', '&lt;', '&amp;', '&quot;', '&#039;'],
-		$string
-	);
-	return $string;
+    $string = str_replace(
+        ['&gt;', '&lt;', '&amp;', '&quot;', '&#039;'],
+        ['&amp;gt;', '&amp;lt;', '&amp;amp;', '&amp;quot;', '&amp;#039;'],
+        $string
+    );
+    $string = html_entity_decode($string, ENT_NOQUOTES, 'UTF-8');
+    $string = str_replace(
+        ['&amp;gt;', '&amp;lt;', '&amp;amp;', '&amp;quot;', '&amp;#039;'],
+        ['&gt;', '&lt;', '&amp;', '&quot;', '&#039;'],
+        $string
+    );
+    return $string;
 }
 
 /**
@@ -527,14 +527,14 @@ 
  * @access private
  */
 function _elgg_get_display_query($string) {
-	//encode <,>,&, quotes and characters above 127
-	if (function_exists('mb_convert_encoding')) {
-		$display_query = mb_convert_encoding($string, 'HTML-ENTITIES', 'UTF-8');
-	} else {
-		// if no mbstring extension, we just strip characters
-		$display_query = preg_replace("/[^\x01-\x7F]/", "", $string);
-	}
-	return htmlspecialchars($display_query, ENT_QUOTES, 'UTF-8', false);
+    //encode <,>,&, quotes and characters above 127
+    if (function_exists('mb_convert_encoding')) {
+        $display_query = mb_convert_encoding($string, 'HTML-ENTITIES', 'UTF-8');
+    } else {
+        // if no mbstring extension, we just strip characters
+        $display_query = preg_replace("/[^\x01-\x7F]/", "", $string);
+    }
+    return htmlspecialchars($display_query, ENT_QUOTES, 'UTF-8', false);
 }
 
 /**
@@ -545,25 +545,25 @@ 
  * @access private
  */
 function _elgg_sane_validate_url($url) {
-	// based on http://php.net/manual/en/function.filter-var.php#104160
-	$res = filter_var($url, FILTER_VALIDATE_URL);
-	if ($res) {
-		return $res;
-	}
-
-	// Check if it has unicode chars.
-	$l = elgg_strlen($url);
-	if (strlen($url) == $l) {
-		return $res;
-	}
-
-	// Replace wide chars by “X”.
-	$s = '';
-	for ($i = 0; $i < $l; ++$i) {
-		$ch = elgg_substr($url, $i, 1);
-		$s .= (strlen($ch) > 1) ? 'X' : $ch;
-	}
-
-	// Re-check now.
-	return filter_var($s, FILTER_VALIDATE_URL) ? $url : false;
+    // based on http://php.net/manual/en/function.filter-var.php#104160
+    $res = filter_var($url, FILTER_VALIDATE_URL);
+    if ($res) {
+        return $res;
+    }
+
+    // Check if it has unicode chars.
+    $l = elgg_strlen($url);
+    if (strlen($url) == $l) {
+        return $res;
+    }
+
+    // Replace wide chars by “X”.
+    $s = '';
+    for ($i = 0; $i < $l; ++$i) {
+        $ch = elgg_substr($url, $i, 1);
+        $s .= (strlen($ch) > 1) ? 'X' : $ch;
+    }
+
+    // Re-check now.
+    return filter_var($s, FILTER_VALIDATE_URL) ? $url : false;
 }