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

[<bz...@us...>]

Revision: 4794
          http://linpha.svn.sourceforge.net/linpha/?rev=4794&view=rev
Author:   bzrudi
Date:     2007-11-10 08:19:35 -0800 (Sat, 10 Nov 2007)

Log Message:
-----------
"fixed a couple if errors
"

Modified Paths:
--------------
    trunk/linpha2/ChangeLog
    trunk/linpha2/admin/maintenance_import.php

Modified: trunk/linpha2/ChangeLog
===================================================================
--- trunk/linpha2/ChangeLog	2007-11-10 15:50:29 UTC (rev 4793)
+++ trunk/linpha2/ChangeLog	2007-11-10 16:19:35 UTC (rev 4794)
@@ -1,3 +1,7 @@
+2007-11-10 bzrudi
+ * bump exiftool to latest 7.00 stable release
+ * fixed a couple of issues in installer and maintenance_import.php
+ 
 2007-11-08 bzrudi
  * more security related stuff
 

Modified: trunk/linpha2/admin/maintenance_import.php
===================================================================
--- trunk/linpha2/admin/maintenance_import.php	2007-11-10 15:50:29 UTC (rev 4793)
+++ trunk/linpha2/admin/maintenance_import.php	2007-11-10 16:19:35 UTC (rev 4794)
@@ -126,7 +126,7 @@
 			if($_REQUEST['index_thumbnails']!='no')
 			{
 				echo '<h3>'.i18n("Parsing All Directories...").'</h3><br />';
-				$createthumbquery = $GLOBALS['linpha']->db->Execute("SELECT id FROM ".LIN_PREFIX."photos WHERE img_type <> 0 AND img_type <> 9999999");
+				$createthumbquery = $GLOBALS['linpha']->db->Execute("SELECT id FROM ".LIN_PREFIX."photos WHERE img_type <> '0' AND img_type <> '9999999'");
 			}
 		}
 		else	// $all_albums == false -> not all directory selected
@@ -139,9 +139,9 @@
 				$data = $GLOBALS['linpha']->db->GetRow("SELECT name FROM ".LIN_PREFIX."photos WHERE id = '".LinSql::linAddslashes($value)."'");				
 				echo i18n("Parsing Directory:").' '.$data['name'].'<br />';
 
-				$sql = "SELECT id FROM ".LIN_PREFIX."photos WHERE " .
+				$sql = "SELECT id, img_type FROM ".LIN_PREFIX."photos WHERE " .
 						"parent_id = '".LinSql::linAddslashes($value)."' AND " .
-						"img_type <> 0 AND img_type <> 9999999";
+						"img_type <> '0' AND img_type <> '9999999' ";
 
 				/**
 				 * delete thumbnails
@@ -152,7 +152,7 @@
 					$query = $GLOBALS['linpha']->db->Execute($sql);
 					while($data = $query->FetchRow(ADODB_FETCH_NUM))
 					{
-						if( LinImage::deleteCachedThumbnail($data[0]) )
+						if( LinImage::deleteCachedThumbnail($data[0], $data[1]))
 						{
 							echo " ".$data[0].",";
 						}


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