Changeset 17671

Timestamp:

Aug 30, 2012, 6:02:48 PM (12 years ago)

Author:

plg

Message:

new feature: ability to select the property to update (title, description, author, tags)

new feature: ability to select the separator (tab, space, comma, semicolon)

Location:

extensions/properties_mass_update

Files:

• admin_update.php (modified) (6 diffs)
• admin_update.tpl (modified) (1 diff)
• language/en_UK/plugin.lang.php (modified) (1 diff)
• language/fr_FR/plugin.lang.php (modified) (2 diffs)

extensions/properties_mass_update/admin_update.php

@@ -31 +31 @@
 
 // +-----------------------------------------------------------------------+
-// | Check Access and exit when user status is not ok                      |
+// | Checks                                                                |
 // +-----------------------------------------------------------------------+
 
 check_status(ACCESS_ADMINISTRATOR);
 
+$regex_for_separator = array(
+  'tab' => '/^([^\t]+)\t+(.*)$/',
+  'space' => '/^([^\s]+)\s+(.*)$/',
+  'comma' => '/^([^,]+),+(.*)$/',
+  'semicolon' => '/^([^;]+);+(.*)$/',
+  );
+
+if (isset($_POST['submit']))
+{
+  if (!in_array($_POST['separator'], array_keys($regex_for_separator)))
+  {
+    die('Hacking attempt!');
+  }
+
+  if (!in_array($_POST['property'], array('name', 'comment', 'author', 'tags')))
+  {
+    die('Hacking attempt!');
+  }
+}
+
 // +-----------------------------------------------------------------------+
-// |                                actions                                |
+// | Actions                                                               |
 // +-----------------------------------------------------------------------+
 
@@ -60 +80 @@
       $raw_lines = explode("\n", $raw);
       
-      $query = 'SELECT file FROM '.IMAGES_TABLE.';';
+      $query = 'SELECT id, file FROM '.IMAGES_TABLE.';';
       $existing_files = hash_from_query($query, 'file');
             
@@ -66 +86 @@
       $update_files = array();
       $missing_files = array();
+      $tags_of = array();
       
       foreach ($raw_lines as $raw_line)
       {
-        if (!preg_match('/^([^\t]+)\t+(.*)$/', $raw_line, $matches))
+        if (!preg_match($regex_for_separator[$_POST['separator']], $raw_line, $matches))
         {
           continue;
@@ -81 +102 @@
 
         if (isset($existing_files[$matches[1]]))
-        {        
+        {
           $update_files[$matches[1]] = true;
+          $image_id = $existing_files[$matches[1]]['id'];
+
+          if ('tags' == $_POST['property'])
+          {
+            $tags_of[$image_id] = array();
+            $raw_tags = explode(',', $matches[2]);
+            foreach ($raw_tags as $tag)
+            {
+              $tag = trim($tag);
+              if (empty($tag))
+              {
+                continue;
+              }
+              $tag_id = tag_id_from_tag_name($tag);
+              array_push($tags_of[$image_id], $tag_id);
+            }
+          }
+          else
+          {
+            array_push(
+              $updates,
+              array(
+                'id' => $image_id,
+                $_POST['property'] => pwg_db_real_escape_string($matches[2]), // TODO right trim
+                )
+              );
+          }
         }
         else
         {
           $missing_files[$matches[1]] = true;
-          continue;
         }
-        
-        array_push(
-          $updates,
+      }
+      
+      if ('tags' == $_POST['property'])
+      {
+        set_tags_of($tags_of);
+      }
+      else
+      {
+        mass_updates(
+          IMAGES_TABLE,
           array(
-            'file' => pwg_db_real_escape_string($matches[1]),
-            'comment' => pwg_db_real_escape_string($matches[2]), // TODO right trim
-            )
+            'primary' => array('id'),
+            'update' => array($_POST['property']),
+            ),
+          $updates
           );
       }
-      
-      mass_updates(
-        IMAGES_TABLE,
-          array(
-            'primary' => array('file'),
-            'update' => array('comment'),
-          ),
-          $updates
-        );
 
       $endtime = get_moment();
@@ -115 +161 @@
         sprintf(
           l10n('%d photos updated'),
-          count($updates)
+          count(array_keys($update_files))
           )
         );
@@ -134 +180 @@
   else
   {
-    array_push($page['errors'], $_FILES['mascarille_update']['error']);
+    array_push($page['errors'], $_FILES['update']['error']);
   }
 }

extensions/properties_mass_update/admin_update.tpl

@@ -11 +11 @@
   </p>
 <input type="file" name="update">
+</fieldset>
+
+<fieldset>
+  <legend>{'Options'|@translate}</legend>
+
+  <p style="margin:0 0 15px 0;">
+    <strong>{'Separator'|@translate}</strong>
+    <br>
+    <select name="separator">
+      <option value="tab">{'tab'|@translate}</option>
+      <option value="space">{'space'|@translate}</option>
+      <option value="comma">, ({'comma'|@translate})</option>
+      <option value="semicolon">; ({'semicolon'|@translate})</option>
+    </select>
+  </p>
+
+  <p style="margin:0;">
+    <strong>{'Property to update'|@translate}</strong>
+    <br>
+    <select name="property">
+      <option value="name">{'Title'|@translate}</option>
+      <option value="comment">{'Description'|@translate}</option>
+      <option value="author">{'Author'|@translate}</option>
+      <option value="tags">{'Tags'|@translate} {'(comma separated)'|@translate}</option>
+    </select>
+  </p>
+
+</fieldset>
+
 <p style="text-align:left">
 <input class="submit" type="submit" name="validate" value="{'Submit'|@translate}">
 </p>
-</fieldset>
 </form>

extensions/properties_mass_update/language/en_UK/plugin.lang.php

@@ -9 +9 @@
 $lang['Wrong file, please select a plain text file'] = 'Wrong file, please select a plain text file';
 $lang['Update'] = 'Update';
+$lang['tab'] = 'tabulation';
+$lang['space'] = 'space';
+$lang['comma'] = 'comma';
+$lang['semicolon'] = 'semicolon';
+$lang['(comma separated)'] = '(comma separated)';
 ?>

extensions/properties_mass_update/language/fr_FR/plugin.lang.php

@@ -21 +21 @@
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
+
 $lang['%d photos are missing in Piwigo: %s'] = '%d photos sont manquantes dans Piwigo : %s';
 $lang['%d photos updated'] = '%d photos mises à jour';
@@ -30 +31 @@
 $lang['Update'] = 'Mettre à jour';
 $lang['Wrong file, please select a plain text file'] = 'Mauvais type de fichier, veuillez sélectionner un fichier texte';
+$lang['tab'] = 'tabulation';
+$lang['space'] = 'espace';
+$lang['comma'] = 'virgule';
+$lang['semicolon'] = 'point virgule';
+$lang['(comma separated)'] = '(séparés par des virgules)';
 ?>