|
From: Tom S. <tom...@us...> - 2004-08-06 20:18:32
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6048 Modified Files: serendipity_admin_images.inc.php serendipity_admin_image_selector.php serendipity_functions_images.inc.php Log Message: Fix Bug #1004818 Index: serendipity_functions_images.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_images.inc.php,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- serendipity_functions_images.inc.php 3 Aug 2004 18:04:36 -0000 1.25 +++ serendipity_functions_images.inc.php 6 Aug 2004 20:18:22 -0000 1.26 @@ -653,47 +653,39 @@ return array($newwidth, $newheight); } -function serendipity_displayImageList($start = 0, $end = 10, $lineBreak = NULL, $manage = false, $url = NULL) { +function serendipity_displayImageList($page = 0, $lineBreak = NULL, $manage = false, $url = NULL) { global $serendipity; + $sort_row_interval = array(8, 16, 50, 100); + + $perPage = (isset($serendipity['GET']['sortorder']['perpage']) ? $serendipity['GET']['sortorder']['perpage'] : $sort_row_interval[0]); + $start = ($page-1)*$perPage; $serendipity['imageList'] = serendipity_fetchImagesFromDatabase( $start, - $end, - $totalImages, - (isset($serendipity['GET']['order']) ? $serendipity['GET']['order'] : false), - (isset($serendipity['GET']['ordermode']) ? $serendipity['GET']['ordermode'] : false), + $perPage, + $totalImages, // Passed by ref + (isset($serendipity['GET']['sortorder']['order']) ? $serendipity['GET']['sortorder']['order'] : false), + (isset($serendipity['GET']['sortorder']['ordermode']) ? $serendipity['GET']['sortorder']['ordermode'] : false), (isset($serendipity['GET']['only_path']) ? $serendipity['GET']['only_path'] : '') ); - $inc = $end - $start; - $extraParems = ''; - if (isset($serendipity['GET']['adminModule'])) { - $extraParems = 'serendipity[adminModule]='. $serendipity['GET']['adminModule'] .'&'; - } - - if (isset($serendipity['GET']['order'])) { - $extraParems .= 'serendipity[order]='. $serendipity['GET']['order'] .'&'; - } - if (isset($serendipity['GET']['ordermode'])) { - $extraParems .= 'serendipity[ordermode]='. $serendipity['GET']['ordermode'] .'&'; + if (isset($serendipity['GET']['adminModule'])) { + $extraParems .= 'serendipity[adminModule]='. $serendipity['GET']['adminModule'] .'&'; } - if (isset($serendipity['GET']['only_path'])) { + if (isset($serendipity['GET']['only_path']) && !empty($serendipity['GET']['only_path']) ) { + $extraParems .= 'serendipity[only_path]='. $serendipity['GET']['only_path'] .'&'; serendipity_uploadSecure($serendipity['GET']['only_path'], true); } - if (isset($serendipity['GET']['htmltarget'])) { - $extraParems .= 'serendipity[htmltarget]='. $serendipity['GET']['htmltarget'] .'&'; - } - - if (isset($serendipity['GET']['filename_only'])) { - $extraParems .= 'serendipity[filename_only]='. $serendipity['GET']['filename_only'] .'&'; + foreach ( (array)$serendipity['GET']['sortorder'] as $k => $v ) { + $extraParems .= 'serendipity[sortorder]['. $k .']='. $v .'&'; } - $left = '<input type="button" value="<<<" onclick="location.href=\'?'. $extraParems .'serendipity[start]=' . ($start-$end) . '\';" '. (($start <= 0) ? 'disabled' : '') .'>' . "\n"; - $right = '<input type="button" value=">>>" onclick="location.href=\'?'. $extraParems .'serendipity[start]=' . ($start+$end) . '\';" '. (($totalImages < $start+$end) ? 'disabled' : '') .'>' . "\n"; + $left = '<input type="button" value="<<<" onclick="location.href=\'?'. $extraParems .'serendipity[page]=' . ($page-1) . '\';" '. (($start <= 0) ? 'disabled' : '') .'>' . "\n"; + $right = '<input type="button" value=">>>" onclick="location.href=\'?'. $extraParems .'serendipity[page]=' . ($page+1) . '\';" '. (($totalImages < $start+$perPage) ? 'disabled' : '') .'>' . "\n"; $sort_order = array( 'date' => SORT_ORDER_DATE, @@ -717,7 +709,6 @@ (isset($serendipity['GET']['only_path']) ? $serendipity['GET']['only_path'] : '') ); - $sort_row_interval = array(8, 16, 50, 100); if (is_null($lineBreak)) { $lineBreak = floor(750 / ($serendipity['thumbSize'] + 20)); @@ -726,7 +717,9 @@ <form style="display: inline; margin: 0px; padding: 0px;" method="get" action="?"> <?php foreach($serendipity['GET'] AS $g_key => $g_val) { - echo '<input type="hidden" name="serendipity[' . $g_key . ']" value="' . htmlspecialchars($g_val) . '" />'; + if ( !is_array($g_val) && $g_key != 'page' ) { + echo '<input type="hidden" name="serendipity[' . $g_key . ']" value="' . htmlspecialchars($g_val) . '" />'; + } } ?> <table class="serendipity_admin_filters" width="100%"> @@ -746,24 +739,24 @@ </tr> <tr> <td><?php echo SORT_BY ?></td> - <td><select name="serendipity[order]"> + <td><select name="serendipity[sortorder][order]"> <?php foreach($sort_order AS $so_key => $so_val) { - echo '<option value="' . $so_key . '" ' . (isset($serendipity['GET']['order']) && $serendipity['GET']['order'] == $so_key ? 'selected="selected"' : '') . '>' . $so_val . '</option>'; + echo '<option value="' . $so_key . '" ' . (isset($serendipity['GET']['sortorder']['order']) && $serendipity['GET']['sortorder']['order'] == $so_key ? 'selected="selected"' : '') . '>' . $so_val . '</option>'; } ?> </select> </td> <td><?php echo SORT_ORDER ?></td> - <td><select name="serendipity[ordermode]"> - <option value="DESC" <?php echo (isset($serendipity['GET']['ordermode']) && $serendipity['GET']['ordermode'] == 'DESC' ? 'selected="selected"' : '') ?>><?php echo SORT_ORDER_DESC ?></option> - <option value="ASC" <?php echo (isset($serendipity['GET']['ordermode']) && $serendipity['GET']['ordermode'] == 'ASC' ? 'selected="selected"' : '') ?>><?php echo SORT_ORDER_ASC ?></option> + <td><select name="serendipity[sortorder][ordermode]"> + <option value="DESC" <?php echo (isset($serendipity['GET']['sortorder']['ordermode']) && $serendipity['GET']['sortorder']['ordermode'] == 'DESC' ? 'selected="selected"' : '') ?>><?php echo SORT_ORDER_DESC ?></option> + <option value="ASC" <?php echo (isset($serendipity['GET']['sortorder']['ordermode']) && $serendipity['GET']['sortorder']['ordermode'] == 'ASC' ? 'selected="selected"' : '') ?>><?php echo SORT_ORDER_ASC ?></option> </select> </td> <td><?php echo IMAGES_PER_PAGE ?></td> - <td><select name="serendipity[end]"> + <td><select name="serendipity[sortorder][perpage]"> <?php - foreach($sort_row_interval AS $so_key => $so_val) { - echo '<option value="' . $so_key . '" ' . (isset($serendipity['GET']['order']) && $serendipity['GET']['order'] == $so_key ? 'selected="selected"' : '') . '>' . $so_val . '</option>'; + foreach($sort_row_interval AS $so_val) { + echo '<option value="' . $so_val . '" ' . ($perPage == $so_val ? 'selected="selected"' : '') . '>' . $so_val . '</option>'; } ?> </select> </tr> Index: serendipity_admin_image_selector.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_image_selector.php,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- serendipity_admin_image_selector.php 16 Jul 2004 22:50:57 -0000 1.26 +++ serendipity_admin_image_selector.php 6 Aug 2004 20:18:19 -0000 1.27 @@ -115,14 +115,6 @@ break; default: - if (!is_numeric($serendipity['GET']['start'])) { - $serendipity['GET']['start'] = 0; - } - - if (!is_numeric($serendipity['GET']['end'])) { - $serendipity['GET']['end'] = 16; - } - $add_url = ''; if (!empty($serendipity['GET']['htmltarget'])) { $add_url .= '&serendipity[htmltarget]=' . $serendipity['GET']['htmltarget']; @@ -140,8 +132,7 @@ <?php serendipity_displayImageList( - isset($serendipity['GET']['start']) ? $serendipity['GET']['start'] : 0, - isset($serendipity['GET']['end']) ? $serendipity['GET']['end'] : 8, + isset($serendipity['GET']['page']) ? $serendipity['GET']['page'] : 1, 4, false, '?serendipity[step]=1' . $add_url . '&serendipity[textarea]='. $serendipity['GET']['textarea'] Index: serendipity_admin_images.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_images.inc.php,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- serendipity_admin_images.inc.php 19 Jul 2004 09:44:11 -0000 1.25 +++ serendipity_admin_images.inc.php 6 Aug 2004 20:18:18 -0000 1.26 @@ -438,8 +438,7 @@ <?php serendipity_displayImageList( - isset($serendipity['GET']['start']) ? $serendipity['GET']['start'] : 0, - isset($serendipity['GET']['end']) ? $serendipity['GET']['end'] : 8, + isset($serendipity['GET']['page']) ? $serendipity['GET']['page'] : 1, 2, true ); |
