diff --git a/src/mibew/install/dbinfo.php b/src/mibew/install/dbinfo.php index 41290ecc..0962b4df 100644 --- a/src/mibew/install/dbinfo.php +++ b/src/mibew/install/dbinfo.php @@ -294,8 +294,7 @@ function show_install_err($text) 'localeLinks' => get_locale_links("$mibewroot/install/index.php") ); $errors = array($text); - start_html_output(); - require(dirname(dirname(__FILE__)).'/view/install_err.php'); + render_view('install_err'); exit; } diff --git a/src/mibew/install/index.php b/src/mibew/install/index.php index b97af1a8..1933d333 100644 --- a/src/mibew/install/index.php +++ b/src/mibew/install/index.php @@ -28,6 +28,7 @@ require_once(dirname(dirname(__FILE__)).'/libs/common/locale.php'); require_once(dirname(dirname(__FILE__)).'/libs/common/misc.php'); require_once(dirname(dirname(__FILE__)).'/libs/common/response.php'); require_once(dirname(dirname(__FILE__)).'/libs/common/string.php'); +require_once(dirname(dirname(__FILE__)).'/libs/view.php'); // Include database structure require_once(dirname(__FILE__).'/dbinfo.php'); @@ -366,6 +367,6 @@ function check_status() check_status(); -start_html_output(); -require(dirname(dirname(__FILE__)).'/view/install_index.php'); +render_view('install_index'); + ?> \ No newline at end of file diff --git a/src/mibew/libs/view.php b/src/mibew/libs/view.php new file mode 100644 index 00000000..c41f13c0 --- /dev/null +++ b/src/mibew/libs/view.php @@ -0,0 +1,49 @@ + \ No newline at end of file diff --git a/src/mibew/license.php b/src/mibew/license.php index b083b19f..66d8b8f6 100644 --- a/src/mibew/license.php +++ b/src/mibew/license.php @@ -16,7 +16,8 @@ */ require_once(dirname(__FILE__).'/libs/init.php'); +require_once(dirname(__FILE__).'/libs/view.php'); + +render_view('license'); -start_html_output(); -require(dirname(__FILE__).'/view/license.php'); ?> \ No newline at end of file diff --git a/src/mibew/operator/agent.php b/src/mibew/operator/agent.php index b36f2e16..2c4b1d9c 100644 --- a/src/mibew/operator/agent.php +++ b/src/mibew/operator/agent.php @@ -23,6 +23,7 @@ require_once(dirname(dirname(__FILE__)).'/libs/operator.php'); require_once(dirname(dirname(__FILE__)).'/libs/pagination.php'); require_once(dirname(dirname(__FILE__)).'/libs/expand.php'); require_once(dirname(dirname(__FILE__)).'/libs/classes/thread.php'); +require_once(dirname(dirname(__FILE__)).'/libs/view.php'); $operator = check_login(); @@ -77,8 +78,7 @@ if (!isset($_GET['token'])) { 'agent' => topage($thread->agentName), 'link' => $_SERVER['PHP_SELF'] . "?thread=$threadid&force=true" ); - start_html_output(); - require(dirname(dirname(__FILE__)).'/view/confirm.php'); + render_view('confirm'); exit; } } diff --git a/src/mibew/operator/avatar.php b/src/mibew/operator/avatar.php index 9ca4652a..2db3bc16 100644 --- a/src/mibew/operator/avatar.php +++ b/src/mibew/operator/avatar.php @@ -18,6 +18,7 @@ require_once(dirname(dirname(__FILE__)).'/libs/init.php'); require_once(dirname(dirname(__FILE__)).'/libs/operator.php'); require_once(dirname(dirname(__FILE__)).'/libs/operator_settings.php'); +require_once(dirname(dirname(__FILE__)).'/libs/view.php'); $operator = check_login(); csrfchecktoken(); @@ -96,6 +97,6 @@ $page['canmodify'] = $canmodify ? "1" : ""; prepare_menu($operator); setup_operator_settings_tabs($opId, 1); -start_html_output(); -require(dirname(dirname(__FILE__)).'/view/avatar.php'); +render_view('avatar'); + ?> \ No newline at end of file diff --git a/src/mibew/operator/ban.php b/src/mibew/operator/ban.php index ab8b3157..70b4778d 100644 --- a/src/mibew/operator/ban.php +++ b/src/mibew/operator/ban.php @@ -20,6 +20,7 @@ require_once(dirname(dirname(__FILE__)).'/libs/chat.php'); require_once(dirname(dirname(__FILE__)).'/libs/operator.php'); require_once(dirname(dirname(__FILE__)).'/libs/pagination.php'); require_once(dirname(dirname(__FILE__)).'/libs/classes/thread.php'); +require_once(dirname(dirname(__FILE__)).'/libs/view.php'); $operator = check_login(); csrfchecktoken(); @@ -126,7 +127,6 @@ if (isset($_POST['address'])) { } prepare_menu($operator, false); -start_html_output(); -require(dirname(dirname(__FILE__)).'/view/ban.php'); -exit; +render_view('ban'); + ?> \ No newline at end of file diff --git a/src/mibew/operator/blocked.php b/src/mibew/operator/blocked.php index 053c3462..06dbc7ba 100644 --- a/src/mibew/operator/blocked.php +++ b/src/mibew/operator/blocked.php @@ -19,6 +19,7 @@ require_once(dirname(dirname(__FILE__)).'/libs/init.php'); require_once(dirname(dirname(__FILE__)).'/libs/chat.php'); require_once(dirname(dirname(__FILE__)).'/libs/operator.php'); require_once(dirname(dirname(__FILE__)).'/libs/pagination.php'); +require_once(dirname(dirname(__FILE__)).'/libs/view.php'); $operator = check_login(); csrfchecktoken(); @@ -51,10 +52,7 @@ $blockedList = $db->query( ); setup_pagination($blockedList); - prepare_menu($operator); -start_html_output(); +render_view('blocked_visitors'); -require(dirname(dirname(__FILE__)).'/view/blocked_visitors.php'); -exit; ?> \ No newline at end of file diff --git a/src/mibew/operator/canned.php b/src/mibew/operator/canned.php index 39770b49..7bca7b95 100644 --- a/src/mibew/operator/canned.php +++ b/src/mibew/operator/canned.php @@ -21,6 +21,7 @@ require_once(dirname(dirname(__FILE__)).'/libs/operator.php'); require_once(dirname(dirname(__FILE__)).'/libs/settings.php'); require_once(dirname(dirname(__FILE__)).'/libs/groups.php'); require_once(dirname(dirname(__FILE__)).'/libs/pagination.php'); +require_once(dirname(dirname(__FILE__)).'/libs/view.php'); $operator = check_login(); force_password($operator); @@ -94,6 +95,6 @@ $page['formlang'] = $lang; $page['formgroup'] = $groupid; prepare_menu($operator); -start_html_output(); -require(dirname(dirname(__FILE__)).'/view/canned.php'); +render_view('canned'); + ?> \ No newline at end of file diff --git a/src/mibew/operator/cannededit.php b/src/mibew/operator/cannededit.php index a6a9d065..03dabfd7 100644 --- a/src/mibew/operator/cannededit.php +++ b/src/mibew/operator/cannededit.php @@ -19,6 +19,7 @@ require_once(dirname(dirname(__FILE__)).'/libs/init.php'); require_once(dirname(dirname(__FILE__)).'/libs/canned.php'); require_once(dirname(dirname(__FILE__)).'/libs/operator.php'); require_once(dirname(dirname(__FILE__)).'/libs/pagination.php'); +require_once(dirname(dirname(__FILE__)).'/libs/view.php'); $operator = check_login(); csrfchecktoken(); @@ -64,8 +65,7 @@ if (isset($_POST['message']) && isset($_POST['title'])) { } $page['saved'] = true; prepare_menu($operator, false); - start_html_output(); - require(dirname(dirname(__FILE__)).'/view/cannededit.php'); + render_view('cannededit'); exit; } } @@ -74,8 +74,8 @@ $page['saved'] = false; $page['key'] = $stringid; $page['formtitle'] = topage($title); $page['formmessage'] = topage($message); + prepare_menu($operator, false); -start_html_output(); -require(dirname(dirname(__FILE__)).'/view/cannededit.php'); -exit; +render_view('cannededit'); + ?> \ No newline at end of file diff --git a/src/mibew/operator/features.php b/src/mibew/operator/features.php index 499079cc..018a4a4e 100644 --- a/src/mibew/operator/features.php +++ b/src/mibew/operator/features.php @@ -18,6 +18,7 @@ require_once(dirname(dirname(__FILE__)).'/libs/init.php'); require_once(dirname(dirname(__FILE__)).'/libs/operator.php'); require_once(dirname(dirname(__FILE__)).'/libs/settings.php'); +require_once(dirname(dirname(__FILE__)).'/libs/view.php'); $operator = check_login(); csrfchecktoken(); @@ -64,6 +65,6 @@ foreach ($options as $opt) { prepare_menu($operator); setup_settings_tabs(1); -start_html_output(); -require(dirname(dirname(__FILE__)).'/view/features.php'); +render_view('features'); + ?> \ No newline at end of file diff --git a/src/mibew/operator/getcode.php b/src/mibew/operator/getcode.php index 916d63a9..3a99d81c 100644 --- a/src/mibew/operator/getcode.php +++ b/src/mibew/operator/getcode.php @@ -20,6 +20,7 @@ require_once(dirname(dirname(__FILE__)).'/libs/operator.php'); require_once(dirname(dirname(__FILE__)).'/libs/groups.php'); require_once(dirname(dirname(__FILE__)).'/libs/getcode.php'); require_once(dirname(dirname(__FILE__)).'/libs/styles.php'); +require_once(dirname(dirname(__FILE__)).'/libs/view.php'); $operator = check_login(); force_password($operator); @@ -95,6 +96,6 @@ $page['enabletracking'] = Settings::get('enabletracking'); $page['operator_code'] = $operator_code; prepare_menu($operator); -start_html_output(); -require(dirname(dirname(__FILE__)).'/view/gen_button.php'); +render_view('gen_button'); + ?> \ No newline at end of file diff --git a/src/mibew/operator/group.php b/src/mibew/operator/group.php index afd41135..9c746f96 100644 --- a/src/mibew/operator/group.php +++ b/src/mibew/operator/group.php @@ -18,6 +18,7 @@ require_once(dirname(dirname(__FILE__)).'/libs/init.php'); require_once(dirname(dirname(__FILE__)).'/libs/operator.php'); require_once(dirname(dirname(__FILE__)).'/libs/groups.php'); +require_once(dirname(dirname(__FILE__)).'/libs/view.php'); $operator = check_login(); csrfchecktoken(); @@ -244,8 +245,9 @@ if (isset($_POST['name'])) { $page['stored'] = isset($_GET['stored']); $page['availableParentGroups'] = get_available_parent_groups($groupid); + prepare_menu($operator); setup_group_settings_tabs($groupid, 0); -start_html_output(); -require(dirname(dirname(__FILE__)).'/view/group.php'); +render_view('group'); + ?> \ No newline at end of file diff --git a/src/mibew/operator/groupmembers.php b/src/mibew/operator/groupmembers.php index 2156527f..5a99c353 100644 --- a/src/mibew/operator/groupmembers.php +++ b/src/mibew/operator/groupmembers.php @@ -18,6 +18,7 @@ require_once(dirname(dirname(__FILE__)).'/libs/init.php'); require_once(dirname(dirname(__FILE__)).'/libs/operator.php'); require_once(dirname(dirname(__FILE__)).'/libs/groups.php'); +require_once(dirname(dirname(__FILE__)).'/libs/view.php'); $operator = check_login(); csrfchecktoken(); @@ -87,8 +88,9 @@ foreach (get_group_members($groupid) as $rel) { } $page['stored'] = isset($_GET['stored']); + prepare_menu($operator); setup_group_settings_tabs($groupid, 1); -start_html_output(); -require(dirname(dirname(__FILE__)).'/view/groupmembers.php'); +render_view('groupmembers'); + ?> \ No newline at end of file diff --git a/src/mibew/operator/groups.php b/src/mibew/operator/groups.php index cebe676d..e0081cc5 100644 --- a/src/mibew/operator/groups.php +++ b/src/mibew/operator/groups.php @@ -17,6 +17,7 @@ require_once(dirname(dirname(__FILE__)).'/libs/init.php'); require_once(dirname(dirname(__FILE__)).'/libs/operator.php'); +require_once(dirname(dirname(__FILE__)).'/libs/view.php'); $operator = check_login(); csrfchecktoken(); @@ -72,6 +73,6 @@ $page['availableDirections'] = array( ); prepare_menu($operator); -start_html_output(); -require(dirname(dirname(__FILE__)).'/view/groups.php'); +render_view('groups'); + ?> \ No newline at end of file diff --git a/src/mibew/operator/history.php b/src/mibew/operator/history.php index 682db671..0b4f23f7 100644 --- a/src/mibew/operator/history.php +++ b/src/mibew/operator/history.php @@ -21,6 +21,7 @@ require_once(dirname(dirname(__FILE__)).'/libs/chat.php'); require_once(dirname(dirname(__FILE__)).'/libs/userinfo.php'); require_once(dirname(dirname(__FILE__)).'/libs/pagination.php'); require_once(dirname(dirname(__FILE__)).'/libs/cron.php'); +require_once(dirname(dirname(__FILE__)).'/libs/view.php'); $operator = check_login(); force_password($operator); @@ -98,6 +99,6 @@ $page['formtype'] = $searchType; $page['forminsystemmessages'] = $searchInSystemMessages; prepare_menu($operator); -start_html_output(); -require(dirname(dirname(__FILE__)).'/view/thread_search.php'); +render_view('thread_search'); + ?> \ No newline at end of file diff --git a/src/mibew/operator/index.php b/src/mibew/operator/index.php index f007c8a3..049f2fa4 100644 --- a/src/mibew/operator/index.php +++ b/src/mibew/operator/index.php @@ -17,6 +17,7 @@ require_once(dirname(dirname(__FILE__)).'/libs/init.php'); require_once(dirname(dirname(__FILE__)).'/libs/operator.php'); +require_once(dirname(dirname(__FILE__)).'/libs/view.php'); $operator = check_login(); force_password($operator); @@ -36,6 +37,6 @@ $page = array( ); prepare_menu($operator); -start_html_output(); -require(dirname(dirname(__FILE__)).'/view/menu.php'); +render_view('menu'); + ?> \ No newline at end of file diff --git a/src/mibew/operator/invitationthemes.php b/src/mibew/operator/invitationthemes.php index 69d4c497..cec06717 100644 --- a/src/mibew/operator/invitationthemes.php +++ b/src/mibew/operator/invitationthemes.php @@ -22,6 +22,7 @@ require_once(dirname(dirname(__FILE__)).'/libs/groups.php'); require_once(dirname(dirname(__FILE__)).'/libs/expand.php'); require_once(dirname(dirname(__FILE__)).'/libs/settings.php'); require_once(dirname(dirname(__FILE__)).'/libs/styles.php'); +require_once(dirname(dirname(__FILE__)).'/libs/view.php'); $operator = check_login(); @@ -38,7 +39,7 @@ $page['availablePreviews'] = $stylelist; $page['operatorName'] = (empty($operator['vclocalname'])?$operator['vccommonname']:$operator['vclocalname']); prepare_menu($operator); -start_html_output(); setup_settings_tabs(4); -require(dirname(dirname(__FILE__)).'/view/invitation_themes.php'); +render_view('invitation_themes'); + ?> \ No newline at end of file diff --git a/src/mibew/operator/login.php b/src/mibew/operator/login.php index e4aa63d1..375bd830 100644 --- a/src/mibew/operator/login.php +++ b/src/mibew/operator/login.php @@ -17,6 +17,7 @@ require_once(dirname(dirname(__FILE__)).'/libs/init.php'); require_once(dirname(dirname(__FILE__)).'/libs/operator.php'); +require_once(dirname(dirname(__FILE__)).'/libs/view.php'); $errors = array(); $page = array('formisRemember' => true, 'version' => $version); @@ -53,6 +54,7 @@ if (isset($_POST['login']) && isset($_POST['password'])) { } $page['localeLinks'] = get_locale_links("$mibewroot/operator/login.php"); -start_html_output(); -require(dirname(dirname(__FILE__)).'/view/login.php'); + +render_view('login'); + ?> \ No newline at end of file diff --git a/src/mibew/operator/operator.php b/src/mibew/operator/operator.php index 73d1e365..c4fc58db 100644 --- a/src/mibew/operator/operator.php +++ b/src/mibew/operator/operator.php @@ -18,6 +18,7 @@ require_once(dirname(dirname(__FILE__)).'/libs/init.php'); require_once(dirname(dirname(__FILE__)).'/libs/operator.php'); require_once(dirname(dirname(__FILE__)).'/libs/operator_settings.php'); +require_once(dirname(dirname(__FILE__)).'/libs/view.php'); $operator = check_login(); csrfchecktoken(); @@ -153,6 +154,6 @@ $page['needChangePassword'] = check_password_hash($operator['vclogin'], '', $ope prepare_menu($operator); setup_operator_settings_tabs($opId, 0); -start_html_output(); -require(dirname(dirname(__FILE__)).'/view/agent.php'); +render_view('agent'); + ?> \ No newline at end of file diff --git a/src/mibew/operator/operators.php b/src/mibew/operator/operators.php index d5f88f4e..269bc4e6 100644 --- a/src/mibew/operator/operators.php +++ b/src/mibew/operator/operators.php @@ -17,6 +17,7 @@ require_once(dirname(dirname(__FILE__)).'/libs/init.php'); require_once(dirname(dirname(__FILE__)).'/libs/operator.php'); +require_once(dirname(dirname(__FILE__)).'/libs/view.php'); $operator = check_login(); force_password($operator); @@ -111,6 +112,6 @@ $page['availableDirections'] = array( setlocale(LC_TIME, getstring("time.locale")); prepare_menu($operator); -start_html_output(); -require(dirname(dirname(__FILE__)).'/view/agents.php'); +render_view('agents'); + ?> \ No newline at end of file diff --git a/src/mibew/operator/opgroups.php b/src/mibew/operator/opgroups.php index bd3ce800..34438522 100644 --- a/src/mibew/operator/opgroups.php +++ b/src/mibew/operator/opgroups.php @@ -18,6 +18,7 @@ require_once(dirname(dirname(__FILE__)).'/libs/init.php'); require_once(dirname(dirname(__FILE__)).'/libs/operator.php'); require_once(dirname(dirname(__FILE__)).'/libs/operator_settings.php'); +require_once(dirname(dirname(__FILE__)).'/libs/view.php'); $operator = check_login(); csrfchecktoken(); @@ -83,8 +84,9 @@ if ($op) { } $page['stored'] = isset($_GET['stored']); + prepare_menu($operator); setup_operator_settings_tabs($opId, 2); -start_html_output(); -require(dirname(dirname(__FILE__)).'/view/operator_groups.php'); +render_view('operator_groups'); + ?> \ No newline at end of file diff --git a/src/mibew/operator/performance.php b/src/mibew/operator/performance.php index 805cf12b..dd475c33 100644 --- a/src/mibew/operator/performance.php +++ b/src/mibew/operator/performance.php @@ -18,6 +18,7 @@ require_once(dirname(dirname(__FILE__)).'/libs/init.php'); require_once(dirname(dirname(__FILE__)).'/libs/operator.php'); require_once(dirname(dirname(__FILE__)).'/libs/settings.php'); +require_once(dirname(dirname(__FILE__)).'/libs/view.php'); $operator = check_login(); csrfchecktoken(); @@ -118,11 +119,10 @@ if (Settings::get('enabletracking')) { } $page['enabletracking'] = Settings::get('enabletracking'); - $page['stored'] = isset($_GET['stored']); prepare_menu($operator); setup_settings_tabs(2); -start_html_output(); -require(dirname(dirname(__FILE__)).'/view/performance.php'); +render_view('performance'); + ?> \ No newline at end of file diff --git a/src/mibew/operator/permissions.php b/src/mibew/operator/permissions.php index 1959ee2c..c69ec557 100644 --- a/src/mibew/operator/permissions.php +++ b/src/mibew/operator/permissions.php @@ -18,6 +18,7 @@ require_once(dirname(dirname(__FILE__)).'/libs/init.php'); require_once(dirname(dirname(__FILE__)).'/libs/operator.php'); require_once(dirname(dirname(__FILE__)).'/libs/operator_settings.php'); +require_once(dirname(dirname(__FILE__)).'/libs/view.php'); $operator = check_login(); csrfchecktoken(); @@ -72,8 +73,9 @@ if ($op) { } $page['stored'] = isset($_GET['stored']); + prepare_menu($operator); setup_operator_settings_tabs($opId, 3); -start_html_output(); -require(dirname(dirname(__FILE__)).'/view/permissions.php'); +render_view('permissions'); + ?> \ No newline at end of file diff --git a/src/mibew/operator/resetpwd.php b/src/mibew/operator/resetpwd.php index 35931acd..c2c7b178 100644 --- a/src/mibew/operator/resetpwd.php +++ b/src/mibew/operator/resetpwd.php @@ -18,6 +18,7 @@ require_once(dirname(dirname(__FILE__)).'/libs/init.php'); require_once(dirname(dirname(__FILE__)).'/libs/operator.php'); require_once(dirname(dirname(__FILE__)).'/libs/settings.php'); +require_once(dirname(dirname(__FILE__)).'/libs/view.php'); $errors = array(); $page = array('version' => $version, 'showform' => true); @@ -56,8 +57,7 @@ if (count($errors) == 0 && isset($_POST['password'])) { ); $page['loginname'] = $operator['vclogin']; - start_html_output(); - require(dirname(dirname(__FILE__)).'/view/resetpwd.php'); + render_view('resetpwd'); exit; } } @@ -65,6 +65,7 @@ if (count($errors) == 0 && isset($_POST['password'])) { $page['id'] = $opId; $page['token'] = $token; $page['isdone'] = false; -start_html_output(); -require(dirname(dirname(__FILE__)).'/view/resetpwd.php'); + +render_view('resetpwd'); + ?> \ No newline at end of file diff --git a/src/mibew/operator/restore.php b/src/mibew/operator/restore.php index 2faeb5f1..b7e3ae3c 100644 --- a/src/mibew/operator/restore.php +++ b/src/mibew/operator/restore.php @@ -19,6 +19,7 @@ require_once(dirname(dirname(__FILE__)).'/libs/init.php'); require_once(dirname(dirname(__FILE__)).'/libs/operator.php'); require_once(dirname(dirname(__FILE__)).'/libs/settings.php'); require_once(dirname(dirname(__FILE__)).'/libs/notify.php'); +require_once(dirname(dirname(__FILE__)).'/libs/view.php'); $errors = array(); $page = array('version' => $version); @@ -55,7 +56,7 @@ if (isset($_POST['loginoremail'])) { mibew_mail($email, $email, getstring("restore.mailsubj"), getstring2("restore.mailtext", array(get_operator_name($torestore), $href))); $page['isdone'] = true; - require(dirname(dirname(__FILE__)).'/view/restore.php'); + render_view('restore'); exit; } } @@ -64,6 +65,7 @@ $page['formloginoremail'] = topage($loginoremail); $page['localeLinks'] = get_locale_links("$mibewroot/operator/restore.php"); $page['isdone'] = false; -start_html_output(); -require(dirname(dirname(__FILE__)).'/view/restore.php'); + +render_view('restore'); + ?> \ No newline at end of file diff --git a/src/mibew/operator/settings.php b/src/mibew/operator/settings.php index 754e34e4..49ff6a47 100644 --- a/src/mibew/operator/settings.php +++ b/src/mibew/operator/settings.php @@ -20,6 +20,7 @@ require_once(dirname(dirname(__FILE__)).'/libs/operator.php'); require_once(dirname(dirname(__FILE__)).'/libs/settings.php'); require_once(dirname(dirname(__FILE__)).'/libs/styles.php'); require_once(dirname(dirname(__FILE__)).'/libs/cron.php'); +require_once(dirname(dirname(__FILE__)).'/libs/view.php'); $operator = check_login(); force_password($operator); @@ -119,7 +120,6 @@ if (Settings::get('enabletracking')) { prepare_menu($operator); setup_settings_tabs(0); -start_html_output(); -require(dirname(dirname(__FILE__)).'/view/settings.php'); +render_view('settings'); ?> \ No newline at end of file diff --git a/src/mibew/operator/statistics.php b/src/mibew/operator/statistics.php index 4709e78a..577f99e1 100644 --- a/src/mibew/operator/statistics.php +++ b/src/mibew/operator/statistics.php @@ -20,6 +20,7 @@ require_once(dirname(dirname(__FILE__)).'/libs/chat.php'); require_once(dirname(dirname(__FILE__)).'/libs/operator.php'); require_once(dirname(dirname(__FILE__)).'/libs/statistics.php'); require_once(dirname(dirname(__FILE__)).'/libs/cron.php'); +require_once(dirname(dirname(__FILE__)).'/libs/view.php'); $operator = check_login(); force_password($operator); @@ -173,6 +174,6 @@ $page['showresults'] = count($errors) == 0; prepare_menu($operator); setup_statistics_tabs($activetab); -start_html_output(); -require(dirname(dirname(__FILE__)).'/view/statistics.php'); +render_view('statistics'); + ?> \ No newline at end of file diff --git a/src/mibew/operator/themes.php b/src/mibew/operator/themes.php index 85c2cbba..fc9fe76c 100644 --- a/src/mibew/operator/themes.php +++ b/src/mibew/operator/themes.php @@ -23,6 +23,7 @@ require_once(dirname(dirname(__FILE__)).'/libs/groups.php'); require_once(dirname(dirname(__FILE__)).'/libs/expand.php'); require_once(dirname(dirname(__FILE__)).'/libs/settings.php'); require_once(dirname(dirname(__FILE__)).'/libs/styles.php'); +require_once(dirname(dirname(__FILE__)).'/libs/view.php'); $operator = check_login(); @@ -51,7 +52,7 @@ $page['availablePreviews'] = $stylelist; $page['screenshotsList'] = $screenshots; prepare_menu($operator); -start_html_output(); setup_settings_tabs(3); -require(dirname(dirname(__FILE__)).'/view/themes.php'); +render_view('themes'); + ?> \ No newline at end of file diff --git a/src/mibew/operator/threadprocessor.php b/src/mibew/operator/threadprocessor.php index 4e387ee3..d31df484 100644 --- a/src/mibew/operator/threadprocessor.php +++ b/src/mibew/operator/threadprocessor.php @@ -19,6 +19,7 @@ require_once(dirname(dirname(__FILE__)).'/libs/init.php'); require_once(dirname(dirname(__FILE__)).'/libs/operator.php'); require_once(dirname(dirname(__FILE__)).'/libs/chat.php'); require_once(dirname(dirname(__FILE__)).'/libs/userinfo.php'); +require_once(dirname(dirname(__FILE__)).'/libs/view.php'); $operator = check_login(); @@ -57,6 +58,6 @@ if (isset($_GET['threadid'])) { } prepare_menu($operator, false); -start_html_output(); -require(dirname(dirname(__FILE__)).'/view/thread_log.php'); +render_view('thread_log'); + ?> \ No newline at end of file diff --git a/src/mibew/operator/tracked.php b/src/mibew/operator/tracked.php index 64ddf0fc..841182c7 100644 --- a/src/mibew/operator/tracked.php +++ b/src/mibew/operator/tracked.php @@ -19,6 +19,7 @@ require_once(dirname(dirname(__FILE__)).'/libs/init.php'); require_once(dirname(dirname(__FILE__)).'/libs/chat.php'); require_once(dirname(dirname(__FILE__)).'/libs/operator.php'); require_once(dirname(dirname(__FILE__)).'/libs/track.php'); +require_once(dirname(dirname(__FILE__)).'/libs/view.php'); $operator = check_login(); @@ -56,6 +57,7 @@ foreach ($path as $k => $v) { $page['history'][] = array( 'date' => date_to_text($k), 'link' => htmlspecialchars($v) ); } -start_html_output(); -require(dirname(dirname(__FILE__)).'/view/tracked.php'); + +render_view('tracked'); + ?> \ No newline at end of file diff --git a/src/mibew/operator/translate.php b/src/mibew/operator/translate.php index 70a991fb..c91751e9 100644 --- a/src/mibew/operator/translate.php +++ b/src/mibew/operator/translate.php @@ -18,6 +18,7 @@ require_once(dirname(dirname(__FILE__)).'/libs/init.php'); require_once(dirname(dirname(__FILE__)).'/libs/operator.php'); require_once(dirname(dirname(__FILE__)).'/libs/pagination.php'); +require_once(dirname(dirname(__FILE__)).'/libs/view.php'); function compare_localization_by_l1($a, $b) { @@ -156,8 +157,7 @@ if ($stringid) { $page['saved'] = true; prepare_menu($operator, false); - start_html_output(); - require(dirname(dirname(__FILE__)).'/view/translate.php'); + render_view('translate'); exit; } } @@ -168,8 +168,7 @@ if ($stringid) { $page['formoriginal'] = isset($lang1[$stringid]) ? $lang1[$stringid] : ""; $page['formtranslation'] = $translation; prepare_menu($operator, false); - start_html_output(); - require(dirname(dirname(__FILE__)).'/view/translate.php'); + render_view('translate'); exit; } @@ -228,7 +227,8 @@ $page['showOptions'] = array( array("id" => "s3", "name" => getlocal("translate.show.foradmin")), ); $page['formshow'] = $show; + prepare_menu($operator); -start_html_output(); -require(dirname(dirname(__FILE__)).'/view/translatelist.php'); +render_view('translatelist'); + ?> \ No newline at end of file diff --git a/src/mibew/operator/updates.php b/src/mibew/operator/updates.php index 4277dc95..d33009af 100644 --- a/src/mibew/operator/updates.php +++ b/src/mibew/operator/updates.php @@ -18,6 +18,7 @@ require_once(dirname(dirname(__FILE__)).'/libs/init.php'); require_once(dirname(dirname(__FILE__)).'/libs/operator.php'); require_once(dirname(dirname(__FILE__)).'/libs/settings.php'); +require_once(dirname(dirname(__FILE__)).'/libs/view.php'); $operator = check_login(); force_password($operator); @@ -42,6 +43,6 @@ foreach ($default_extensions as $ext) { prepare_menu($operator); setup_settings_tabs(3); -start_html_output(); -require(dirname(dirname(__FILE__)).'/view/updates.php'); +render_view('updates'); + ?> \ No newline at end of file diff --git a/src/mibew/operator/userhistory.php b/src/mibew/operator/userhistory.php index 48b42e1b..409d7c49 100644 --- a/src/mibew/operator/userhistory.php +++ b/src/mibew/operator/userhistory.php @@ -20,6 +20,7 @@ require_once(dirname(dirname(__FILE__)).'/libs/operator.php'); require_once(dirname(dirname(__FILE__)).'/libs/chat.php'); require_once(dirname(dirname(__FILE__)).'/libs/userinfo.php'); require_once(dirname(dirname(__FILE__)).'/libs/pagination.php'); +require_once(dirname(dirname(__FILE__)).'/libs/view.php'); $operator = check_login(); @@ -62,6 +63,7 @@ setup_pagination($found, 6); foreach ($page['pagination.items'] as $key => $item) { $page['pagination.items'][$key] = Thread::createFromDbInfo($item); } -start_html_output(); -require(dirname(dirname(__FILE__)).'/view/userhistory.php'); + +render_view('userhistory'); + ?> \ No newline at end of file diff --git a/src/mibew/operator/users.php b/src/mibew/operator/users.php index 9048adf4..cd6f40df 100644 --- a/src/mibew/operator/users.php +++ b/src/mibew/operator/users.php @@ -18,6 +18,7 @@ require_once(dirname(dirname(__FILE__)).'/libs/init.php'); require_once(dirname(dirname(__FILE__)).'/libs/operator.php'); require_once(dirname(dirname(__FILE__)).'/libs/groups.php'); +require_once(dirname(dirname(__FILE__)).'/libs/view.php'); $operator = check_login(); force_password($operator); @@ -56,6 +57,6 @@ $page['coreStyles.banWindowParams'] = $style_config['ban']['window_params']; $page = array_merge($page, get_plugins_data('users')); prepare_menu($operator); -start_html_output(); -require(dirname(dirname(__FILE__)).'/view/pending_users.php'); +render_view('pending_users'); + ?> \ No newline at end of file