Completed
Push — master ( 23b00d...aa8d19 )
by Steve
10:04 queued 37s
created
engine/lib/views.php 1 patch
Indentation   +913 added lines, -913 removed lines patch added patch discarded remove patch
@@ -72,11 +72,11 @@  discard block
 block discarded – undo
72 72
  * @return bool
73 73
  */
74 74
 function elgg_set_viewtype($viewtype = "") {
75
-	global $CURRENT_SYSTEM_VIEWTYPE;
75
+    global $CURRENT_SYSTEM_VIEWTYPE;
76 76
 
77
-	$CURRENT_SYSTEM_VIEWTYPE = $viewtype;
77
+    $CURRENT_SYSTEM_VIEWTYPE = $viewtype;
78 78
 
79
-	return true;
79
+    return true;
80 80
 }
81 81
 
82 82
 /**
@@ -93,13 +93,13 @@  discard block
 block discarded – undo
93 93
  * @see elgg_set_viewtype()
94 94
  */
95 95
 function elgg_get_viewtype() {
96
-	global $CURRENT_SYSTEM_VIEWTYPE;
96
+    global $CURRENT_SYSTEM_VIEWTYPE;
97 97
 
98
-	if (empty($CURRENT_SYSTEM_VIEWTYPE)) {
99
-		$CURRENT_SYSTEM_VIEWTYPE = _elgg_get_initial_viewtype();
100
-	}
98
+    if (empty($CURRENT_SYSTEM_VIEWTYPE)) {
99
+        $CURRENT_SYSTEM_VIEWTYPE = _elgg_get_initial_viewtype();
100
+    }
101 101
 
102
-	return $CURRENT_SYSTEM_VIEWTYPE;
102
+    return $CURRENT_SYSTEM_VIEWTYPE;
103 103
 }
104 104
 
105 105
 /**
@@ -110,18 +110,18 @@  discard block
 block discarded – undo
110 110
  * @since 2.0.0
111 111
  */
112 112
 function _elgg_get_initial_viewtype() {
113
-	global $CONFIG;
113
+    global $CONFIG;
114 114
 
115
-	$viewtype = get_input('view', '', false);
116
-	if (_elgg_is_valid_viewtype($viewtype)) {
117
-		return $viewtype;
118
-	}
115
+    $viewtype = get_input('view', '', false);
116
+    if (_elgg_is_valid_viewtype($viewtype)) {
117
+        return $viewtype;
118
+    }
119 119
 
120
-	if (isset($CONFIG->view) && _elgg_is_valid_viewtype($CONFIG->view)) {
121
-		return $CONFIG->view;
122
-	}
120
+    if (isset($CONFIG->view) && _elgg_is_valid_viewtype($CONFIG->view)) {
121
+        return $CONFIG->view;
122
+    }
123 123
 
124
-	return 'default';
124
+    return 'default';
125 125
 }
126 126
 
127 127
 /**
@@ -131,15 +131,15 @@  discard block
 block discarded – undo
131 131
  * @return bool
132 132
  */
133 133
 function elgg_register_viewtype($viewtype) {
134
-	if (!isset($GLOBALS['_ELGG']->view_types) || !is_array($GLOBALS['_ELGG']->view_types)) {
135
-		$GLOBALS['_ELGG']->view_types = [];
136
-	}
134
+    if (!isset($GLOBALS['_ELGG']->view_types) || !is_array($GLOBALS['_ELGG']->view_types)) {
135
+        $GLOBALS['_ELGG']->view_types = [];
136
+    }
137 137
 
138
-	if (!in_array($viewtype, $GLOBALS['_ELGG']->view_types)) {
139
-		$GLOBALS['_ELGG']->view_types[] = $viewtype;
140
-	}
138
+    if (!in_array($viewtype, $GLOBALS['_ELGG']->view_types)) {
139
+        $GLOBALS['_ELGG']->view_types[] = $viewtype;
140
+    }
141 141
 
142
-	return true;
142
+    return true;
143 143
 }
144 144
 
145 145
 /**
@@ -151,11 +151,11 @@  discard block
 block discarded – undo
151 151
  * @since 1.9.0
152 152
  */
153 153
 function elgg_is_registered_viewtype($viewtype) {
154
-	if (!isset($GLOBALS['_ELGG']->view_types) || !is_array($GLOBALS['_ELGG']->view_types)) {
155
-		return false;
156
-	}
154
+    if (!isset($GLOBALS['_ELGG']->view_types) || !is_array($GLOBALS['_ELGG']->view_types)) {
155
+        return false;
156
+    }
157 157
 
158
-	return in_array($viewtype, $GLOBALS['_ELGG']->view_types);
158
+    return in_array($viewtype, $GLOBALS['_ELGG']->view_types);
159 159
 }
160 160
 
161 161
 
@@ -169,15 +169,15 @@  discard block
 block discarded – undo
169 169
  * @since 1.9
170 170
  */
171 171
 function _elgg_is_valid_viewtype($viewtype) {
172
-	if (!is_string($viewtype) || $viewtype === '') {
173
-		return false;
174
-	}
172
+    if (!is_string($viewtype) || $viewtype === '') {
173
+        return false;
174
+    }
175 175
 
176
-	if (preg_match('/\W/', $viewtype)) {
177
-		return false;
178
-	}
176
+    if (preg_match('/\W/', $viewtype)) {
177
+        return false;
178
+    }
179 179
 
180
-	return true;
180
+    return true;
181 181
 }
182 182
 
183 183
 /**
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
  * @since 1.7.2
193 193
  */
194 194
 function elgg_register_viewtype_fallback($viewtype) {
195
-	_elgg_services()->views->registerViewtypeFallback($viewtype);
195
+    _elgg_services()->views->registerViewtypeFallback($viewtype);
196 196
 }
197 197
 
198 198
 /**
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
204 204
  * @since 1.7.2
205 205
  */
206 206
 function elgg_does_viewtype_fallback($viewtype) {
207
-	return _elgg_services()->views->doesViewtypeFallback($viewtype);
207
+    return _elgg_services()->views->doesViewtypeFallback($viewtype);
208 208
 }
209 209
 
210 210
 /**
@@ -219,7 +219,7 @@  discard block
 block discarded – undo
219 219
  * @since 1.8.3
220 220
  */
221 221
 function elgg_register_ajax_view($view) {
222
-	elgg_register_external_view($view, false);
222
+    elgg_register_external_view($view, false);
223 223
 }
224 224
 
225 225
 /**
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
  * @since 1.8.3
231 231
  */
232 232
 function elgg_unregister_ajax_view($view) {
233
-	elgg_unregister_external_view($view);
233
+    elgg_unregister_external_view($view);
234 234
 }
235 235
 
236 236
 /**
@@ -243,11 +243,11 @@  discard block
 block discarded – undo
243 243
  */
244 244
 function elgg_register_external_view($view, $cacheable = false) {
245 245
 	
246
-	_elgg_services()->ajax->registerView($view);
246
+    _elgg_services()->ajax->registerView($view);
247 247
 
248
-	if ($cacheable) {
249
-		_elgg_services()->views->registerCacheableView($view);
250
-	}
248
+    if ($cacheable) {
249
+        _elgg_services()->views->registerCacheableView($view);
250
+    }
251 251
 }
252 252
 
253 253
 /**
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
  * @since 1.9.0
259 259
  */
260 260
 function elgg_unregister_external_view($view) {
261
-	_elgg_services()->ajax->unregisterView($view);
261
+    _elgg_services()->ajax->unregisterView($view);
262 262
 }
263 263
 
264 264
 /**
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
276 276
  * @return void
277 277
  */
278 278
 function elgg_set_view_location($view, $location, $viewtype = '') {
279
-	_elgg_services()->views->setViewDir($view, $location, $viewtype);
279
+    _elgg_services()->views->setViewDir($view, $location, $viewtype);
280 280
 }
281 281
 
282 282
 /**
@@ -291,7 +291,7 @@  discard block
 block discarded – undo
291 291
  * @return bool
292 292
  */
293 293
 function elgg_view_exists($view, $viewtype = '', $recurse = true) {
294
-	return _elgg_services()->views->viewExists($view, $viewtype, $recurse);
294
+    return _elgg_services()->views->viewExists($view, $viewtype, $recurse);
295 295
 }
296 296
 
297 297
 /**
@@ -304,7 +304,7 @@  discard block
 block discarded – undo
304 304
  * @since 2.0
305 305
  */
306 306
 function elgg_list_views($viewtype = 'default') {
307
-	return _elgg_services()->views->listViews($viewtype);
307
+    return _elgg_services()->views->listViews($viewtype);
308 308
 }
309 309
 
310 310
 /**
@@ -334,7 +334,7 @@  discard block
 block discarded – undo
334 334
  * @return string The parsed view
335 335
  */
336 336
 function elgg_view($view, $vars = [], $ignore1 = false, $ignore2 = false, $viewtype = '') {
337
-	return _elgg_services()->views->renderView($view, $vars, $ignore1, $viewtype);
337
+    return _elgg_services()->views->renderView($view, $vars, $ignore1, $viewtype);
338 338
 }
339 339
 
340 340
 /**
@@ -351,7 +351,7 @@  discard block
 block discarded – undo
351 351
  * @access private
352 352
  */
353 353
 function elgg_view_deprecated($view, array $vars, $suggestion, $version) {
354
-	return _elgg_services()->views->renderDeprecatedView($view, $vars, $suggestion, $version);
354
+    return _elgg_services()->views->renderDeprecatedView($view, $vars, $suggestion, $version);
355 355
 }
356 356
 
357 357
 /**
@@ -378,7 +378,7 @@  discard block
 block discarded – undo
378 378
  * @since 1.7.0
379 379
  */
380 380
 function elgg_extend_view($view, $view_extension, $priority = 501) {
381
-	_elgg_services()->views->extendView($view, $view_extension, $priority);
381
+    _elgg_services()->views->extendView($view, $view_extension, $priority);
382 382
 }
383 383
 
384 384
 /**
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
391 391
  * @since 1.7.2
392 392
  */
393 393
 function elgg_unextend_view($view, $view_extension) {
394
-	return _elgg_services()->views->unextendView($view, $view_extension);
394
+    return _elgg_services()->views->unextendView($view, $view_extension);
395 395
 }
396 396
 
397 397
 /**
@@ -405,9 +405,9 @@  discard block
 block discarded – undo
405 405
  * @since 2.3
406 406
  */
407 407
 function elgg_get_view_extensions($view) {
408
-	$list = _elgg_services()->views->getViewList($view);
409
-	unset($list[500]);
410
-	return $list;
408
+    $list = _elgg_services()->views->getViewList($view);
409
+    unset($list[500]);
410
+    return $list;
411 411
 }
412 412
 
413 413
 /**
@@ -422,7 +422,7 @@  discard block
 block discarded – undo
422 422
  * @since 2.2
423 423
  */
424 424
 function elgg_prepend_css_urls($css, $path) {
425
-	return Minify_CSS_UriRewriter::prepend($css, $path);
425
+    return Minify_CSS_UriRewriter::prepend($css, $path);
426 426
 }
427 427
 
428 428
 /**
@@ -445,57 +445,57 @@  discard block
 block discarded – undo
445 445
  * @since  1.8
446 446
  */
447 447
 function elgg_view_page($title, $body, $page_shell = 'default', $vars = []) {
448
-	$timer = _elgg_services()->timer;
449
-	if (!$timer->hasEnded(['build page'])) {
450
-		$timer->end(['build page']);
451
-	}
452
-	$timer->begin([__FUNCTION__]);
448
+    $timer = _elgg_services()->timer;
449
+    if (!$timer->hasEnded(['build page'])) {
450
+        $timer->end(['build page']);
451
+    }
452
+    $timer->begin([__FUNCTION__]);
453 453
 
454
-	$params = [];
455
-	$params['identifier'] = _elgg_services()->request->getFirstUrlSegment();
456
-	$params['segments'] = _elgg_services()->request->getUrlSegments();
457
-	array_shift($params['segments']);
458
-	$page_shell = elgg_trigger_plugin_hook('shell', 'page', $params, $page_shell);
454
+    $params = [];
455
+    $params['identifier'] = _elgg_services()->request->getFirstUrlSegment();
456
+    $params['segments'] = _elgg_services()->request->getUrlSegments();
457
+    array_shift($params['segments']);
458
+    $page_shell = elgg_trigger_plugin_hook('shell', 'page', $params, $page_shell);
459 459
 
460 460
 
461
-	$system_messages = _elgg_services()->systemMessages;
461
+    $system_messages = _elgg_services()->systemMessages;
462 462
 
463
-	$messages = null;
464
-	if ($system_messages->count()) {
465
-		$messages = $system_messages->dumpRegister();
463
+    $messages = null;
464
+    if ($system_messages->count()) {
465
+        $messages = $system_messages->dumpRegister();
466 466
 
467
-		if (isset($messages['error'])) {
468
-			// always make sure error is the first type
469
-			$errors = [
470
-				'error' => $messages['error']
471
-			];
467
+        if (isset($messages['error'])) {
468
+            // always make sure error is the first type
469
+            $errors = [
470
+                'error' => $messages['error']
471
+            ];
472 472
 
473
-			unset($messages['error']);
474
-			$messages = array_merge($errors, $messages);
475
-		}
476
-	}
473
+            unset($messages['error']);
474
+            $messages = array_merge($errors, $messages);
475
+        }
476
+    }
477 477
 
478
-	$vars['title'] = $title;
479
-	$vars['body'] = $body;
480
-	$vars['sysmessages'] = $messages;
481
-	$vars['admin_notices'] = elgg_is_admin_logged_in() ? elgg_get_admin_notices() : [];
482
-	$vars['page_shell'] = $page_shell;
478
+    $vars['title'] = $title;
479
+    $vars['body'] = $body;
480
+    $vars['sysmessages'] = $messages;
481
+    $vars['admin_notices'] = elgg_is_admin_logged_in() ? elgg_get_admin_notices() : [];
482
+    $vars['page_shell'] = $page_shell;
483 483
 
484
-	// head has keys 'title', 'metas', 'links'
485
-	$head_params = _elgg_views_prepare_head($title);
484
+    // head has keys 'title', 'metas', 'links'
485
+    $head_params = _elgg_views_prepare_head($title);
486 486
 
487
-	$vars['head'] = elgg_trigger_plugin_hook('head', 'page', $vars, $head_params);
487
+    $vars['head'] = elgg_trigger_plugin_hook('head', 'page', $vars, $head_params);
488 488
 
489
-	$vars = elgg_trigger_plugin_hook('output:before', 'page', null, $vars);
489
+    $vars = elgg_trigger_plugin_hook('output:before', 'page', null, $vars);
490 490
 
491
-	$output = elgg_view("page/$page_shell", $vars);
491
+    $output = elgg_view("page/$page_shell", $vars);
492 492
 
493 493
 
494
-	// Allow plugins to modify the output
495
-	$output = elgg_trigger_plugin_hook('output', 'page', $vars, $output);
494
+    // Allow plugins to modify the output
495
+    $output = elgg_trigger_plugin_hook('output', 'page', $vars, $output);
496 496
 
497
-	$timer->end([__FUNCTION__]);
498
-	return $output;
497
+    $timer->end([__FUNCTION__]);
498
+    return $output;
499 499
 }
500 500
 
501 501
 /**
@@ -509,25 +509,25 @@  discard block
 block discarded – undo
509 509
  * @throws SecurityException
510 510
  */
511 511
 function elgg_view_resource($name, array $vars = []) {
512
-	$view = "resources/$name";
512
+    $view = "resources/$name";
513 513
 
514
-	if (elgg_view_exists($view)) {
515
-		return _elgg_services()->views->renderView($view, $vars);
516
-	}
514
+    if (elgg_view_exists($view)) {
515
+        return _elgg_services()->views->renderView($view, $vars);
516
+    }
517 517
 
518
-	if (elgg_get_viewtype() !== 'default' && elgg_view_exists($view, 'default')) {
519
-		return _elgg_services()->views->renderView($view, $vars, false, 'default');
520
-	}
518
+    if (elgg_get_viewtype() !== 'default' && elgg_view_exists($view, 'default')) {
519
+        return _elgg_services()->views->renderView($view, $vars, false, 'default');
520
+    }
521 521
 
522
-	_elgg_services()->logger->error("The view $view is missing.");
522
+    _elgg_services()->logger->error("The view $view is missing.");
523 523
 
524
-	if (elgg_get_viewtype() === 'default') {
525
-		// only works for default viewtype
526
-		forward('', '404');
527
-	} else {
528
-		register_error(elgg_echo('error:404:content'));
529
-		forward('');
530
-	}
524
+    if (elgg_get_viewtype() === 'default') {
525
+        // only works for default viewtype
526
+        forward('', '404');
527
+    } else {
528
+        register_error(elgg_echo('error:404:content'));
529
+        forward('');
530
+    }
531 531
 }
532 532
 
533 533
 /**
@@ -538,58 +538,58 @@  discard block
 block discarded – undo
538 538
  * @access private
539 539
  */
540 540
 function _elgg_views_prepare_head($title) {
541
-	$params = [
542
-		'links' => [],
543
-		'metas' => [],
544
-	];
545
-
546
-	if (empty($title)) {
547
-		$params['title'] = elgg_get_config('sitename');
548
-	} else {
549
-		$params['title'] = $title . ' : ' . elgg_get_config('sitename');
550
-	}
551
-
552
-	$params['metas']['content-type'] = [
553
-		'http-equiv' => 'Content-Type',
554
-		'content' => 'text/html; charset=utf-8',
555
-	];
556
-
557
-	$params['metas']['description'] = [
558
-		'name' => 'description',
559
-		'content' => elgg_get_config('sitedescription')
560
-	];
561
-
562
-	// https://developer.chrome.com/multidevice/android/installtohomescreen
563
-	$params['metas']['viewport'] = [
564
-		'name' => 'viewport',
565
-		'content' => 'width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0',
566
-	];
567
-	$params['metas']['mobile-web-app-capable'] = [
568
-		'name' => 'mobile-web-app-capable',
569
-		'content' => 'yes',
570
-	];
571
-	$params['metas']['apple-mobile-web-app-capable'] = [
572
-		'name' => 'apple-mobile-web-app-capable',
573
-		'content' => 'yes',
574
-	];
541
+    $params = [
542
+        'links' => [],
543
+        'metas' => [],
544
+    ];
545
+
546
+    if (empty($title)) {
547
+        $params['title'] = elgg_get_config('sitename');
548
+    } else {
549
+        $params['title'] = $title . ' : ' . elgg_get_config('sitename');
550
+    }
551
+
552
+    $params['metas']['content-type'] = [
553
+        'http-equiv' => 'Content-Type',
554
+        'content' => 'text/html; charset=utf-8',
555
+    ];
556
+
557
+    $params['metas']['description'] = [
558
+        'name' => 'description',
559
+        'content' => elgg_get_config('sitedescription')
560
+    ];
561
+
562
+    // https://developer.chrome.com/multidevice/android/installtohomescreen
563
+    $params['metas']['viewport'] = [
564
+        'name' => 'viewport',
565
+        'content' => 'width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0',
566
+    ];
567
+    $params['metas']['mobile-web-app-capable'] = [
568
+        'name' => 'mobile-web-app-capable',
569
+        'content' => 'yes',
570
+    ];
571
+    $params['metas']['apple-mobile-web-app-capable'] = [
572
+        'name' => 'apple-mobile-web-app-capable',
573
+        'content' => 'yes',
574
+    ];
575 575
 	
576
-	// RSS feed link
577
-	if (_elgg_has_rss_link()) {
578
-		$url = current_page_url();
579
-		if (substr_count($url, '?')) {
580
-			$url .= "&view=rss";
581
-		} else {
582
-			$url .= "?view=rss";
583
-		}
584
-		$params['links']['rss'] = [
585
-			'rel' => 'alternative',
586
-			'type' => 'application/rss+xml',
587
-			'title' => 'RSS',
588
-			'href' => $url,
589
-		];
590
-	}
576
+    // RSS feed link
577
+    if (_elgg_has_rss_link()) {
578
+        $url = current_page_url();
579
+        if (substr_count($url, '?')) {
580
+            $url .= "&view=rss";
581
+        } else {
582
+            $url .= "?view=rss";
583
+        }
584
+        $params['links']['rss'] = [
585
+            'rel' => 'alternative',
586
+            'type' => 'application/rss+xml',
587
+            'title' => 'RSS',
588
+            'href' => $url,
589
+        ];
590
+    }
591 591
 	
592
-	return $params;
592
+    return $params;
593 593
 }
594 594
 
595 595
 
@@ -611,48 +611,48 @@  discard block
 block discarded – undo
611 611
  */
612 612
 function _elgg_views_prepare_favicon_links($hook, $type, $head_params, $params) {
613 613
 
614
-	$head_params['links']['apple-touch-icon'] = [
615
-		'rel' => 'apple-touch-icon',
616
-		'href' => elgg_get_simplecache_url('graphics/favicon-128.png'),
617
-	];
618
-
619
-	// favicons
620
-	$head_params['links']['icon-ico'] = [
621
-		'rel' => 'icon',
622
-		'href' => elgg_get_simplecache_url('graphics/favicon.ico'),
623
-	];
624
-	$head_params['links']['icon-vector'] = [
625
-		'rel' => 'icon',
626
-		'sizes' => '16x16 32x32 48x48 64x64 128x128',
627
-		'type' => 'image/svg+xml',
628
-		'href' => elgg_get_simplecache_url('graphics/favicon.svg'),
629
-	];
630
-	$head_params['links']['icon-16'] = [
631
-		'rel' => 'icon',
632
-		'sizes' => '16x16',
633
-		'type' => 'image/png',
634
-		'href' => elgg_get_simplecache_url('graphics/favicon-16.png'),
635
-	];
636
-	$head_params['links']['icon-32'] = [
637
-		'rel' => 'icon',
638
-		'sizes' => '32x32',
639
-		'type' => 'image/png',
640
-		'href' => elgg_get_simplecache_url('graphics/favicon-32.png'),
641
-	];
642
-	$head_params['links']['icon-64'] = [
643
-		'rel' => 'icon',
644
-		'sizes' => '64x64',
645
-		'type' => 'image/png',
646
-		'href' => elgg_get_simplecache_url('graphics/favicon-64.png'),
647
-	];
648
-	$head_params['links']['icon-128'] = [
649
-		'rel' => 'icon',
650
-		'sizes' => '128x128',
651
-		'type' => 'image/png',
652
-		'href' => elgg_get_simplecache_url('graphics/favicon-128.png'),
653
-	];
654
-
655
-	return $head_params;
614
+    $head_params['links']['apple-touch-icon'] = [
615
+        'rel' => 'apple-touch-icon',
616
+        'href' => elgg_get_simplecache_url('graphics/favicon-128.png'),
617
+    ];
618
+
619
+    // favicons
620
+    $head_params['links']['icon-ico'] = [
621
+        'rel' => 'icon',
622
+        'href' => elgg_get_simplecache_url('graphics/favicon.ico'),
623
+    ];
624
+    $head_params['links']['icon-vector'] = [
625
+        'rel' => 'icon',
626
+        'sizes' => '16x16 32x32 48x48 64x64 128x128',
627
+        'type' => 'image/svg+xml',
628
+        'href' => elgg_get_simplecache_url('graphics/favicon.svg'),
629
+    ];
630
+    $head_params['links']['icon-16'] = [
631
+        'rel' => 'icon',
632
+        'sizes' => '16x16',
633
+        'type' => 'image/png',
634
+        'href' => elgg_get_simplecache_url('graphics/favicon-16.png'),
635
+    ];
636
+    $head_params['links']['icon-32'] = [
637
+        'rel' => 'icon',
638
+        'sizes' => '32x32',
639
+        'type' => 'image/png',
640
+        'href' => elgg_get_simplecache_url('graphics/favicon-32.png'),
641
+    ];
642
+    $head_params['links']['icon-64'] = [
643
+        'rel' => 'icon',
644
+        'sizes' => '64x64',
645
+        'type' => 'image/png',
646
+        'href' => elgg_get_simplecache_url('graphics/favicon-64.png'),
647
+    ];
648
+    $head_params['links']['icon-128'] = [
649
+        'rel' => 'icon',
650
+        'sizes' => '128x128',
651
+        'type' => 'image/png',
652
+        'href' => elgg_get_simplecache_url('graphics/favicon-128.png'),
653
+    ];
654
+
655
+    return $head_params;
656 656
 }
657 657
 
658 658
 /**
@@ -684,67 +684,67 @@  discard block
 block discarded – undo
684 684
  * @return string
685 685
  */
686 686
 function elgg_view_layout($layout_name, $vars = []) {
687
-	$timer = _elgg_services()->timer;
688
-	if (!$timer->hasEnded(['build page'])) {
689
-		$timer->end(['build page']);
690
-	}
691
-	$timer->begin([__FUNCTION__]);
692
-
693
-	// Help plugins transition without breaking them
694
-	switch ($layout_name) {
695
-		case 'content' :
696
-			$layout_name = 'default';
697
-			$vars = _elgg_normalize_content_layout_vars($vars);
698
-			break;
699
-
700
-		case 'one_sidebar' :
701
-			$layout_name = 'default';
702
-			$vars['sidebar'] = elgg_extract('sidebar', $vars, '', false);
703
-			$vars['sidebar_alt'] = false;
704
-			break;
705
-
706
-		case 'one_column' :
707
-			$layout_name = 'default';
708
-			$vars['sidebar'] = false;
709
-			$vars['sidebar_alt'] = false;
710
-			break;
711
-
712
-		case 'two_sidebar' :
713
-			$layout_name = 'default';
714
-			$vars['sidebar'] = elgg_extract('sidebar', $vars, '', false);
715
-			$vars['sidebar_alt'] = elgg_extract('sidebar_alt', $vars, '', false);
716
-			break;
717
-	}
718
-
719
-	if (isset($vars['nav'])) {
720
-		// Temporary helper until all core views are updated
721
-		$vars['breadcrumbs'] = $vars['nav'];
722
-		unset($vars['nav']);
723
-	}
724
-
725
-	$vars['identifier'] = _elgg_services()->request->getFirstUrlSegment();
726
-	$vars['segments'] = _elgg_services()->request->getUrlSegments();
727
-	array_shift($vars['segments']);
728
-
729
-	$layout_name = elgg_trigger_plugin_hook('layout', 'page', $vars, $layout_name);
730
-
731
-	$vars['layout'] = $layout_name;
732
-
733
-	$layout_views = [
734
-		"page/layouts/$layout_name",
735
-		"page/layouts/default",
736
-	];
737
-
738
-	$output = '';
739
-	foreach ($layout_views as $layout_view) {
740
-		if (elgg_view_exists($layout_view)) {
741
-			$output = elgg_view($layout_view, $vars);
742
-			break;
743
-		}
744
-	}
745
-
746
-	$timer->end([__FUNCTION__]);
747
-	return $output;
687
+    $timer = _elgg_services()->timer;
688
+    if (!$timer->hasEnded(['build page'])) {
689
+        $timer->end(['build page']);
690
+    }
691
+    $timer->begin([__FUNCTION__]);
692
+
693
+    // Help plugins transition without breaking them
694
+    switch ($layout_name) {
695
+        case 'content' :
696
+            $layout_name = 'default';
697
+            $vars = _elgg_normalize_content_layout_vars($vars);
698
+            break;
699
+
700
+        case 'one_sidebar' :
701
+            $layout_name = 'default';
702
+            $vars['sidebar'] = elgg_extract('sidebar', $vars, '', false);
703
+            $vars['sidebar_alt'] = false;
704
+            break;
705
+
706
+        case 'one_column' :
707
+            $layout_name = 'default';
708
+            $vars['sidebar'] = false;
709
+            $vars['sidebar_alt'] = false;
710
+            break;
711
+
712
+        case 'two_sidebar' :
713
+            $layout_name = 'default';
714
+            $vars['sidebar'] = elgg_extract('sidebar', $vars, '', false);
715
+            $vars['sidebar_alt'] = elgg_extract('sidebar_alt', $vars, '', false);
716
+            break;
717
+    }
718
+
719
+    if (isset($vars['nav'])) {
720
+        // Temporary helper until all core views are updated
721
+        $vars['breadcrumbs'] = $vars['nav'];
722
+        unset($vars['nav']);
723
+    }
724
+
725
+    $vars['identifier'] = _elgg_services()->request->getFirstUrlSegment();
726
+    $vars['segments'] = _elgg_services()->request->getUrlSegments();
727
+    array_shift($vars['segments']);
728
+
729
+    $layout_name = elgg_trigger_plugin_hook('layout', 'page', $vars, $layout_name);
730
+
731
+    $vars['layout'] = $layout_name;
732
+
733
+    $layout_views = [
734
+        "page/layouts/$layout_name",
735
+        "page/layouts/default",
736
+    ];
737
+
738
+    $output = '';
739
+    foreach ($layout_views as $layout_view) {
740
+        if (elgg_view_exists($layout_view)) {
741
+            $output = elgg_view($layout_view, $vars);
742
+            break;
743
+        }
744
+    }
745
+
746
+    $timer->end([__FUNCTION__]);
747
+    return $output;
748 748
 }
749 749
 
750 750
 /**
@@ -757,27 +757,27 @@  discard block
 block discarded – undo
757 757
  */
758 758
 function _elgg_normalize_content_layout_vars(array $vars = []) {
759 759
 
760
-	$context = elgg_extract('context', $vars, elgg_get_context());
761
-
762
-	$vars['title'] = elgg_extract('title', $vars, '');
763
-	if (!$vars['title'] && $vars['title'] !== false) {
764
-		$vars['title'] = elgg_echo($context);
765
-	}
766
-
767
-	// 1.8 supported 'filter_override'
768
-	if (isset($vars['filter_override'])) {
769
-		$vars['filter'] = $vars['filter_override'];
770
-	}
771
-
772
-	// register the default content filters
773
-	if (!isset($vars['filter']) && $context) {
774
-		$selected = elgg_extract('filter_context', $vars);
775
-		$vars['filter'] = elgg_get_filter_tabs($context, $selected, null, $vars);
776
-		$vars['filter_id'] = $context;
777
-		$vars['filter_value'] = $selected;
778
-	}
760
+    $context = elgg_extract('context', $vars, elgg_get_context());
761
+
762
+    $vars['title'] = elgg_extract('title', $vars, '');
763
+    if (!$vars['title'] && $vars['title'] !== false) {
764
+        $vars['title'] = elgg_echo($context);
765
+    }
766
+
767
+    // 1.8 supported 'filter_override'
768
+    if (isset($vars['filter_override'])) {
769
+        $vars['filter'] = $vars['filter_override'];
770
+    }
771
+
772
+    // register the default content filters
773
+    if (!isset($vars['filter']) && $context) {
774
+        $selected = elgg_extract('filter_context', $vars);
775
+        $vars['filter'] = elgg_get_filter_tabs($context, $selected, null, $vars);
776
+        $vars['filter_id'] = $context;
777
+        $vars['filter_value'] = $selected;
778
+    }
779 779
 	
780
-	return $vars;
780
+    return $vars;
781 781
 }
782 782
 
783 783
 /**
@@ -837,33 +837,33 @@  discard block
 block discarded – undo
837 837
  */
838 838
 function elgg_view_menu($menu, array $vars = []) {
839 839
 
840
-	$menu_view = elgg_extract('menu_view', $vars);
841
-	unset($vars['menu_view']);
842
-
843
-	if (is_string($menu)) {
844
-		$menu = _elgg_services()->menus->getMenu($menu, $vars);
845
-	} elseif ($menu instanceof UnpreparedMenu) {
846
-		$menu = _elgg_services()->menus->prepareMenu($menu);
847
-	}
848
-
849
-	if (!$menu instanceof Menu) {
850
-		throw new \InvalidArgumentException('$menu must be a menu name, a Menu, or UnpreparedMenu');
851
-	}
852
-
853
-	$name = $menu->getName();
854
-	$params = $menu->getParams();
855
-
856
-	$views = [
857
-		$menu_view,
858
-		"navigation/menu/$name",
859
-		'navigation/menu/default',
860
-	];
861
-
862
-	foreach ($views as $view) {
863
-		if (elgg_view_exists($view)) {
864
-			return elgg_view($view, $params);
865
-		}
866
-	}
840
+    $menu_view = elgg_extract('menu_view', $vars);
841
+    unset($vars['menu_view']);
842
+
843
+    if (is_string($menu)) {
844
+        $menu = _elgg_services()->menus->getMenu($menu, $vars);
845
+    } elseif ($menu instanceof UnpreparedMenu) {
846
+        $menu = _elgg_services()->menus->prepareMenu($menu);
847
+    }
848
+
849
+    if (!$menu instanceof Menu) {
850
+        throw new \InvalidArgumentException('$menu must be a menu name, a Menu, or UnpreparedMenu');
851
+    }
852
+
853
+    $name = $menu->getName();
854
+    $params = $menu->getParams();
855
+
856
+    $views = [
857
+        $menu_view,
858
+        "navigation/menu/$name",
859
+        'navigation/menu/default',
860
+    ];
861
+
862
+    foreach ($views as $view) {
863
+        if (elgg_view_exists($view)) {
864
+            return elgg_view($view, $params);
865
+        }
866
+    }
867 867
 }
868 868
 
869 869
 /**
@@ -875,36 +875,36 @@  discard block
 block discarded – undo
875 875
  * @since 1.9.0
876 876
  */
877 877
 function elgg_view_menu_item(\ElggMenuItem $item, array $vars = []) {
878
-	if (!isset($vars['class'])) {
879
-		$vars['class'] = 'elgg-menu-content';
880
-	}
878
+    if (!isset($vars['class'])) {
879
+        $vars['class'] = 'elgg-menu-content';
880
+    }
881 881
 
882
-	$vars = array_merge($item->getValues(), $vars);
882
+    $vars = array_merge($item->getValues(), $vars);
883 883
 
884
-	if ($item->getLinkClass()) {
885
-		$vars['class'] .= ' ' . $item->getLinkClass();
886
-	}
884
+    if ($item->getLinkClass()) {
885
+        $vars['class'] .= ' ' . $item->getLinkClass();
886
+    }
887 887
 
888
-	if ($item->getHref() === false || $item->getHref() === null) {
889
-		$text = $item->getText();
888
+    if ($item->getHref() === false || $item->getHref() === null) {
889
+        $text = $item->getText();
890 890
 
891
-		// if contains elements, don't wrap
892
-		if (preg_match('~<[a-z]~', $text)) {
893
-			return $text;
894
-		} else {
895
-			return elgg_format_element('span', ['class' => 'elgg-non-link'], $text);
896
-		}
897
-	}
891
+        // if contains elements, don't wrap
892
+        if (preg_match('~<[a-z]~', $text)) {
893
+            return $text;
894
+        } else {
895
+            return elgg_format_element('span', ['class' => 'elgg-non-link'], $text);
896
+        }
897
+    }
898 898
 
899
-	if (!isset($vars['rel']) && !isset($vars['is_trusted'])) {
900
-		$vars['is_trusted'] = true;
901
-	}
899
+    if (!isset($vars['rel']) && !isset($vars['is_trusted'])) {
900
+        $vars['is_trusted'] = true;
901
+    }
902 902
 
903
-	if ($item->getConfirmText()) {
904
-		$vars['confirm'] = $item->getConfirmText();
905
-	}
903
+    if ($item->getConfirmText()) {
904
+        $vars['confirm'] = $item->getConfirmText();
905
+    }
906 906
 
907
-	return elgg_view('output/url', $vars);
907
+    return elgg_view('output/url', $vars);
908 908
 }
909 909
 
910 910
 /**
@@ -934,50 +934,50 @@  discard block
 block discarded – undo
934 934
  */
935 935
 function elgg_view_entity(\ElggEntity $entity, array $vars = [], $bypass = false, $debug = false) {
936 936
 
937
-	// No point continuing if entity is null
938
-	if (!$entity || !($entity instanceof \ElggEntity)) {
939
-		return false;
940
-	}
941
-
942
-	elgg_register_rss_link();
943
-
944
-	$defaults = [
945
-		'full_view' => true,
946
-	];
947
-
948
-	$vars = array_merge($defaults, $vars);
949
-
950
-	$vars['entity'] = $entity;
951
-
952
-	$entity_type = $entity->getType();
953
-	$entity_subtype = $entity->getSubtype();
954
-	if (empty($entity_subtype)) {
955
-		$entity_subtype = 'default';
956
-	}
957
-
958
-	$entity_views = [
959
-		elgg_extract('item_view', $vars, ''),
960
-		"$entity_type/$entity_subtype",
961
-		"$entity_type/default",
962
-	];
963
-
964
-	$contents = '';
965
-	foreach ($entity_views as $view) {
966
-		if (elgg_view_exists($view)) {
967
-			$contents = elgg_view($view, $vars, $bypass, $debug);
968
-			break;
969
-		}
970
-	}
971
-
972
-	// Marcus Povey 20090616 : Speculative and low impact approach for fixing #964
973
-	if ($vars['full_view']) {
974
-		$annotations = elgg_view_entity_annotations($entity, $vars['full_view']);
975
-
976
-		if ($annotations) {
977
-			$contents .= $annotations;
978
-		}
979
-	}
980
-	return $contents;
937
+    // No point continuing if entity is null
938
+    if (!$entity || !($entity instanceof \ElggEntity)) {
939
+        return false;
940
+    }
941
+
942
+    elgg_register_rss_link();
943
+
944
+    $defaults = [
945
+        'full_view' => true,
946
+    ];
947
+
948
+    $vars = array_merge($defaults, $vars);
949
+
950
+    $vars['entity'] = $entity;
951
+
952
+    $entity_type = $entity->getType();
953
+    $entity_subtype = $entity->getSubtype();
954
+    if (empty($entity_subtype)) {
955
+        $entity_subtype = 'default';
956
+    }
957
+
958
+    $entity_views = [
959
+        elgg_extract('item_view', $vars, ''),
960
+        "$entity_type/$entity_subtype",
961
+        "$entity_type/default",
962
+    ];
963
+
964
+    $contents = '';
965
+    foreach ($entity_views as $view) {
966
+        if (elgg_view_exists($view)) {
967
+            $contents = elgg_view($view, $vars, $bypass, $debug);
968
+            break;
969
+        }
970
+    }
971
+
972
+    // Marcus Povey 20090616 : Speculative and low impact approach for fixing #964
973
+    if ($vars['full_view']) {
974
+        $annotations = elgg_view_entity_annotations($entity, $vars['full_view']);
975
+
976
+        if ($annotations) {
977
+            $contents .= $annotations;
978
+        }
979
+    }
980
+    return $contents;
981 981
 }
982 982
 
983 983
 /**
@@ -997,33 +997,33 @@  discard block
 block discarded – undo
997 997
  */
998 998
 function elgg_view_entity_icon(\ElggEntity $entity, $size = 'medium', $vars = []) {
999 999
 
1000
-	// No point continuing if entity is null
1001
-	if (!$entity || !($entity instanceof \ElggEntity)) {
1002
-		return false;
1003
-	}
1004
-
1005
-	$vars['entity'] = $entity;
1006
-	$vars['size'] = $size;
1007
-
1008
-	$entity_type = $entity->getType();
1009
-
1010
-	$subtype = $entity->getSubtype();
1011
-	if (empty($subtype)) {
1012
-		$subtype = 'default';
1013
-	}
1014
-
1015
-	$contents = '';
1016
-	if (elgg_view_exists("icon/$entity_type/$subtype")) {
1017
-		$contents = elgg_view("icon/$entity_type/$subtype", $vars);
1018
-	}
1019
-	if (empty($contents)) {
1020
-		$contents = elgg_view("icon/$entity_type/default", $vars);
1021
-	}
1022
-	if (empty($contents)) {
1023
-		$contents = elgg_view("icon/default", $vars);
1024
-	}
1025
-
1026
-	return $contents;
1000
+    // No point continuing if entity is null
1001
+    if (!$entity || !($entity instanceof \ElggEntity)) {
1002
+        return false;
1003
+    }
1004
+
1005
+    $vars['entity'] = $entity;
1006
+    $vars['size'] = $size;
1007
+
1008
+    $entity_type = $entity->getType();
1009
+
1010
+    $subtype = $entity->getSubtype();
1011
+    if (empty($subtype)) {
1012
+        $subtype = 'default';
1013
+    }
1014
+
1015
+    $contents = '';
1016
+    if (elgg_view_exists("icon/$entity_type/$subtype")) {
1017
+        $contents = elgg_view("icon/$entity_type/$subtype", $vars);
1018
+    }
1019
+    if (empty($contents)) {
1020
+        $contents = elgg_view("icon/$entity_type/default", $vars);
1021
+    }
1022
+    if (empty($contents)) {
1023
+        $contents = elgg_view("icon/default", $vars);
1024
+    }
1025
+
1026
+    return $contents;
1027 1027
 }
1028 1028
 
1029 1029
 /**
@@ -1047,35 +1047,35 @@  discard block
 block discarded – undo
1047 1047
  * @return string/false Rendered annotation
1048 1048
  */
1049 1049
 function elgg_view_annotation(\ElggAnnotation $annotation, array $vars = [], $bypass = false, $debug = false) {
1050
-	elgg_register_rss_link();
1051
-
1052
-	$defaults = [
1053
-		'full_view' => true,
1054
-	];
1055
-
1056
-	$vars = array_merge($defaults, $vars);
1057
-	$vars['annotation'] = $annotation;
1058
-
1059
-	$name = $annotation->name;
1060
-	if (empty($name)) {
1061
-		return false;
1062
-	}
1063
-
1064
-	$annotation_views = [
1065
-		elgg_extract('item_view', $vars, ''),
1066
-		"annotation/$name",
1067
-		"annotation/default",
1068
-	];
1069
-
1070
-	$contents = '';
1071
-	foreach ($annotation_views as $view) {
1072
-		if (elgg_view_exists($view)) {
1073
-			$contents = elgg_view($view, $vars, $bypass, $debug);
1074
-			break;
1075
-		}
1076
-	}
1077
-
1078
-	return $contents;
1050
+    elgg_register_rss_link();
1051
+
1052
+    $defaults = [
1053
+        'full_view' => true,
1054
+    ];
1055
+
1056
+    $vars = array_merge($defaults, $vars);
1057
+    $vars['annotation'] = $annotation;
1058
+
1059
+    $name = $annotation->name;
1060
+    if (empty($name)) {
1061
+        return false;
1062
+    }
1063
+
1064
+    $annotation_views = [
1065
+        elgg_extract('item_view', $vars, ''),
1066
+        "annotation/$name",
1067
+        "annotation/default",
1068
+    ];
1069
+
1070
+    $contents = '';
1071
+    foreach ($annotation_views as $view) {
1072
+        if (elgg_view_exists($view)) {
1073
+            $contents = elgg_view($view, $vars, $bypass, $debug);
1074
+            break;
1075
+        }
1076
+    }
1077
+
1078
+    return $contents;
1079 1079
 }
1080 1080
 
1081 1081
 /**
@@ -1108,36 +1108,36 @@  discard block
 block discarded – undo
1108 1108
  * @return string The rendered list of entities
1109 1109
  */
1110 1110
 function elgg_view_entity_list($entities, array $vars = []) {
1111
-	$offset = (int) get_input('offset', 0);
1112
-
1113
-	// list type can be passed as request parameter
1114
-	$list_type = get_input('list_type', 'list');
1115
-
1116
-	$defaults = [
1117
-		'items' => $entities,
1118
-		'list_class' => 'elgg-list-entity',
1119
-		'full_view' => true,
1120
-		'pagination' => true,
1121
-		'list_type' => $list_type,
1122
-		'list_type_toggle' => false,
1123
-		'offset' => $offset,
1124
-		'limit' => null,
1125
-	];
1126
-
1127
-	$vars = array_merge($defaults, $vars);
1128
-
1129
-	if (!$vars["limit"] && !$vars["offset"]) {
1130
-		// no need for pagination if listing is unlimited
1131
-		$vars["pagination"] = false;
1132
-	}
1133
-
1134
-	if ($vars['list_type'] == 'table') {
1135
-		return elgg_view('page/components/table', $vars);
1136
-	} elseif ($vars['list_type'] == 'list') {
1137
-		return elgg_view('page/components/list', $vars);
1138
-	} else {
1139
-		return elgg_view('page/components/gallery', $vars);
1140
-	}
1111
+    $offset = (int) get_input('offset', 0);
1112
+
1113
+    // list type can be passed as request parameter
1114
+    $list_type = get_input('list_type', 'list');
1115
+
1116
+    $defaults = [
1117
+        'items' => $entities,
1118
+        'list_class' => 'elgg-list-entity',
1119
+        'full_view' => true,
1120
+        'pagination' => true,
1121
+        'list_type' => $list_type,
1122
+        'list_type_toggle' => false,
1123
+        'offset' => $offset,
1124
+        'limit' => null,
1125
+    ];
1126
+
1127
+    $vars = array_merge($defaults, $vars);
1128
+
1129
+    if (!$vars["limit"] && !$vars["offset"]) {
1130
+        // no need for pagination if listing is unlimited
1131
+        $vars["pagination"] = false;
1132
+    }
1133
+
1134
+    if ($vars['list_type'] == 'table') {
1135
+        return elgg_view('page/components/table', $vars);
1136
+    } elseif ($vars['list_type'] == 'list') {
1137
+        return elgg_view('page/components/list', $vars);
1138
+    } else {
1139
+        return elgg_view('page/components/gallery', $vars);
1140
+    }
1141 1141
 }
1142 1142
 
1143 1143
 /**
@@ -1159,23 +1159,23 @@  discard block
 block discarded – undo
1159 1159
  * @access private
1160 1160
  */
1161 1161
 function elgg_view_annotation_list($annotations, array $vars = []) {
1162
-	$defaults = [
1163
-		'items' => $annotations,
1164
-		'offset' => null,
1165
-		'limit' => null,
1166
-		'list_class' => 'elgg-list-annotation elgg-annotation-list', // @todo remove elgg-annotation-list in Elgg 1.9
1167
-		'full_view' => true,
1168
-		'offset_key' => 'annoff',
1169
-	];
1170
-
1171
-	$vars = array_merge($defaults, $vars);
1172
-
1173
-	if (!$vars["limit"] && !$vars["offset"]) {
1174
-		// no need for pagination if listing is unlimited
1175
-		$vars["pagination"] = false;
1176
-	}
1177
-
1178
-	return elgg_view('page/components/list', $vars);
1162
+    $defaults = [
1163
+        'items' => $annotations,
1164
+        'offset' => null,
1165
+        'limit' => null,
1166
+        'list_class' => 'elgg-list-annotation elgg-annotation-list', // @todo remove elgg-annotation-list in Elgg 1.9
1167
+        'full_view' => true,
1168
+        'offset_key' => 'annoff',
1169
+    ];
1170
+
1171
+    $vars = array_merge($defaults, $vars);
1172
+
1173
+    if (!$vars["limit"] && !$vars["offset"]) {
1174
+        // no need for pagination if listing is unlimited
1175
+        $vars["pagination"] = false;
1176
+    }
1177
+
1178
+    return elgg_view('page/components/list', $vars);
1179 1179
 }
1180 1180
 
1181 1181
 /**
@@ -1193,20 +1193,20 @@  discard block
 block discarded – undo
1193 1193
  * @todo Change the hook name.
1194 1194
  */
1195 1195
 function elgg_view_entity_annotations(\ElggEntity $entity, $full_view = true) {
1196
-	if (!($entity instanceof \ElggEntity)) {
1197
-		return false;
1198
-	}
1196
+    if (!($entity instanceof \ElggEntity)) {
1197
+        return false;
1198
+    }
1199 1199
 
1200
-	$entity_type = $entity->getType();
1200
+    $entity_type = $entity->getType();
1201 1201
 
1202
-	$annotations = elgg_trigger_plugin_hook('entity:annotate', $entity_type,
1203
-		[
1204
-			'entity' => $entity,
1205
-			'full_view' => $full_view,
1206
-		]
1207
-	);
1202
+    $annotations = elgg_trigger_plugin_hook('entity:annotate', $entity_type,
1203
+        [
1204
+            'entity' => $entity,
1205
+            'full_view' => $full_view,
1206
+        ]
1207
+    );
1208 1208
 
1209
-	return $annotations;
1209
+    return $annotations;
1210 1210
 }
1211 1211
 
1212 1212
 /**
@@ -1220,9 +1220,9 @@  discard block
 block discarded – undo
1220 1220
  * @return string The HTML (etc)
1221 1221
  */
1222 1222
 function elgg_view_title($title, array $vars = []) {
1223
-	$vars['title'] = $title;
1223
+    $vars['title'] = $title;
1224 1224
 
1225
-	return elgg_view('page/elements/title', $vars);
1225
+    return elgg_view('page/elements/title', $vars);
1226 1226
 }
1227 1227
 
1228 1228
 /**
@@ -1236,11 +1236,11 @@  discard block
 block discarded – undo
1236 1236
  * @since 1.7.2
1237 1237
  */
1238 1238
 function elgg_view_friendly_time($time) {
1239
-	$view = 'output/friendlytime';
1240
-	$vars = ['time' => $time];
1241
-	$viewtype = elgg_view_exists($view) ? '' : 'default';
1239
+    $view = 'output/friendlytime';
1240
+    $vars = ['time' => $time];
1241
+    $viewtype = elgg_view_exists($view) ? '' : 'default';
1242 1242
 
1243
-	return _elgg_view_under_viewtype($view, $vars, $viewtype);
1243
+    return _elgg_view_under_viewtype($view, $vars, $viewtype);
1244 1244
 }
1245 1245
 
1246 1246
 /**
@@ -1257,20 +1257,20 @@  discard block
 block discarded – undo
1257 1257
  * @return string|false Rendered comments or false on failure
1258 1258
  */
1259 1259
 function elgg_view_comments($entity, $add_comment = true, array $vars = []) {
1260
-	if (!($entity instanceof \ElggEntity)) {
1261
-		return false;
1262
-	}
1263
-
1264
-	$vars['entity'] = $entity;
1265
-	$vars['show_add_form'] = $add_comment;
1266
-	$vars['class'] = elgg_extract('class', $vars, "{$entity->getSubtype()}-comments");
1267
-
1268
-	$output = elgg_trigger_plugin_hook('comments', $entity->getType(), $vars, false);
1269
-	if ($output !== false) {
1270
-		return $output;
1271
-	} else {
1272
-		return elgg_view('page/elements/comments', $vars);
1273
-	}
1260
+    if (!($entity instanceof \ElggEntity)) {
1261
+        return false;
1262
+    }
1263
+
1264
+    $vars['entity'] = $entity;
1265
+    $vars['show_add_form'] = $add_comment;
1266
+    $vars['class'] = elgg_extract('class', $vars, "{$entity->getSubtype()}-comments");
1267
+
1268
+    $output = elgg_trigger_plugin_hook('comments', $entity->getType(), $vars, false);
1269
+    if ($output !== false) {
1270
+        return $output;
1271
+    } else {
1272
+        return elgg_view('page/elements/comments', $vars);
1273
+    }
1274 1274
 }
1275 1275
 
1276 1276
 /**
@@ -1292,9 +1292,9 @@  discard block
 block discarded – undo
1292 1292
  * @since 1.8.0
1293 1293
  */
1294 1294
 function elgg_view_image_block($image, $body, $vars = []) {
1295
-	$vars['image'] = $image;
1296
-	$vars['body'] = $body;
1297
-	return elgg_view('page/components/image_block', $vars);
1295
+    $vars['image'] = $image;
1296
+    $vars['body'] = $body;
1297
+    return elgg_view('page/components/image_block', $vars);
1298 1298
 }
1299 1299
 
1300 1300
 /**
@@ -1313,10 +1313,10 @@  discard block
 block discarded – undo
1313 1313
  * @since 1.8.0
1314 1314
  */
1315 1315
 function elgg_view_module($type, $title, $body, array $vars = []) {
1316
-	$vars['type'] = $type;
1317
-	$vars['title'] = $title;
1318
-	$vars['body'] = $body;
1319
-	return elgg_view('page/components/module', $vars);
1316
+    $vars['type'] = $type;
1317
+    $vars['title'] = $title;
1318
+    $vars['body'] = $body;
1319
+    return elgg_view('page/components/module', $vars);
1320 1320
 }
1321 1321
 
1322 1322
 /**
@@ -1328,49 +1328,49 @@  discard block
 block discarded – undo
1328 1328
  * @return string returns empty string if could not be rendered
1329 1329
  */
1330 1330
 function elgg_view_river_item($item, array $vars = []) {
1331
-	if (!($item instanceof \ElggRiverItem)) {
1332
-		return '';
1333
-	}
1334
-	// checking default viewtype since some viewtypes do not have unique views per item (rss)
1335
-	$view = $item->getView();
1336
-	if (!$view || !elgg_view_exists($view, 'default')) {
1337
-		return '';
1338
-	}
1339
-
1340
-	$subject = $item->getSubjectEntity();
1341
-	$object = $item->getObjectEntity();
1342
-	if (!$subject || !$object) {
1343
-		// subject is disabled or subject/object deleted
1344
-		return '';
1345
-	}
1346
-
1347
-	// @todo this needs to be cleaned up
1348
-	// Don't hide objects in closed groups that a user can see.
1349
-	// see https://github.com/elgg/elgg/issues/4789
1350
-	//	else {
1351
-	//		// hide based on object's container
1352
-	//		$visibility = \Elgg\GroupItemVisibility::factory($object->container_guid);
1353
-	//		if ($visibility->shouldHideItems) {
1354
-	//			return '';
1355
-	//		}
1356
-	//	}
1357
-
1358
-	$vars['item'] = $item;
1359
-
1360
-	$river_views = [
1361
-		elgg_extract('item_view', $vars, ''),
1362
-		$view,
1363
-	];
1364
-
1365
-	$contents = '';
1366
-	foreach ($river_views as $view) {
1367
-		if (elgg_view_exists($view)) {
1368
-			$contents = elgg_view($view, $vars);
1369
-			break;
1370
-		}
1371
-	}
1372
-
1373
-	return $contents;
1331
+    if (!($item instanceof \ElggRiverItem)) {
1332
+        return '';
1333
+    }
1334
+    // checking default viewtype since some viewtypes do not have unique views per item (rss)
1335
+    $view = $item->getView();
1336
+    if (!$view || !elgg_view_exists($view, 'default')) {
1337
+        return '';
1338
+    }
1339
+
1340
+    $subject = $item->getSubjectEntity();
1341
+    $object = $item->getObjectEntity();
1342
+    if (!$subject || !$object) {
1343
+        // subject is disabled or subject/object deleted
1344
+        return '';
1345
+    }
1346
+
1347
+    // @todo this needs to be cleaned up
1348
+    // Don't hide objects in closed groups that a user can see.
1349
+    // see https://github.com/elgg/elgg/issues/4789
1350
+    //	else {
1351
+    //		// hide based on object's container
1352
+    //		$visibility = \Elgg\GroupItemVisibility::factory($object->container_guid);
1353
+    //		if ($visibility->shouldHideItems) {
1354
+    //			return '';
1355
+    //		}
1356
+    //	}
1357
+
1358
+    $vars['item'] = $item;
1359
+
1360
+    $river_views = [
1361
+        elgg_extract('item_view', $vars, ''),
1362
+        $view,
1363
+    ];
1364
+
1365
+    $contents = '';
1366
+    foreach ($river_views as $view) {
1367
+        if (elgg_view_exists($view)) {
1368
+            $contents = elgg_view($view, $vars);
1369
+            break;
1370
+        }
1371
+    }
1372
+
1373
+    return $contents;
1374 1374
 }
1375 1375
 
1376 1376
 /**
@@ -1408,7 +1408,7 @@  discard block
 block discarded – undo
1408 1408
  * @return string The complete form
1409 1409
  */
1410 1410
 function elgg_view_form($action, $form_vars = [], $body_vars = []) {
1411
-	return _elgg_services()->forms->render($action, $form_vars, $body_vars);
1411
+    return _elgg_services()->forms->render($action, $form_vars, $body_vars);
1412 1412
 }
1413 1413
 
1414 1414
 /**
@@ -1421,7 +1421,7 @@  discard block
 block discarded – undo
1421 1421
  * @return bool
1422 1422
  */
1423 1423
 function elgg_set_form_footer($footer = '') {
1424
-	return _elgg_services()->forms->setFooter($footer);
1424
+    return _elgg_services()->forms->setFooter($footer);
1425 1425
 }
1426 1426
 
1427 1427
 /**
@@ -1429,7 +1429,7 @@  discard block
 block discarded – undo
1429 1429
  * @return string|false
1430 1430
  */
1431 1431
 function elgg_get_form_footer() {
1432
-	return _elgg_services()->forms->getFooter();
1432
+    return _elgg_services()->forms->getFooter();
1433 1433
 }
1434 1434
 
1435 1435
 /**
@@ -1449,24 +1449,24 @@  discard block
 block discarded – undo
1449 1449
  */
1450 1450
 function elgg_view_input($input_type, array $vars = []) {
1451 1451
 
1452
-	elgg_deprecated_notice(__FUNCTION__ . '() is deprecated. Use elgg_view_field()', '2.3');
1452
+    elgg_deprecated_notice(__FUNCTION__ . '() is deprecated. Use elgg_view_field()', '2.3');
1453 1453
 
1454
-	$vars['#type'] = $input_type;
1454
+    $vars['#type'] = $input_type;
1455 1455
 
1456
-	if (isset($vars['label']) && $input_type !== 'checkbox') {
1457
-		$vars['#label'] = $vars['label'];
1458
-		unset($vars['label']);
1459
-	}
1460
-	if (isset($vars['help'])) {
1461
-		$vars['#help'] = $vars['help'];
1462
-		unset($vars['help']);
1463
-	}
1464
-	if (isset($vars['field_class'])) {
1465
-		$vars['#class'] = $vars['field_class'];
1466
-		unset($vars['field_class']);
1467
-	}
1456
+    if (isset($vars['label']) && $input_type !== 'checkbox') {
1457
+        $vars['#label'] = $vars['label'];
1458
+        unset($vars['label']);
1459
+    }
1460
+    if (isset($vars['help'])) {
1461
+        $vars['#help'] = $vars['help'];
1462
+        unset($vars['help']);
1463
+    }
1464
+    if (isset($vars['field_class'])) {
1465
+        $vars['#class'] = $vars['field_class'];
1466
+        unset($vars['field_class']);
1467
+    }
1468 1468
 
1469
-	return elgg_view_field($vars);
1469
+    return elgg_view_field($vars);
1470 1470
 }
1471 1471
 
1472 1472
 /**
@@ -1488,93 +1488,93 @@  discard block
 block discarded – undo
1488 1488
  */
1489 1489
 function elgg_view_field(array $params = []) {
1490 1490
 
1491
-	if (empty($params['#type'])) {
1492
-		_elgg_services()->logger->error(__FUNCTION__ . '(): $params["#type"] is required.');
1493
-		return '';
1494
-	}
1495
-
1496
-	$input_type = $params['#type'];
1497
-	if (!elgg_view_exists("input/$input_type")) {
1498
-		return '';
1499
-	}
1500
-
1501
-	$hidden_types = ['hidden', 'securitytoken'];
1502
-	if (in_array($input_type, $hidden_types)) {
1503
-		unset($params['#type']);
1504
-		unset($params['#label']);
1505
-		unset($params['#help']);
1506
-		unset($params['#class']);
1507
-		return elgg_view("input/$input_type", $params);
1508
-	}
1509
-
1510
-	$id = elgg_extract('id', $params);
1511
-	if (!$id) {
1512
-		$id = "elgg-field-" . base_convert(mt_rand(), 10, 36);
1513
-		$params['id'] = $id;
1514
-	}
1515
-
1516
-	// $vars passed to label, help and field wrapper views
1517
-	$element_vars = [];
1518
-
1519
-	// $vars passed to input/$input_name
1520
-	$input_vars = [];
1491
+    if (empty($params['#type'])) {
1492
+        _elgg_services()->logger->error(__FUNCTION__ . '(): $params["#type"] is required.');
1493
+        return '';
1494
+    }
1495
+
1496
+    $input_type = $params['#type'];
1497
+    if (!elgg_view_exists("input/$input_type")) {
1498
+        return '';
1499
+    }
1500
+
1501
+    $hidden_types = ['hidden', 'securitytoken'];
1502
+    if (in_array($input_type, $hidden_types)) {
1503
+        unset($params['#type']);
1504
+        unset($params['#label']);
1505
+        unset($params['#help']);
1506
+        unset($params['#class']);
1507
+        return elgg_view("input/$input_type", $params);
1508
+    }
1509
+
1510
+    $id = elgg_extract('id', $params);
1511
+    if (!$id) {
1512
+        $id = "elgg-field-" . base_convert(mt_rand(), 10, 36);
1513
+        $params['id'] = $id;
1514
+    }
1515
+
1516
+    // $vars passed to label, help and field wrapper views
1517
+    $element_vars = [];
1518
+
1519
+    // $vars passed to input/$input_name
1520
+    $input_vars = [];
1521 1521
 	
1522
-	$make_special_checkbox_label = false;
1523
-	if ($input_type == 'checkbox' && (isset($params['label']) || isset($params['#label']))) {
1524
-		if (isset($params['#label']) && isset($params['label'])) {
1525
-			$params['label_tag'] = 'div';
1526
-		} else {
1527
-			$label = elgg_extract('label', $params);
1528
-			$label = elgg_extract('#label', $params, $label);
1522
+    $make_special_checkbox_label = false;
1523
+    if ($input_type == 'checkbox' && (isset($params['label']) || isset($params['#label']))) {
1524
+        if (isset($params['#label']) && isset($params['label'])) {
1525
+            $params['label_tag'] = 'div';
1526
+        } else {
1527
+            $label = elgg_extract('label', $params);
1528
+            $label = elgg_extract('#label', $params, $label);
1529 1529
 			
1530
-			$params['#label'] = $label;
1531
-			unset($params['label']);
1532
-
1533
-			// Single checkbox input view gets special treatment
1534
-			// We don't want the field label to appear a checkbox without a label
1535
-			$make_special_checkbox_label = true;
1536
-		}
1537
-	}
1538
-
1539
-	// first pass non-hash keys into both
1540
-	foreach ($params as $key => $value) {
1541
-		if ($key[0] !== '#') {
1542
-			$element_vars[$key] = $value;
1543
-			$input_vars[$key] = $value;
1544
-		}
1545
-	}
1546
-
1547
-	// field input view needs this
1548
-	$input_vars['input_type'] = $input_type;
1549
-
1550
-	// field views get more data
1551
-	$element_vars['input_type'] = $input_type;
1530
+            $params['#label'] = $label;
1531
+            unset($params['label']);
1532
+
1533
+            // Single checkbox input view gets special treatment
1534
+            // We don't want the field label to appear a checkbox without a label
1535
+            $make_special_checkbox_label = true;
1536
+        }
1537
+    }
1538
+
1539
+    // first pass non-hash keys into both
1540
+    foreach ($params as $key => $value) {
1541
+        if ($key[0] !== '#') {
1542
+            $element_vars[$key] = $value;
1543
+            $input_vars[$key] = $value;
1544
+        }
1545
+    }
1546
+
1547
+    // field input view needs this
1548
+    $input_vars['input_type'] = $input_type;
1549
+
1550
+    // field views get more data
1551
+    $element_vars['input_type'] = $input_type;
1552 1552
 	
1553
-	unset($element_vars['class']);
1554
-	if (isset($params['#class'])) {
1555
-		$element_vars['class'] = $params['#class'];
1556
-	}
1557
-	unset($element_vars['help']);
1558
-	if (isset($params['#help'])) {
1559
-		$element_vars['help'] = $params['#help'];
1560
-	}
1561
-	unset($element_vars['label']);
1562
-	if (isset($params['#label'])) {
1563
-		$element_vars['label'] = $params['#label'];
1564
-	}
1553
+    unset($element_vars['class']);
1554
+    if (isset($params['#class'])) {
1555
+        $element_vars['class'] = $params['#class'];
1556
+    }
1557
+    unset($element_vars['help']);
1558
+    if (isset($params['#help'])) {
1559
+        $element_vars['help'] = $params['#help'];
1560
+    }
1561
+    unset($element_vars['label']);
1562
+    if (isset($params['#label'])) {
1563
+        $element_vars['label'] = $params['#label'];
1564
+    }
1565 1565
 	
1566
-	// wrap if present
1567
-	$element_vars['label'] = elgg_view('elements/forms/label', $element_vars);
1568
-	$element_vars['help'] = elgg_view('elements/forms/help', $element_vars);
1569
-
1570
-	if ($make_special_checkbox_label) {
1571
-		$input_vars['label'] = $element_vars['label'];
1572
-		$input_vars['label_tag'] = 'div';
1573
-		unset($element_vars['label']);
1574
-	}
1575
-	$element_vars['input'] = elgg_view("elements/forms/input", $input_vars);
1576
-
1577
-	return elgg_view('elements/forms/field', $element_vars);
1566
+    // wrap if present
1567
+    $element_vars['label'] = elgg_view('elements/forms/label', $element_vars);
1568
+    $element_vars['help'] = elgg_view('elements/forms/help', $element_vars);
1569
+
1570
+    if ($make_special_checkbox_label) {
1571
+        $input_vars['label'] = $element_vars['label'];
1572
+        $input_vars['label_tag'] = 'div';
1573
+        unset($element_vars['label']);
1574
+    }
1575
+    $element_vars['input'] = elgg_view("elements/forms/input", $input_vars);
1576
+
1577
+    return elgg_view('elements/forms/field', $element_vars);
1578 1578
 }
1579 1579
 
1580 1580
 /**
@@ -1593,20 +1593,20 @@  discard block
 block discarded – undo
1593 1593
  */
1594 1594
 function elgg_view_tagcloud(array $options = []) {
1595 1595
 
1596
-	$type = $subtype = '';
1597
-	if (isset($options['type'])) {
1598
-		$type = $options['type'];
1599
-	}
1600
-	if (isset($options['subtype'])) {
1601
-		$subtype = $options['subtype'];
1602
-	}
1603
-
1604
-	$tag_data = elgg_get_tags($options);
1605
-	return elgg_view("output/tagcloud", [
1606
-		'value' => $tag_data,
1607
-		'type' => $type,
1608
-		'subtype' => $subtype,
1609
-	]);
1596
+    $type = $subtype = '';
1597
+    if (isset($options['type'])) {
1598
+        $type = $options['type'];
1599
+    }
1600
+    if (isset($options['subtype'])) {
1601
+        $subtype = $options['subtype'];
1602
+    }
1603
+
1604
+    $tag_data = elgg_get_tags($options);
1605
+    return elgg_view("output/tagcloud", [
1606
+        'value' => $tag_data,
1607
+        'type' => $type,
1608
+        'subtype' => $subtype,
1609
+    ]);
1610 1610
 }
1611 1611
 
1612 1612
 /**
@@ -1623,21 +1623,21 @@  discard block
 block discarded – undo
1623 1623
  */
1624 1624
 function elgg_view_list_item($item, array $vars = []) {
1625 1625
 
1626
-	if ($item instanceof \ElggEntity) {
1627
-		return elgg_view_entity($item, $vars);
1628
-	} else if ($item instanceof \ElggAnnotation) {
1629
-		return elgg_view_annotation($item, $vars);
1630
-	} else if ($item instanceof \ElggRiverItem) {
1631
-		return elgg_view_river_item($item, $vars);
1632
-	}
1633
-
1634
-	$view = elgg_extract('item_view', $vars);
1635
-	if ($view && elgg_view_exists($view)) {
1636
-		$vars['item'] = $item;
1637
-		return elgg_view($view, $vars);
1638
-	}
1639
-
1640
-	return '';
1626
+    if ($item instanceof \ElggEntity) {
1627
+        return elgg_view_entity($item, $vars);
1628
+    } else if ($item instanceof \ElggAnnotation) {
1629
+        return elgg_view_annotation($item, $vars);
1630
+    } else if ($item instanceof \ElggRiverItem) {
1631
+        return elgg_view_river_item($item, $vars);
1632
+    }
1633
+
1634
+    $view = elgg_extract('item_view', $vars);
1635
+    if ($view && elgg_view_exists($view)) {
1636
+        $vars['item'] = $item;
1637
+        return elgg_view($view, $vars);
1638
+    }
1639
+
1640
+    return '';
1641 1641
 }
1642 1642
 
1643 1643
 /**
@@ -1653,29 +1653,29 @@  discard block
 block discarded – undo
1653 1653
  * @throws InvalidArgumentException
1654 1654
  */
1655 1655
 function elgg_view_icon($name, $vars = []) {
1656
-	if (empty($vars)) {
1657
-		$vars = [];
1658
-	}
1656
+    if (empty($vars)) {
1657
+        $vars = [];
1658
+    }
1659 1659
 
1660
-	if (is_string($vars)) {
1661
-		$vars = ['class' => $vars];
1662
-	}
1660
+    if (is_string($vars)) {
1661
+        $vars = ['class' => $vars];
1662
+    }
1663 1663
 
1664
-	if (!is_array($vars)) {
1665
-		throw new \InvalidArgumentException('$vars needs to be a string or an array');
1666
-	}
1664
+    if (!is_array($vars)) {
1665
+        throw new \InvalidArgumentException('$vars needs to be a string or an array');
1666
+    }
1667 1667
 
1668
-	if (!array_key_exists('class', $vars)) {
1669
-		$vars['class'] = [];
1670
-	}
1668
+    if (!array_key_exists('class', $vars)) {
1669
+        $vars['class'] = [];
1670
+    }
1671 1671
 
1672
-	if (!is_array($vars['class'])) {
1673
-		$vars['class'] = [$vars['class']];
1674
-	}
1672
+    if (!is_array($vars['class'])) {
1673
+        $vars['class'] = [$vars['class']];
1674
+    }
1675 1675
 
1676
-	$vars['class'][] = "elgg-icon-$name";
1676
+    $vars['class'][] = "elgg-icon-$name";
1677 1677
 
1678
-	return elgg_view("output/icon", $vars);
1678
+    return elgg_view("output/icon", $vars);
1679 1679
 }
1680 1680
 
1681 1681
 /**
@@ -1684,7 +1684,7 @@  discard block
 block discarded – undo
1684 1684
  * @return void
1685 1685
  */
1686 1686
 function elgg_register_rss_link() {
1687
-	_elgg_services()->config->set('_elgg_autofeed', true);
1687
+    _elgg_services()->config->set('_elgg_autofeed', true);
1688 1688
 }
1689 1689
 
1690 1690
 /**
@@ -1693,7 +1693,7 @@  discard block
 block discarded – undo
1693 1693
  * @return void
1694 1694
  */
1695 1695
 function elgg_unregister_rss_link() {
1696
-	_elgg_services()->config->set('_elgg_autofeed', false);
1696
+    _elgg_services()->config->set('_elgg_autofeed', false);
1697 1697
 }
1698 1698
 
1699 1699
 /**
@@ -1703,11 +1703,11 @@  discard block
 block discarded – undo
1703 1703
  * @access private
1704 1704
  */
1705 1705
 function _elgg_has_rss_link() {
1706
-	if (isset($GLOBALS['autofeed']) && is_bool($GLOBALS['autofeed'])) {
1707
-		elgg_deprecated_notice('Do not set the global $autofeed. Use elgg_register_rss_link()', '2.1');
1708
-		return $GLOBALS['autofeed'];
1709
-	}
1710
-	return (bool) _elgg_services()->config->getVolatile('_elgg_autofeed');
1706
+    if (isset($GLOBALS['autofeed']) && is_bool($GLOBALS['autofeed'])) {
1707
+        elgg_deprecated_notice('Do not set the global $autofeed. Use elgg_register_rss_link()', '2.1');
1708
+        return $GLOBALS['autofeed'];
1709
+    }
1710
+    return (bool) _elgg_services()->config->getVolatile('_elgg_autofeed');
1711 1711
 }
1712 1712
 
1713 1713
 /**
@@ -1728,7 +1728,7 @@  discard block
 block discarded – undo
1728 1728
  * @access private
1729 1729
  */
1730 1730
 function autoregister_views($view_base, $folder, $ignored, $viewtype) {
1731
-	return _elgg_services()->views->autoregisterViews($view_base, $folder, $viewtype);
1731
+    return _elgg_services()->views->autoregisterViews($view_base, $folder, $viewtype);
1732 1732
 }
1733 1733
 
1734 1734
 /**
@@ -1743,21 +1743,21 @@  discard block
 block discarded – undo
1743 1743
  * @access private
1744 1744
  */
1745 1745
 function _elgg_views_minify($hook, $type, $content, $params) {
1746
-	if (preg_match('~[\.-]min\.~', $params['view'])) {
1747
-		// bypass minification
1748
-		return;
1749
-	}
1750
-
1751
-	if ($type == 'js') {
1752
-		if (elgg_get_config('simplecache_minify_js')) {
1753
-			return JSMin::minify($content);
1754
-		}
1755
-	} elseif ($type == 'css') {
1756
-		if (elgg_get_config('simplecache_minify_css')) {
1757
-			$cssmin = new CSSmin();
1758
-			return $cssmin->run($content);
1759
-		}
1760
-	}
1746
+    if (preg_match('~[\.-]min\.~', $params['view'])) {
1747
+        // bypass minification
1748
+        return;
1749
+    }
1750
+
1751
+    if ($type == 'js') {
1752
+        if (elgg_get_config('simplecache_minify_js')) {
1753
+            return JSMin::minify($content);
1754
+        }
1755
+    } elseif ($type == 'css') {
1756
+        if (elgg_get_config('simplecache_minify_css')) {
1757
+            $cssmin = new CSSmin();
1758
+            return $cssmin->run($content);
1759
+        }
1760
+    }
1761 1761
 }
1762 1762
 
1763 1763
 /**
@@ -1772,14 +1772,14 @@  discard block
 block discarded – undo
1772 1772
  * @access private
1773 1773
  */
1774 1774
 function _elgg_views_preprocess_css($hook, $type, $content, $params) {
1775
-	$options = [
1776
-		'minify' => false, // minify handled by _elgg_views_minify
1777
-		'formatter' => 'single-line', // shows lowest byte size
1778
-		'versioning' => false, // versioning done by Elgg
1779
-		'rewrite_import_urls' => false,
1780
-	];
1775
+    $options = [
1776
+        'minify' => false, // minify handled by _elgg_views_minify
1777
+        'formatter' => 'single-line', // shows lowest byte size
1778
+        'versioning' => false, // versioning done by Elgg
1779
+        'rewrite_import_urls' => false,
1780
+    ];
1781 1781
 	
1782
-	return csscrush_string($content, $options);
1782
+    return csscrush_string($content, $options);
1783 1783
 }
1784 1784
 
1785 1785
 /**
@@ -1794,8 +1794,8 @@  discard block
 block discarded – undo
1794 1794
  * @access private
1795 1795
  */
1796 1796
 function _elgg_views_amd($hook, $type, $content, $params) {
1797
-	$filter = new \Elgg\Amd\ViewFilter();
1798
-	return $filter->filter($params['view'], $content);
1797
+    $filter = new \Elgg\Amd\ViewFilter();
1798
+    return $filter->filter($params['view'], $content);
1799 1799
 }
1800 1800
 
1801 1801
 /**
@@ -1804,7 +1804,7 @@  discard block
 block discarded – undo
1804 1804
  * @access private
1805 1805
  */
1806 1806
 function _elgg_views_send_header_x_frame_options() {
1807
-	header('X-Frame-Options: SAMEORIGIN');
1807
+    header('X-Frame-Options: SAMEORIGIN');
1808 1808
 }
1809 1809
 
1810 1810
 /**
@@ -1835,27 +1835,27 @@  discard block
 block discarded – undo
1835 1835
  * @access private
1836 1836
  */
1837 1837
 function _elgg_view_may_be_altered($view, $path) {
1838
-	$views = _elgg_services()->views;
1838
+    $views = _elgg_services()->views;
1839 1839
 
1840
-	if ($views->viewIsExtended($view) || $views->viewHasHookHandlers($view)) {
1841
-		return true;
1842
-	}
1840
+    if ($views->viewIsExtended($view) || $views->viewHasHookHandlers($view)) {
1841
+        return true;
1842
+    }
1843 1843
 
1844
-	$viewtype = elgg_get_viewtype();
1844
+    $viewtype = elgg_get_viewtype();
1845 1845
 
1846
-	// check location
1847
-	if (0 === strpos($path, '/') || preg_match('~^([A-Za-z]\:)?\\\\~', $path)) {
1848
-		// absolute path
1849
-		$expected_path = $path;
1850
-	} else {
1851
-		// relative path
1852
-		$root = dirname(dirname(__DIR__));
1853
-		$expected_path = "$root/views/$viewtype/" . ltrim($path, '/\\');
1854
-	}
1846
+    // check location
1847
+    if (0 === strpos($path, '/') || preg_match('~^([A-Za-z]\:)?\\\\~', $path)) {
1848
+        // absolute path
1849
+        $expected_path = $path;
1850
+    } else {
1851
+        // relative path
1852
+        $root = dirname(dirname(__DIR__));
1853
+        $expected_path = "$root/views/$viewtype/" . ltrim($path, '/\\');
1854
+    }
1855 1855
 
1856
-	$view_path = $views->findViewFile($view, $viewtype);
1856
+    $view_path = $views->findViewFile($view, $viewtype);
1857 1857
 	
1858
-	return realpath($view_path) !== realpath($expected_path);
1858
+    return realpath($view_path) !== realpath($expected_path);
1859 1859
 }
1860 1860
 
1861 1861
 /**
@@ -1867,107 +1867,107 @@  discard block
 block discarded – undo
1867 1867
  * @elgg_event_handler boot system
1868 1868
  */
1869 1869
 function elgg_views_boot() {
1870
-	if (!elgg_get_config('system_cache_loaded')) {
1871
-		// Core view files in /views
1872
-		_elgg_services()->views->registerPluginViews(realpath(__DIR__ . '/../../'));
1870
+    if (!elgg_get_config('system_cache_loaded')) {
1871
+        // Core view files in /views
1872
+        _elgg_services()->views->registerPluginViews(realpath(__DIR__ . '/../../'));
1873 1873
 
1874
-		// Core view definitions in /engine/views.php
1875
-		$file = dirname(__DIR__) . '/views.php';
1876
-		if (is_file($file)) {
1877
-			$spec = Includer::includeFile($file);
1878
-			if (is_array($spec)) {
1879
-				_elgg_services()->views->mergeViewsSpec($spec);
1880
-			}
1881
-		}
1882
-	}
1874
+        // Core view definitions in /engine/views.php
1875
+        $file = dirname(__DIR__) . '/views.php';
1876
+        if (is_file($file)) {
1877
+            $spec = Includer::includeFile($file);
1878
+            if (is_array($spec)) {
1879
+                _elgg_services()->views->mergeViewsSpec($spec);
1880
+            }
1881
+        }
1882
+    }
1883 1883
 
1884
-	// on every page
1884
+    // on every page
1885 1885
 
1886
-	// jQuery and UI must come before require. See #9024
1887
-	elgg_register_js('jquery', elgg_get_simplecache_url('jquery.js'), 'head');
1888
-	elgg_load_js('jquery');
1886
+    // jQuery and UI must come before require. See #9024
1887
+    elgg_register_js('jquery', elgg_get_simplecache_url('jquery.js'), 'head');
1888
+    elgg_load_js('jquery');
1889 1889
 
1890
-	elgg_register_js('jquery-ui', elgg_get_simplecache_url('jquery-ui.js'), 'head');
1891
-	elgg_load_js('jquery-ui');
1890
+    elgg_register_js('jquery-ui', elgg_get_simplecache_url('jquery-ui.js'), 'head');
1891
+    elgg_load_js('jquery-ui');
1892 1892
 
1893
-	elgg_register_js('elgg.require_config', elgg_get_simplecache_url('elgg/require_config.js'), 'head');
1894
-	elgg_load_js('elgg.require_config');
1893
+    elgg_register_js('elgg.require_config', elgg_get_simplecache_url('elgg/require_config.js'), 'head');
1894
+    elgg_load_js('elgg.require_config');
1895 1895
 
1896
-	elgg_register_js('require', elgg_get_simplecache_url('require.js'), 'head');
1897
-	elgg_load_js('require');
1896
+    elgg_register_js('require', elgg_get_simplecache_url('require.js'), 'head');
1897
+    elgg_load_js('require');
1898 1898
 
1899
-	elgg_register_js('elgg', elgg_get_simplecache_url('elgg.js'), 'head');
1900
-	elgg_load_js('elgg');
1899
+    elgg_register_js('elgg', elgg_get_simplecache_url('elgg.js'), 'head');
1900
+    elgg_load_js('elgg');
1901 1901
 	
1902
-	elgg_register_css('font-awesome', elgg_get_simplecache_url('font-awesome/css/font-awesome.css'));
1903
-	elgg_load_css('font-awesome');
1902
+    elgg_register_css('font-awesome', elgg_get_simplecache_url('font-awesome/css/font-awesome.css'));
1903
+    elgg_load_css('font-awesome');
1904 1904
 
1905
-	elgg_register_css('elgg', elgg_get_simplecache_url('elgg.css'));
1906
-	elgg_load_css('elgg');
1905
+    elgg_register_css('elgg', elgg_get_simplecache_url('elgg.css'));
1906
+    elgg_load_css('elgg');
1907 1907
 
1908
-	elgg_register_simplecache_view('elgg/init.js');
1908
+    elgg_register_simplecache_view('elgg/init.js');
1909 1909
 
1910
-	elgg_extend_view('elgg.css', 'lightbox/elgg-colorbox-theme/colorbox.css');
1910
+    elgg_extend_view('elgg.css', 'lightbox/elgg-colorbox-theme/colorbox.css');
1911 1911
 
1912
-	elgg_define_js('jquery.ui.autocomplete.html', [
1913
-		'deps' => ['jquery-ui'],
1914
-	]);
1912
+    elgg_define_js('jquery.ui.autocomplete.html', [
1913
+        'deps' => ['jquery-ui'],
1914
+    ]);
1915 1915
 
1916
-	elgg_register_js('elgg.avatar_cropper', elgg_get_simplecache_url('elgg/ui.avatar_cropper.js'));
1916
+    elgg_register_js('elgg.avatar_cropper', elgg_get_simplecache_url('elgg/ui.avatar_cropper.js'));
1917 1917
 
1918
-	// @deprecated 2.2
1919
-	elgg_register_js('elgg.ui.river', elgg_get_simplecache_url('elgg/ui.river.js'));
1918
+    // @deprecated 2.2
1919
+    elgg_register_js('elgg.ui.river', elgg_get_simplecache_url('elgg/ui.river.js'));
1920 1920
 
1921
-	elgg_register_js('jquery.imgareaselect', elgg_get_simplecache_url('jquery.imgareaselect.js'));
1922
-	elgg_register_css('jquery.imgareaselect', elgg_get_simplecache_url('jquery.imgareaselect.css'));
1921
+    elgg_register_js('jquery.imgareaselect', elgg_get_simplecache_url('jquery.imgareaselect.js'));
1922
+    elgg_register_css('jquery.imgareaselect', elgg_get_simplecache_url('jquery.imgareaselect.css'));
1923 1923
 
1924
-	elgg_register_ajax_view('languages.js');
1924
+    elgg_register_ajax_view('languages.js');
1925 1925
 
1926
-	// pre-process CSS regardless of simplecache
1927
-	elgg_register_plugin_hook_handler('cache:generate', 'css', '_elgg_views_preprocess_css');
1928
-	elgg_register_plugin_hook_handler('simplecache:generate', 'css', '_elgg_views_preprocess_css');
1926
+    // pre-process CSS regardless of simplecache
1927
+    elgg_register_plugin_hook_handler('cache:generate', 'css', '_elgg_views_preprocess_css');
1928
+    elgg_register_plugin_hook_handler('simplecache:generate', 'css', '_elgg_views_preprocess_css');
1929 1929
 
1930
-	elgg_register_plugin_hook_handler('simplecache:generate', 'js', '_elgg_views_amd');
1931
-	elgg_register_plugin_hook_handler('simplecache:generate', 'css', '_elgg_views_minify');
1932
-	elgg_register_plugin_hook_handler('simplecache:generate', 'js', '_elgg_views_minify');
1930
+    elgg_register_plugin_hook_handler('simplecache:generate', 'js', '_elgg_views_amd');
1931
+    elgg_register_plugin_hook_handler('simplecache:generate', 'css', '_elgg_views_minify');
1932
+    elgg_register_plugin_hook_handler('simplecache:generate', 'js', '_elgg_views_minify');
1933 1933
 
1934
-	elgg_register_plugin_hook_handler('output:before', 'page', '_elgg_views_send_header_x_frame_options');
1934
+    elgg_register_plugin_hook_handler('output:before', 'page', '_elgg_views_send_header_x_frame_options');
1935 1935
 
1936
-	// registered with high priority for BC
1937
-	// prior to 2.2 registration used to take place in _elgg_views_prepare_head() before the hook was triggered
1938
-	elgg_register_plugin_hook_handler('head', 'page', '_elgg_views_prepare_favicon_links', 1);
1936
+    // registered with high priority for BC
1937
+    // prior to 2.2 registration used to take place in _elgg_views_prepare_head() before the hook was triggered
1938
+    elgg_register_plugin_hook_handler('head', 'page', '_elgg_views_prepare_favicon_links', 1);
1939 1939
 	
1940
-	// @todo the cache is loaded in load_plugins() but we need to know viewtypes earlier
1941
-	$view_path = _elgg_services()->views->view_path;
1942
-	$viewtype_dirs = scandir($view_path);
1943
-	foreach ($viewtype_dirs as $viewtype) {
1944
-		if (_elgg_is_valid_viewtype($viewtype) && is_dir($view_path . $viewtype)) {
1945
-			elgg_register_viewtype($viewtype);
1946
-		}
1947
-	}
1948
-
1949
-	// set default icon sizes - can be overridden in settings.php or with plugin
1950
-	if (!_elgg_services()->config->getVolatile('icon_sizes')) {
1951
-		$icon_sizes = [
1952
-			'topbar' => ['w' => 16, 'h' => 16, 'square' => true, 'upscale' => true],
1953
-			'tiny' => ['w' => 25, 'h' => 25, 'square' => true, 'upscale' => true],
1954
-			'small' => ['w' => 40, 'h' => 40, 'square' => true, 'upscale' => true],
1955
-			'medium' => ['w' => 100, 'h' => 100, 'square' => true, 'upscale' => true],
1956
-			'large' => ['w' => 200, 'h' => 200, 'square' => false, 'upscale' => false],
1957
-			'master' => ['w' => 550, 'h' => 550, 'square' => false, 'upscale' => false],
1958
-		];
1959
-		elgg_set_config('icon_sizes', $icon_sizes);
1960
-	}
1961
-
1962
-	// Patches and features that were included between major releases
1963
-	// sometimes require additional styling, but adding them to core CSS files
1964
-	// is not always feasible, because those can be replaced by themes.
1965
-	// @todo Remove in 3.0
1966
-	elgg_extend_view('elgg.css', 'elements/pathces.css');
1967
-	elgg_extend_view('admin.css', 'elements/pathces.css');
1968
-
1969
-	// Configure lightbox
1970
-	elgg_register_plugin_hook_handler('elgg.data', 'site', '_elgg_set_lightbox_config');
1940
+    // @todo the cache is loaded in load_plugins() but we need to know viewtypes earlier
1941
+    $view_path = _elgg_services()->views->view_path;
1942
+    $viewtype_dirs = scandir($view_path);
1943
+    foreach ($viewtype_dirs as $viewtype) {
1944
+        if (_elgg_is_valid_viewtype($viewtype) && is_dir($view_path . $viewtype)) {
1945
+            elgg_register_viewtype($viewtype);
1946
+        }
1947
+    }
1948
+
1949
+    // set default icon sizes - can be overridden in settings.php or with plugin
1950
+    if (!_elgg_services()->config->getVolatile('icon_sizes')) {
1951
+        $icon_sizes = [
1952
+            'topbar' => ['w' => 16, 'h' => 16, 'square' => true, 'upscale' => true],
1953
+            'tiny' => ['w' => 25, 'h' => 25, 'square' => true, 'upscale' => true],
1954
+            'small' => ['w' => 40, 'h' => 40, 'square' => true, 'upscale' => true],
1955
+            'medium' => ['w' => 100, 'h' => 100, 'square' => true, 'upscale' => true],
1956
+            'large' => ['w' => 200, 'h' => 200, 'square' => false, 'upscale' => false],
1957
+            'master' => ['w' => 550, 'h' => 550, 'square' => false, 'upscale' => false],
1958
+        ];
1959
+        elgg_set_config('icon_sizes', $icon_sizes);
1960
+    }
1961
+
1962
+    // Patches and features that were included between major releases
1963
+    // sometimes require additional styling, but adding them to core CSS files
1964
+    // is not always feasible, because those can be replaced by themes.
1965
+    // @todo Remove in 3.0
1966
+    elgg_extend_view('elgg.css', 'elements/pathces.css');
1967
+    elgg_extend_view('admin.css', 'elements/pathces.css');
1968
+
1969
+    // Configure lightbox
1970
+    elgg_register_plugin_hook_handler('elgg.data', 'site', '_elgg_set_lightbox_config');
1971 1971
 }
1972 1972
 
1973 1973
 /**
@@ -1979,21 +1979,21 @@  discard block
 block discarded – undo
1979 1979
  * @access private
1980 1980
  */
1981 1981
 function _elgg_get_js_site_data() {
1982
-	$language = elgg_get_config('language');
1983
-	if (!$language) {
1984
-		$language = 'en';
1985
-	}
1986
-
1987
-	return [
1988
-		'elgg.data' => (object) elgg_trigger_plugin_hook('elgg.data', 'site', null, []),
1989
-		'elgg.version' => elgg_get_version(),
1990
-		'elgg.release' => elgg_get_version(true),
1991
-		'elgg.config.wwwroot' => elgg_get_site_url(),
1992
-
1993
-		// refresh token 3 times during its lifetime (in microseconds 1000 * 1/3)
1994
-		'elgg.security.interval' => (int) _elgg_services()->actions->getActionTokenTimeout() * 333,
1995
-		'elgg.config.language' => $language,
1996
-	];
1982
+    $language = elgg_get_config('language');
1983
+    if (!$language) {
1984
+        $language = 'en';
1985
+    }
1986
+
1987
+    return [
1988
+        'elgg.data' => (object) elgg_trigger_plugin_hook('elgg.data', 'site', null, []),
1989
+        'elgg.version' => elgg_get_version(),
1990
+        'elgg.release' => elgg_get_version(true),
1991
+        'elgg.config.wwwroot' => elgg_get_site_url(),
1992
+
1993
+        // refresh token 3 times during its lifetime (in microseconds 1000 * 1/3)
1994
+        'elgg.security.interval' => (int) _elgg_services()->actions->getActionTokenTimeout() * 333,
1995
+        'elgg.config.language' => $language,
1996
+    ];
1997 1997
 }
1998 1998
 
1999 1999
 /**
@@ -2003,48 +2003,48 @@  discard block
 block discarded – undo
2003 2003
  * @access private
2004 2004
  */
2005 2005
 function _elgg_get_js_page_data() {
2006
-	$data = elgg_trigger_plugin_hook('elgg.data', 'page', null, []);
2007
-	if (!is_array($data)) {
2008
-		elgg_log('"elgg.data" plugin hook handlers must return an array. Returned ' . gettype($data) . '.', 'ERROR');
2009
-		$data = [];
2010
-	}
2011
-
2012
-	$elgg = [
2013
-		'config' => [
2014
-			'lastcache' => (int) elgg_get_config('lastcache'),
2015
-			'viewtype' => elgg_get_viewtype(),
2016
-			'simplecache_enabled' => (int) elgg_is_simplecache_enabled(),
2017
-		],
2018
-		'security' => [
2019
-			'token' => [
2020
-				'__elgg_ts' => $ts = time(),
2021
-				'__elgg_token' => generate_action_token($ts),
2022
-			],
2023
-		],
2024
-		'session' => [
2025
-			'user' => null,
2026
-			'token' => _elgg_services()->session->get('__elgg_session'),
2027
-		],
2028
-		'_data' => (object) $data,
2029
-	];
2030
-
2031
-	if (elgg_get_config('elgg_load_sync_code')) {
2032
-		$elgg['config']['load_sync_code'] = true;
2033
-	}
2034
-
2035
-	$page_owner = elgg_get_page_owner_entity();
2036
-	if ($page_owner instanceof ElggEntity) {
2037
-		$elgg['page_owner'] = $page_owner->toObject();
2038
-	}
2039
-
2040
-	$user = elgg_get_logged_in_user_entity();
2041
-	if ($user instanceof ElggUser) {
2042
-		$user_object = $user->toObject();
2043
-		$user_object->admin = $user->isAdmin();
2044
-		$elgg['session']['user'] = $user_object;
2045
-	}
2046
-
2047
-	return $elgg;
2006
+    $data = elgg_trigger_plugin_hook('elgg.data', 'page', null, []);
2007
+    if (!is_array($data)) {
2008
+        elgg_log('"elgg.data" plugin hook handlers must return an array. Returned ' . gettype($data) . '.', 'ERROR');
2009
+        $data = [];
2010
+    }
2011
+
2012
+    $elgg = [
2013
+        'config' => [
2014
+            'lastcache' => (int) elgg_get_config('lastcache'),
2015
+            'viewtype' => elgg_get_viewtype(),
2016
+            'simplecache_enabled' => (int) elgg_is_simplecache_enabled(),
2017
+        ],
2018
+        'security' => [
2019
+            'token' => [
2020
+                '__elgg_ts' => $ts = time(),
2021
+                '__elgg_token' => generate_action_token($ts),
2022
+            ],
2023
+        ],
2024
+        'session' => [
2025
+            'user' => null,
2026
+            'token' => _elgg_services()->session->get('__elgg_session'),
2027
+        ],
2028
+        '_data' => (object) $data,
2029
+    ];
2030
+
2031
+    if (elgg_get_config('elgg_load_sync_code')) {
2032
+        $elgg['config']['load_sync_code'] = true;
2033
+    }
2034
+
2035
+    $page_owner = elgg_get_page_owner_entity();
2036
+    if ($page_owner instanceof ElggEntity) {
2037
+        $elgg['page_owner'] = $page_owner->toObject();
2038
+    }
2039
+
2040
+    $user = elgg_get_logged_in_user_entity();
2041
+    if ($user instanceof ElggUser) {
2042
+        $user_object = $user->toObject();
2043
+        $user_object->admin = $user->isAdmin();
2044
+        $elgg['session']['user'] = $user_object;
2045
+    }
2046
+
2047
+    return $elgg;
2048 2048
 }
2049 2049
 
2050 2050
 /**
@@ -2059,18 +2059,18 @@  discard block
 block discarded – undo
2059 2059
  * @access private
2060 2060
  */
2061 2061
 function _elgg_view_under_viewtype($view, $vars, $viewtype) {
2062
-	if ($viewtype) {
2063
-		$old = elgg_get_viewtype();
2064
-		elgg_set_viewtype($viewtype);
2065
-	}
2062
+    if ($viewtype) {
2063
+        $old = elgg_get_viewtype();
2064
+        elgg_set_viewtype($viewtype);
2065
+    }
2066 2066
 
2067
-	$ret = elgg_view($view, $vars);
2067
+    $ret = elgg_view($view, $vars);
2068 2068
 
2069
-	if ($viewtype) {
2070
-		elgg_set_viewtype($old);
2071
-	}
2069
+    if ($viewtype) {
2070
+        elgg_set_viewtype($old);
2071
+    }
2072 2072
 
2073
-	return $ret;
2073
+    return $ret;
2074 2074
 }
2075 2075
 
2076 2076
 /**
@@ -2085,17 +2085,17 @@  discard block
 block discarded – undo
2085 2085
  */
2086 2086
 function _elgg_set_lightbox_config($hook, $type, $return, $params) {
2087 2087
 
2088
-	$return['lightbox'] = [
2089
-		'current' => elgg_echo('js:lightbox:current', ['{current}', '{total}']),
2090
-		'previous' => elgg_view_icon('caret-left'),
2091
-		'next' => elgg_view_icon('caret-right'),
2092
-		'close' => elgg_view_icon('times'),
2093
-		'opacity' => 0.5,
2094
-		'maxWidth' => '990px',
2095
-		'maxHeight' => '990px',
2096
-		'initialWidth' => '300px',
2097
-		'initialHeight' => '300px',
2098
-	];
2099
-
2100
-	return $return;
2088
+    $return['lightbox'] = [
2089
+        'current' => elgg_echo('js:lightbox:current', ['{current}', '{total}']),
2090
+        'previous' => elgg_view_icon('caret-left'),
2091
+        'next' => elgg_view_icon('caret-right'),
2092
+        'close' => elgg_view_icon('times'),
2093
+        'opacity' => 0.5,
2094
+        'maxWidth' => '990px',
2095
+        'maxHeight' => '990px',
2096
+        'initialWidth' => '300px',
2097
+        'initialHeight' => '300px',
2098
+    ];
2099
+
2100
+    return $return;
2101 2101
 }
Please login to merge, or discard this patch.