Changeset 1609 for trunk/admin

Timestamp:

Nov 15, 2006, 5:25:12 AM (18 years ago)

Author:

rvelices

Message:

completely replaced get_thumbnail_src it get_thumbnail_url
or get_thumbnail_path

Location:

trunk/admin

Files:

• cat_modify.php (modified) (1 diff)
• element_set_global.php (modified) (2 diffs)
• element_set_unit.php (modified) (13 diffs)
• picture_modify.php (modified) (3 diffs)
• waiting.php (modified) (7 diffs)

trunk/admin/cat_modify.php

@@ -389 +389 @@
   {
     $query = '
-SELECT tn_ext,path
+SELECT id,tn_ext,path
   FROM '.IMAGES_TABLE.'
   WHERE id = '.$category['representative_picture_id'].'
 ;';
     $row = mysql_fetch_array(pwg_query($query));
-    $src = get_thumbnail_src($row['path'], @$row['tn_ext']);
+    $src = get_thumbnail_url($row);
     $url = PHPWG_ROOT_PATH.'admin.php?page=picture_modify';
     $url.= '&image_id='.$category['representative_picture_id'];

trunk/admin/element_set_global.php

@@ -123 +123 @@
 ';
     pwg_query($query);
-    
+
     update_category($_POST['dissociate']);
   }
@@ -400 +400 @@
   }
 
-  while ($row = mysql_fetch_array($result))
-  {
-    $src = get_thumbnail_src($row['path'], @$row['tn_ext']);
+  while ($row = mysql_fetch_assoc($result))
+  {
+    $src = get_thumbnail_url($row);
 
     $template->assign_block_vars(

trunk/admin/element_set_unit.php

@@ -29 +29 @@
  * Management of elements set. Elements can belong to a category or to the
  * user caddie.
- * 
+ *
  */
- 
+
 if (!defined('PHPWG_ROOT_PATH'))
 {
@@ -51 +51 @@
 {
   $collection = explode(',', $_POST['list']);
-  
+
   $datas = array();
-  
+
   $query = '
 SELECT id, date_creation
@@ -76 +76 @@
       }
     }
-    
+
     if ($conf['allow_html_descriptions'])
     {
@@ -104 +104 @@
       $data{'date_creation'} = $row['date_creation'];
     }
-    
+
     array_push($datas, $data);
 
@@ -113 +113 @@
     }
   }
-  
+
   mass_updates(
     IMAGES_TABLE,
@@ -122 +122 @@
     $datas
     );
-  
+
   array_push($page['infos'], l10n('Picture informations updated'));
 }
@@ -142 +142 @@
 
     'L_SUBMIT'=>$lang['submit'],
-    
+
     'U_ELEMENTS_PAGE'
     =>$base_url.get_query_string_diff(array('display','start')),
-    
+
     'U_GLOBAL_MODE'
     =>
@@ -151 +151 @@
     .get_query_string_diff(array('mode','display'))
     .'&mode=global',
-    
+
     'F_ACTION'=>$base_url.get_query_string_diff(array()),
     )
@@ -191 +191 @@
   // tags
   $all_tags = get_all_tags();
- 
+
   $element_ids = array();
 
@@ -203 +203 @@
   $result = pwg_query($query);
 
-  while ($row = mysql_fetch_array($result))
+  while ($row = mysql_fetch_assoc($result))
   {
     // echo '<pre>'; print_r($row); echo '</pre>';
     array_push($element_ids, $row['id']);
-    
-    $src = get_thumbnail_src($row['path'], @$row['tn_ext']);
+
+    $src = get_thumbnail_url($row);
 
     $query = '
@@ -216 +216 @@
 ;';
     $selected_tags = array_from_query($query, 'tag_id');
-    
+
     // creation date
     if (!empty($row['date_creation']))
@@ -242 +242 @@
         '</p>';
     }
-    
+
     $template->assign_block_vars(
       'element',
@@ -259 +259 @@
         'DESCRIPTION' => @$row['comment'],
         'DATE_CREATION_YEAR' => $year,
-        
+
         'TAG_SELECTION' => $tag_selection,
         )
       );
-    
+
     get_day_list('element.date_creation_day', $day);
     get_month_list('element.date_creation_month', $month);

trunk/admin/picture_modify.php

@@ -142 +142 @@
 ';
   pwg_query($query);
-  
+
   update_category($_POST['cat_associated']);
 }
@@ -224 +224 @@
     '</p>';
 }
-  
+
 $template->assign_vars(
   array(
@@ -235 +235 @@
     'PATH'=>$row['path'],
 
-    'TN_SRC' => get_thumbnail_src($row['path'], @$row['tn_ext']),
+    'TN_SRC' => get_thumbnail_url($row),
 
     'NAME' =>

trunk/admin/waiting.php

@@ -43 +43 @@
   $to_validate = array();
   $to_reject = array();
-  
+
   if (isset($_POST['submit']))
-  {    
+  {
     foreach (explode(',', $_POST['list']) as $waiting_id)
     {
@@ -107 +107 @@
       $dir = get_complete_dir($row['storage_category_id']);
       unlink($dir.$row['file']);
-      if (isset($row['tn_ext']) and $row['tn_ext'] != '')
+      $element_info = array(
+        'path' => $dir.$row['file'],
+        'tn_ext' =>
+          (isset($row['tn_ext']) and $row['tn_ext']!='') ? $row['tn_ext']:'jpg'
+        );
+      $tn_path = get_thumbnail_path( $element_info );
+
+      if ( @is_file($tn_path) )
       {
-        unlink(
-          get_thumbnail_src(
-            $dir.$row['file'],
-            $row['tn_ext']
-            )
-          );
-      }
-      else if (@is_file(get_thumbnail_src($dir.$row['file'], 'jpg')))
-      {
-        unlink(
-          get_thumbnail_src(
-            $dir.$row['file'],
-            'jpg'
-            )
-          );
+        unlink( $tn_path );
       }
     }
-    
+
     $query = '
 DELETE
@@ -155 +148 @@
   'L_RESET'=>$lang['reset'],
   'L_DELETE'=>$lang['delete'],
-  
+
   'F_ACTION'=>str_replace( '&', '&', $_SERVER['REQUEST_URI'])
   ));
-  
+
 //---------------------------------------------------------------- form display
 $cat_names = array();
@@ -183 +176 @@
   $class='row1';
   if ( $i++ % 2== 0 ) $class='row2';
-  
+
   $template->assign_block_vars(
     'picture',
@@ -195 +188 @@
         (strlen($row['file']) > 10) ?
           (substr($row['file'], 0, 10)).'...' : $row['file'],
-      'PREVIEW_URL_IMG'=>$preview_url, 
+      'PREVIEW_URL_IMG'=>$preview_url,
       'UPLOAD_EMAIL'=>get_email_address_as_display_text($row['mail_address']),
       'UPLOAD_USERNAME'=>$row['username']
@@ -209 +202 @@
         $url = $cat_names[$row['storage_category_id']]['dir'];
     $url.= 'thumbnail/'.$thumbnail;
-        
+
     $template->assign_block_vars(
       'picture.thumbnail',
@@ -230 +223 @@
     )
   );
-  
+
 //----------------------------------------------------------- sending html code
 $template->assign_var_from_handle('ADMIN_CONTENT', 'waiting');