Commit 5364195a authored by sylvieg's avatar sylvieg

[FIX] move section setting before setup

parent 1e5ec692
......@@ -5,6 +5,7 @@
// Copyright (c) 2002-2007, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
$section = 'user_messages';
require_once ('tiki-setup.php');
include_once ('lib/messu/messulib.php');
......@@ -161,7 +162,6 @@ if ($prefs['messu_sent_size']>0) {
$smarty->assign('cellsize', $cellsize);
$smarty->assign('percentage', $percentage);
$section = 'user_messages';
include_once ('tiki-section_options.php');
include_once ('tiki-mytiki_shared.php');
......
......@@ -7,6 +7,7 @@
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// Initialization
$section = 'calendar';
require_once ('tiki-setup.php');
include_once ('lib/calendar/calendarlib.php');
......@@ -195,7 +196,6 @@ $smarty->assign_by_ref('calendars', $calendars["data"]);
// $cat_type = 'calendar';
// $cat_objid = $_REQUEST["calendarId"];
// include_once ("categorize_list.php");
$section = 'calendar';
include_once ('tiki-section_options.php');
ask_ticket('admin-calendars');
......
......@@ -7,6 +7,7 @@
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// Initialization
$section = 'newsletters';
require_once ('tiki-setup.php');
include_once ('lib/newsletters/nllib.php');
......@@ -284,7 +285,6 @@ $cat_type='newsletter';
$cat_objid = $_REQUEST["nlId"];
include_once("categorize_list.php");
*/
$section = 'newsletters';
include_once ('tiki-section_options.php');
ask_ticket('admin-nl-subsriptions');
......
......@@ -7,6 +7,7 @@
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// Initialization
$section = 'newsletters';
require_once ('tiki-setup.php');
include_once ('lib/newsletters/nllib.php');
......@@ -196,7 +197,6 @@ $cat_type='newsletter';
$cat_objid = $_REQUEST["nlId"];
include_once("categorize_list.php");
*/
$section = 'newsletters';
include_once ('tiki-section_options.php');
ask_ticket('admin-nl');
......
<?php
// $Header$
$section = 'file_galleries';
require_once ('tiki-setup.php');
include_once ('lib/filegals/filegallib.php');
......@@ -302,7 +303,6 @@ for ($i = 0; $i < $temp_max; $i++) {
$smarty->assign_by_ref('galleries', $galleries["data"]);
$section = 'galleries';
include_once ('tiki-section_options.php');
// disallow robots to index page:
......
......@@ -6,11 +6,8 @@
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// Initialization
$section = 'categories';
require_once ('tiki-setup.php');
include_once ('lib/categories/categlib.php');
......@@ -166,7 +163,6 @@ if ($offset > 0) {
$smarty->assign('prev_offset', -1);
}
$section = 'categories';
include_once ('tiki-section_options.php');
ask_ticket('browse-categories');
......
......@@ -8,6 +8,7 @@
// Initialization
$section = 'freetags';
require_once ('tiki-setup.php');
include_once ('lib/freetag/freetaglib.php');
......@@ -168,7 +169,6 @@ if ($offset > 0) {
$smarty->assign('prev_offset', -1);
}
$section = 'freetags';
include_once ('tiki-section_options.php');
ask_ticket('browse-freetags');
......
......@@ -273,7 +273,6 @@ if ($resultscale) {
}
$smarty->assign_by_ref('scaleinfo',$scaleinfo);
$section = 'galleries';
include_once('tiki-section_options.php');
if ($prefs['feature_theme_control'] == 'y') {
......
......@@ -323,7 +323,6 @@ if($prefs['feature_user_watches'] == 'y' && $user && count($_SESSION['CalendarVi
}
$section = 'calendar';
if ($prefs['feature_theme_control'] == 'y' and isset($_REQUEST['calIds'])) {
$cat_type = "calendar";
$cat_objid = $_REQUEST['calIds'][0];
......
......@@ -8,6 +8,7 @@
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// Initialization
$section = 'calendar';
require_once ('tiki-setup.php');
require_once ('lib/calendar/calendarlib.php');
......@@ -30,7 +31,6 @@ if (isset($_REQUEST["import"]) && isset($_REQUEST["calendarId"]) && isset($_FILE
$calendars = $calendarlib->list_calendars(); // no check perm as p_admin only
$smarty->assign_by_ref('calendars', $calendars['data']);
$section = 'calendar';
include_once ('tiki-section_options.php');
// disallow robots to index page:
......
......@@ -7,6 +7,7 @@
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// Initialization
$section='directory';
require_once ('tiki-setup.php');
include_once ('lib/directory/dirlib.php');
......@@ -218,7 +219,6 @@ usort($countries, 'country_sort');
$smarty->assign_by_ref('countries', $countries);
// This page should be displayed with Directory section options
$section='directory';
include_once('tiki-section_options.php');
ask_ticket('dir-add-site');
......
<?php
// Initialization
$section = 'directory';
require_once('tiki-setup.php');
include_once('lib/directory/dirlib.php');
......@@ -70,7 +71,6 @@ $smarty->assign_by_ref('info',$info);
$countries = $tikilib->get_flags();
$smarty->assign_by_ref('countries',$countries);
$section = 'directory';
include_once ('tiki-section_options.php');
$smarty->assign('save','y');
......
......@@ -7,6 +7,7 @@
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// Initialization
$section = 'directory';
require_once('tiki-setup.php');
include_once('lib/directory/dirlib.php');
......@@ -147,7 +148,6 @@ if ($categ_info['allowSites'] == 'y') {
$smarty->assign_by_ref('items', $items["data"]);
}
$section = 'directory';
include_once('tiki-section_options.php');
// Related categs
......
......@@ -7,6 +7,7 @@
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// Initialization
$section = 'directory';
require_once ('tiki-setup.php');
include_once ('lib/directory/dirlib.php');
......@@ -72,7 +73,6 @@ if ($offset > 0) {
$smarty->assign_by_ref('items', $items["data"]);
$smarty->assign_by_ref('cant', $items["cant"]);
$section = 'directory';
include_once ('tiki-section_options.php');
ask_ticket('dir-ranking');
......
......@@ -7,6 +7,7 @@
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// Initialization
$section = 'directory';
require_once ('tiki-setup.php');
include_once ('lib/directory/dirlib.php');
......@@ -75,7 +76,6 @@ if ($offset > 0) {
$smarty->assign_by_ref('items', $items["data"]);
$section = 'directory';
include_once ('tiki-section_options.php');
// Display the template
......
......@@ -7,6 +7,7 @@
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// Initialization
$section = 'cms';
require_once ('tiki-setup.php');
include_once ('lib/articles/artlib.php');
......@@ -448,7 +449,6 @@ $smarty->assign('showtags', 'n');
$smarty->assign('qtcycle', '');
ask_ticket('edit-submission');
$section = 'cms';
$smarty->assign('section', $section);
include_once ('tiki-section_options.php');
......
<?php
// $Id: /cvsroot/tikiwiki/tiki/tiki-edit_topic.php,v 1.9 2007-10-12 07:55:27 nyloth Exp $
$section = 'cms';
require_once('tiki-setup.php');
include_once('lib/articles/artlib.php');
......@@ -63,7 +64,6 @@ if(isset($_REQUEST["edittopic"])) {
$smarty->assign_by_ref('errors', $errors);
}
}
$section = 'cms';
include_once ('tiki-section_options.php');
// disallow robots to index page:
......
......@@ -8,6 +8,7 @@
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// Initialization
$section = 'sheet';
require_once ('tiki-setup.php');
require_once ('lib/sheet/grid.php');
......@@ -98,7 +99,6 @@ $cat_type = 'sheet';
$cat_objid = $_REQUEST["sheetId"];
include_once ("categorize_list.php");
$section = 'sheet';
include_once ('tiki-section_options.php');
ask_ticket('sheet');
// Display the template
......
......@@ -4,6 +4,7 @@
// Copyright (c) 2002-2007, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
$section = 'file_galleries';
require_once ('tiki-setup.php');
include_once ('lib/filegals/filegallib.php');
......@@ -109,7 +110,6 @@ $gal_info = array_merge($gal_info, array(
));
$smarty->assign_by_ref('gal_info', $gal_info);
$section = 'file_galleries';
include_once ('tiki-section_options.php');
if ($prefs['feature_theme_control'] == 'y') {
......
......@@ -78,7 +78,6 @@ if ($tiki_p_admin_forum != 'y') {
}
$smarty->assign_by_ref('forum_info', $forum_info);
$section = 'forums';
include_once ('tiki-section_options.php');
if ($prefs['feature_theme_control'] == 'y') {
......
......@@ -78,7 +78,6 @@ if ($tiki_p_admin_forum != 'y') {
}
$smarty->assign_by_ref('forum_info', $forum_info);
$section = 'forums';
include_once ('tiki-section_options.php');
if ($prefs['feature_theme_control'] == 'y') {
......
......@@ -8,6 +8,7 @@
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// Initialization
$section = 'sheet';
require_once ('tiki-setup.php');
require_once ('lib/sheet/grid.php');
......@@ -46,7 +47,6 @@ while( $row = $result->fetchRow() )
$smarty->assign_by_ref( 'history', $data );
$section = 'sheet';
include_once ('tiki-section_options.php');
ask_ticket('sheet');
......
......@@ -8,6 +8,7 @@
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// Initialization
$section = 'sheet';
require_once ('tiki-setup.php');
require_once ('lib/sheet/grid.php');
......@@ -114,7 +115,6 @@ $cat_type = 'sheet';
$cat_objid = $_REQUEST["sheetId"];
include_once ("categorize_list.php");
$section = 'sheet';
include_once ('tiki-section_options.php');
ask_ticket('sheet');
......
......@@ -7,6 +7,7 @@
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// Initialization
$section = 'wiki page';
require_once('tiki-setup.php');
if ($prefs['feature_ajax'] == "y") {
include_once('lib/ajax/ajaxlib.php');
......@@ -247,7 +248,6 @@ if (empty($info["user"])) {
$smarty->assign_by_ref('lastUser', $info["user"]);
$smarty->assign_by_ref('description', $info["description"]);
$section = 'wiki';
include_once('tiki-section_options.php');
$smarty->assign('wiki_extras', 'y');
......
......@@ -7,6 +7,7 @@
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// Initialization
$section = 'wiki page';
require_once ('tiki-setup.php');
include_once ('lib/structures/structlib.php');
......@@ -167,7 +168,6 @@ if ($prefs['feature_wiki_comments'] == 'y') {
include_once ("comments.php");
}
$section = 'wiki';
include_once ('tiki-section_options.php');
ask_ticket('index-raw');
......
......@@ -7,6 +7,7 @@
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// Initialization
$section = 'file_galleries';
require_once('tiki-setup.php');
if ( $prefs['feature_file_galleries'] != 'y' ) {
......@@ -736,7 +737,6 @@ $smarty->assign_by_ref('options_sortorder', $options_sortorder);
// Set section config
$section = 'file_galleries';
include_once('tiki-section_options.php');
// Theme control
......
......@@ -26,6 +26,7 @@
*/
// Initialization
$section = 'games';
require_once('tiki-setup.php');
include_once('lib/games/gamelib.php');
......@@ -255,7 +256,6 @@ if (isset($_REQUEST["remove"]) && $tiki_p_admin_games == 'y') {
}
}
$section = 'games';
include_once('tiki-section_options.php');
ask_ticket('list-games');
......
......@@ -7,6 +7,7 @@
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// Initialization
$section = 'cms';
require_once ('tiki-setup.php');
include_once ('lib/articles/artlib.php');
......@@ -123,7 +124,6 @@ if ($offset > 0) {
$smarty->assign('prev_offset', -1);
}
$section = 'cms';
include_once ('tiki-section_options.php');
$smarty->assign_by_ref('listpages', $listpages["data"]);
......
......@@ -7,6 +7,7 @@
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// Initialization
$section = 'surveys';
require_once ('tiki-setup.php');
include_once ('lib/surveys/surveylib.php');
......@@ -103,7 +104,6 @@ if ($offset > 0) {
$smarty->assign_by_ref('channels', $channels["data"]);
$section = 'surveys';
include_once ('tiki-section_options.php');
ask_ticket('list-surveys');
......
......@@ -7,6 +7,7 @@
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// Initialization
$section = 'trackers';
require_once ('tiki-setup.php');
include_once ('lib/trackers/trackerlib.php');
......@@ -101,7 +102,6 @@ if ($offset > 0) {
$smarty->assign('prev_offset', -1);
}
$section = 'trackers';
include_once('tiki-section_options.php');
$smarty->assign_by_ref('channels', $channels["data"]);
......
......@@ -7,6 +7,7 @@
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// Initialization
$section = 'quizzes';
require_once ('tiki-setup.php');
include_once ('lib/quizzes/quizlib.php');
......@@ -86,7 +87,6 @@ $smarty->assign_by_ref('result', $result);
$questions = $quizlib->get_user_quiz_questions($_REQUEST["userResultId"]);
$smarty->assign('questions', $questions);
$section = 'quizzes';
include_once ('tiki-section_options.php');
ask_ticket('quiz-res-stats');
......
......@@ -192,7 +192,6 @@ if (isset($is_categorized) && $is_categorized) {
$smarty->assign('is_categorized','n');
}
$section = 'cms';
include_once ('tiki-section_options.php');
if ($prefs['feature_theme_control'] == 'y') {
......
......@@ -135,7 +135,6 @@ if ($prefs['feature_blogposts_comments'] == 'y') {
include_once ("comments.php");
}
$section = 'blogs';
include_once ('tiki-section_options.php');
if ($prefs['feature_theme_control'] == 'y') {
......
......@@ -7,6 +7,7 @@
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// Initialization
$section = 'newsletters';
require_once ('tiki-setup.php');
@ini_set('max_execution_time', 0); //will not work in safe_mode is on
$prefs['feature_wiki_protect_email'] = 'n'; //not to alter the email
......@@ -356,7 +357,6 @@ include_once ('lib/quicktags/quicktagslib.php');
$quicktags = $quicktagslib->list_quicktags(0,-1,'taglabel_desc','','newsletters');
$smarty->assign_by_ref('quicktags', $quicktags["data"]);
$section = 'newsletters';
include_once ('tiki-section_options.php');
setcookie('tab',$_REQUEST['cookietab']);
......
......@@ -8,6 +8,7 @@
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// Initialization
$section = 'sheet';
require_once ('tiki-setup.php');
require_once ('lib/sheet/grid.php');
......@@ -191,7 +192,6 @@ $cat_type = 'sheet';
$cat_objid = $_REQUEST["sheetId"];
include_once ("categorize_list.php");
$section = 'sheet';
include_once ('tiki-section_options.php');
ask_ticket('sheet');
......
......@@ -7,6 +7,7 @@
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// Initialization
$section = 'wiki page';
require_once ('tiki-setup.php');
if ($prefs['feature_wiki'] != 'y') {
......@@ -165,7 +166,6 @@ if (empty($info["user"])) {
$smarty->assign_by_ref('lastUser', $info["user"]);
$section = 'wiki';
include_once ('tiki-section_options.php');
$smarty->assign('wiki_extras', 'y');
......
......@@ -7,6 +7,7 @@
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// Initialization
$section = 'wiki page';
require_once ('tiki-setup.php');
include_once ('lib/structures/structlib.php');
......@@ -107,7 +108,6 @@ if (empty($info["user"])) {
$smarty->assign_by_ref('lastUser', $info["user"]);
$section = 'wiki';
include_once ('tiki-section_options.php');
$smarty->assign('wiki_extras', 'y');
......
......@@ -7,6 +7,7 @@
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// Initialization
$section = 'surveys';
require_once ('tiki-setup.php');
include_once ('lib/surveys/surveylib.php');
......@@ -106,7 +107,6 @@ if ($offset > 0) {
$smarty->assign_by_ref('channels', $channels["data"]);
$section = 'surveys';
$smarty->assign('section',$section);
include_once ('tiki-section_options.php');
......
......@@ -7,6 +7,7 @@
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// Initialization
$section = 'surveys';
require_once ('tiki-setup.php');
include_once ('lib/surveys/surveylib.php');
......@@ -114,7 +115,6 @@ if ($offset > 0) {
$smarty->assign_by_ref('channels', $channels["data"]);
$section = 'surveys';
include_once ('tiki-section_options.php');
ask_ticket('survey-stats-survey');
......
......@@ -7,6 +7,7 @@
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// Initialization
$section = 'surveys';
require_once ('tiki-setup.php');
include_once ('lib/surveys/surveylib.php');
......@@ -140,7 +141,6 @@ if (isset($_REQUEST["ans"])) {
}
//print_r($questions);
$section = 'surveys';
include_once ('tiki-section_options.php');
include_once("textareasize.php");
......
......@@ -6,6 +6,7 @@
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
$section = 'file_galleries';
require_once ('tiki-setup.php');
include_once ('lib/categories/categlib.php');
include_once ('lib/filegals/filegallib.php');
......@@ -344,7 +345,6 @@ $cat_type = 'file';
$cat_objid = empty($_REQUEST['fileId'])? 0: $_REQUEST['fileId'];
include_once('categorize_list.php');
$section = 'file_galleries';
include_once ('tiki-section_options.php');
ask_ticket('upload-file');
......
......@@ -8,6 +8,7 @@
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// Initialization
$section = 'sheet';
require_once ('tiki-setup.php');
require_once ('lib/sheet/grid.php');
......@@ -159,7 +160,6 @@ $cat_type = 'sheet';
$cat_objid = $_REQUEST["sheetId"];
include_once ("categorize_list.php");
$section = 'sheet';
include_once ('tiki-section_options.php');
ask_ticket('sheet');
......
......@@ -7,6 +7,7 @@
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// Initialization
$section = 'trackers';
require_once('tiki-setup.php');
include_once('lib/trackers/trackerlib.php');
......@@ -763,7 +764,6 @@ $groups = $userlib->list_all_groups();
$smarty->assign('users', $users);
$smarty->assign('groups', $groups);
$section = 'trackers';
include_once('tiki-section_options.php');
$smarty->assign('uses_tabs', 'y');
......
......@@ -7,6 +7,7 @@
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// Initialization
$section = 'trackers';
require_once ('tiki-setup.php');
include_once('lib/categories/categlib.php');
include_once ("lib/filegals/filegallib.php");
......@@ -1165,7 +1166,6 @@ $smarty->assign('from',$from);
if (isset($_REQUEST['status']))
$smarty->assign_by_ref('status', $_REQUEST['status']);
$section = 'trackers';
include_once ('tiki-section_options.php');
$smarty->assign('uses_tabs', 'y');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment