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

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

Revision: 4860
          http://linpha.svn.sourceforge.net/linpha/?rev=4860&view=rev
Author:   bzrudi
Date:     2008-02-11 09:51:58 -0800 (Mon, 11 Feb 2008)

Log Message:
-----------
Removed all calls for ADODB_FETCH_NUM as they do no longer work.

Modified Paths:
--------------
    trunk/linpha2/ChangeLog
    trunk/linpha2/admin/maintenance_import.php
    trunk/linpha2/admin/permissions_readwrite.php
    trunk/linpha2/install/step10_postsettings.php
    trunk/linpha2/lib/classes/linpha.image.class.php
    trunk/linpha2/lib/classes/linpha.imgview.class.php
    trunk/linpha2/lib/classes/linpha.import.class.php
    trunk/linpha2/lib/classes/linpha.metadata.class.php
    trunk/linpha2/lib/classes/linpha.sql.class.php
    trunk/linpha2/lib/modules/module.basket.php
    trunk/linpha2/lib/modules/module.benchmark.php
    trunk/linpha2/lib/modules/module.browse.php
    trunk/linpha2/lib/modules/module.search.php

Modified: trunk/linpha2/ChangeLog
===================================================================
--- trunk/linpha2/ChangeLog	2008-02-11 16:30:34 UTC (rev 4859)
+++ trunk/linpha2/ChangeLog	2008-02-11 17:51:58 UTC (rev 4860)
@@ -1,4 +1,12 @@
-
+2008-02-11 bzrudi
+ * Removed all calls for ADODB_FETCH_NUM as they do no longer work.
+   AdoDB documentation says FTECH_ASSOC is nearly as fast as FETCH_NUM. 
+   As we used FETCH_NUM just in a small number of cases, I guess it's save to
+   convert to default (FETCH_ASSOC).
+   To be true I wonder if it ever worked as expected as we sometimes asked for
+   FETCH_NUM but return was used as ASSOC !?!?. However let's use ASSOC to 
+   be save.
+   
 2008-02-07 flo
  * AdoDB updated to version 503
  * fixed adodb error handler

Modified: trunk/linpha2/admin/maintenance_import.php
===================================================================
--- trunk/linpha2/admin/maintenance_import.php	2008-02-11 16:30:34 UTC (rev 4859)
+++ trunk/linpha2/admin/maintenance_import.php	2008-02-11 17:51:58 UTC (rev 4860)
@@ -150,11 +150,11 @@
 				{
 					echo i18n("Delete Thumbnails");
 					$query = $GLOBALS['linpha']->db->Execute($sql);
-					while($data = $query->FetchRow(ADODB_FETCH_NUM))
+					while($data = $query->FetchRow())
 					{
-						if( LinImage::deleteCachedThumbnail($data[0], $data[1]))
+						if( LinImage::deleteCachedThumbnail($data['id'], $data['img_type']))
 						{
-							echo " ".$data[0].",";
+							echo " ".$data['id'].",";
 						}
 					}
 					echo '<br />';
@@ -176,15 +176,15 @@
 		if($_REQUEST['index_thumbnails']!='no')
 		{
 			echo i18n("Create Thumbnail");
-			while($data = $createthumbquery->FetchRow(ADODB_FETCH_NUM))
+			while($data = $createthumbquery->FetchRow())
 			{
-				if( ! $thumbnail->createThumbnail($data[0]) )
+				if( ! $thumbnail->createThumbnail($data['0']) )
 				{
 					echo i18n("Error While Creating Thumbnail!")."<br />Error: ".$thumbnail->error_msg."<br />";
 				}
 				if( ! $thumbnail->isCached )	// thumbnail wasn't cached -> now created!
 				{
-					echo " ".$data[0].",";
+					echo " ".$data['0'].",";
 				}
 				flush();
 			}
@@ -233,7 +233,7 @@
 					$query = $GLOBALS['linpha']->db->Execute("SELECT id, md5sum FROM ".LIN_PREFIX."photos WHERE " .
 							"parent_id = '".LinSql::linAddslashes($value)."' AND " .
 							"img_type <> 0 AND img_type <> 9999999");
-					while($data = $query->FetchRow(ADODB_FETCH_NUM))
+					while($data = $query->FetchRow())
 					{
 			        	$array_meta_ids[$data['id']] = $data['md5sum'];
 					}
@@ -387,11 +387,11 @@
 
 	$num = 0;
 	$query = $GLOBALS['linpha']->db->Execute("SELECT id FROM ".LIN_PREFIX."photos WHERE img_type <> 0 AND img_type <> 9999999");
-	while($data = $query->FetchRow(ADODB_FETCH_NUM))
+	while($data = $query->FetchRow())
 	{
 
 		$thumbnail->mode = 'thumb';
-		$thumbnail->photo_id = $data[0];
+		$thumbnail->photo_id = $data['0'];
 
 		$thumbnail->setFileInformation();
 		

Modified: trunk/linpha2/admin/permissions_readwrite.php
===================================================================
--- trunk/linpha2/admin/permissions_readwrite.php	2008-02-11 16:30:34 UTC (rev 4859)
+++ trunk/linpha2/admin/permissions_readwrite.php	2008-02-11 17:51:58 UTC (rev 4860)
@@ -122,9 +122,9 @@
 	 */
 		$array_groups = Array();
 		$query = $GLOBALS['linpha']->db->Execute("SELECT id, group_name FROM ".LIN_PREFIX."groups WHERE group_name <> 'admin'");
-		while($data = $query->FetchRow(ADODB_FETCH_NUM))
+		while($data = $query->FetchRow())
 		{
-			$array_groups[$data[0]] = $data[1];
+			$array_groups[$data['id']] = $data['group_name'];
 		}
 	
 	/**
@@ -154,10 +154,10 @@
 		
 		$query = $GLOBALS['linpha']->db->Execute("SELECT name FROM ".LIN_PREFIX."photos " .
 				"WHERE id = '".LinSql::linAddslashes($linpha->template->idCurrent)."'");
-		$data = $query->FetchRow(ADODB_FETCH_NUM);
+		$data = $query->FetchRow();
 		?>
 		<form name="permission" method="POST" action="<?php echo LINPHA_DIR.'/admin/?cat=permissions_'.$cat2.'&amp;parent_id='.$parent_id; ?>">
-		<h3><?php echo i18n("Change/Add permissions of folder/file"); ?> "<?php echo $data[0]; ?>"</h3>
+		<h3><?php echo i18n("Change/Add permissions of folder/file"); ?> "<?php echo $data['name']; ?>"</h3>
 		
 		<?php
 		/**

Modified: trunk/linpha2/install/step10_postsettings.php
===================================================================
--- trunk/linpha2/install/step10_postsettings.php	2008-02-11 16:30:34 UTC (rev 4859)
+++ trunk/linpha2/install/step10_postsettings.php	2008-02-11 17:51:58 UTC (rev 4860)
@@ -98,9 +98,9 @@
 <?php
 $query = $linpha->db->Execute("SELECT option_value FROM ".LIN_PREFIX."config " .
 		"WHERE option_name='sys_im_use_imagemagick'");
-$data = $query->FetchRow(ADODB_FETCH_NUM);
+$data = $query->FetchRow();
 
-if(false === $data[0])
+if(false === $data['option_value'])
 {
 	echo "<h2>".i18n_install("Please Choose Thumbnail Quality")."</h2><hr>";
 	?>

Modified: trunk/linpha2/lib/classes/linpha.image.class.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.image.class.php	2008-02-11 16:30:34 UTC (rev 4859)
+++ trunk/linpha2/lib/classes/linpha.image.class.php	2008-02-11 17:51:58 UTC (rev 4860)
@@ -797,9 +797,9 @@
     function deleteCachedImage($id,$img_type)
     {
         $query = $GLOBALS['linpha']->db->Execute("SELECT id FROM ".LIN_PREFIX."photos_cache WHERE photo_id = '".$id."'");
-        while($data = $query->FetchRow(ADODB_FETCH_NUM))
+        while($data = $query->FetchRow())
         {
-            $output = LinImage::getCachePath('img',$data[0],$img_type);
+            $output = LinImage::getCachePath('img',$data['id'],$img_type);
 
             if(file_exists($output))
             {

Modified: trunk/linpha2/lib/classes/linpha.imgview.class.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.imgview.class.php	2008-02-11 16:30:34 UTC (rev 4859)
+++ trunk/linpha2/lib/classes/linpha.imgview.class.php	2008-02-11 17:51:58 UTC (rev 4860)
@@ -26,7 +26,7 @@
 if(!defined('LINPHA_DIR')) { exit(1); }
 
 define('LIN_SELECT_FIELDS',
-		"".LIN_PREFIX."photos.id AS 'id2', " .
+		"".LIN_PREFIX."photos.id AS id2, " .
         "".LIN_PREFIX."photos.id AS id, ".LIN_PREFIX."photos.name AS name, " .
 		"".LIN_PREFIX."photos.img_type AS img_type, ".LIN_PREFIX."photos.md5sum AS md5sum, " .
 		"".LIN_PREFIX."photos.width AS width, ".LIN_PREFIX."photos.height AS height, " .
@@ -260,7 +260,7 @@
 					$value['name'] = htmlspecialchars($value['name'],ENT_QUOTES);
 					$this->photos_filtered[] = $value;
 					
-					print_r($value);
+					//print_r($value);
 				}
 			}
 		}
@@ -973,15 +973,15 @@
 	{
 		$GLOBALS['linpha']->template->output['browse_by_date'] = '';
 	
-		$data = $GLOBALS['linpha']->db->GetRow("SELECT min(datetimeoriginal), max(datetimeoriginal) " .
+		$data = $GLOBALS['linpha']->db->GetRow("SELECT min(datetimeoriginal) AS min , max(datetimeoriginal) AS max " .
 			"FROM ".LIN_PREFIX."meta_exif");
-		if(isset($data[0]) && isset($data[1]) && !empty($data[0]) && !empty($data[1]) )
+		if(isset($data['min']) && isset($data['max']) && !empty($data['min']) && !empty($data['max']) )
 		{
 			/**
 			 * get min and max year
 			 */
-			$min_year = substr($data[0],0,4);
-			$max_year = substr($data[1],0,4);
+			$min_year = substr($data['min'],0,4);
+			$max_year = substr($data['max'],0,4);
 			/**
 			 * get years between
 			 */
@@ -992,10 +992,10 @@
 				 */
 				if($i > 1900)
 				{
-					$data = $GLOBALS['linpha']->db->GetRow("SELECT count(datetimeoriginal) FROM ".LIN_PREFIX."meta_exif WHERE datetimeoriginal LIKE '".$i."%'");
-					if($data[0]>0)
+					$data = $GLOBALS['linpha']->db->GetRow("SELECT count(datetimeoriginal) AS datetime FROM ".LIN_PREFIX."meta_exif WHERE datetimeoriginal LIKE '".$i."%'");
+					if($data['datetime']>0)
 					{
-						$GLOBALS['linpha']->template->output['browse_by_date'] .= '<a href="'.LINPHA_LINK.'&amp;linCat=browse&amp;year='.$i.'">'.$i.'</a> ('.$data[0].'), ';
+						$GLOBALS['linpha']->template->output['browse_by_date'] .= '<a href="'.LINPHA_LINK.'&amp;linCat=browse&amp;year='.$i.'">'.$i.'</a> ('.$data['datetime'].'), ';
 					}
 				}
 			}
@@ -1033,14 +1033,14 @@
 	
 		for($i = 1; $i <= $nr_images ; )
 		{
-			$data = $query->FetchRow(ADODB_FETCH_NUM);
-			if(isset($data['0']))
+			$data = $query->FetchRow();
+			if(isset($data['id']))
 			{
-				$path = LinSql::getFullImagePath( $data[0] );
+				$path = LinSql::getFullImagePath( $data['id'] );
 
-				if(file_exists($path) && LinSql::photoIsAllowed($data['0']))
+				if(file_exists($path) && LinSql::photoIsAllowed($data['id']))
 				{
-					$GLOBALS['linpha']->template->output[$key][] = array('id'=>$data['0'],'path'=>$path);
+					$GLOBALS['linpha']->template->output[$key][] = array('id'=>$data['id'],'path'=>$path);
 					$i++;
 				}
 			}

Modified: trunk/linpha2/lib/classes/linpha.import.class.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.import.class.php	2008-02-11 16:30:34 UTC (rev 4859)
+++ trunk/linpha2/lib/classes/linpha.import.class.php	2008-02-11 17:51:58 UTC (rev 4860)
@@ -142,15 +142,15 @@
 			$query = $GLOBALS['linpha']->db->Execute("SELECT id " .
 					"FROM ".LIN_PREFIX."photos WHERE img_type = '0' " .
 					"AND parent_id = '".$parent_id."'");
-			while($data = $query->FetchRow(ADODB_FETCH_NUM))
+			while($data = $query->FetchRow())
 			{
 				/**
 				 * on dryrun, the delete process isn't done completley
 				 * so it would appear here again, prevent this!
 				 */
-				if( !isset($deleted_keys) OR !in_array($data['0'],$deleted_keys) )
+				if( !isset($deleted_keys) OR !in_array($data['id'],$deleted_keys) )
 				{
-					LinImport::updateDir($data['0'], $recursive, $dryrun);
+					LinImport::updateDir($data['id'], $recursive, $dryrun);
 				}
 			}
 		}
@@ -187,7 +187,7 @@
 	/**
 	 * delete thumbnail if one exists with the same id
 	 */
-	$inserted_id = $GLOBALS['linpha']->db->GetOne("SELECT MAX(id) FROM ".LIN_PREFIX."photos ");
+	$inserted_id = $GLOBALS['linpha']->db->GetOne("SELECT max(id) FROM ".LIN_PREFIX."photos ");
 
 	LinImage::deleteCachedThumbnail($inserted_id,$file_type);
 
@@ -381,10 +381,10 @@
 {
 	if( $id != 0 )
 	{
-		$data = $GLOBALS['linpha']->db->GetRow("SELECT sum(stats_numbers) " .
+		$data = $GLOBALS['linpha']->db->GetRow("SELECT sum(stats_numbers) AS s " .
 				"FROM ".LIN_PREFIX."photos WHERE parent_id = '".$id."'");
 		$GLOBALS['linpha']->db->Execute("UPDATE ".LIN_PREFIX."photos " .
-				"SET stats_numbers = '".$data[0]."' WHERE id = '".$id."'");    	
+				"SET stats_numbers = '".$data['s']."' WHERE id = '".$id."'");    	
 		
 		$data = $GLOBALS['linpha']->db->GetRow("SELECT parent_id " .
 				"FROM ".LIN_PREFIX."photos WHERE id = '".$id."'");

Modified: trunk/linpha2/lib/classes/linpha.metadata.class.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.metadata.class.php	2008-02-11 16:30:34 UTC (rev 4859)
+++ trunk/linpha2/lib/classes/linpha.metadata.class.php	2008-02-11 17:51:58 UTC (rev 4860)
@@ -73,9 +73,9 @@
                 "WHERE flags = '" . $flag_nr . "' " .
                 "ORDER by id");
 
-            while ($fields_data = $query->FetchRow(ADODB_FETCH_NUM))
+            while ($fields_data = $query->FetchRow())
             {
-                $this->cachedSelectedFieldNames[] = $fields_data['0'];
+                $this->cachedSelectedFieldNames[] = $fields_data['name'];
             }
         }
 
@@ -938,7 +938,7 @@
 
         while($data = $query->FetchRow())
         {
-            $filename = LinSql::getFullImagePath($data['0']);
+            $filename = LinSql::getFullImagePath($data['id']);
             $dataArray = $this->objMetaTool->readMetaDataFromFile('exif', $filename);
 
             //echo '<pre>', print_r($dataArray), '</pre>';

Modified: trunk/linpha2/lib/classes/linpha.sql.class.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.sql.class.php	2008-02-11 16:30:34 UTC (rev 4859)
+++ trunk/linpha2/lib/classes/linpha.sql.class.php	2008-02-11 17:51:58 UTC (rev 4860)
@@ -57,7 +57,7 @@
         }
         else
         {
-            error_reporting(0);
+            error_reporting('E_ALL');
             include_once(LINPHA_DIR.'/lib/classes/adodb-errorhandler.inc.php');
             
             /**
@@ -171,7 +171,7 @@
 
 
             }
-            exit(1);
+            //exit(1);
         }
         
         
@@ -477,7 +477,7 @@
             $query = $GLOBALS['linpha']->db->Execute("SELECT option_name, option_value " .
 				"FROM ".LIN_PREFIX."config WHERE user_id = '".LinSql::linAddslashes($_SESSION['user_id'])."'");
 
-            while($data = $query->FetchRow(ADODB_FETCH_NUM))
+            while($data = $query->FetchRow())
             {
                 $GLOBALS['linpha']->sql->config->value[$data['option_name']] = $data['option_value'];
             }
@@ -545,18 +545,18 @@
 				"WHERE perm_type = '".LinSql::linAddslashes($perm_type)."' " .
 				"AND photos_id = '".LinSql::linAddslashes($photos_id)."'");
 
-            if( isset( $data[0] ) && !empty( $data[0] ) )
+            if( isset( $data['permission'] ) && !empty( $data['permission'] ) )
             {
-                return array($i, $data[0]);
+                return array($i, $data['permission']);
             }
             else
             {
                 $data = $GLOBALS['linpha']->db->GetRow("SELECT parent_id FROM ".LIN_PREFIX."photos " .
 				"WHERE id = '".LinSql::linAddslashes($photos_id)."'");
 
-                if( isset( $data[0] ) )
+                if( isset( $data['parent_id'] ) )
                 {
-                    $photos_id = $data[0];
+                    $photos_id = $data['parent_id'];
                 }
                 else
                 {
@@ -968,7 +968,7 @@
          */
         $query = $GLOBALS['linpha']->db->Execute("SELECT option_name, option_value " .
 			"FROM ".LIN_PREFIX."config WHERE user_id = '0'");
-        while($data = $query->FetchRow(ADODB_FETCH_NUM))
+        while($data = $query->FetchRow())
         {
             $this->value[$data['option_name']] = $data['option_value'];
         }
@@ -983,7 +983,7 @@
             $query = $GLOBALS['linpha']->db->Execute("SELECT option_name, option_value " .
 				"FROM ".LIN_PREFIX."config WHERE user_id = '".$_SESSION['user_id']."'");
 
-            while($data = $query->FetchRow(ADODB_FETCH_NUM))
+            while($data = $query->FetchRow())
             {
                 $GLOBALS['linpha']->sql->config->value[$data['option_name']] = $data['option_value'];
             }

Modified: trunk/linpha2/lib/modules/module.basket.php
===================================================================
--- trunk/linpha2/lib/modules/module.basket.php	2008-02-11 16:30:34 UTC (rev 4859)
+++ trunk/linpha2/lib/modules/module.basket.php	2008-02-11 17:51:58 UTC (rev 4860)
@@ -166,12 +166,12 @@
 		foreach($_SESSION['basket_ids'] AS $value)
 		{
 			$data = $GLOBALS['linpha']->db->GetRow("SELECT parent_id FROM ".LIN_PREFIX."photos WHERE id = '". LinSql::linAddslashes($value)."'" );
-			$array_folders[] = $data[0];
+			$array_folders[] = $data['parent_id'];
 			
 			/**
 			 * store all imgids in an array with parent_id as the key for easy access
 			 */
-			$GLOBALS['linpha']->template->output['basket_folder_contents'][$data[0]][] = $value;
+			$GLOBALS['linpha']->template->output['basket_folder_contents'][$data['parent_id']][] = $value;
 		}
 		
 		$GLOBALS['linpha']->template->output['basket_folders'] = array_unique($array_folders);

Modified: trunk/linpha2/lib/modules/module.benchmark.php
===================================================================
--- trunk/linpha2/lib/modules/module.benchmark.php	2008-02-11 16:30:34 UTC (rev 4859)
+++ trunk/linpha2/lib/modules/module.benchmark.php	2008-02-11 17:51:58 UTC (rev 4860)
@@ -17,7 +17,7 @@
     
     $query = $GLOBALS['linpha']->db->Execute("SELECT option_name, option_value " .
         "FROM ".LIN_PREFIX."config WHERE user_id = '0'");
-    while($data = $query->FetchRow(ADODB_FETCH_NUM))
+    while($data = $query->FetchRow())
     {
         $config[$data['option_name']] = $data['option_value'];
     }

Modified: trunk/linpha2/lib/modules/module.browse.php
===================================================================
--- trunk/linpha2/lib/modules/module.browse.php	2008-02-11 16:30:34 UTC (rev 4859)
+++ trunk/linpha2/lib/modules/module.browse.php	2008-02-11 17:51:58 UTC (rev 4860)
@@ -69,11 +69,11 @@
 /**
  * year
  */
-	$data = $linpha->db->GetRow("SELECT min(datetimeoriginal), max(datetimeoriginal) " .
+	$data = $linpha->db->GetRow("SELECT min(datetimeoriginal) AS min, max(datetimeoriginal)  AS max " .
 		"FROM ".LIN_PREFIX."meta_exif");
 
-	$min_year = substr($data[0],0,4);
-	$max_year = substr($data[1],0,4);
+	$min_year = substr($data['min'],0,4);
+	$max_year = substr($data['max'],0,4);
 	
 	$sum = 0;
 	
@@ -87,19 +87,19 @@
 		 */
 		if($i > 1900)
 		{
-			$data = $linpha->db->GetRow("SELECT count(datetimeoriginal) FROM ".LIN_PREFIX."meta_exif WHERE datetimeoriginal LIKE '".$i."%'");
-			if($data[0]>0)
+			$data = $linpha->db->GetRow("SELECT count(datetimeoriginal) AS datetime FROM ".LIN_PREFIX."meta_exif WHERE datetimeoriginal LIKE '".$i."%'");
+			if($data['datetime']>0)
 			{
 				if(isset($_GET['year']) && $i == $_GET['year'])
 				{
-					$str_datelinks .= $i.' ('.$data[0].'), ';
+					$str_datelinks .= $i.' ('.$data['datetime'].'), ';
 				}
 				else
 				{
-					$str_datelinks .= '<a href="'.$url_base.'&amp;year='.$i.'">'.$i.'</a> ('.$data[0].'), ';
+					$str_datelinks .= '<a href="'.$url_base.'&amp;year='.$i.'">'.$i.'</a> ('.$data['datetime'].'), ';
 				}
 				
-				$sum += $data[0];
+				$sum += $data['datetime'];
 			}
 		}
 	}
@@ -107,8 +107,11 @@
 	/**
 	 * calc not indexed images
 	 */
-		$data = $linpha->db->GetRow("SELECT sum( stats_numbers ) FROM ".LIN_PREFIX."photos WHERE parent_id = '0' GROUP BY parent_id");
-		$str_datelinks .= '<a href="'.$url_base.'&amp;year=0">'.i18n("not indexed").'</a> ('.($data[0]-$sum).')';
+		$data = $linpha->db->GetRow("SELECT sum( stats_numbers ) AS sum " . 
+		  "FROM ".LIN_PREFIX."photos " . 
+		  "WHERE parent_id = '0' " . 
+		  "GROUP BY parent_id");
+		$str_datelinks .= '<a href="'.$url_base.'&amp;year=0">'.i18n("not indexed").'</a> ('.($data['sum']-$sum).')';
 
 
 	if(isset($_GET['year']) && $_GET['year'] != 0)
@@ -127,17 +130,19 @@
 				$i = "0".$i;
 			}
 			
-			$data = $linpha->db->GetRow("SELECT count(datetimeoriginal) FROM ".LIN_PREFIX."meta_exif " .
-					"WHERE datetimeoriginal LIKE '".LinSql::linAddslashes($search_string).":".$i."%'");
-			if($data[0]>0)
+			$data = $linpha->db->GetRow("SELECT count(datetimeoriginal) AS datetime " . 
+			    "FROM ".LIN_PREFIX."meta_exif " .
+                "WHERE datetimeoriginal " . 
+                "LIKE '".LinSql::linAddslashes($search_string).":".$i."%'");
+			if($data['datetime']>0)
 			{
 				if(isset($_GET['month']) && $i == $_GET['month'])
 				{
-					$str_datelinks .= $i.' ('.$data[0].'), ';
+					$str_datelinks .= $i.' ('.$data['datetime'].'), ';
 				}
 				else
 				{
-					$str_datelinks .= '<a href="'.$url_base.'&amp;year='.$_GET['year'].'&amp;month='.$i.'">'.$i.'</a> ('.$data[0].'), ';
+					$str_datelinks .= '<a href="'.$url_base.'&amp;year='.$_GET['year'].'&amp;month='.$i.'">'.$i.'</a> ('.$data['datetime'].'), ';
 				}
 			}
 		}
@@ -162,17 +167,19 @@
 				$i = "0".$i;
 			}
 			
-			$data = $linpha->db->GetRow("SELECT count(datetimeoriginal) FROM ".LIN_PREFIX."meta_exif " .
-					"WHERE datetimeoriginal LIKE '".LinSql::linAddslashes($search_string).":".$i."%'");
-			if($data[0]>0)
+			$data = $linpha->db->GetRow("SELECT count(datetimeoriginal) AS datetime " . 
+			    "FROM ".LIN_PREFIX."meta_exif " .
+				"WHERE datetimeoriginal " . 
+				"LIKE '".LinSql::linAddslashes($search_string).":".$i."%'");
+			if($data['datetime']>0)
 			{
 				if(isset($_GET['day']) && $i == $_GET['day'])
 				{
-					$str_datelinks .= $i.' ('.$data[0].'), ';
+					$str_datelinks .= $i.' ('.$data['datetime'].'), ';
 				}
 				else
 				{
-					$str_datelinks .= '<a href="'.$url_base.'&amp;year='.$_GET['year'].'&amp;month='.$_GET['month'].'&amp;day='.$i.'">'.$i.'</a> ('.$data[0].'), ';
+					$str_datelinks .= '<a href="'.$url_base.'&amp;year='.$_GET['year'].'&amp;month='.$_GET['month'].'&amp;day='.$i.'">'.$i.'</a> ('.$data['datetime'].'), ';
 				}
 			}
 		}

Modified: trunk/linpha2/lib/modules/module.search.php
===================================================================
--- trunk/linpha2/lib/modules/module.search.php	2008-02-11 16:30:34 UTC (rev 4859)
+++ trunk/linpha2/lib/modules/module.search.php	2008-02-11 17:51:58 UTC (rev 4860)
@@ -198,9 +198,9 @@
 		}
 
 		$query = $GLOBALS['linpha']->db->Execute("SELECT id FROM ".LIN_PREFIX."meta_fields WHERE field_type = '1' AND (flags = '5' OR flags = '7')");
-		while($data = $query->FetchRow(ADODB_FETCH_NUM))
+		while($data = $query->FetchRow())
 		{
-			if(isset($_REQUEST['button']['meta'][$data[0]]) OR isset($_REQUEST['button']['meta']['all']))
+			if(isset($_REQUEST['button']['meta'][$data['id']]) OR isset($_REQUEST['button']['meta']['all']))
 			{
 				$sql_buttons .= " OR (";
 				
@@ -208,7 +208,7 @@
 				reset($array_strings);
 				for($i = 1; list($key,$value) = each($array_strings); $i++)
 				{
-					$sql_buttons .= " (".LIN_PREFIX."meta_data.field_id = '".$data[0]."' AND ".LIN_PREFIX."meta_data.meta_data LIKE '%".$value."%') ";
+					$sql_buttons .= " (".LIN_PREFIX."meta_data.field_id = '".$data['id']."' AND ".LIN_PREFIX."meta_data.meta_data LIKE '%".$value."%') ";
 					
 					/**
 					 * append AND/OR, but not on last item


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