From 31e658a2aedf56cc91081d44aec3694342e84454 Mon Sep 17 00:00:00 2001 From: Cameron Date: Tue, 26 Feb 2013 21:43:31 -0800 Subject: [PATCH] Issue #125 The require_once() cleanup. --- e107_admin/admin_log.php | 4 +--- e107_admin/administrator.php | 4 ---- e107_admin/emoticon.php | 2 +- e107_admin/filemanager.php | 6 ++---- e107_admin/fla.php | 3 --- e107_admin/frontpage.php | 7 ++----- e107_admin/language.php | 4 ++-- e107_admin/meta.php | 2 +- e107_admin/notify.php | 2 +- e107_admin/search.php | 3 +-- 10 files changed, 11 insertions(+), 26 deletions(-) diff --git a/e107_admin/admin_log.php b/e107_admin/admin_log.php index 2537cd13b..6afba108a 100644 --- a/e107_admin/admin_log.php +++ b/e107_admin/admin_log.php @@ -67,9 +67,7 @@ if(is_array($pref['lan_log_list'])) //... and for any plugins which support it unset($qs); require_once (e_ADMIN.'auth.php'); -require_once (e_HANDLER.'message_handler.php'); -require_once (e_HANDLER.'form_handler.php'); -//$frm = new e_form(false); + $mes = e107::getMessage(); $frm = e107::getForm(); diff --git a/e107_admin/administrator.php b/e107_admin/administrator.php index d51ad2f05..7a6052f67 100644 --- a/e107_admin/administrator.php +++ b/e107_admin/administrator.php @@ -33,10 +33,6 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE); $e_sub_cat = 'admin'; require_once('auth.php'); - -require_once(e_HANDLER."form_handler.php"); -require_once(e_HANDLER."message_handler.php"); -//$frm = new e_form(true); $frm = e107::getForm(); $mes = e107::getMessage(); $prm = e107::getUserPerms(); diff --git a/e107_admin/emoticon.php b/e107_admin/emoticon.php index 3f0e640a4..833adfd39 100644 --- a/e107_admin/emoticon.php +++ b/e107_admin/emoticon.php @@ -25,7 +25,7 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE); $e_sub_cat = 'emoticon'; require_once("auth.php"); -require_once(e_HANDLER."message_handler.php"); + $mes = e107::getMessage(); if(!$sql->db_Count("core", "(*)", "WHERE e107_name = 'emote_default' AND e107_value !='' ")) diff --git a/e107_admin/filemanager.php b/e107_admin/filemanager.php index 3d8e050e5..c11c3e87d 100644 --- a/e107_admin/filemanager.php +++ b/e107_admin/filemanager.php @@ -26,11 +26,9 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE); $e_sub_cat = 'filemanage'; require_once("auth.php"); require_once(e_HANDLER.'upload_handler.php'); -require_once(e_HANDLER."form_handler.php"); -$frm = e107::getForm(); -require_once (e_HANDLER."message_handler.php"); -$mes = e107::getMessage(); //FIXME +$frm = e107::getForm(); +$mes = e107::getMessage(); $pubfolder = (str_replace("../","",e_QUERY) == str_replace("../","",e_UPLOAD)) ? TRUE : FALSE; diff --git a/e107_admin/fla.php b/e107_admin/fla.php index 95dcf76cf..0494d2379 100644 --- a/e107_admin/fla.php +++ b/e107_admin/fla.php @@ -25,10 +25,7 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE); $e_sub_cat = 'failed_login'; require_once('auth.php'); -require_once(e_HANDLER.'form_handler.php'); $frm = e107::getForm(); - -require_once(e_HANDLER.'message_handler.php'); $mes = e107::getMessage(); $tmp = (e_QUERY) ? explode('.', e_QUERY) : ''; diff --git a/e107_admin/frontpage.php b/e107_admin/frontpage.php index eeef44449..32336d514 100644 --- a/e107_admin/frontpage.php +++ b/e107_admin/frontpage.php @@ -32,11 +32,8 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE); $e_sub_cat = 'frontpage'; require_once ('auth.php'); -require_once (e_HANDLER.'form_handler.php'); -require_once (e_HANDLER.'message_handler.php'); -$mes = e107::getMessage(); -require_once (e_HANDLER.'userclass_class.php'); +$mes = e107::getMessage(); $frontPref = e107::pref('core'); // Get prefs @@ -344,7 +341,7 @@ class frontpage public function __construct($fp) { - $this->frm = new e_form(); + $this->frm = e107::getForm(); $this->frontPage = $fp; } diff --git a/e107_admin/language.php b/e107_admin/language.php index 1d14b5b60..312a3fce6 100644 --- a/e107_admin/language.php +++ b/e107_admin/language.php @@ -22,8 +22,8 @@ e107::coreLan('language', true); $e_sub_cat = 'language'; require_once ("auth.php"); -require_once (e_HANDLER."form_handler.php"); -require_once (e_HANDLER."message_handler.php"); + + $frm = e107::getForm(); $mes = e107::getMessage(); $tabs = table_list(); // array("news","content","links"); diff --git a/e107_admin/meta.php b/e107_admin/meta.php index f48322887..56f39b7c3 100644 --- a/e107_admin/meta.php +++ b/e107_admin/meta.php @@ -22,7 +22,7 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE); $e_sub_cat = 'meta'; require_once("auth.php"); -require_once(e_HANDLER."message_handler.php"); + $mes = e107::getMessage(); $frm = e107::getForm(); $ns = e107::getRender(); diff --git a/e107_admin/notify.php b/e107_admin/notify.php index 0d8e1b74c..83eaa7e81 100644 --- a/e107_admin/notify.php +++ b/e107_admin/notify.php @@ -37,7 +37,7 @@ require_once('auth.php'); require_once(e_HANDLER.'userclass_class.php'); require_once(e_HANDLER.'form_handler.php'); -require_once(e_HANDLER.'message_handler.php'); + //$emessage = &eMessage::getInstance(); diff --git a/e107_admin/search.php b/e107_admin/search.php index 73076516a..e33771b5c 100644 --- a/e107_admin/search.php +++ b/e107_admin/search.php @@ -25,8 +25,7 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE); $e_sub_cat = 'search'; require_once('auth.php'); require_once(e_HANDLER.'userclass_class.php'); -require_once(e_HANDLER."message_handler.php"); -require_once (e_HANDLER.'form_handler.php'); + $frm = e107::getForm(); $mes = e107::getMessage(); $e_userclass = new user_class();