[Linpha-cvs] SF.net SVN: linpha: [4456] trunk/linpha2

[<fan...@us...>]

Revision: 4456
Author:   fangehrn
Date:     2006-03-30 09:30:49 -0800 (Thu, 30 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/linpha/?rev=4456&view=rev

Log Message:
-----------
 * fixing some errors in browse by date view
   (we got an endless loop if meta_exif is empty)
   rudi: maybe that solves your problem..

Modified Paths:
--------------
    trunk/linpha2/ChangeLog
    trunk/linpha2/lib/classes/linpha.imgview.class.php
    trunk/linpha2/templates/default/home.html.php
Modified: trunk/linpha2/ChangeLog
===================================================================
--- trunk/linpha2/ChangeLog	2006-03-29 16:53:38 UTC (rev 4455)
+++ trunk/linpha2/ChangeLog	2006-03-30 17:30:49 UTC (rev 4456)
@@ -1,3 +1,8 @@
+2006-03-30 flo
+ * fixing some errors in browse by date view
+   (we got an endless loop if meta_exif is empty)
+   rudi: maybe that solves your problem..
+
 2006-03-29 flo
  * rearanged templates
  * thumbnails are now cropped -> they are all squares now

Modified: trunk/linpha2/lib/classes/linpha.imgview.class.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.imgview.class.php	2006-03-29 16:53:38 UTC (rev 4455)
+++ trunk/linpha2/lib/classes/linpha.imgview.class.php	2006-03-30 17:30:49 UTC (rev 4456)
@@ -584,25 +584,28 @@
  */
 function setBrowseByDate()
 {
+	$GLOBALS['linpha']->template->output['browse_by_date'] = '';
+
 	$data = $GLOBALS['linpha']->db->GetRow("SELECT min(datetimeoriginal), max(datetimeoriginal) " .
 		"FROM ".PREFIX."meta_exif");
-	
-	/**
-	 * get min and max year
-	 */
-	$min_year = substr($data[0],0,4);
-	$max_year = substr($data[1],0,4);
-	
-	/**
-	 * get years between
-	 */
-	$GLOBALS['linpha']->template->output['browse_by_date'] = '';
-	for($i = $min_year; $i <= $max_year; $i++)
+	if(isset($data[0]) && isset($data[1]) && !empty($data[0]) && !empty($data[1]) )
 	{
-		$data = $GLOBALS['linpha']->db->GetRow("SELECT count(datetimeoriginal) FROM ".PREFIX."meta_exif WHERE datetimeoriginal LIKE '".$i."%'");
-		if($data[0]>0)
+		/**
+		 * get min and max year
+		 */
+		$min_year = substr($data[0],0,4);
+		$max_year = substr($data[1],0,4);
+		
+		/**
+		 * get years between
+		 */
+		for($i = $min_year; $i <= $max_year; $i++)
 		{
-			$GLOBALS['linpha']->template->output['browse_by_date'] .= '<a href="'.LINPHA_DIR.'/?cat=browse&amp;year='.$i.'">'.$i.'</a> ('.$data[0].'), ';
+			$data = $GLOBALS['linpha']->db->GetRow("SELECT count(datetimeoriginal) FROM ".PREFIX."meta_exif WHERE datetimeoriginal LIKE '".$i."%'");
+			if($data[0]>0)
+			{
+				$GLOBALS['linpha']->template->output['browse_by_date'] .= '<a href="'.LINPHA_DIR.'/?cat=browse&amp;year='.$i.'">'.$i.'</a> ('.$data[0].'), ';
+			}
 		}
 	}
 }

Modified: trunk/linpha2/templates/default/home.html.php
===================================================================
--- trunk/linpha2/templates/default/home.html.php	2006-03-29 16:53:38 UTC (rev 4455)
+++ trunk/linpha2/templates/default/home.html.php	2006-03-30 17:30:49 UTC (rev 4456)
@@ -29,8 +29,12 @@
 	<hr />
 <?php } ?>
 
-<?php echo i18n("Browse by Date").': '.$GLOBALS['linpha']->template->output['browse_by_date']; ?><br />
-<hr />
+<?php
+if(!empty($GLOBALS['linpha']->template->output['browse_by_date'])) {
+	echo i18n("Browse by Date").': '.$GLOBALS['linpha']->template->output['browse_by_date'];
+	echo "<br /><hr />";
+}
+?>
 
 <h1><?php echo i18n("Albums"); ?></h1>
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.