← All changes | lib/Template.php +13 -11 trunk → 2.4.31 View file →

		@@ -65,13 +65,11 @@
65	65	$variables['domain'] = $this->domain;
66	66	$variables['user_email'] = WebTotem::getUserEmail();
67	67
68	68	if (WebTotem::isMultiSite()) {
69		-// $variables['is_multisite'] = WebTotem::isMultiSite();
70		-// $variables['is_super_admin'] = is_super_admin();
71		-// $variables['hid'] = (WebTotemRequest::get('hid')) ? '&hid=' . WebTotemRequest::get('hid') : '';
72		- $variables['is_multisite'] = false;
	69	+ $variables['is_multisite'] = WebTotem::isMultiSite();
73	70	$variables['is_super_admin'] = is_super_admin();
	71	+ $variables['hid'] = (WebTotemRequest::get('hid')) ? '&hid=' . WebTotemRequest::get('hid') : '';
74	72	}
75	73
76	74	$twig->addFilter(new \Twig\TwigFilter('trans', array($this, 'translate')));
77	75	$twig->addFunction(new \Twig\TwigFunction('plural', array($this, 'plural')));
		@@ -129,11 +127,8 @@
129	127	{
130	128
131	129	if (WebTotemRequest::get('hid')) {
132	130	WebTotemOption::setSessionOptions(['host_id' => WebTotemRequest::get('hid')]);
133		- $host = WebTotemOption::getHost(WebTotemRequest::get('hid'));
134		- } else {
135		- $host = WebTotemAPI::siteInfo();
136	131	}
137	132
138	133	$variables['menu_url'] = WebTotem::adminURL('admin.php?page=wtotem');
139	134
		@@ -141,12 +136,18 @@
141	136	$page = $page ?: 'dashboard';
142	137	$variables['is_active'][$page] = 'wtotem_nav__link_active';
143	138	$variables['page'] = $page;
144	139
145		- $site_created_at = WebTotemOption::getOption('site_created_at');
146		- $site_created_at = $site_created_at ? json_decode($site_created_at, true) : [];
147		- $site_created_at = (array_key_exists($host['name'], $site_created_at)) ? $site_created_at[$host['name']] : null;
148		- $variables['site_created_at'] = $site_created_at ? date('Y-m-d', strtotime($site_created_at)) : null;
	140	+ if ($page != 'activation') {
	141	+ $user_feedback = WebTotemAPI::getFeedback();
	142	+ if(is_array($user_feedback) and array_key_exists('score', $user_feedback)){
	143	+ $variables['user_feedback'] = (bool)$user_feedback['score'];
	144	+ } else {
	145	+ $variables['user_feedback'] = true;
	146	+ }
	147	+ } else {
	148	+ $variables['user_feedback'] = true;
	149	+ }
149	150
150	151	$variables['theme_mode'] = WebTotem::getThemeMode();
151	152	$variables['notifications'] = WebTotem::getNotifications();
152	153	$variables['current_year'] = date('Y');
		@@ -153,8 +154,9 @@
153	154	$variables['content'] = $page_content;
154	155
155	156	return $this->twigRender('layout.html.twig', $variables);
156	157	}
	158	+
157	159
158	160	/**
159	161	* String translation.
160	162	*