mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 06:07:32 +02:00
Code Issues Releases Wiki Activity

More require_once clean-up (#125)

Browse Source
This commit is contained in:
Moc
2013-03-10 15:36:45 +01:00
parent 38c03a48b1
commit 823e813a5e
4 changed files with 10 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e107_plugins/banner/banner.php
View File

@@ -30,8 +30,8 @@ if (!e107::isInstalled('banner'))
e107::includeLan(e_PLUGIN."banner/languages/".e_LANGUAGE."_banner.php");
require_once(e_HANDLER."form_handler.php");
$rs = new form;
require_once(e_HANDLER."form_handler.php"); // FIXME
$rs = new form; // FIXME
if (e_QUERY) {
$query_string = intval(e_QUERY);

24
e107_plugins/import/admin_import.php
View File

@@ -2,16 +2,10 @@
/*
* e107 website system
*
* Copyright (C) 2008-2009 e107 Inc (e107.org)
* Copyright (C) 2008-2013 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
*
*
* $Source: /cvs_backup/e107_0.8/e107_plugins/import/admin_import.php,v $
* $Revision$
* $Date$
* $Author$
*/
@@ -20,7 +14,6 @@
*
* @package e107_plugins
* @subpackage import
* @version $Id$;
Routine manages import from other databases
@@ -44,15 +37,8 @@ require_once("../../class2.php");
// define("USE_PERSISTANT_DB",TRUE);
require_once (e_HANDLER.'form_handler.php');
$frm = new e_form();
require_once(e_HANDLER.'message_handler.php');
$emessage = &eMessage::getInstance(); //nothing wrong with doing it twice
$frm = e107::getForm();
$mes = e107::getMessage();
include_lan(e_PLUGIN.'import/languages/'.e_LANGUAGE.'_admin_import.php');
@@ -1073,7 +1059,7 @@ if(isset($_POST['do_conversion']))
}
}
/*
/*
function rssImport()
{
@@ -1225,7 +1211,7 @@ function dbImport($mode='db')
return true;
// $abandon = FALSE;
}
*/
*/
//======================================================
// Display front page

10
e107_plugins/login_menu/config.php
View File

@@ -2,16 +2,12 @@
/*
* e107 website system
*
* Copyright (C) 2008-2009 e107 Inc (e107.org)
* Copyright (C) 2008-2013 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
* Plugin Administration - Login menu
*
* $Source: /cvs_backup/e107_0.8/e107_plugins/login_menu/config.php,v $
* $Revision$
* $Date$
* $Author$
*
*/
@@ -23,7 +19,6 @@
*
* @package e107_plugins
* @subpackage login
* @version $Id$;
*
* @todo - sanitise options
*/
@@ -45,8 +40,8 @@ $loginClass = new login_menu_class();
$menuPref = e107::getConfig('menu'); // Pref object
$loginPrefs = $menuPref->getPref('login_menu'); // Array of login-related values
require_once(e_HANDLER.'message_handler.php');
$mes = e107::getMessage();
$frm = e107::getForm();
if (isset($_POST['update_menu']))
{
@@ -115,7 +110,6 @@ if (!isset($loginPrefs['new_news']))
$loginPrefs['new_members'] = '0';
}
$frm = e107::getForm();
$text = "
<form method='post' action='".e_SELF."'>

12
e107_plugins/newsletter/admin_config.php
View File

@@ -8,8 +8,6 @@
*
* Plugin - Newsletter
*
* $URL$
* $Id$
*/
/**
@@ -17,7 +15,6 @@
*
* @package e107_plugins
* @subpackage newsletter
* @version $Id$;
*/
@@ -32,7 +29,6 @@ require_once(e_ADMIN.'auth.php');
// Include ren_help for display_help (while showing BBcodes)
require_once(e_HANDLER.'ren_help.php');
require_once(e_HANDLER.'message_handler.php');
$mes = e107::getMessage();
if (e_QUERY)
@@ -136,7 +132,6 @@ class newsletter
if(!$sql->db_Select('newsletter', '*', "newsletter_parent='0' ORDER BY newsletter_id DESC"))
{
//$text = NLLAN_05;
$mes->addInfo(NLLAN_05);
}
else
@@ -176,11 +171,10 @@ class newsletter
}
$ns->tablerender(NLLAN_10, $mes->render() . $text);
unset($text); // FIXME fix to prevent 'existing newsletters' table from showing twice
unset($text); // FIXME fix to prevent 'existing newsletters' table from showing twice, is this ok?
if(!$sql->db_Select('newsletter', '*', "newsletter_parent!='0' ORDER BY newsletter_id DESC"))
{
//$text = NLLAN_11;
$mes->addinfo(NLLAN_11);
}
else
@@ -299,14 +293,12 @@ class newsletter
if(isset($_POST['editid']))
{
$sql -> db_Update('newsletter', "newsletter_title='{$letter['newsletter_title']}', newsletter_text='{$letter['newsletter_text']}', newsletter_header='{$letter['newsletter_header']}', newsletter_footer='{$letter['newsletter_footer']}' WHERE newsletter_id=".intval($_POST['editid']));
//$this -> message = NLLAN_27;
$mes->addSuccess(LAN_UPDATED);
}
else
{
$letter['newsletter_datestamp'] = time();
$sql->db_Insert('newsletter', $letter);
//$this -> message = NLLAN_28;
$mes->addSuccess(LAN_CREATED);
}
}
@@ -396,14 +388,12 @@ class newsletter
if (isset($_POST['editid']))
{
$sql->db_Update('newsletter', "newsletter_title='{$letter['newsletter_title']}', newsletter_text='{$letter['newsletter_text']}', newsletter_parent='".$letter['newsletter_parent']."', newsletter_issue='".$letter['newsletter_issue']."' WHERE newsletter_id=".intval($_POST['editid']));
//$this -> message = NLLAN_38;
$mes->addSuccess(LAN_UPDATED);
}
else
{
$letter['newsletter_datestamp'] = time();
$sql->db_Insert('newsletter', $letter);
//$this -> message = NLLAN_39;
$mes->addSuccess(NLLAN_39);
}