[Spidertree-cvs] spidertree/edit album.php,1.7,1.8 album_list_inc.php,1.1.1.1,1.2 image.php,1.1,1.2 index.php,1.1.1.1,1.2 upload.php,1.5,1.6

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

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

Modified Files:
	album.php album_list_inc.php image.php index.php upload.php 
Log Message:
updates for TikiPro -Bonnie-


Index: album.php
===================================================================
RCS file: /cvsroot/spidertree/spidertree/edit/album.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- album.php	9 Feb 2004 06:23:02 -0000	1.7
+++ album.php	21 Apr 2004 20:18:45 -0000	1.8
@@ -1,28 +1,28 @@
 <?php
-    require_once('../../setup_inc.php');
-	
+    require_once('../../tiki_setup_inc.php');
+
 	global $FORM, $gAlbum;
 
-	$smarty->assign('spidertree_body','tikipackage:spidertree/spidertree_edit_album.tpl');
+	$smarty->assign('spidertree_body','tikipackage:'.SPIDERTREE_PKG_NAME.'/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');
+				$smarty->assign('spidertree_body','tikipackage:'.SPIDERTREE_PKG_NAME.'/spidertree_upload.tpl');
 			} else {
 				include_once( 'album_list_inc.php' );
 			}
 			$smarty->assign_by_ref( 'album', $FORM );
 		} else {
-			$smarty->assign('spidertree_body','tikipackage:spidertree/spidertree_edit_album_info.tpl');
+			$smarty->assign('spidertree_body','tikipackage:'.SPIDERTREE_PKG_NAME.'/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/spidertree_edit_album_info.tpl');
+		$smarty->assign('spidertree_body','tikipackage:'.SPIDERTREE_PKG_NAME.'/spidertree_edit_album_info.tpl');
 	} elseif( empty( $gAlbum->mALID ) ) {
-		$smarty->assign('spidertree_body','tikipackage:spidertree/spidertree_edit_album_info.tpl');
+		$smarty->assign('spidertree_body','tikipackage:'.SPIDERTREE_PKG_NAME.'/spidertree_edit_album_info.tpl');
 	} else {
 		$gAlbum->loadImages();
 		$smarty->assign_by_ref( 'images', $gAlbum->mImages );

Index: album_list_inc.php
===================================================================
RCS file: /cvsroot/spidertree/spidertree/edit/album_list_inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- album_list_inc.php	7 Feb 2004 16:21:28 -0000	1.1.1.1
+++ album_list_inc.php	21 Apr 2004 20:18:45 -0000	1.2
@@ -1,6 +1,7 @@
 <?php
-	$albums = &$gTreeUser->getAlbums();
+	$album = new SAlbum();
+	$albums = &$album->getAlbums( $gTreeUser->mUserId );
 	$smarty->assign_by_ref( 'albums', $albums );	
 	$smarty->assign_by_ref( 'FORM', $FORM );
-	$smarty->assign('spidertree_body','tikipackage:spidertree/spidertree_user_main.tpl');
+	$smarty->assign('spidertree_body','tikipackage:'.SPIDERTREE_PKG_NAME.'/spidertree_user_main.tpl');
 ?>

Index: image.php
===================================================================
RCS file: /cvsroot/spidertree/spidertree/edit/image.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- image.php	9 Feb 2004 06:23:02 -0000	1.1
+++ image.php	21 Apr 2004 20:18:45 -0000	1.2
@@ -1,8 +1,8 @@
 <?php
-    require_once('../../setup_inc.php');
+    require_once('../../tiki_setup_inc.php');
 	
 	global $FORM, $gImage;
-	$smarty->assign('spidertree_body','tikipackage:spidertree/spidertree_edit_image.tpl');
+	$smarty->assign('spidertree_body','tikipackage:'.SPIDERTREE_PKG_NAME.'/spidertree_edit_image.tpl');
 	if( isset( $fImageSave ) ) {
 	}
 

Index: index.php
===================================================================
RCS file: /cvsroot/spidertree/spidertree/edit/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:45 -0000	1.2
@@ -1,5 +1,5 @@
 <?php
-    require_once('../../setup_inc.php');
+    require_once('../../tiki_setup_inc.php');
 
 	include_once( 'album_list_inc.php' );
 

Index: upload.php
===================================================================
RCS file: /cvsroot/spidertree/spidertree/edit/upload.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- upload.php	9 Feb 2004 06:23:02 -0000	1.5
+++ upload.php	21 Apr 2004 20:18:45 -0000	1.6
@@ -1,5 +1,5 @@
 <?php
-    require_once('../../setup_inc.php');
+    require_once('../../tiki_setup_inc.php');
 
 	if( isset($HTTP_POST_FILES['UPLOAD']) ) {
 		$gAlbum->processUpload( $HTTP_POST_FILES );