[Spidertree-cvs] spidertree tiki_setup_inc.php,NONE,1.1 config_inc.php,1.3,1.4 index.php,1.1.1.1,1.2
Status: Pre-Alpha
Brought to you by:
spiderr
Menu
▾
▴
[Spidertree-cvs] spidertree tiki_setup_inc.php,NONE,1.1 config_inc.php,1.3,1.4 index.php,1.1.1.1,1.2 setup_inc.php,1.5,1.6 start.php,1.1.1.1,1.2 thumbnailer.php,1.1,1.2 user_main.php,1.1.1.1,1.2
Update of /cvsroot/spidertree/spidertree In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6308 Modified Files: config_inc.php index.php setup_inc.php start.php thumbnailer.php user_main.php Added Files: tiki_setup_inc.php Log Message: updates for TikiPro -Bonnie- --- NEW FILE: tiki_setup_inc.php --- <?php global $siteTitle, $gTikiSystem, $gTikiUser, $user; $gTreeUser = &$gTikiUser; if( !defined( 'SPIDERTREE_PKG_PATH' ) ) { define( 'SPIDERTREE_PKG_PATH', dirname( __FILE__ ).'/' ); } $spiderTreeDir = basename(dirname(__FILE__)); define( 'SPIDERTREE_PKG_NAME', $spiderTreeDir ); require_once( SPIDERTREE_PKG_PATH.'setup_inc.php' ); define( 'STREE_BASE_CLASS', KERNEL_PKG_PATH.'TikiBase.php' ); $smarty->assign('siteTitle', $siteTitle.' Photos' ); $gTikiSystem->registerAppMenu( 'spidertree', 'Photos', constant( strtoupper( $spiderTreeDir ).'_PKG_URL' ).'index.php', 'tikipackage:'.$phpBBDir.'/menu_phpbb.tpl' ); function renderSpiderTree() { global $gTikiSystem; $gTikiSystem->display( "tikipackage:".SPIDERTREE_PKG_NAME."/spidertree.tpl" ); } ?> Index: config_inc.php =================================================================== RCS file: /cvsroot/spidertree/spidertree/config_inc.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- config_inc.php 9 Feb 2004 06:23:02 -0000 1.3 +++ config_inc.php 21 Apr 2004 20:18:44 -0000 1.4 @@ -1,8 +1,6 @@ <?php define( 'STREE_DB_PREFIX', '' ); - $gSpidertree['environment'] = ENV_TIKIWIKI; - $gSpidertree['content_url'] = 'uploads/'; $gSpidertree['content_path'] = SPIDERTREE_PKG_PATH.$gSpidertree['content_url']; ?> Index: index.php =================================================================== RCS file: /cvsroot/spidertree/spidertree/index.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- index.php 7 Feb 2004 16:21:28 -0000 1.1.1.1 +++ index.php 21 Apr 2004 20:18:44 -0000 1.2 @@ -1,8 +1,8 @@ <?php - require_once('../setup_inc.php'); + require_once('../tiki_setup_inc.php'); - $smarty->assign('spidertree_body','tikipackage:spidertree/spidertree_home.tpl'); + $smarty->assign('spidertree_body','tikipackage:'.SPIDERTREE_PKG_NAME.'/spidertree_home.tpl'); renderSpiderTree(); - + ?> Index: setup_inc.php =================================================================== RCS file: /cvsroot/spidertree/spidertree/setup_inc.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- setup_inc.php 9 Feb 2004 06:23:02 -0000 1.5 +++ setup_inc.php 21 Apr 2004 20:18:44 -0000 1.6 @@ -1,9 +1,7 @@ <?php // $Header$ - define( 'SPIDERTREE_CLASS_PATH', SPIDERTREE_PKG_PATH.'/classes/' ); - // Compatibility environments - define( 'ENV_TIKIWIKI', 'tikiwiki' ); + define( 'SPIDERTREE_CLASS_PATH', dirname( __FILE__ ).'/classes/' ); // hash containing all global Spidertree specific settings global $gSpidertree, $gTreeUser, $smarty, $FORM; @@ -11,21 +9,6 @@ // load up site specific settings require_once( 'config_inc.php' ); - - // Tikiwiki setup - if( $gSpidertree['environment'] == ENV_TIKIWIKI ) { - - global $siteTitle, $tikilib; - define( 'STREE_BASE_CLASS', KERNEL_PKG_PATH.'TikiBase.php' ); - require_once( 'classes/SUserTikiwiki.php' ); - - $smarty->assign('mid', SPIDERTREE_PKG_PATH.'templates/spidertree.tpl'); - $smarty->assign('siteTitle', $siteTitle.' Photos' ); - - $tikilib->registerAppMenu( 'spidertree', 'spidertree_menu.tpl' ); - - $gTreeUser = new SUserTikiwiki(); - } // create an album global var if we have an album ID require_once( SPIDERTREE_CLASS_PATH.'SAlbum.php'); @@ -36,7 +19,8 @@ } elseif( empty( $FORM['alid'] ) ) { $FORM['alid'] = NULL; // prevent Undefined variable warning } - $gAlbum = new SAlbum( $FORM['alid'], $gTreeUser->mUID ); + + $gAlbum = new SAlbum( $FORM['alid'], $gTreeUser->mUserId ); if( $gAlbum->load() ) { $smarty->assign_by_ref('album', $gAlbum->mRow ); } @@ -53,11 +37,6 @@ $smarty->assign_by_ref('image', $gImage->mRow ); } + $smarty->assign( 'SPIDERTREE_PKG_NAME', SPIDERTREE_PKG_NAME ); - - function renderSpiderTree() { - global $smarty; - $smarty->display("tiki.tpl"); - } - -?> +?> \ No newline at end of file Index: start.php =================================================================== RCS file: /cvsroot/spidertree/spidertree/start.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- start.php 7 Feb 2004 16:21:28 -0000 1.1.1.1 +++ start.php 21 Apr 2004 20:18:44 -0000 1.2 @@ -1,8 +1,8 @@ <?php - require_once('../setup_inc.php'); + require_once('../tiki_setup_inc.php'); + + $smarty->assign('spidertree_body','tikipackage:'.SPIDERTREE_PKG_NAME.'/spidertree_start.tpl'); - $smarty->assign('spidertree_body','tikipackage:spidertree/spidertree_start.tpl'); - renderSpiderTree(); ?> Index: thumbnailer.php =================================================================== RCS file: /cvsroot/spidertree/spidertree/thumbnailer.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- thumbnailer.php 13 Feb 2004 06:54:55 -0000 1.1 +++ thumbnailer.php 21 Apr 2004 20:18:44 -0000 1.2 @@ -1,6 +1,6 @@ <?php - require_once( '../setup_inc.php' ); + require_once( '../tiki_setup_inc.php' ); global $dbTiki; Index: user_main.php =================================================================== RCS file: /cvsroot/spidertree/spidertree/user_main.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- user_main.php 7 Feb 2004 16:21:28 -0000 1.1.1.1 +++ user_main.php 21 Apr 2004 20:18:44 -0000 1.2 @@ -1,6 +1,6 @@ <?php - require_once('../setup_inc.php'); + require_once('../tiki_setup_inc.php'); $smarty->assign('spidertree_body','tikipackage:spidertree/spidertree_user_main.tpl'); |
