[Tikiwiki-cvs] tiki tiki-file_archives.php,1.4,1.5

[<sy...@us...>]

Update of /cvsroot/tikiwiki/tiki
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13728

Modified Files:
	tiki-file_archives.php 
Log Message:
[NEW]fgal: show up sub_galleries if any in list files of a gallery

Index: tiki-file_archives.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-file_archives.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tiki-file_archives.php	28 Nov 2006 16:20:21 -0000	1.4
+++ tiki-file_archives.php	29 Nov 2006 18:40:50 -0000	1.5
@@ -61,17 +61,17 @@
 	}
 }
 
-if (!isset($_REQUEST['sort_mode']))
-	$_REQUEST['sort_mode'] = 'created_desc';
-$smarty->assign_by_ref('sort_mode', $_REQUEST['sort_mode']);
-if (!isset($_REQUEST['find']))
-	$_REQUEST['find'] = '';
-$smarty->assign('find', $_REQUEST['find']);
-if (!isset($_REQUEST['offset']))
-	$_REQUEST['offset'] = 0;
-$smarty->assign_by_ref('offset', $_REQUEST['offset']);
+if (!isset($_REQUEST['file_sort_mode']))
+	$_REQUEST['file_sort_mode'] = 'created_desc';
+$smarty->assign_by_ref('file_sort_mode', $_REQUEST['file_sort_mode']);
+if (!isset($_REQUEST['file_find']))
+	$_REQUEST['file_find'] = '';
+$smarty->assign('file_find', $_REQUEST['file_find']);
+if (!isset($_REQUEST['file_offset']))
+	$_REQUEST['file_offset'] = 0;
+$smarty->assign_by_ref('file_offset', $_REQUEST['file_offset']);
 
-$files = $filegallib->get_archives($_REQUEST['fileId'], $_REQUEST['offset'], $maxRecords, $_REQUEST['sort_mode'], $_REQUEST['find']);
+$files = $filegallib->get_archives($_REQUEST['fileId'], $_REQUEST['file_offset'], $maxRecords, $_REQUEST['file_sort_mode'], $_REQUEST['file_find']);
 $smarty->assign_by_ref('files', $files['data']);
 $file[] = $fileInfo;
 $smarty->assign_by_ref('file',$file); 
@@ -79,16 +79,16 @@
 $cant_pages = ceil($files['cant'] / $maxRecords);
 $smarty->assign_by_ref('cant_pages', $cant_pages);
 $smarty->assign_by_ref('maxRecords', $maxRecords);
-$smarty->assign('actual_page', 1 + ($offset / $maxRecords));
-if ($files["cant"] > ($offset + $maxRecords)) {
-	$smarty->assign('next_offset', $offset + $maxRecords);
+$smarty->assign('actual_page', 1 + ($file_offset / $maxRecords));
+if ($files["cant"] > ($file_offset + $maxRecords)) {
+	$smarty->assign('file_next_offset', $file_offset + $maxRecords);
 } else {
-	$smarty->assign('next_offset', -1);
+	$smarty->assign('file_next_offset', -1);
 }
-if ($offset > 0) {
-	$smarty->assign('prev_offset', $offset - $maxRecords);
+if ($file_offset > 0) {
+	$smarty->assign('file_prev_offset', $file_offset - $maxRecords);
 } else {
-	$smarty->assign('prev_offset', -1);
+	$smarty->assign('file_prev_offset', -1);
 }
 
 $smarty->assign_by_ref('file_info', $fileInfo);