[Spidertree-cvs] spidertree/edit album.php,1.8,1.9 album_list_inc.php,1.2,1.3 image.php,1.2,1.3 index.php,1.2,1.3

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

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

Modified Files:
	album.php album_list_inc.php image.php index.php 
Log Message:
bring up to speed for CLYDE

Index: album.php
===================================================================
RCS file: /cvsroot/spidertree/spidertree/edit/album.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- album.php	21 Apr 2004 20:18:45 -0000	1.8
+++ album.php	20 Nov 2004 20:07:26 -0000	1.9
@@ -1,33 +1,34 @@
 <?php
     require_once('../../tiki_setup_inc.php');
-
+    require_once('../setup_inc.php');
+	
 	global $FORM, $gAlbum;
 
-	$smarty->assign('spidertree_body','tikipackage:'.SPIDERTREE_PKG_NAME.'/spidertree_edit_album.tpl');
+	$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_PKG_NAME.'/spidertree_upload.tpl');
+				$spidertree_body = 'tikipackage:spidertree/spidertree_upload.tpl';
 			} else {
 				include_once( 'album_list_inc.php' );
 			}
 			$smarty->assign_by_ref( 'album', $FORM );
 		} else {
-			$smarty->assign('spidertree_body','tikipackage:'.SPIDERTREE_PKG_NAME.'/spidertree_edit_album_info.tpl');
+			$spidertree_body = 'tikipackage:spidertree/spidertree_edit_album_info.tpl';
 			$smarty->assign_by_ref( 'FORM', $FORM );
 			$smarty->assign_by_ref( 'ERRORS', $gAlbum->mErrors );
 		}
 	} elseif( isset( $fAlbumEditInfo ) ) {
 		$smarty->assign_by_ref( 'FORM', $gAlbum->mRow );
-		$smarty->assign('spidertree_body','tikipackage:'.SPIDERTREE_PKG_NAME.'/spidertree_edit_album_info.tpl');
+		$spidertree_body = 'tikipackage:spidertree/spidertree_edit_album_info.tpl';
 	} elseif( empty( $gAlbum->mALID ) ) {
-		$smarty->assign('spidertree_body','tikipackage:'.SPIDERTREE_PKG_NAME.'/spidertree_edit_album_info.tpl');
+		$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 );
 	}
 
-	renderSpiderTree();
+	renderSpiderTree( $spidertree_body );
 ?>

Index: album_list_inc.php
===================================================================
RCS file: /cvsroot/spidertree/spidertree/edit/album_list_inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- album_list_inc.php	21 Apr 2004 20:18:45 -0000	1.2
+++ album_list_inc.php	20 Nov 2004 20:07:27 -0000	1.3
@@ -3,5 +3,5 @@
 	$albums = &$album->getAlbums( $gTreeUser->mUserId );
 	$smarty->assign_by_ref( 'albums', $albums );	
 	$smarty->assign_by_ref( 'FORM', $FORM );
-	$smarty->assign('spidertree_body','tikipackage:'.SPIDERTREE_PKG_NAME.'/spidertree_user_main.tpl');
+	$spidertree_body = 'tikipackage:spidertree/spidertree_user_main.tpl';
 ?>

Index: image.php
===================================================================
RCS file: /cvsroot/spidertree/spidertree/edit/image.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- image.php	21 Apr 2004 20:18:45 -0000	1.2
+++ image.php	20 Nov 2004 20:07:27 -0000	1.3
@@ -1,5 +1,6 @@
 <?php
     require_once('../../tiki_setup_inc.php');
+    require_once('../setup_inc.php');
 	
 	global $FORM, $gImage;
 	$smarty->assign('spidertree_body','tikipackage:'.SPIDERTREE_PKG_NAME.'/spidertree_edit_image.tpl');

Index: index.php
===================================================================
RCS file: /cvsroot/spidertree/spidertree/edit/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:45 -0000	1.2
+++ index.php	20 Nov 2004 20:07:27 -0000	1.3
@@ -1,7 +1,8 @@
 <?php
     require_once('../../tiki_setup_inc.php');
+    require_once('../setup_inc.php');
 
 	include_once( 'album_list_inc.php' );
 
-	renderSpiderTree();
+	renderSpiderTree( $spidertree_body );
 ?>