[FIX] move section setting before setup

messu-sent.php

@@ -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');

tiki-admin_calendars.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');

tiki-admin_newsletter_subscriptions.php

@@ -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');

tiki-admin_newsletters.php

@@ -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');

tiki-batch_upload_files.php

 <?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:

tiki-browse_categories.php

@@ -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');
 

tiki-browse_freetags.php

@@ -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');
 

tiki-browse_image.php

@@ -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') {

tiki-calendar.php

@@ -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]; 

tiki-calendar_import.php

@@ -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:

tiki-directory_add_site.php

@@ -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');
 

tiki-directory_add_tiki_site.php

 <?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');

tiki-directory_browse.php

@@ -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

tiki-directory_ranking.php

@@ -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');
 

tiki-directory_search.php

@@ -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

tiki-edit_submission.php

@@ -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');
 

tiki-edit_topic.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:

tiki-export_sheet.php

@@ -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

tiki-file_archives.php

@@ -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') {

tiki-forum_queue.php

@@ -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') {

tiki-forums_reported.php

@@ -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') {

tiki-history_sheets.php

@@ -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');
 

tiki-import_sheet.php

@@ -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');

tiki-index_p.php

@@ -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');

tiki-index_raw.php

@@ -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');
 

tiki-list_file_gallery.php

@@ -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

tiki-list_games.php

@@ -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');
 

tiki-list_submissions.php

@@ -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"]);

tiki-list_surveys.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');
@@ -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');
 

tiki-list_trackers.php

@@ -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"]);

tiki-quiz_result_stats.php

@@ -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);