Changeset 20013 for extensions/Piwecard/include/piwecard.class.php

Timestamp:

Jan 9, 2013, 12:32:04 AM (11 years ago)

Author:

julien1311

Message:

[piwecard] new improvements

File:

• extensions/Piwecard/include/piwecard.class.php (modified) (5 diffs)

extensions/Piwecard/include/piwecard.class.php

@@ -166 +166 @@
                         if (!empty($page['category'])) {
                                 // Gets all upper categories from the image category to test 
-                                //      - if the parameter for "recursive" is OK
                                 //      - if the upper category is activated for this function
                                 $query = 'SELECT * FROM '.CATEGORIES_TABLE.' WHERE id = '.pwg_db_real_escape_string($page['category']['id']).';';
@@ -213 +212 @@
                         // Only on available cats
                         if (($this->my_config['authorizations'] == 'all_cats')          //Parameter : all_cats
-                                OR ($this->my_config['authorizations'] == 'selected_cats' AND !empty($page['category']) AND in_array($page['category']['id'], $this->my_config['selected_cats']))       //Parameter : selected_cats but not recursive
-                                OR ($this->my_config['authorizations'] == 'selected_cats' AND $this->my_config['recursive'] AND isset($upper_ids) AND (array_intersect($upper_ids, $this->my_config['selected_cats']) != array())) //Parameter : selected_cats and recursive
-                                OR      ($this->my_config['authorizations'] == 'user_cats' AND (in_array($username, $catname) OR $username == $authorname)) //Parameter : selected_cats and recursive
+                                OR ($this->my_config['authorizations'] == 'selected_cats' AND isset($upper_ids) AND (array_intersect($upper_ids, $this->my_config['selected_cats']) != array())) //Parameter : selected_cats and recursive
+                                OR      ($this->my_config['authorizations'] == 'user_cats' AND (in_array($username, $catname) OR $username == $authorname)) //Parameter : user_cats
                         ) {
                                 // Check if user is guest. 
@@ -233 +231 @@
                                                 'recipient_email'       => l10n('ecard_send_dest_mail'),
                                                 'copy'                          => $this->my_config['sender_copy'] ? 'checked="checked"' : '',
-                                                'changemail'            => (!isset($user['email']) OR $this->my_config['sender_email_change']) ? '' : 'disabled="disabled"')
-                                                ));
+                                                'changemail'            => (!isset($user['email']) OR $this->my_config['sender_email_change']) ? '' : 'disabled="disabled"'
+                                                )
+                                );
 
                                 // Template add for the active parameter choice by the user
@@ -252 +251 @@
                                                                                                                                 'id' => $email_format,
                                                                                                                                 'name' => l10n('ecard_mail_format_'.$email_format),
-                                                                                                                                'selected' => (($this->my_config['email_format_default'] == $email_format) ?  '' : 'checked')
+                                                                                                                                'selected' => (($this->my_config['email_format_default'] == $email_format) ?  '' : 'checked'),
                                                                                                                         )
                                         );
@@ -322 +321 @@
 
                                         $email_subject = htmlspecialchars_decode($this->parse( $this->my_config['email_subject'], $_POST));
-                                        $email_message = htmlspecialchars_decode($this->parse($this->my_config['email_'.$this->my_config['email_format']], $_POST, $image_element));
+                                        $email_message = htmlspecialchars_decode($this->parse($this->my_config['email_message'][$send_method], $_POST, $image_element));
                                         $email_arg=array(       'from' => $_POST['ecard_sender_email'],
                                                                                 'subject'                       => $email_subject,