Changeset 20202 for extensions/Piwecard/admin/admin_management.php

Timestamp:

Jan 17, 2013, 12:06:49 AM (11 years ago)

Author:

julien1311

Message:

[piwecard] several changes (almost 2.4.a.b4)

File:

• extensions/Piwecard/admin/admin_management.php (modified) (3 diffs)

extensions/Piwecard/admin/admin_management.php

@@ -6 +6 @@
 $piwecard = get_plugin_data($plugin_id);
 
-$query = 'SELECT * FROM '.PIWECARD_TABLE;
+$query = 'SELECT DISTINCT ecard_id, sender_name, sender_email, title, message, image, date_creation, date_validity FROM '.PIWECARD_TABLE;
         
 if (isset($_POST['ecard_form_filter_submit'])) {
@@ -84 +84 @@
 
 $start =  (isset($_GET['start']) ? $_GET['start'] : 0);
-if ($start != 0 and $piwecard->get_nb_ecard() == $piwecard->config['nb_ecard_page'])
+if ($start != 0 and $piwecard->get_nb_ecard() <= $piwecard->config['nb_ecard_page'])
         $start = 0;
 
@@ -101 +101 @@
 
 while($file = pwg_db_fetch_assoc($result)) {
-        $ecard_url = embellish_url(get_absolute_root_url() . './index.php?/ecard/'.$file['id']);
+        //Recipients
+        $recipients = array();
+        $query2 = 'SELECT recipient_name, recipient_email FROM piwigo_piwecard WHERE ecard_id="'.$file['ecard_id'].'";';
+        $result2 = pwg_query($query2);
+        
+        while($row = pwg_db_fetch_assoc($result2)) {
+                array_push($recipients, array(
+                                                                        'name' => $row['recipient_name'],
+                                                                        'email' => $row['recipient_email'],
+                                                                )
+                );
+        }
+        
+        $ecard_url = embellish_url(get_absolute_root_url() . './index.php?/ecard/'.$file['ecard_id']);
 
         // Check if the ecard is valid 
-        $valid = $piwecard->is_valid($file['id']);
+        $valid = $piwecard->is_valid($file['ecard_id']);
 
         $template->append('ecard_file',array(
-                                                                        'id'                            => $file['id'],
+                                                                        'id'                            => $file['ecard_id'],
                                                                         'title'                         => $file['title'],
                                                                         'url'                           => $ecard_url,
                                                                         'sender_name'           => $file['sender_name'],
                                                                         'sender_email'          => $file['sender_email'],
-                                                                        'recipient_name'        => $file['recipient_name'],
-                                                                        'recipient_email'       => $file['recipient_email'],
+                                                                        'recipients'            => $recipients,
                                                                         'date_creation'         => strftime('%d/%m/%y %H:%M', strtotime($file['date_creation'])),
                                                                         'date_validity'         => (isset($file['date_validity'])) ? strftime('%d/%m/%y %H:%M', strtotime($file['date_validity'])) : l10n('piwecard_nolimit'),