Pass page templates data through PageStyle::render method

src/mibew/install/dbinfo.php

@@ -298,7 +298,7 @@ function show_install_err($text)
 		'errors' => array($text),
 	);
 	$page_style = new \Mibew\Style\PageStyle('default');
-	$page_style->render('install_err');
+	$page_style->render('install_err', $page);
 	exit;
 }
 

src/mibew/install/index.php

@@ -391,6 +391,6 @@ $page['fixedwrap'] = true;
 $page['errors'] = $errors;
 
 $page_style = new \Mibew\Style\PageStyle('default');
-$page_style->render('install_index');
+$page_style->render('install_index', $page);
 
 ?>

src/mibew/libs/classes/Mibew/Style/PageStyle.php

@@ -43,10 +43,6 @@ class PageStyle extends Style implements StyleInterface {
 	 * substitutions in a template.
 	 */
 	public function render($template_name, $data = array()) {
-		// We need to import some variables to make them visible to required
-		// view.
-		global $page;
-
 		// Add template root value to page variables
 		$page['stylepath'] = MIBEW_WEB_ROOT . '/' . $this->filesPath();
 
@@ -58,6 +54,10 @@ class PageStyle extends Style implements StyleInterface {
 		$full_view_name = MIBEW_FS_ROOT . '/' . $this->filesPath() . '/views/' .
 			str_replace("/\\", '', $template_name) . '.php';
 
+		// $page variable is used in included views files, so we need to create
+		// it as an alias of $data argument.
+		$page = $data;
+
 		// Load and execute the view
 		require($full_view_name);
 	}

src/mibew/license.php

@@ -27,6 +27,6 @@ $page['no_right_menu'] = true;
 $page['fixedwrap'] = true;
 
 $page_style = new PageStyle(PageStyle::currentStyle());
-$page_style->render('license');
+$page_style->render('license', $page);
 
 ?>

src/mibew/operator/agent.php

@@ -87,7 +87,7 @@ if (!isset($_GET['token'])) {
 				'link' => $_SERVER['PHP_SELF'] . "?thread=$threadid&force=true",
 				'title' => getlocal("confirm.take.head"),
 			);
-			$page_style->render('confirm');
+			$page_style->render('confirm', $page);
 			exit;
 		}
 	}

src/mibew/operator/avatar.php

@@ -111,6 +111,6 @@ $page = array_merge(
 $page['tabs'] = setup_operator_settings_tabs($opId, 1);
 
 $page_style = new PageStyle(PageStyle::currentStyle());
-$page_style->render('avatar');
+$page_style->render('avatar', $page);
 
 ?>

src/mibew/operator/ban.php

@@ -138,6 +138,6 @@ $page = array_merge(
 );
 
 $page_style = new PageStyle(PageStyle::currentStyle());
-$page_style->render('ban');
+$page_style->render('ban', $page);
 
 ?>

src/mibew/operator/blocked.php

@@ -69,6 +69,6 @@ $page = array_merge(
 );
 
 $page_style = new PageStyle(PageStyle::currentStyle());
-$page_style->render('blocked_visitors');
+$page_style->render('blocked_visitors', $page);
 
 ?>

src/mibew/operator/canned.php

@@ -109,6 +109,6 @@ $page = array_merge(
 );
 
 $page_style = new PageStyle(PageStyle::currentStyle());
-$page_style->render('canned');
+$page_style->render('canned', $page);
 
 ?>

src/mibew/operator/cannededit.php

@@ -74,7 +74,7 @@ if (isset($_POST['message']) && isset($_POST['title'])) {
 			$page,
 			prepare_menu($operator, false)
 		);
-		$page_style->render('cannededit');
+		$page_style->render('cannededit', $page);
 		exit;
 	}
 }
@@ -90,6 +90,6 @@ $page = array_merge(
 	prepare_menu($operator, false)
 );
 
-$page_style->render('cannededit');
+$page_style->render('cannededit', $page);
 
 ?>

src/mibew/operator/features.php

@@ -80,6 +80,6 @@ $page = array_merge(
 $page['tabs'] = setup_settings_tabs(1);
 
 $page_style = new PageStyle(PageStyle::currentStyle());
-$page_style->render('features');
+$page_style->render('features', $page);
 
 ?>

src/mibew/operator/getcode.php

@@ -112,6 +112,6 @@ $page = array_merge(
 );
 
 $page_style = new PageStyle(PageStyle::currentStyle());
-$page_style->render('gen_button');
+$page_style->render('gen_button', $page);
 
 ?>

src/mibew/operator/group.php

@@ -263,6 +263,6 @@ $page = array_merge(
 $page['tabs'] = setup_group_settings_tabs($groupid, 0);
 
 $page_style = new PageStyle(PageStyle::currentStyle());
-$page_style->render('group');
+$page_style->render('group', $page);
 
 ?>

src/mibew/operator/groupmembers.php

@@ -103,6 +103,6 @@ $page = array_merge(
 $page['tabs'] = setup_group_settings_tabs($groupid, 1);
 
 $page_style = new PageStyle(PageStyle::currentStyle());
-$page_style->render('groupmembers');
+$page_style->render('groupmembers', $page);
 
 ?>

src/mibew/operator/groups.php

@@ -86,6 +86,6 @@ $page = array_merge(
 );
 
 $page_style = new PageStyle(PageStyle::currentStyle());
-$page_style->render('groups');
+$page_style->render('groups', $page);
 
 ?>

src/mibew/operator/history.php

@@ -139,6 +139,6 @@ $page = array_merge(
 );
 
 $page_style = new PageStyle(PageStyle::currentStyle());
-$page_style->render('thread_search');
+$page_style->render('thread_search', $page);
 
 ?>

src/mibew/operator/index.php

@@ -48,6 +48,6 @@ $page = array_merge(
 );
 
 $page_style = new PageStyle(PageStyle::currentStyle());
-$page_style->render('menu');
+$page_style->render('menu', $page);
 
 ?>

src/mibew/operator/invitationthemes.php

@@ -50,6 +50,6 @@ $page = array_merge(
 $page['tabs'] = setup_settings_tabs(5);
 
 $page_style = new PageStyle(PageStyle::currentStyle());
-$page_style->render('invitation_themes');
+$page_style->render('invitation_themes', $page);
 
 ?>

src/mibew/operator/login.php

@@ -66,6 +66,6 @@ $page['show_small_login'] = false;
 $page['fixedwrap'] = true;
 
 $page_style = new PageStyle(PageStyle::currentStyle());
-$page_style->render('login');
+$page_style->render('login', $page);
 
 ?>

src/mibew/operator/operator.php

@@ -168,6 +168,6 @@ $page = array_merge(
 $page['tabs'] = setup_operator_settings_tabs($opId, 0);
 
 $page_style = new PageStyle(PageStyle::currentStyle());
-$page_style->render('agent');
+$page_style->render('agent', $page);
 
 ?>

src/mibew/operator/operators.php

@@ -126,6 +126,6 @@ $page = array_merge(
 );
 
 $page_style = new PageStyle(PageStyle::currentStyle());
-$page_style->render('agents');
+$page_style->render('agents', $page);
 
 ?>

src/mibew/operator/opgroups.php

@@ -99,6 +99,6 @@ $page = array_merge(
 $page['tabs'] = setup_operator_settings_tabs($opId, 2);
 
 $page_style = new PageStyle(PageStyle::currentStyle());
-$page_style->render('operator_groups');
+$page_style->render('operator_groups', $page);
 
 ?>

src/mibew/operator/page_themes.php

@@ -60,6 +60,6 @@ $page = array_merge(
 $page['tabs'] = setup_settings_tabs(3);
 
 $page_style = new PageStyle(PageStyle::currentStyle());
-$page_style->render('page_themes');
+$page_style->render('page_themes', $page);
 
 ?>

src/mibew/operator/performance.php

@@ -138,6 +138,6 @@ $page = array_merge(
 $page['tabs'] = setup_settings_tabs(2);
 
 $page_style = new PageStyle(PageStyle::currentStyle());
-$page_style->render('performance');
+$page_style->render('performance', $page);
 
 ?>

src/mibew/operator/permissions.php

@@ -90,6 +90,6 @@ $page = array_merge(
 $page['tabs'] = setup_operator_settings_tabs($opId, 3);
 
 $page_style = new PageStyle(PageStyle::currentStyle());
-$page_style->render('permissions');
+$page_style->render('permissions', $page);
 
 ?>

src/mibew/operator/resetpwd.php

@@ -70,7 +70,7 @@ if (count($page['errors']) == 0 && isset($_POST['password'])) {
 		);
 
 		$page['loginname'] = $operator['vclogin'];
-		$page_style->render('resetpwd');
+		$page_style->render('resetpwd', $page);
 		exit;
 	}
 }
@@ -79,6 +79,6 @@ $page['id'] = $opId;
 $page['token'] = $token;
 $page['isdone'] = false;
 
-$page_style->render('resetpwd');
+$page_style->render('resetpwd', $page);
 
 ?>

src/mibew/operator/restore.php

@@ -69,7 +69,7 @@ if (isset($_POST['loginoremail'])) {
 		mibew_mail($email, $email, getstring("restore.mailsubj"), getstring2("restore.mailtext", array(get_operator_name($torestore), $href)));
 
 		$page['isdone'] = true;
-		$page_style->render('restore');
+		$page_style->render('restore', $page);
 		exit;
 	}
 }
@@ -79,6 +79,6 @@ $page['formloginoremail'] = topage($loginoremail);
 $page['localeLinks'] = get_locale_links(MIBEW_WEB_ROOT . "/operator/restore.php");
 $page['isdone'] = false;
 
-$page_style->render('restore');
+$page_style->render('restore', $page);
 
 ?>

src/mibew/operator/settings.php

@@ -169,6 +169,6 @@ $page = array_merge(
 $page['tabs'] = setup_settings_tabs(0);
 
 $page_style = new PageStyle(PageStyle::currentStyle());
-$page_style->render('settings');
+$page_style->render('settings', $page);
 
 ?>

src/mibew/operator/statistics.php

@@ -191,6 +191,6 @@ $page = array_merge(
 $page['tabs'] = setup_statistics_tabs($activetab);
 
 $page_style = new PageStyle(PageStyle::currentStyle());
-$page_style->render('statistics');
+$page_style->render('statistics', $page);
 
 ?>

src/mibew/operator/themes.php

@@ -65,6 +65,6 @@ $page = array_merge(
 $page['tabs'] = setup_settings_tabs(4);
 
 $page_style = new PageStyle(PageStyle::currentStyle());
-$page_style->render('themes');
+$page_style->render('themes', $page);
 
 ?>

src/mibew/operator/threadprocessor.php

@@ -70,6 +70,6 @@ $page = array_merge(
 );
 
 $page_style = new PageStyle(PageStyle::currentStyle());
-$page_style->render('thread_log');
+$page_style->render('thread_log', $page);
 
 ?>

src/mibew/operator/tracked.php

@@ -65,6 +65,6 @@ foreach ($path as $k => $v) {
 $page['title'] = getlocal("tracked.path");
 
 $page_style = new PageStyle(PageStyle::currentStyle());
-$page_style->render('tracked');
+$page_style->render('tracked', $page);
 
 ?>

src/mibew/operator/translate.php

@@ -165,7 +165,7 @@ if ($stringid) {
 				$page,
 				prepare_menu($operator, false)
 			);
-			$page_style->render('translate');
+			$page_style->render('translate', $page);
 			exit;
 		}
 	}
@@ -180,7 +180,7 @@ if ($stringid) {
 		$page,
 		prepare_menu($operator, false)
 	);
-	$page_style->render('translate');
+	$page_style->render('translate', $page);
 	exit;
 }
 
@@ -250,6 +250,6 @@ $page = array_merge(
 	prepare_menu($operator)
 );
 
-$page_style->render('translatelist');
+$page_style->render('translatelist', $page);
 
 ?>

src/mibew/operator/updates.php

@@ -52,6 +52,6 @@ $page = array_merge(
 );
 
 $page_style = new PageStyle(PageStyle::currentStyle());
-$page_style->render('updates');
+$page_style->render('updates', $page);
 
 ?>

src/mibew/operator/userhistory.php

@@ -82,6 +82,6 @@ $page['title'] = getlocal("page.analysis.userhistory.title");
 $page['menuid'] = "history";
 
 $page_style = new PageStyle(PageStyle::currentStyle());
-$page_style->render('userhistory');
+$page_style->render('userhistory', $page);
 
 ?>

src/mibew/operator/users.php

@@ -71,6 +71,6 @@ $page = array_merge(
 	prepare_menu($operator)
 );
 
-$page_style->render('pending_users');
+$page_style->render('pending_users', $page);
 
 ?>