Changeset 2304

Timestamp:

Apr 19, 2008, 5:00:11 AM (16 years ago)

Author:

rvelices

Message:

merge -r 2303 from branch-1_7 to trunk

• removed some unused code
• mass_updates function does not need SELECT VERSION()
• rewrote update_uppercats to avoid db update if no change

Location:

trunk/admin

Files:

• include/functions.php (modified) (7 diffs)
• picture_modify.php (modified) (4 diffs)

trunk/admin/include/functions.php

@@ -60 +60 @@
 function delete_categories($ids)
 {
-  global $counts;
-
   if (count($ids) == 0)
   {
@@ -122 +120 @@
   pwg_query($query);
 
-  if (isset($counts['del_categories']))
-  {
-    $counts['del_categories']+= count($ids);
-  }
   trigger_action('delete_categories', $ids);
 }
@@ -136 +130 @@
 function delete_elements($ids)
 {
-  global $counts;
-
   if (count($ids) == 0)
   {
@@ -199 +191 @@
   pwg_query($query);
 
-  if (isset($counts['del_elements']))
-  {
-    $counts['del_elements']+= count($ids);
-  }
   trigger_action('delete_elements', $ids);
 }
@@ -437 +425 @@
 }
 
-function date_convert_back( $date )
-{
-  // date arrives at this format : YYYY-MM-DD
-  // It must be transformed in DD/MM/YYYY
-  if ( $date != '' )
-  {
-    list($year,$month,$day) = explode( '-', $date );
-    return $day.'/'.$month.'/'.$year;
-  }
-  else
-  {
-    return '';
-  }
-}
-
 /**
  * returns an array containing sub-directories which can be a category,
@@ -576 +549 @@
     // depending on the MySQL version, we use the multi table update or N
     // update queries
-    $query = 'SELECT VERSION() AS version;';
-    list($mysql_version) = mysql_fetch_array(pwg_query($query));
-    if (count($datas) < 10 or version_compare($mysql_version, '4.0.4') < 0)
+    if (count($datas) < 10 or version_compare(mysql_get_server_info(), '4.0.4') < 0)
     {
       // MySQL is prior to version 4.0.4, multi table update feature is not
@@ -1185 +1156 @@
 function update_uppercats()
 {
-  $uppercat_ids = array();
-
-  $query = '
-SELECT id, id_uppercat
+  $query = '
+SELECT id, id_uppercat, uppercats
   FROM '.CATEGORIES_TABLE.'
 ;';
-  $result = pwg_query($query);
-  while ($row = mysql_fetch_array($result))
-  {
-    $uppercat_ids[$row['id']] =
-      !empty($row['id_uppercat']) ? $row['id_uppercat'] : 'NULL';
-  }
-
-  // uppercats array associates a category id to the list of uppercats id.
-  $uppercats = array();
-
-  foreach (array_keys($uppercat_ids) as $id)
-  {
-    $uppercats[$id] = array();
+  $cat_map = hash_from_query($query, 'id');
+
+  $datas = array();
+  foreach ($cat_map as $id => $cat)
+  {
+    $upper_list = array();
 
     $uppercat = $id;
-
-    while ($uppercat != 'NULL')
-    {
-      array_push($uppercats[$id], $uppercat);
-      $uppercat = $uppercat_ids[$uppercat];
-    }
-  }
-
-  $datas = array();
-
-  foreach ($uppercats as $id => $list)
-  {
-    array_push(
-      $datas,
-      array(
-        'id' => $id,
-        'uppercats' => implode(',', array_reverse($list))
-        )
-      );
-  }
-
+    while ($uppercat)
+    {
+      array_push($upper_list, $uppercat);
+      $uppercat = $cat_map[$uppercat]['id_uppercat'];
+    }
+
+    $new_uppercats = implode(',', array_reverse($upper_list));
+    if ($new_uppercats != $cat['uppercats'])
+    {
+      array_push(
+        $datas,
+        array(
+          'id' => $id,
+          'uppercats' => $new_uppercats
+          )
+        );
+    }
+  }
   $fields = array('primary' => array('id'), 'update' => array('uppercats'));
   mass_updates(CATEGORIES_TABLE, $fields, $datas);

trunk/admin/picture_modify.php

@@ -189 +189 @@
 $selected_tags = array_from_query($query, 'tag_id');
 
-// Navigation path
-
-$date = isset($_POST['date_creation']) && empty($page['errors'])
-?$_POST['date_creation']:date_convert_back(@$row['date_creation']);
-
 // +-----------------------------------------------------------------------+
 // |                             template init                             |
@@ -225 +220 @@
   array(
     'U_SYNC' =>
-        PHPWG_ROOT_PATH.'admin.php?page=picture_modify'.
+        get_root_url().'admin.php?page=picture_modify'.
         '&image_id='.$_GET['image_id'].
         (isset($_GET['cat_id']) ? '&cat_id='.$_GET['cat_id'] : '').
@@ -247 +242 @@
     'AUTHOR' => isset($_POST['author']) ? $_POST['author'] : @$row['author'],
 
-    'CREATION_DATE' => $date,
-
     'TAG_SELECTION' => $tag_selection,
 
@@ -256 +249 @@
 
     'F_ACTION' =>
-        PHPWG_ROOT_PATH.'admin.php'
+        get_root_url().'admin.php'
         .get_query_string_diff(array('sync_metadata'))
     )