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