[Spidertree-cvs] spidertree config_inc.php,1.2,1.3 setup_inc.php,1.4,1.5

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

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

Modified Files:
	config_inc.php setup_inc.php 
Log Message:
uploads now working, thumbnailing still non-existent


Index: config_inc.php
===================================================================
RCS file: /cvsroot/spidertree/spidertree/config_inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- config_inc.php	7 Feb 2004 21:04:32 -0000	1.2
+++ config_inc.php	9 Feb 2004 06:23:02 -0000	1.3
@@ -2,5 +2,7 @@
 	define( 'STREE_DB_PREFIX', '' );
 
 	$gSpidertree['environment'] = ENV_TIKIWIKI;
-	$gSpidertree['content_path'] = SPIDERTREE_PKG_PATH.'uploads';
+	
+	$gSpidertree['content_url'] = 'uploads/';
+	$gSpidertree['content_path'] = SPIDERTREE_PKG_PATH.$gSpidertree['content_url'];
 ?>

Index: setup_inc.php
===================================================================
RCS file: /cvsroot/spidertree/spidertree/setup_inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- setup_inc.php	7 Feb 2004 21:04:32 -0000	1.4
+++ setup_inc.php	9 Feb 2004 06:23:02 -0000	1.5
@@ -6,7 +6,7 @@
 	define( 'ENV_TIKIWIKI', 'tikiwiki' );
 
 	// hash containing all global Spidertree specific settings
-	global $gSpidertree, $gTreeUser, $smarty;
+	global $gSpidertree, $gTreeUser, $smarty, $FORM;
 	$gSpidertree = array();
 
 	// load up site specific settings
@@ -27,20 +27,34 @@
 		$gTreeUser = new SUserTikiwiki();
 	}
 
-	// create a album global var if we have an album ID
+	// create an album global var if we have an album ID
     require_once( SPIDERTREE_CLASS_PATH.'SAlbum.php');
 
-	global $fALID, $FORM, $gAlbum;
+	global $fALID, $gAlbum;
 	if( isset( $fALID ) ) {
-		$FORM['ALID'] = $fALID;
-	} elseif( empty( $FORM['ALID'] ) ) {
-		$FORM['ALID'] = NULL; // prevent Undefined variable warning
+		$FORM['alid'] = $fALID;
+	} elseif( empty( $FORM['alid'] ) ) {
+		$FORM['alid'] = NULL; // prevent Undefined variable warning
 	}
-	$gAlbum = new SAlbum( $FORM['ALID'], $gTreeUser->mUID );
+	$gAlbum = new SAlbum( $FORM['alid'], $gTreeUser->mUID );
 	if( $gAlbum->load() ) {
 		$smarty->assign_by_ref('album', $gAlbum->mRow );
 	}
 
+	// create an image global var if we have an album ID
+	global $fIMID, $gImage;
+	if( isset( $fIMID ) ) {
+		$FORM['imid'] = $fIMID;
+	} elseif( empty( $FORM['imid'] ) ) {
+		$FORM['imid'] = NULL; // prevent Undefined variable warning
+	}
+	$gImage = new SImage( $FORM['imid'], $gTreeUser->mUID );
+	if( $gImage->load() ) {
+		$smarty->assign_by_ref('image', $gImage->mRow );
+	}
+
+
+
 	function renderSpiderTree() {
 		global $smarty;
 		$smarty->display("tiki.tpl");