Changeset 18729 for trunk/include

Timestamp:

Oct 23, 2012, 10:19:57 PM (11 years ago)

Author:

rvelices

Message:

• navigation bar urls are always on the number of images per page boundaries (fix rare case when the admin changer the number of thumbs per page for guests, and then google bot fetches almost all start-xx pages)

File:

• trunk/include/functions.inc.php (modified) (8 diffs)

trunk/include/functions.inc.php

@@ -510 +510 @@
     $formated_date.= ' '.$lang['month'][(int)$ymdhms[1]];
   }
-  
+
   $formated_date.= ' '.$ymdhms[0];
   if ($show_time and count($ymdhms)>=5 )
@@ -533 +533 @@
       $tok = strtok('- :');
     }
-    
+
     if ($ymdhms[0] < 1970) return false;
     if (!isset($ymdhms[3])) $ymdhms[3] = 12;
@@ -540 +540 @@
     $original = mktime($ymdhms[3],$ymdhms[4],$ymdhms[5],$ymdhms[1],$ymdhms[2],$ymdhms[0]);
   }
-  
+
   // array of time period chunks
   $chunks = array(
@@ -551 +551 @@
     'second' => 1,
   );
-  
+
   $today = time(); /* Current unix time  */
   $since = abs($today - $original);
-  
+
   $print = null;
   foreach ($chunks as $name => $seconds)
@@ -569 +569 @@
   }
 
-  if ($today > $original) 
+  if ($today > $original)
   {
     $print = sprintf(l10n('%s ago'), $print);
@@ -577 +577 @@
     $print = sprintf(l10n('%s in the future'), $print);
   }
-  
+
   return $print;
 }
@@ -1422 +1422 @@
   if ($nb_element > $nb_element_page)
   {
-    $cur_page = ceil($start / $nb_element_page) + 1;
+    $url_start = $url.$start_str;
+
+    $cur_page = $navbar['CURRENT_PAGE'] = $start / $nb_element_page + 1;
     $maximum = ceil($nb_element / $nb_element_page);
+
+    $start = $nb_element_page * round( $start / $nb_element_page );
     $previous = $start - $nb_element_page;
     $next = $start + $nb_element_page;
     $last = ($maximum - 1) * $nb_element_page;
 
-    $navbar['CURRENT_PAGE'] = $cur_page;
-
     // link to first page and previous page?
     if ($cur_page != 1)
     {
       $navbar['URL_FIRST'] = $url;
-      $navbar['URL_PREV'] = $url.($previous > 0 ? $start_str.$previous : '');
+      $navbar['URL_PREV'] = $previous > 0 ? $url_start.$previous : $url;
     }
     // link on next page and last page?
     if ($cur_page != $maximum)
     {
-      $navbar['URL_NEXT'] = $url.$start_str.$next;
-      $navbar['URL_LAST'] = $url.$start_str.$last;
+      $navbar['URL_NEXT'] = $url_start.($next < $last ? $next : $last);
+      $navbar['URL_LAST'] = $url_start.$last;
     }
 
@@ -1446 +1448 @@
     $navbar['pages'] = array();
     $navbar['pages'][1] = $url;
-    $navbar['pages'][$maximum] = $url.$start_str.$last;
-
-    for ($i = max($cur_page - $pages_around , 2), $stop = min($cur_page + $pages_around + 1, $maximum);
+    for ($i = max( floor($cur_page) - $pages_around , 2), $stop = min( ceil($cur_page) + $pages_around + 1, $maximum);
          $i < $stop; $i++)
     {
       $navbar['pages'][$i] = $url.$start_str.(($i - 1) * $nb_element_page);
     }
-    ksort($navbar['pages']);
+    $navbar['pages'][$maximum] = $url_start.$last;
   }
   return $navbar;