1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 12:20:44 +02:00

Bugtracker #5148 - can't display poll menu and main page together - thanks Dolphin 713

This commit is contained in:
e107steved
2011-01-14 18:29:06 +00:00
parent 0c794e2fb4
commit c8273d06c4
6 changed files with 60 additions and 39 deletions

View File

@@ -1,20 +1,26 @@
<?php <?php
/* /*
* e107 website system * e107 website system
* *
* Copyright (C) 2008-2009 e107 Inc (e107.org) * Copyright (C) 2008-2011 e107 Inc (e107.org)
* Released under the terms and conditions of the * Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
* *
* * Content management main file
* *
* $Source: /cvs_backup/e107_0.8/e107_plugins/content/content.php,v $ * $URL$
* $Revision$ * $Id$
* $Date$ *
* $Author$ */
*/
require_once('../../class2.php');
$e107 = e107::getInstance();
if (!$e107->isInstalled('content'))
{
header('Location: '.e_BASE.'index.php');
exit;
}
require_once("../../class2.php");
$plugindir = e_PLUGIN."content/"; $plugindir = e_PLUGIN."content/";
require_once($plugindir."content_shortcodes.php"); require_once($plugindir."content_shortcodes.php");
require_once(e_HANDLER."emailprint_class.php"); require_once(e_HANDLER."emailprint_class.php");

View File

@@ -2,7 +2,7 @@
/* /*
* e107 website system * e107 website system
* *
* Copyright (C) 2008-2010 e107 Inc (e107.org) * Copyright (C) 2008-2011 e107 Inc (e107.org)
* Released under the terms and conditions of the * Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
* *
@@ -16,6 +16,12 @@ if(!defined('e107_INIT'))
{ {
require_once('../../class2.php'); require_once('../../class2.php');
} }
$e107 = e107::getInstance();
if (!$e107->isInstalled('forum'))
{
header('Location: '.e_BASE.'index.php');
exit;
}
include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_forum.php'); include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_forum.php');

View File

@@ -2,7 +2,7 @@
/* /*
* e107 website system * e107 website system
* *
* Copyright (C) 2008-2009 e107 Inc (e107.org) * Copyright (C) 2008-2011 e107 Inc (e107.org)
* Released under the terms and conditions of the * Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
* *
@@ -14,6 +14,12 @@
*/ */
require_once('../../class2.php'); require_once('../../class2.php');
$e107 = e107::getInstance();
if (!$e107->isInstalled('forum'))
{
header('Location: '.e_BASE.'index.php');
exit;
}
include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_forum_viewforum.php'); include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_forum_viewforum.php');
if (isset($_POST['fjsubmit'])) if (isset($_POST['fjsubmit']))

View File

@@ -2,7 +2,7 @@
/* /*
* e107 website system * e107 website system
* *
* Copyright (C) 2008-2009 e107 Inc (e107.org) * Copyright (C) 2008-2011 e107 Inc (e107.org)
* Released under the terms and conditions of the * Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
* *
@@ -14,6 +14,12 @@
*/ */
require_once ('../../class2.php'); require_once ('../../class2.php');
$e107 = e107::getInstance();
if (!$e107->isInstalled('forum'))
{
header('Location: '.e_BASE.'index.php');
exit;
}
if (isset($_POST['fjsubmit'])) if (isset($_POST['fjsubmit']))
{ {

View File

@@ -2,28 +2,26 @@
/* /*
* e107 website system * e107 website system
* *
* Copyright (C) 2008-2009 e107 Inc (e107.org) * Copyright (C) 2008-2011 e107 Inc (e107.org)
* Released under the terms and conditions of the * Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
* *
* Poll plugin main page display
* *
* * $URL$
* $Source: /cvs_backup/e107_0.8/e107_plugins/poll/poll.php,v $ * $Id$
* $Revision$
* $Date$
* $Author$
*/ */
require_once("../../class2.php"); require_once('../../class2.php');
if (!plugInstalled('poll')) if (!plugInstalled('poll'))
{ {
header("Location: ".e_BASE."index.php"); header('Location: '.e_BASE.'index.php');
exit; exit;
} }
require_once(HEADERF); require_once(HEADERF);
require_once(e_PLUGIN."poll/poll_menu.php"); require(e_PLUGIN.'poll/poll_menu.php');
require_once(FOOTERF); require_once(FOOTERF);

View File

@@ -1,18 +1,17 @@
<?php <?php
/* /*
* e107 website system * e107 website system
* *
* Copyright (C) 2008-2009 e107 Inc (e107.org) * Copyright (C) 2008-2011 e107 Inc (e107.org)
* Released under the terms and conditions of the * Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
* *
* * RSS Feed management
* *
* $Source: /cvs_backup/e107_0.8/e107_plugins/rss_menu/rss.php,v $ * $URL$
* $Revision$ * $Id$
* $Date$ *
* $Author$ */
*/
/* /*
Query string: content_type.rss_type.[topic id] Query string: content_type.rss_type.[topic id]