From 0d407ce1ca10a4dbdfa7cafb667ea38ac7dbd1e2 Mon Sep 17 00:00:00 2001 From: x2000habouzit Date: Mon, 22 Nov 2004 20:05:22 +0000 Subject: [PATCH] move to require_once everywhere --- article.php | 28 ++++++++++++++-------------- disconnect.php | 12 ++++++------ index.php | 22 +++++++++++----------- install.d/error.inc.php | 10 +++++----- install.d/session.inc.php | 10 +++++----- post.php | 28 ++++++++++++++-------------- scripts/spoolgen.php | 14 +++++++------- subscribe.php | 24 ++++++++++++------------ thread.php | 28 ++++++++++++++-------------- 9 files changed, 88 insertions(+), 88 deletions(-) diff --git a/article.php b/article.php index e638459..de4f084 100644 --- a/article.php +++ b/article.php @@ -7,22 +7,22 @@ * Copyright: See COPYING files that comes with this distribution ********************************************************************************/ -require("include/session.inc.php"); -require("include/encoding.inc.php"); -require("include/wrapper.inc.php"); -require("include/format.inc.php"); -require("include/config.inc.php"); -require("include/NetNNTP.inc.php"); -require("include/spool.inc.php"); -require("include/post.inc.php"); -require("include/profile.inc.php"); -require("include/password.inc.php"); -require("include/error.inc.php"); +require_once("include/session.inc.php"); +require_once("include/encoding.inc.php"); +require_once("include/wrapper.inc.php"); +require_once("include/format.inc.php"); +require_once("include/config.inc.php"); +require_once("include/NetNNTP.inc.php"); +require_once("include/spool.inc.php"); +require_once("include/post.inc.php"); +require_once("include/profile.inc.php"); +require_once("include/password.inc.php"); +require_once("include/error.inc.php"); $profile=getprofile(); -require($profile['locale']); +require_once($profile['locale']); -require("include/header.inc.php"); +require_once("include/header.inc.php"); if (isset($_REQUEST['group'])) { $group=htmlentities(strtolower($_REQUEST['group'])); @@ -120,5 +120,5 @@ $spool->disp($ndx-$news['threadtop'],$ndx+$news['threadbottom'],$ndx); diff --git a/disconnect.php b/disconnect.php index 2b9d535..4b30556 100644 --- a/disconnect.php +++ b/disconnect.php @@ -7,17 +7,17 @@ * Copyright: See COPYING files that comes with this distribution ********************************************************************************/ -require("include/session.inc.php"); -require("include/profile.inc.php"); -require("include/error.inc.php"); +require_once("include/session.inc.php"); +require_once("include/profile.inc.php"); +require_once("include/error.inc.php"); $profile=getprofile(); -require($profile['locale']); +require_once($profile['locale']); $_SESSION=array(); session_destroy(); -require("include/header.inc.php"); +require_once("include/header.inc.php"); ?>
@@ -26,5 +26,5 @@ require("include/header.inc.php");

diff --git a/index.php b/index.php index a7c520b..4c8d8a3 100644 --- a/index.php +++ b/index.php @@ -7,19 +7,19 @@ * Copyright: See COPYING files that comes with this distribution ********************************************************************************/ -require("include/session.inc.php"); -require("include/password.inc.php"); -require("include/NetNNTP.inc.php"); -require("include/groups.inc.php"); -require("include/format.inc.php"); -require("include/config.inc.php"); -require("include/profile.inc.php"); -require("include/error.inc.php"); +require_once("include/session.inc.php"); +require_once("include/password.inc.php"); +require_once("include/NetNNTP.inc.php"); +require_once("include/groups.inc.php"); +require_once("include/format.inc.php"); +require_once("include/config.inc.php"); +require_once("include/profile.inc.php"); +require_once("include/error.inc.php"); $profile=getprofile(); -require($profile['locale']); +require_once($profile['locale']); -require("include/header.inc.php"); +require_once("include/header.inc.php"); $nntp = new nntp($news['server']); if (!$nntp) error("nntpsock"); @@ -130,5 +130,5 @@ if (count($newgroups->overview) and count($profile['subscribe'])) { displayshortcuts(); $nntp->quit(); -require("include/footer.inc.php"); +require_once("include/footer.inc.php"); ?> diff --git a/install.d/error.inc.php b/install.d/error.inc.php index 6ada1b1..1507cc3 100644 --- a/install.d/error.inc.php +++ b/install.d/error.inc.php @@ -16,20 +16,20 @@ function error($_type) { switch ($_type) { case "nntpsock": echo "

\n\t".$locale['error']['connect']."\n

"; - require("include/footer.inc.php"); + require_once("include/footer.inc.php"); exit; break; case "nntpauth": echo "

\n\t".$locale['error']['credentials'] ."\n

"; - require("include/footer.inc.php"); + require_once("include/footer.inc.php"); exit; break; case "nntpgroups": echo "

"; echo "\n".$locale['error']['nogroup']."\n"; echo "

\n"; - require("include/footer.inc.php"); + require_once("include/footer.inc.php"); exit; break; case "nntpspool": @@ -37,7 +37,7 @@ function error($_type) { echo "[Liste des forums]\n"; echo "
\n"; echo "

\n\t".$locale['error']['group']."\n

"; - require("footer.inc.php"); + require_once("footer.inc.php"); exit; break; case "nntpart": @@ -46,7 +46,7 @@ function error($_type) { echo "[$group] \n"; echo "\n"; echo "

\n\t".$locale['error']['post']."\n

"; - require("footer.inc.php"); + require_once("footer.inc.php"); exit; break; } diff --git a/install.d/session.inc.php b/install.d/session.inc.php index d099e20..46f4dae 100644 --- a/install.d/session.inc.php +++ b/install.d/session.inc.php @@ -23,12 +23,12 @@ if (!isset($_SESSION['profile']) && isset($_POST['action']) && $_POST['action']= //sets sessions variables if (!isset($_SESSION['profile'])) { - require("include/profile.inc.php"); + require_once("include/profile.inc.php"); $profile=getprofile(); - require($profile['locale']); - require("header.inc.php"); - require("profile_form.inc.php"); - require("footer.inc.php"); + require_once($profile['locale']); + require_once("header.inc.php"); + require_once("profile_form.inc.php"); + require_once("footer.inc.php"); exit; } diff --git a/post.php b/post.php index 2f02382..f0e4397 100644 --- a/post.php +++ b/post.php @@ -7,22 +7,22 @@ * Copyright: See COPYING files that comes with this distribution ********************************************************************************/ -require("include/session.inc.php"); -require("include/encoding.inc.php"); -require("include/format.inc.php"); -require("include/config.inc.php"); -require("include/NetNNTP.inc.php"); -require("include/post.inc.php"); -require("include/spool.inc.php"); -require("include/password.inc.php"); -require("include/profile.inc.php"); -require("include/wrapper.inc.php"); -require("include/error.inc.php"); +require_once("include/session.inc.php"); +require_once("include/encoding.inc.php"); +require_once("include/format.inc.php"); +require_once("include/config.inc.php"); +require_once("include/NetNNTP.inc.php"); +require_once("include/post.inc.php"); +require_once("include/spool.inc.php"); +require_once("include/password.inc.php"); +require_once("include/profile.inc.php"); +require_once("include/wrapper.inc.php"); +require_once("include/error.inc.php"); $profile = getprofile(); -require($profile['locale']); +require_once($profile['locale']); -require("include/header.inc.php"); +require_once("include/header.inc.php"); if (isset($_REQUEST['group'])) { $group=htmlentities(strtolower($_REQUEST['group'])); } @@ -161,5 +161,5 @@ if (isset($group) && isset($id) && isset($_REQUEST['type']) diff --git a/scripts/spoolgen.php b/scripts/spoolgen.php index 1b22d44..03a8e2a 100644 --- a/scripts/spoolgen.php +++ b/scripts/spoolgen.php @@ -10,13 +10,13 @@ ini_set('max_execution_time','300'); ini_set('include_path','.:..:../custom/banana:../../custom/banana:../public/include:../../public/include'); -require("include/encoding.inc.php"); -require("include/config.inc.php"); -require("include/NetNNTP.inc.php"); -include("include/post.inc.php"); -include("include/groups.inc.php"); -require("include/spool.inc.php"); -require("include/password.inc.php"); +require_once("include/encoding.inc.php"); +require_once("include/config.inc.php"); +require_once("include/NetNNTP.inc.php"); +require_once("include/post.inc.php"); +require_once("include/groups.inc.php"); +require_once("include/spool.inc.php"); +require_once("include/password.inc.php"); $nntp = new nntp($news['server']); diff --git a/subscribe.php b/subscribe.php index d09b26f..a7bf18e 100644 --- a/subscribe.php +++ b/subscribe.php @@ -7,20 +7,20 @@ * Copyright: See COPYING files that comes with this distribution ********************************************************************************/ -require("include/session.inc.php"); -require("include/password.inc.php"); -require("include/NetNNTP.inc.php"); -require("include/groups.inc.php"); -require("include/format.inc.php"); -require("include/config.inc.php"); -require("include/profile.inc.php"); -require("include/subscribe.inc.php"); -require("include/error.inc.php"); +require_once("include/session.inc.php"); +require_once("include/password.inc.php"); +require_once("include/NetNNTP.inc.php"); +require_once("include/groups.inc.php"); +require_once("include/format.inc.php"); +require_once("include/config.inc.php"); +require_once("include/profile.inc.php"); +require_once("include/subscribe.inc.php"); +require_once("include/error.inc.php"); $profile=getprofile(); -require($profile['locale']); +require_once($profile['locale']); -require("include/header.inc.php"); +require_once("include/header.inc.php"); $nntp = new nntp($news['server']); if (!$nntp) error("nntpsock"); @@ -103,5 +103,5 @@ foreach ($groups->overview as $g => $d) { displayshortcuts(); $nntp->quit(); -require("include/footer.inc.php"); +require_once("include/footer.inc.php"); ?> diff --git a/thread.php b/thread.php index 982c5f3..680bcbf 100644 --- a/thread.php +++ b/thread.php @@ -7,22 +7,22 @@ * Copyright: See COPYING files that comes with this distribution ********************************************************************************/ -require("include/session.inc.php"); -require("include/encoding.inc.php"); -require("include/format.inc.php"); -require("include/config.inc.php"); -require("include/NetNNTP.inc.php"); -include("include/post.inc.php"); -require("include/spool.inc.php"); -require("include/password.inc.php"); -require("include/profile.inc.php"); -include("include/wrapper.inc.php"); -include("include/error.inc.php"); +require_once("include/session.inc.php"); +require_once("include/encoding.inc.php"); +require_once("include/format.inc.php"); +require_once("include/config.inc.php"); +require_once("include/NetNNTP.inc.php"); +require_once("include/post.inc.php"); +require_once("include/spool.inc.php"); +require_once("include/password.inc.php"); +require_once("include/profile.inc.php"); +require_once("include/wrapper.inc.php"); +require_once("include/error.inc.php"); $profile=getprofile(); -require($profile['locale']); +require_once($profile['locale']); -require("include/header.inc.php"); +require_once("include/header.inc.php"); if (isset($_REQUEST['group'])) { $group=htmlentities(strtolower($_REQUEST['group'])); @@ -169,5 +169,5 @@ echo ""; displayshortcuts(); -require("include/footer.inc.php"); +require_once("include/footer.inc.php"); ?> -- 2.1.4