diff options
| author | Max Kremmel <xing@synapse.plus.com> | 2005-08-01 18:40:31 +0000 |
|---|---|---|
| committer | Max Kremmel <xing@synapse.plus.com> | 2005-08-01 18:40:31 +0000 |
| commit | 796abac6241f626d947a98c281ce036ae9b5cf61 (patch) | |
| tree | e08f98336790eedc7c498d6f4979d38e945273cb /install.php | |
| parent | b5a06219c50aa709c8a4f4f0b8b034f2c9c56878 (diff) | |
| download | install-796abac6241f626d947a98c281ce036ae9b5cf61.tar.gz install-796abac6241f626d947a98c281ce036ae9b5cf61.tar.bz2 install-796abac6241f626d947a98c281ce036ae9b5cf61.zip | |
merge recent changes with HEAD - R1 and HEAD are identical now
Diffstat (limited to 'install.php')
| -rw-r--r-- | install.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/install.php b/install.php index 0c85402..87a7e02 100644 --- a/install.php +++ b/install.php @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_install/install.php,v 1.4 2005/07/25 20:02:06 squareing Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_install/install.php,v 1.5 2005/08/01 18:40:30 squareing Exp $ * @package install * @subpackage functions */ @@ -77,15 +77,15 @@ $install_file[$i]['name'] = 'Installation Complete'; // if we have to log in, call login template and die if( !empty( $gBitDbType ) && $gBitInstaller->isPackageActive( 'users' ) && !$gBitUser->isAdmin() && !$_SESSION['first_install'] ) { $install_file = 'login'; - $smarty->assign( 'install_file', INSTALL_PKG_PATH."templates/install_".$install_file.".tpl" ); - $smarty->display( INSTALL_PKG_PATH.'templates/install.tpl' ); + $gBitSmarty->assign( 'install_file', INSTALL_PKG_PATH."templates/install_".$install_file.".tpl" ); + $gBitSmarty->display( INSTALL_PKG_PATH.'templates/install.tpl' ); die; } // if the page has been renamed to anything else than 'install.php' we send it to the last installation stage if( !strpos( $_SERVER['PHP_SELF'],'install/install.php' ) ) { $step = $i; - $smarty->assign( 'renamed',basename( $_SERVER['PHP_SELF'] ) ); + $gBitSmarty->assign( 'renamed',basename( $_SERVER['PHP_SELF'] ) ); } // finally we are ready to include the actual php file @@ -117,13 +117,13 @@ foreach( $install_file as $key => $menu_step ) { } } } -$smarty->assign( 'step', $step ); -$smarty->assign( 'menu_steps', $install_file ); +$gBitSmarty->assign( 'step', $step ); +$gBitSmarty->assign( 'menu_steps', $install_file ); $steps = ( count( $install_file ) ); $progress = ( ceil( 100 / $steps * $done ) ); -$smarty->assign( 'progress', $progress ); +$gBitSmarty->assign( 'progress', $progress ); -$smarty->assign( 'install_file', INSTALL_PKG_PATH."templates/install_".$install_file[$step]['file'].$app.".tpl" ); +$gBitSmarty->assign( 'install_file', INSTALL_PKG_PATH."templates/install_".$install_file[$step]['file'].$app.".tpl" ); $gBitInstaller->display( INSTALL_PKG_PATH.'templates/install.tpl', $install_file[$step]['name'] ); ?> |