[Spidertree-cvs] spidertree index.php,1.2,1.3 setup_inc.php,1.6,1.7 start.php,1.2,1.3 thumbnailer.php,1.2,1.3 tiki_setup_inc.php,1.2,1.3

[<sp...@us...>]

Update of /cvsroot/spidertree/spidertree
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14108

Modified Files:
	index.php setup_inc.php start.php thumbnailer.php 
	tiki_setup_inc.php 
Log Message:
bring up to speed for CLYDE

Index: index.php
===================================================================
RCS file: /cvsroot/spidertree/spidertree/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- index.php	21 Apr 2004 20:18:44 -0000	1.2
+++ index.php	20 Nov 2004 20:07:25 -0000	1.3
@@ -1,8 +1,6 @@
 <?php
     require_once('../tiki_setup_inc.php');
+    require_once('setup_inc.php');
 
-	$smarty->assign('spidertree_body','tikipackage:'.SPIDERTREE_PKG_NAME.'/spidertree_home.tpl');
-
-	renderSpiderTree();
-
+	renderSpiderTree( 'tikipackage:spidertree/spidertree_home.tpl' );
 ?>

Index: setup_inc.php
===================================================================
RCS file: /cvsroot/spidertree/spidertree/setup_inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- setup_inc.php	21 Apr 2004 20:18:44 -0000	1.6
+++ setup_inc.php	20 Nov 2004 20:07:25 -0000	1.7
@@ -1,18 +1,6 @@
 <?php
 	// $Header$
 
-	define( 'SPIDERTREE_CLASS_PATH', dirname( __FILE__ ).'/classes/' );
-
-	// hash containing all global Spidertree specific settings
-	global $gSpidertree, $gTreeUser, $smarty, $FORM;
-	$gSpidertree = array();
-
-	// load up site specific settings
-	require_once( 'config_inc.php' );
-
-	// create an album global var if we have an album ID
-    require_once( SPIDERTREE_CLASS_PATH.'SAlbum.php');
-
 	global $fALID, $gAlbum;
 	if( isset( $fALID ) ) {
 		$FORM['alid'] = $fALID;
@@ -39,4 +27,10 @@
 
 	$smarty->assign( 'SPIDERTREE_PKG_NAME', SPIDERTREE_PKG_NAME );
 
-?>
\ No newline at end of file
+
+	function renderSpiderTree( $pTemplate ) {
+		global $gTikiSystem;
+		$gTikiSystem->display( $pTemplate );
+	}
+	
+?>

Index: start.php
===================================================================
RCS file: /cvsroot/spidertree/spidertree/start.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- start.php	21 Apr 2004 20:18:44 -0000	1.2
+++ start.php	20 Nov 2004 20:07:25 -0000	1.3
@@ -1,8 +1,7 @@
 <?php
 
     require_once('../tiki_setup_inc.php');
+    require_once('setup_inc.php');
 
-	$smarty->assign('spidertree_body','tikipackage:'.SPIDERTREE_PKG_NAME.'/spidertree_start.tpl');
-
-	renderSpiderTree();
+	renderSpiderTree( 'tikipackage:spidertree/spidertree_start.tpl' );
 ?>

Index: thumbnailer.php
===================================================================
RCS file: /cvsroot/spidertree/spidertree/thumbnailer.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- thumbnailer.php	21 Apr 2004 20:18:44 -0000	1.2
+++ thumbnailer.php	20 Nov 2004 20:07:25 -0000	1.3
@@ -1,6 +1,7 @@
 <?php
  
 	require_once( '../tiki_setup_inc.php' );
+	require_once( 'setup_inc.php' );
 
 	global $dbTiki;
 

Index: tiki_setup_inc.php
===================================================================
RCS file: /cvsroot/spidertree/spidertree/tiki_setup_inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- tiki_setup_inc.php	22 Apr 2004 06:59:06 -0000	1.2
+++ tiki_setup_inc.php	20 Nov 2004 20:07:25 -0000	1.3
@@ -1,22 +1,38 @@
 <?php
-	global $siteTitle, $gTikiSystem, $gTikiUser, $user;
-	$gTreeUser = &$gTikiUser;
+	// $Header$
 
-	$gTikiSystem->registerPackage( 'SpiderTree', dirname( __FILE__ ).'/' );
+	// Compatibility environments
+	define( 'ENV_TIKIWIKI', 'tikiwiki' );
 
-	require_once( SPIDERTREE_PKG_PATH.'setup_inc.php' );
+	// hash containing all global Spidertree specific settings
+	global $gSpidertree, $gTreeUser, $smarty, $FORM;
+	$gSpidertree = array();
 
-	define( 'STREE_BASE_CLASS', KERNEL_PKG_PATH.'TikiBase.php' );
+	// Tikiwiki setup
+#	if( $gSpidertree['environment'] == ENV_TIKIWIKI ) {
 
-	$smarty->assign('siteTitle', $siteTitle.' Photos' );
+		global $siteTitle, $gTikiSystem;
+		$gTikiSystem->registerPackage( 'SpiderTree', dirname( __FILE__).'/' );
+		if( $gTikiSystem->isPackageActive( 'search' ) ) {
+			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' );
 
-	$gTikiSystem->registerAppMenu( 'spidertree', 'Photos', SPIDERTREE_PKG_URL.'index.php', 'tikipackage:'.SPIDERTREE_PKG_NAME.'/menu_spidertree.tpl' );
+			$gTikiSystem->registerAppMenu( 'SpiderTree', 'Galleries', SPIDERTREE_PKG_URL, '', 'galleries');
 
+			$gTreeUser = new SUserTikiwiki();
+		}
+#	}
 
-	function renderSpiderTree() {
-		global $gTikiSystem;
-		$gTikiSystem->display( "tikipackage:".SPIDERTREE_PKG_NAME."/spidertree.tpl" );
-	}
+	define( 'SPIDERTREE_CLASS_PATH', SPIDERTREE_PKG_PATH.'/classes/' );
+	// load up site specific settings
+	require_once( 'config_inc.php' );
+	
 
+	// create an album global var if we have an album ID
+    require_once( SPIDERTREE_CLASS_PATH.'SAlbum.php');
 
-?>
\ No newline at end of file
+
+?>