Changeset 2560

Timestamp:

Sep 21, 2008, 1:06:20 PM (16 years ago)

Author:

rvelices

Message:

• fix function get_fulldirs - works correctly eent for wrong params (virtual cats)
• fix functions_metadata.php - could not be included from inside another function

Location:

trunk/admin/include

Files:

• functions.php (modified) (3 diffs)
• functions_metadata.php (modified) (4 diffs)

trunk/admin/include/functions.php

@@ -799 +799 @@
   WHERE dir IS NOT NULL
 ;';
-  $result = pwg_query($query);
-  $cat_dirs = array();
-  while ($row = mysql_fetch_array($result))
-  {
-    $cat_dirs[$row['id']] = $row['dir'];
-  }
+  $cat_dirs = simple_hash_from_query($query, 'id', 'dir');
 
   // caching galleries_url
@@ -811 +806 @@
   FROM '.SITES_TABLE.'
 ;';
-  $result = pwg_query($query);
-  $galleries_url = array();
-  while ($row = mysql_fetch_array($result))
-  {
-    $galleries_url[$row['id']] = $row['galleries_url'];
-  }
+  $galleries_url = simple_hash_from_query($query, 'id', 'galleries_url');
 
   // categories : id, site_id, uppercats
@@ -824 +814 @@
 SELECT id, uppercats, site_id
   FROM '.CATEGORIES_TABLE.'
-  WHERE id IN (
+  WHERE dir IS NOT NULL
+    AND id IN (
 '.wordwrap(implode(', ', $cat_ids), 80, "\n").')
 ;';

trunk/admin/include/functions_metadata.php

@@ -24 +24 @@
 include_once(PHPWG_ROOT_PATH.'/include/functions_metadata.inc.php');
 
-$page['datefields'] = array('date_creation', 'date_available');
 
 function get_sync_iptc_data($file)
 {
-  global $conf, $page;
+  global $conf;
 
   $map = $conf['use_iptc_mapping'];
@@ -36 +35 @@
   foreach ($iptc as $pwg_key => $value)
   {
-    if (in_array($pwg_key, $page['datefields']))
+    if (in_array($pwg_key, array('date_creation', 'date_available')))
     {
       if (preg_match('/(\d{4})(\d{2})(\d{2})/', $value, $matches))
@@ -72 +71 @@
 function get_sync_exif_data($file)
 {
-  global $conf, $page;
+  global $conf;
 
   $exif = get_exif_data($file, $conf['use_exif_mapping']);
@@ -78 +77 @@
   foreach ($exif as $pwg_key => $value)
   {
-    if (in_array($pwg_key, $page['datefields']))
+    if (in_array($pwg_key, array('date_creation', 'date_available')))
     {
       if (preg_match('/^(\d{4}).(\d{2}).(\d{2})/', $value, $matches))