Commit c700fcf9 authored by mose's avatar mose

removed hardcoded style path in smarty display method calls

parent 29b821f1
<?php <?php
// $Header: /cvsroot/tikiwiki/tiki/comments.php,v 1.18 2003-11-16 00:17:16 xenfasa Exp $ // $Header: /cvsroot/tikiwiki/tiki/comments.php,v 1.19 2003-11-17 15:44:27 mose Exp $
// Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al. // Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
// All Rights Reserved. See copyright.txt for details and a complete list of authors. // All Rights Reserved. See copyright.txt for details and a complete list of authors.
...@@ -143,7 +143,7 @@ if ($tiki_p_post_comments == 'y') { ...@@ -143,7 +143,7 @@ if ($tiki_p_post_comments == 'y') {
} else { } else {
$smarty->assign('msg', tra("Missing title or body when trying to post a comment")); $smarty->assign('msg', tra("Missing title or body when trying to post a comment"));
$smarty->display("styles/$style_base/error.tpl"); $smarty->display("error.tpl");
die; die;
} }
} }
......
<?php <?php
// $Header: /cvsroot/tikiwiki/tiki/copyrights.php,v 1.2 2003-08-07 04:33:56 rossta Exp $ // $Header: /cvsroot/tikiwiki/tiki/copyrights.php,v 1.3 2003-11-17 15:44:27 mose Exp $
// Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al. // Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
// All Rights Reserved. See copyright.txt for details and a complete list of authors. // All Rights Reserved. See copyright.txt for details and a complete list of authors.
...@@ -15,14 +15,14 @@ require_once ('tiki-setup.php'); ...@@ -15,14 +15,14 @@ require_once ('tiki-setup.php');
if ($wiki_feature_copyrights != 'y') { if ($wiki_feature_copyrights != 'y') {
$smarty->assign('msg', tra("The copyright management feature is not enabled.")); $smarty->assign('msg', tra("The copyright management feature is not enabled."));
$smarty->display("styles/$style_base/error.tpl"); $smarty->display("error.tpl");
die; die;
} }
if (!((isset($tiki_p_edit_copyrights)) && ($tiki_p_edit_copyrights == 'y'))) { if (!((isset($tiki_p_edit_copyrights)) && ($tiki_p_edit_copyrights == 'y'))) {
$smarty->assign('msg', tra("You do not have permission to use this feature.")); $smarty->assign('msg', tra("You do not have permission to use this feature."));
$smarty->display("styles/$style_base/error.tpl"); $smarty->display("error.tpl");
die; die;
} }
...@@ -49,7 +49,7 @@ if (isset($_REQUEST['addcopyright'])) { ...@@ -49,7 +49,7 @@ if (isset($_REQUEST['addcopyright'])) {
} else { } else {
$smarty->assign('msg', tra("You must supply all the information, including title and year.")); $smarty->assign('msg', tra("You must supply all the information, including title and year."));
$smarty->display("styles/$style_base/error.tpl"); $smarty->display("error.tpl");
die; die;
} }
} }
...@@ -66,7 +66,7 @@ if (isset($_REQUEST['editcopyright'])) { ...@@ -66,7 +66,7 @@ if (isset($_REQUEST['editcopyright'])) {
} else { } else {
$smarty->assign('msg', tra("You must supply all the information, including title and year.")); $smarty->assign('msg', tra("You must supply all the information, including title and year."));
$smarty->display("styles/$style_base/error.tpl"); $smarty->display("error.tpl");
die; die;
} }
} }
...@@ -86,6 +86,6 @@ $smarty->assign('copyrights', $copyrights["data"]); ...@@ -86,6 +86,6 @@ $smarty->assign('copyrights', $copyrights["data"]);
// Display the template // Display the template
$smarty->assign('mid', 'copyrights.tpl'); $smarty->assign('mid', 'copyrights.tpl');
$smarty->display("styles/$style_base/tiki.tpl"); $smarty->display("tiki.tpl");
?> ?>
\ No newline at end of file
...@@ -64,7 +64,7 @@ if (!function_exists('galaxia_show_error')) { ...@@ -64,7 +64,7 @@ if (!function_exists('galaxia_show_error')) {
{ {
global $smarty, $style_base; global $smarty, $style_base;
$smarty->assign('msg',tra($msg)); $smarty->assign('msg',tra($msg));
$smarty->display("styles/$style_base/error.tpl"); $smarty->display("error.tpl");
} }
} }
......
...@@ -64,7 +64,7 @@ if (!function_exists('galaxia_show_error')) { ...@@ -64,7 +64,7 @@ if (!function_exists('galaxia_show_error')) {
{ {
global $smarty, $style_base; global $smarty, $style_base;
$smarty->assign('msg',tra($msg)); $smarty->assign('msg',tra($msg));
$smarty->display("styles/$style_base/error.tpl"); $smarty->display("error.tpl");
} }
} }
......
...@@ -250,7 +250,7 @@ class FileGalLib extends TikiLib { ...@@ -250,7 +250,7 @@ class FileGalLib extends TikiLib {
if (!$fw) { if (!$fw) {
$smarty->assign('msg', tra('Cannot write to this file:'). $fhash); $smarty->assign('msg', tra('Cannot write to this file:'). $fhash);
$smarty->display("styles/$style_base/error.tpl"); $smarty->display("error.tpl");
die; die;
} }
} }
......
<?php <?php
// $Header: /cvsroot/tikiwiki/tiki/messu-broadcast.php,v 1.14 2003-10-19 13:44:21 mose Exp $ // $Header: /cvsroot/tikiwiki/tiki/messu-broadcast.php,v 1.15 2003-11-17 15:44:27 mose Exp $
// Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al. // Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
// All Rights Reserved. See copyright.txt for details and a complete list of authors. // All Rights Reserved. See copyright.txt for details and a complete list of authors.
...@@ -12,21 +12,21 @@ include_once ('lib/messu/messulib.php'); ...@@ -12,21 +12,21 @@ include_once ('lib/messu/messulib.php');
if (!$user) { if (!$user) {
$smarty->assign('msg', tra("You are not logged in")); $smarty->assign('msg', tra("You are not logged in"));
$smarty->display("styles/$style_base/error.tpl"); $smarty->display("error.tpl");
die; die;
} }
if ($feature_messages != 'y') { if ($feature_messages != 'y') {
$smarty->assign('msg', tra("This feature is disabled").": feature_messages"); $smarty->assign('msg', tra("This feature is disabled").": feature_messages");
$smarty->display("styles/$style_base/error.tpl"); $smarty->display("error.tpl");
die; die;
} }
if ($tiki_p_broadcast != 'y') { if ($tiki_p_broadcast != 'y') {
$smarty->assign('msg', tra("Permission denied")); $smarty->assign('msg', tra("Permission denied"));
$smarty->display("styles/$style_base/error.tpl"); $smarty->display("error.tpl");
die; die;
} }
...@@ -87,7 +87,7 @@ if (isset($_REQUEST['send'])) { ...@@ -87,7 +87,7 @@ if (isset($_REQUEST['send'])) {
if (empty($_REQUEST['subject']) && empty($_REQUEST['body'])) { if (empty($_REQUEST['subject']) && empty($_REQUEST['body'])) {
$smarty->assign('message', tra('ERROR: Either the subject or body must be non-empty')); $smarty->assign('message', tra('ERROR: Either the subject or body must be non-empty'));
$smarty->display("styles/$style_base/tiki.tpl"); $smarty->display("tiki.tpl");
die; die;
} }
...@@ -118,7 +118,7 @@ if (isset($_REQUEST['send'])) { ...@@ -118,7 +118,7 @@ if (isset($_REQUEST['send'])) {
$message = tra('ERROR: No valid users to send the message'); $message = tra('ERROR: No valid users to send the message');
$smarty->assign('message', $message); $smarty->assign('message', $message);
$smarty->display("styles/$style_base/tiki.tpl"); $smarty->display("tiki.tpl");
die; die;
} }
...@@ -137,6 +137,6 @@ $section = 'user_messages'; ...@@ -137,6 +137,6 @@ $section = 'user_messages';
include_once ('tiki-section_options.php'); include_once ('tiki-section_options.php');
include_once ('tiki-mytiki_shared.php'); include_once ('tiki-mytiki_shared.php');
$smarty->display("styles/$style_base/tiki.tpl"); $smarty->display("tiki.tpl");
?> ?>
<?php <?php
// $Header: /cvsroot/tikiwiki/tiki/messu-compose.php,v 1.12 2003-10-19 13:44:21 mose Exp $ // $Header: /cvsroot/tikiwiki/tiki/messu-compose.php,v 1.13 2003-11-17 15:44:27 mose Exp $
// Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al. // Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
// All Rights Reserved. See copyright.txt for details and a complete list of authors. // All Rights Reserved. See copyright.txt for details and a complete list of authors.
...@@ -12,21 +12,21 @@ include_once ('lib/messu/messulib.php'); ...@@ -12,21 +12,21 @@ include_once ('lib/messu/messulib.php');
if (!$user) { if (!$user) {
$smarty->assign('msg', tra("You are not logged in")); $smarty->assign('msg', tra("You are not logged in"));
$smarty->display("styles/$style_base/error.tpl"); $smarty->display("error.tpl");
die; die;
} }
if ($feature_messages != 'y') { if ($feature_messages != 'y') {
$smarty->assign('msg', tra("This feature is disabled").": feature_messages"); $smarty->assign('msg', tra("This feature is disabled").": feature_messages");
$smarty->display("styles/$style_base/error.tpl"); $smarty->display("error.tpl");
die; die;
} }
if ($tiki_p_messages != 'y') { if ($tiki_p_messages != 'y') {
$smarty->assign('msg', tra("Permission denied")); $smarty->assign('msg', tra("Permission denied"));
$smarty->display("styles/$style_base/error.tpl"); $smarty->display("error.tpl");
die; die;
} }
...@@ -78,7 +78,7 @@ if (isset($_REQUEST['send'])) { ...@@ -78,7 +78,7 @@ if (isset($_REQUEST['send'])) {
if (empty($_REQUEST['subject']) && empty($_REQUEST['body'])) { if (empty($_REQUEST['subject']) && empty($_REQUEST['body'])) {
$smarty->assign('message', tra('ERROR: Either the subject or body must be non-empty')); $smarty->assign('message', tra('ERROR: Either the subject or body must be non-empty'));
$smarty->display("styles/$style_base/tiki.tpl"); $smarty->display("tiki.tpl");
die; die;
} }
...@@ -144,7 +144,7 @@ if (isset($_REQUEST['send'])) { ...@@ -144,7 +144,7 @@ if (isset($_REQUEST['send'])) {
$message = tra('ERROR: No valid users to send the message'); $message = tra('ERROR: No valid users to send the message');
$smarty->assign('message', $message); $smarty->assign('message', $message);
$smarty->display("styles/$style_base/tiki.tpl"); $smarty->display("tiki.tpl");
die; die;
} }
...@@ -163,6 +163,6 @@ include_once ('tiki-section_options.php'); ...@@ -163,6 +163,6 @@ include_once ('tiki-section_options.php');
include_once ('tiki-mytiki_shared.php'); include_once ('tiki-mytiki_shared.php');
$smarty->display("styles/$style_base/tiki.tpl"); $smarty->display("tiki.tpl");
?> ?>
<?php <?php
// $Header: /cvsroot/tikiwiki/tiki/messu-mailbox.php,v 1.10 2003-10-19 13:44:21 mose Exp $ // $Header: /cvsroot/tikiwiki/tiki/messu-mailbox.php,v 1.11 2003-11-17 15:44:27 mose Exp $
// Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al. // Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
// All Rights Reserved. See copyright.txt for details and a complete list of authors. // All Rights Reserved. See copyright.txt for details and a complete list of authors.
...@@ -12,21 +12,21 @@ include_once ('lib/messu/messulib.php'); ...@@ -12,21 +12,21 @@ include_once ('lib/messu/messulib.php');
if (!$user) { if (!$user) {
$smarty->assign('msg', tra("You are not logged in")); $smarty->assign('msg', tra("You are not logged in"));
$smarty->display("styles/$style_base/error.tpl"); $smarty->display("error.tpl");
die; die;
} }
if ($feature_messages != 'y') { if ($feature_messages != 'y') {
$smarty->assign('msg', tra("This feature is disabled").": feature_messages"); $smarty->assign('msg', tra("This feature is disabled").": feature_messages");
$smarty->display("styles/$style_base/error.tpl"); $smarty->display("error.tpl");
die; die;
} }
if ($tiki_p_messages != 'y') { if ($tiki_p_messages != 'y') {
$smarty->assign('msg', tra("Permission denied")); $smarty->assign('msg', tra("Permission denied"));
$smarty->display("styles/$style_base/error.tpl"); $smarty->display("error.tpl");
die; die;
} }
...@@ -118,6 +118,6 @@ include_once ('tiki-section_options.php'); ...@@ -118,6 +118,6 @@ include_once ('tiki-section_options.php');
include_once ('tiki-mytiki_shared.php'); include_once ('tiki-mytiki_shared.php');
$smarty->assign('mid', 'messu-mailbox.tpl'); $smarty->assign('mid', 'messu-mailbox.tpl');
$smarty->display("styles/$style_base/tiki.tpl"); $smarty->display("tiki.tpl");
?> ?>
<?php <?php
// $Header: /cvsroot/tikiwiki/tiki/messu-read.php,v 1.11 2003-10-19 13:44:21 mose Exp $ // $Header: /cvsroot/tikiwiki/tiki/messu-read.php,v 1.12 2003-11-17 15:44:27 mose Exp $
// Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al. // Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
// All Rights Reserved. See copyright.txt for details and a complete list of authors. // All Rights Reserved. See copyright.txt for details and a complete list of authors.
...@@ -12,21 +12,21 @@ include_once ('lib/messu/messulib.php'); ...@@ -12,21 +12,21 @@ include_once ('lib/messu/messulib.php');
if (!$user) { if (!$user) {
$smarty->assign('msg', tra("You are not logged in")); $smarty->assign('msg', tra("You are not logged in"));
$smarty->display("styles/$style_base/error.tpl"); $smarty->display("error.tpl");
die; die;
} }
if ($feature_messages != 'y') { if ($feature_messages != 'y') {
$smarty->assign('msg', tra("This feature is disabled").": feature_messages"); $smarty->assign('msg', tra("This feature is disabled").": feature_messages");
$smarty->display("styles/$style_base/error.tpl"); $smarty->display("error.tpl");
die; die;
} }
if ($tiki_p_messages != 'y') { if ($tiki_p_messages != 'y') {
$smarty->assign('msg', tra("Permission denied")); $smarty->assign('msg', tra("Permission denied"));
$smarty->display("styles/$style_base/error.tpl"); $smarty->display("error.tpl");
die; die;
} }
...@@ -46,7 +46,7 @@ if (!isset($_REQUEST['msgId']) || $_REQUEST['msgId'] == 0) { ...@@ -46,7 +46,7 @@ if (!isset($_REQUEST['msgId']) || $_REQUEST['msgId'] == 0) {
$smarty->assign('legend', tra("No more messages")); $smarty->assign('legend', tra("No more messages"));
$smarty->assign('mid', 'messu-read.tpl'); $smarty->assign('mid', 'messu-read.tpl');
$smarty->display("styles/$style_base/tiki.tpl"); $smarty->display("tiki.tpl");
die; die;
} }
...@@ -74,6 +74,6 @@ $section = 'user_messages'; ...@@ -74,6 +74,6 @@ $section = 'user_messages';
include_once ('tiki-section_options.php'); include_once ('tiki-section_options.php');
include_once ('tiki-mytiki_shared.php'); include_once ('tiki-mytiki_shared.php');
$smarty->assign('mid', 'messu-read.tpl'); $smarty->assign('mid', 'messu-read.tpl');
$smarty->display("styles/$style_base/tiki.tpl"); $smarty->display("tiki.tpl");
?> ?>
<?php <?php
// $Header: /cvsroot/tikiwiki/tiki/tiki-admin.php,v 1.93 2003-11-10 00:02:30 gongo Exp $ // $Header: /cvsroot/tikiwiki/tiki/tiki-admin.php,v 1.94 2003-11-17 15:44:27 mose Exp $
// Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al. // Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
// All Rights Reserved. See copyright.txt for details and a complete list of authors. // All Rights Reserved. See copyright.txt for details and a complete list of authors.
...@@ -14,7 +14,7 @@ include_once ('lib/admin/adminlib.php'); ...@@ -14,7 +14,7 @@ include_once ('lib/admin/adminlib.php');
if ($tiki_p_admin != 'y') { if ($tiki_p_admin != 'y') {
$smarty->assign('msg', tra("You dont have permission to use this feature")); $smarty->assign('msg', tra("You dont have permission to use this feature"));
$smarty->display("styles/$style_base/error.tpl"); $smarty->display("error.tpl");
die; die;
} }
...@@ -112,6 +112,6 @@ if (isset($_REQUEST["page"])) { ...@@ -112,6 +112,6 @@ if (isset($_REQUEST["page"])) {
// Display the template // Display the template
$smarty->assign('mid', 'tiki-admin.tpl'); $smarty->assign('mid', 'tiki-admin.tpl');
$smarty->display("styles/$style_base/tiki.tpl"); $smarty->display("tiki.tpl");
?> ?>
\ No newline at end of file
<?php <?php
// $Header: /cvsroot/tikiwiki/tiki/tiki-admin_banners.php,v 1.3 2003-08-07 04:33:56 rossta Exp $ // $Header: /cvsroot/tikiwiki/tiki/tiki-admin_banners.php,v 1.4 2003-11-17 15:44:27 mose Exp $
// Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al. // Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
// All Rights Reserved. See copyright.txt for details and a complete list of authors. // All Rights Reserved. See copyright.txt for details and a complete list of authors.
...@@ -13,7 +13,7 @@ require_once ('tiki-setup.php'); ...@@ -13,7 +13,7 @@ require_once ('tiki-setup.php');
if($user != 'admin') { if($user != 'admin') {
if($tiki_p_admin != 'y') { if($tiki_p_admin != 'y') {
$smarty->assign('msg',tra("You dont have permission to use this feature")); $smarty->assign('msg',tra("You dont have permission to use this feature"));
$smarty->display("styles/$style_base/error.tpl"); $smarty->display("error.tpl");
die; die;
} }
} }
...@@ -21,6 +21,6 @@ if($user != 'admin') { ...@@ -21,6 +21,6 @@ if($user != 'admin') {
// Display the template // Display the template
$smarty->assign('mid', 'tiki-edit_banner.tpl'); $smarty->assign('mid', 'tiki-edit_banner.tpl');
$smarty->display("styles/$style_base/tiki.tpl"); $smarty->display("tiki.tpl");
?> ?>
\ No newline at end of file
...@@ -12,14 +12,14 @@ include_once ('lib/ban/banlib.php'); ...@@ -12,14 +12,14 @@ include_once ('lib/ban/banlib.php');
if ($feature_banning != 'y') { if ($feature_banning != 'y') {
$smarty->assign('msg', tra("This feature is disabled").": feature_banning"); $smarty->assign('msg', tra("This feature is disabled").": feature_banning");
$smarty->display("styles/$style_base/error.tpl"); $smarty->display("error.tpl");
die; die;
} }
if ($tiki_p_admin_banning != 'y') { if ($tiki_p_admin_banning != 'y') {
$smarty->assign('msg', tra("Permission denied")); $smarty->assign('msg', tra("Permission denied"));
$smarty->display("styles/$style_base/error.tpl"); $smarty->display("error.tpl");
die; die;
} }
...@@ -167,6 +167,6 @@ $sections = array( ...@@ -167,6 +167,6 @@ $sections = array(
$smarty->assign('sections', $sections); $smarty->assign('sections', $sections);
$smarty->assign('mid', 'tiki-admin_banning.tpl'); $smarty->assign('mid', 'tiki-admin_banning.tpl');
$smarty->display("styles/$style_base/tiki.tpl"); $smarty->display("tiki.tpl");
?> ?>
<?php <?php
// $Header: /cvsroot/tikiwiki/tiki/tiki-admin_calendars.php,v 1.7 2003-11-07 23:12:11 mose Exp $ // $Header: /cvsroot/tikiwiki/tiki/tiki-admin_calendars.php,v 1.8 2003-11-17 15:44:27 mose Exp $
// Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al. // Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
// All Rights Reserved. See copyright.txt for details and a complete list of authors. // All Rights Reserved. See copyright.txt for details and a complete list of authors.
...@@ -13,7 +13,7 @@ include_once ('lib/calendar/calendarlib.php'); ...@@ -13,7 +13,7 @@ include_once ('lib/calendar/calendarlib.php');
if ($tiki_p_admin_calendar != 'y' and $tiki_p_admin != 'y') { if ($tiki_p_admin_calendar != 'y' and $tiki_p_admin != 'y') {
$smarty->assign('msg', tra("You dont have permission to use this feature")); $smarty->assign('msg', tra("You dont have permission to use this feature"));
$smarty->display("styles/$style_base/error.tpl"); $smarty->display("error.tpl");
die; die;
} }
...@@ -85,6 +85,6 @@ include_once ("categorize_list.php"); ...@@ -85,6 +85,6 @@ include_once ("categorize_list.php");
// Display the template // Display the template
$smarty->assign('mid', 'tiki-admin_calendars.tpl'); $smarty->assign('mid', 'tiki-admin_calendars.tpl');
$smarty->display("styles/$style_base/tiki.tpl"); $smarty->display("tiki.tpl");
?> ?>
<?php <?php
// $Header: /cvsroot/tikiwiki/tiki/tiki-admin_categories.php,v 1.14 2003-11-10 16:19:20 gillesm Exp $ // $Header: /cvsroot/tikiwiki/tiki/tiki-admin_categories.php,v 1.15 2003-11-17 15:44:27 mose Exp $
// Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al. // Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
// All Rights Reserved. See copyright.txt for details and a complete list of authors. // 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. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// //
// $Header: /cvsroot/tikiwiki/tiki/tiki-admin_categories.php,v 1.14 2003-11-10 16:19:20 gillesm Exp $ // $Header: /cvsroot/tikiwiki/tiki/tiki-admin_categories.php,v 1.15 2003-11-17 15:44:27 mose Exp $
// //
// Initialization // Initialization
...@@ -28,14 +28,14 @@ if (!isset($polllib)) { ...@@ -28,14 +28,14 @@ if (!isset($polllib)) {
if ($feature_categories != 'y') { if ($feature_categories != 'y') {
$smarty->assign('msg', tra("This feature is disabled").": feature_categories"); $smarty->assign('msg', tra("This feature is disabled").": feature_categories");