diff options
| -rwxr-xr-x | BitSystem.php | 3 | ||||
| -rw-r--r-- | admin/admin_notifications.php | 4 | ||||
| -rw-r--r-- | admin/admin_system.php | 4 | ||||
| -rw-r--r-- | admin/backup.php | 6 | ||||
| -rw-r--r-- | admin/db_performance.php | 2 | ||||
| -rw-r--r-- | admin/index.php | 4 | ||||
| -rw-r--r-- | admin/list_cache.php | 4 | ||||
| -rw-r--r-- | error.php | 4 | ||||
| -rw-r--r-- | module_controls_inc.php | 10 | ||||
| -rw-r--r-- | view_cache.php | 10 |
10 files changed, 26 insertions, 25 deletions
diff --git a/BitSystem.php b/BitSystem.php index e489d0d..5c8f347 100755 --- a/BitSystem.php +++ b/BitSystem.php @@ -3,7 +3,7 @@ * Main bitweaver systems functions * * @package kernel - * @version $Header: /cvsroot/bitweaver/_bit_kernel/BitSystem.php,v 1.175 2008/06/11 15:22:45 squareing Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_kernel/BitSystem.php,v 1.176 2008/06/25 22:21:11 spiderr Exp $ * @author spider <spider@steelsun.com> */ // +----------------------------------------------------------------------+ @@ -1153,6 +1153,7 @@ die; $this->mRegisterCalled = FALSE; $scanFile = BIT_ROOT_PATH.$pPkgDir.'/'.$pScanFile; $file_exists = 0; + if( file_exists( $scanFile ) ) { $file_exists = 1; global $gBitSystem, $gLibertySystem, $gBitSmarty, $gBitUser, $gBitLanguage; diff --git a/admin/admin_notifications.php b/admin/admin_notifications.php index 03b0888..b5398a0 100644 --- a/admin/admin_notifications.php +++ b/admin/admin_notifications.php @@ -1,6 +1,6 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_kernel/admin/admin_notifications.php,v 1.4 2006/04/11 13:05:16 squareing Exp $ +// $Header: /cvsroot/bitweaver/_bit_kernel/admin/admin_notifications.php,v 1.5 2008/06/25 22:21:12 spiderr Exp $ // 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. @@ -76,6 +76,6 @@ $gBitSmarty->assign('admin_mail', $admin_mail); $gBitSmarty->assign('cuser_mail', $cuser_mail); // Display the template -$gBitSystem->display( 'bitpackage:kernel/admin_notifications.tpl'); +$gBitSystem->display( 'bitpackage:kernel/admin_notifications.tpl', NULL, array( 'display_mode' => 'admin' )); ?> diff --git a/admin/admin_system.php b/admin/admin_system.php index 97dea2e..fd67711 100644 --- a/admin/admin_system.php +++ b/admin/admin_system.php @@ -1,5 +1,5 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_kernel/admin/admin_system.php,v 1.17 2008/06/04 13:20:27 squareing Exp $ +// $Header: /cvsroot/bitweaver/_bit_kernel/admin/admin_system.php,v 1.18 2008/06/25 22:21:12 spiderr Exp $ // 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. @@ -126,7 +126,7 @@ foreach( array_keys( $languages ) as $clang ) { $gBitSmarty->assign( 'templates', $templates ); $gBitSmarty->assign( 'feedback', $feedback ); -$gBitSystem->display( 'bitpackage:kernel/admin_system.tpl', tra( "System Cache" ) ); +$gBitSystem->display( 'bitpackage:kernel/admin_system.tpl', tra( "System Cache" ) , array( 'display_mode' => 'admin' )); // ----------------------- Functions ----------------------- // diff --git a/admin/backup.php b/admin/backup.php index 8ccb28d..ef3ed9c 100644 --- a/admin/backup.php +++ b/admin/backup.php @@ -1,6 +1,6 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_kernel/admin/backup.php,v 1.4 2006/04/11 13:05:16 squareing Exp $ +// $Header: /cvsroot/bitweaver/_bit_kernel/admin/backup.php,v 1.5 2008/06/25 22:21:12 spiderr Exp $ // 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. @@ -65,7 +65,7 @@ if (isset($_REQUEST["upload"])) { } else { $gBitSmarty->assign('msg', tra("Upload failed")); - $gBitSystem->display( 'error.tpl' ); + $gBitSystem->display( 'error.tpl' , NULL, array( 'display_mode' => 'admin' )); die; } } @@ -91,6 +91,6 @@ $gBitSmarty->assign_by_ref('backups', $backups); $gBitSmarty->assign('bitdomain', $bitdomain); -$gBitSystem->display( 'bitpackage:kernel/backup.tpl', tra( 'Backups') ); +$gBitSystem->display( 'bitpackage:kernel/backup.tpl', tra( 'Backups') , array( 'display_mode' => 'admin' )); ?> diff --git a/admin/db_performance.php b/admin/db_performance.php index cfe2261..c450b50 100644 --- a/admin/db_performance.php +++ b/admin/db_performance.php @@ -4,7 +4,7 @@ if (!$gBitUser->isAdmin()) { $gBitSmarty->assign('msg', tra("You dont have permission to use this feature")); - $gBitSystem->display( 'error.tpl' ); + $gBitSystem->display( 'error.tpl' , NULL, array( 'display_mode' => 'admin' )); die; } diff --git a/admin/index.php b/admin/index.php index dd78b5d..73a05e4 100644 --- a/admin/index.php +++ b/admin/index.php @@ -1,6 +1,6 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_kernel/admin/index.php,v 1.19 2007/07/19 05:00:27 squareing Exp $ +// $Header: /cvsroot/bitweaver/_bit_kernel/admin/index.php,v 1.20 2008/06/25 22:21:12 spiderr Exp $ // 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. @@ -86,5 +86,5 @@ if( !empty( $_REQUEST['version_check'] ) ) { } // Display the template -$gBitSystem->display( 'bitpackage:kernel/admin.tpl' ); +$gBitSystem->display( 'bitpackage:kernel/admin.tpl' , NULL, array( 'display_mode' => 'admin' )); ?> diff --git a/admin/list_cache.php b/admin/list_cache.php index bb68f75..4ea8049 100644 --- a/admin/list_cache.php +++ b/admin/list_cache.php @@ -1,6 +1,6 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_kernel/admin/list_cache.php,v 1.5 2006/04/11 13:05:16 squareing Exp $ +// $Header: /cvsroot/bitweaver/_bit_kernel/admin/list_cache.php,v 1.6 2008/06/25 22:21:12 spiderr Exp $ // 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. @@ -76,6 +76,6 @@ $gBitSmarty->assign_by_ref('listpages', $listpages["data"]); // Display the template -$gBitSystem->display( 'bitpackage:kernel/list_cache.tpl'); +$gBitSystem->display( 'bitpackage:kernel/list_cache.tpl', NULL, array( 'display_mode' => 'list' )); ?> @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_kernel/error.php,v 1.3 2005/08/01 18:40:33 squareing Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_kernel/error.php,v 1.4 2008/06/25 22:21:11 spiderr Exp $ * @package kernel * @subpackage functions */ @@ -18,6 +18,6 @@ require_once( '../bit_setup_inc.php' ); // Display the template $gBitSmarty->assign('msg', strip_tags($_REQUEST["error"])); -$gBitSystem->display( 'error.tpl' ); +$gBitSystem->display( 'error.tpl' , NULL, array( 'display_mode' => 'display' )); ?> diff --git a/module_controls_inc.php b/module_controls_inc.php index bd9bf0b..b996df0 100644 --- a/module_controls_inc.php +++ b/module_controls_inc.php @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_kernel/module_controls_inc.php,v 1.8 2006/04/19 13:48:37 squareing Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_kernel/module_controls_inc.php,v 1.9 2008/06/25 22:21:11 spiderr Exp $ * * Copyright (c) 2004 bitweaver.org * Copyright (c) 2003 tikwiki.org @@ -8,7 +8,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 * - * $Id: module_controls_inc.php,v 1.8 2006/04/19 13:48:37 squareing Exp $ + * $Id: module_controls_inc.php,v 1.9 2008/06/25 22:21:11 spiderr Exp $ * @package kernel * @subpackage functions */ @@ -20,17 +20,17 @@ include_once( '../bit_setup_inc.php' ); if (!$gBitUser->hasPermission( 'p_tidbits_configure_modules' )) { $gBitSmarty->assign('msg', tra("You dont have permission to use this feature")); - $gBitSystem->display( 'error.tpl' ); + $gBitSystem->display( 'error.tpl' , NULL, array( 'display_mode' => 'display' )); die; } /*if (!$gBitSystem->isFeatureActive( 'site_user_assigned_modules' ) && $check_req) { $gBitSmarty->assign('msg', tra("This feature is disabled").": site_user_assigned_modules"); - $gBitSystem->display( 'error.tpl' ); + $gBitSystem->display( 'error.tpl' , NULL, array( 'display_mode' => 'display' )); die; }*/ if (!$gBitUser->isRegistered()) { $gBitSmarty->assign('msg', tra("You must log in to use this feature")); - $gBitSystem->display( 'error.tpl' ); + $gBitSystem->display( 'error.tpl' , NULL, array( 'display_mode' => 'display' )); die; } diff --git a/view_cache.php b/view_cache.php index 1c97bcb..957a3d7 100644 --- a/view_cache.php +++ b/view_cache.php @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_kernel/view_cache.php,v 1.9 2007/07/10 16:58:21 squareing Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_kernel/view_cache.php,v 1.10 2008/06/25 22:21:11 spiderr Exp $ * @package kernel * @subpackage functions */ @@ -18,7 +18,7 @@ require_once( WIKI_PKG_PATH.'BitPage.php' ); /* if($gBitSystem->getConfig('wiki_list_pages') != 'y') { $gBitSmarty->assign('msg',tra("This feature is disabled")); - $gBitSystem->display( 'error.tpl' ); + $gBitSystem->display( 'error.tpl' , NULL, array( 'display_mode' => 'display' )); die; } */ @@ -28,7 +28,7 @@ if (isset($_REQUEST['url'])) { if (!$id) { $gBitSmarty->assign('msg', tra("No cache information available")); - $gBitSystem->display( 'error.tpl' ); + $gBitSystem->display( 'error.tpl' , NULL, array( 'display_mode' => 'display' )); die; } @@ -38,7 +38,7 @@ if (isset($_REQUEST['url'])) { if (!isset($_REQUEST["cache_id"])) { $gBitSmarty->assign('msg', tra("No page indicated")); - $gBitSystem->display( 'error.tpl' ); + $gBitSystem->display( 'error.tpl' , NULL, array( 'display_mode' => 'display' )); die; } @@ -53,7 +53,7 @@ if (substr($info["url"], -4, 4) == ".txt") { $gBitSmarty->assign('ggcacheurl', $ggcacheurl); $gBitSmarty->assign_by_ref('info', $info); -$gBitSystem->display( 'bitpackage:kernel/view_cache.tpl'); +$gBitSystem->display( 'bitpackage:kernel/view_cache.tpl', NULL, array( 'display_mode' => 'display' )); |
