Changeset 2521 for trunk/admin

Timestamp:

Sep 12, 2008, 4:17:35 AM (16 years ago)

Author:

rvelices

Message:

• images.file categories.permalink old_permalinks.permalink - become binary
• session security improvement: now the sessions are valid only for originating ip addr (with mask 255.255.0.0 to allow users behind load balancing proxies) -> stealing the session cookie is almost a non issue (with the exception of the 65536 machines in range)
• metadata sync from the sync button does not overwrite valid data with empty metadata
• other small fixes/enhancements:
  • added event get_category_image_orders
  • fix display issue with redirect.tpl (h1/h2 within h1)
  • fix known_script smarty function registration
  • query search form not submitted if q is empty
  • better admin css rules
  • some other minor changes (ws_core, rest_handler, functions_search...)

Location:

trunk/admin

Files:

• include/functions_metadata.php (modified) (12 diffs)
• template/yoga/default-layout.css (modified) (1 diff)
• template/yoga/layout.css (modified) (1 diff)
• template/yoga/theme/admin/theme.css (modified) (1 diff)

trunk/admin/include/functions_metadata.php

@@ -29 +29 @@
 {
   global $conf, $page;
-  
+
   $map = $conf['use_iptc_mapping'];
-  
+
   $iptc = get_iptc_data($file, $map);
 
@@ -109 +109 @@
     array_push($image_ids, $id);
   }
-  
+
   $query = '
 SELECT id
@@ -119 +119 @@
 ;';
 
-  $result = pwg_query($query);
-  while ($row = mysql_fetch_array($result))
-  {
-    array_push($has_high_images, $row['id']);
-  }
+  $has_high_images = array_from_query($query, 'id');
 
   foreach ($files as $id => $file)
@@ -130 +126 @@
     $data['id'] = $id;
     $data['filesize'] = floor(filesize($file)/1024);
-  
+
     if ($image_size = @getimagesize($file))
     {
@@ -143 +139 @@
       $data['high_filesize'] = floor(filesize($high_file)/1024);
     }
-  
+
     if ($conf['use_exif'])
     {
@@ -162 +158 @@
               $tags_of[$id] = array();
             }
-            
+
             foreach (explode(',', $iptc[$key]) as $tag_name)
             {
@@ -179 +175 @@
     array_push($datas, $data);
   }
-  
+
   if (count($datas) > 0)
   {
@@ -190 +186 @@
         'date_metadata_update'
         );
-    
+
     if ($conf['use_exif'])
     {
@@ -199 +195 @@
           );
     }
-    
+
     if ($conf['use_iptc'])
     {
@@ -218 +214 @@
         'update'  => array_unique($update_fields)
         ),
-      $datas
+      $datas,
+      MASS_UPDATES_SKIP_EMPTY
       );
   }
@@ -235 +232 @@
  * @return array
  */
-function get_filelist($category_id = '', $site_id=1, $recursive = false, 
+function get_filelist($category_id = '', $site_id=1, $recursive = false,
                       $only_new = false)
 {
   // filling $cat_ids : all categories required
   $cat_ids = array();
-  
+
   $query = '
 SELECT id
@@ -293 +290 @@
     $files[$row['id']] = $row['path'];
   }
-  
+
   return $files;
 }

trunk/admin/template/yoga/default-layout.css

@@ -291 +291 @@
   font-size: 1em;       /* <= some browsers don't set it correctly */
 }
-UL, DL { text-align: left;}
+UL, DL, OL { text-align: left;}
 TABLE {                 /* horizontaly centered */
   margin-left: auto;

trunk/admin/template/yoga/layout.css

@@ -1 @@
-/* $Id$ */
 
 /* template css */
-@import "menubar.css";
+/*@import "menubar.css";*/
 @import "content.css";
 @import "thumbnails.css";

trunk/admin/template/yoga/theme/admin/theme.css

@@ -45 +45 @@
 .content dl, dd { margin:5px; }
 .content div.titrePage { height:55px; }
-.content ol li { text-align: left; }
 .instructions { text-align: left; padding: 20px 20px 0 20px; }
 .throw, td h3 {
  background-image: url(images/fillet.png); background-repeat: repeat-x; }
-.browsePath a { color: #eee; }
 /* borders */ /* TODO */
 INPUT, SELECT, TEXTAREA { border-left: 2px inset #696969;