[Spidertree-cvs] spidertree/edit image.php,NONE,1.1 album.php,1.6,1.7 upload.php,1.4,1.5

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

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

Modified Files:
	album.php upload.php 
Added Files:
	image.php 
Log Message:
uploads now working, thumbnailing still non-existent


--- NEW FILE: image.php ---
<?php
    require_once('../../setup_inc.php');
	
	global $FORM, $gImage;
	$smarty->assign('spidertree_body','tikipackage:spidertree/spidertree_edit_image.tpl');
	if( isset( $fImageSave ) ) {
	}

	renderSpiderTree();
?>

Index: album.php
===================================================================
RCS file: /cvsroot/spidertree/spidertree/edit/album.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- album.php	8 Feb 2004 02:20:31 -0000	1.6
+++ album.php	9 Feb 2004 06:23:02 -0000	1.7
@@ -4,13 +4,11 @@
 	global $FORM, $gAlbum;
 
 	$smarty->assign('spidertree_body','tikipackage:spidertree/spidertree_edit_album.tpl');
-
 	if( isset( $fAlbumSave ) ) {
 		$new = empty( $gAlbum->mALID );
 		if( $gAlbum->store( $FORM ) ) {
 			if( $new ) {
 				$smarty->assign('spidertree_body','tikipackage:spidertree/spidertree_upload.tpl');
-pvd( $FORM );
 			} else {
 				include_once( 'album_list_inc.php' );
 			}
@@ -26,6 +24,8 @@
 	} elseif( empty( $gAlbum->mALID ) ) {
 		$smarty->assign('spidertree_body','tikipackage:spidertree/spidertree_edit_album_info.tpl');
 	} else {
+		$gAlbum->loadImages();
+		$smarty->assign_by_ref( 'images', $gAlbum->mImages );
 		$smarty->assign_by_ref( 'FORM', $gAlbum->mRow );
 	}
 

Index: upload.php
===================================================================
RCS file: /cvsroot/spidertree/spidertree/edit/upload.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- upload.php	7 Feb 2004 21:05:35 -0000	1.4
+++ upload.php	9 Feb 2004 06:23:02 -0000	1.5
@@ -2,7 +2,7 @@
     require_once('../../setup_inc.php');
 
 	if( isset($HTTP_POST_FILES['UPLOAD']) ) {
-		$gAlbum->processUpload( $HTTP_POST_FILES, $gTreeUser->getUploadPath() );
+		$gAlbum->processUpload( $HTTP_POST_FILES );
 		$smarty->assign_by_ref( 'FORM', $FORM );
 		$smarty->assign('spidertree_body','tikipackage:spidertree/spidertree_edit_album.tpl');
 	} else {