php-blog-cvs

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8724

Modified Files:
	serendipity_functions.inc.php 
Log Message:
* Adjusted footer to display on more reasonable pages, including event hook
* Pimped up PDF export: Per-entry (including comments), Per-Month,
Per-Category)
* Added TODO-List for PDF-export. If someone wants to have a go, I won't put
much more work into this...


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -d -r1.324 -r1.325
--- serendipity_functions.inc.php	9 Jul 2004 18:40:04 -0000	1.324
+++ serendipity_functions.inc.php	12 Jul 2004 12:47:28 -0000	1.325
@@ -1032,62 +1032,66 @@
 /** Print a footer below the list of entries
  *
  **/
-function serendipity_printEntryFooter() {
+function serendipity_printEntryFooter($short_output = false) {
 global $serendipity;
 
-    // build the query string with variables we want to carry from each page to page
-    $add_query = '';
-    if (is_array($serendipity['GET'])) {
-        $page_get_array = $serendipity['GET'];
-        unset($page_get_array['calendarZoom']);
-        unset($page_get_array['page']);
-        unset($page_get_array['range']);
-        unset($page_get_array['action']);
-        unset($page_get_array['adminAction']);
+    if (!$short_output) {
+        // build the query string with variables we want to carry from each page to page
+        $add_query = '';
+        if (is_array($serendipity['GET'])) {
+            $page_get_array = $serendipity['GET'];
+            unset($page_get_array['calendarZoom']);
+            unset($page_get_array['page']);
+            unset($page_get_array['range']);
+            unset($page_get_array['action']);
+            unset($page_get_array['adminAction']);
 
-        foreach($page_get_array AS $skey => $sval) {
-            $add_query .= '&serendipity[' . urlencode($skey) . ']=' . urlencode($sval);
+            foreach($page_get_array AS $skey => $sval) {
+                $add_query .= '&serendipity[' . urlencode($skey) . ']=' . urlencode($sval);
+            }
         }
-    }
 
-    $querystring  = "SELECT count(id)
-                       FROM {$serendipity['dbPrefix']}entries e,
-                         {$serendipity['dbPrefix']}entrycat ec,
-                         {$serendipity['dbPrefix']}category c
-                       WHERE e.isdraft = 'false'
-                         AND e.id = ec.entryid AND ec.categoryid = c.categoryid ";
-    if (isset($serendipity['GET']['category'])) {
-        $_categoryid = explode('_', $serendipity['GET']['category']);
-        $categoryid  = serendipity_db_escape_string($_categoryid[0]);
+        $querystring  = "SELECT count(id)
+                           FROM {$serendipity['dbPrefix']}entries e,
+                             {$serendipity['dbPrefix']}entrycat ec,
+                             {$serendipity['dbPrefix']}category c
+                           WHERE e.isdraft = 'false'
+                             AND e.id = ec.entryid AND ec.categoryid = c.categoryid ";
+        if (isset($serendipity['GET']['category'])) {
+            $_categoryid = explode('_', $serendipity['GET']['category']);
+            $categoryid  = serendipity_db_escape_string($_categoryid[0]);
 
-        if (is_numeric($categoryid)) {
-            $querystring .= " AND c.category_left BETWEEN " . implode(' AND ', serendipity_fetchCategoryRange($categoryid));
+            if (is_numeric($categoryid)) {
+                $querystring .= " AND c.category_left BETWEEN " . implode(' AND ', serendipity_fetchCategoryRange($categoryid));
+            }
         }
-    }
 
-    $query        = serendipity_db_query($querystring);
+        $query        = serendipity_db_query($querystring);
 
-    $totalEntries = $query[0][0];
-    $totalPages   = ceil($totalEntries / (!empty($serendipity['fetchLimit']) ? $serendipity['fetchLimit'] : 15));
+        $totalEntries = $query[0][0];
+        $totalPages   = ceil($totalEntries / (!empty($serendipity['fetchLimit']) ? $serendipity['fetchLimit'] : 15));
 
-    if (!isset($serendipity['GET']['page'])) {
-        $serendipity['GET']['page'] = 1;
+        if (!isset($serendipity['GET']['page'])) {
+            $serendipity['GET']['page'] = 1;
+        }
     }
 ?>
 <div class='serendipity_entryFooter' style="text-align: center">
 <?php
-    if ($serendipity['GET']['page'] > 1) {
+    if (!$short_output) {
+        if ($serendipity['GET']['page'] > 1) {
 ?>
 <a href="<?php echo $serendipity['baseURL'] . $serendipity['indexFile'] . '?serendipity[page]=' . ($serendipity['GET']['page'] - 1) . $add_query; ?>">&laquo; <?php echo PREVIOUS_PAGE; ?></a>&nbsp;&nbsp;
 <?php
-    }
+        }
 ?>
 (<?php printf(PAGE_BROWSE, $serendipity['GET']['page'], $totalPages, $totalEntries); ?>)
 <?php
-    if ($serendipity['GET']['page'] < $totalPages) {
+        if ($serendipity['GET']['page'] < $totalPages) {
 ?>
 &nbsp;&nbsp;<a href="<?php echo $serendipity['baseURL'] . $serendipity['indexFile'] . '?serendipity[page]=' . ($serendipity['GET']['page'] + 1) . $add_query; ?>"><?php echo NEXT_PAGE; ?> &raquo;</a>
 <?php
+        }
     }
 
     serendipity_plugin_api::hook_event('entries_footer', $serendipity);
@@ -1296,9 +1300,11 @@
         } // end for-loop (dates)
 
         if (!isset($serendipity['GET']['id']) &&
-               (!isset($serendipity['GET']['hidefooter']) || $serendipity['GET']['hidefooter'] == false) &&
-               count($entries) <= (!empty($serendipity['fetchLimit']) ? $serendipity['fetchLimit'] : 15)) {
+               (!isset($serendipity['GET']['hidefooter']) || $serendipity['GET']['hidefooter'] == false &&
+               count($entries) <= (!empty($serendipity['fetchLimit']) ? $serendipity['fetchLimit'] : 15))) {
             serendipity_printEntryFooter();
+        } else {
+            serendipity_printEntryFooter(true);
         }
     } else { // else short mode
         $s = &$serendipity['GET']['range'];