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

Timestamp:

Jan 15, 2013, 12:41:50 AM (11 years ago)

Author:

julien1311

Message:

[piwecard] several improvements

File:

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

extensions/Piwecard/include/piwecard.class.php

@@ -199 +199 @@
                                 // Username or the current user
                                 $username = $user['username'];
+                                if (!$this->config['user_cats_case_sensitive'])
+                                        $catname = array_map('strtolower', $catname);
                                 
                                 // author of the photo
@@ -212 +214 @@
                         if (($this->config['authorized_cats'] == 'all')         //Parameter : all
                                 OR ($this->config['authorized_cats'] == 'selected' AND !empty($upper_ids) AND (array_intersect($upper_ids, $this->config['selected_cats']) != array())) //Parameter : selected
-                                OR      ($this->config['authorized_cats'] == 'user' AND (in_array($username, $catname) OR $username == $authorname)) //Parameter : user
+                                OR      ($this->config['authorized_cats'] == 'user' AND $this->config['user_cats_case_sensitive'] AND (in_array($username, $catname) OR $username == $authorname)) //Parameter : user AND case sensitive
+                                OR      ($this->config['authorized_cats'] == 'user' AND !$this->config['user_cats_case_sensitive'] AND (in_array(strtolower($username), $catname) OR $username == $authorname)) //Parameter : user AND not case sensitive
                         ) {
                                 // Check if user is guest. 
@@ -244 +247 @@
                                                 );
                                         }
+                                } else {
+                                        $template->assign('ecard_validity_hidden', $this->config['validity_default']);
                                 }
 
@@ -254 +259 @@
                                         );
                                 }
+                                
+                                $template->set_filenames(array('ecard_template' =>  PIWECARD_ROOT.'/template/ecard.tpl'));
+                                $template->concat('COMMENT_IMG', $template->parse('ecard_template', true));
 
                                 // Send the card
                                 if (isset($_POST['ecard_submit'])) {
                                         $email_format = $_POST['ecard_email_format'];
+                                        
+                                        //Check fields
+                                        if ($_POST['ecard_sender_name'] == ''
+                                                OR $_POST['ecard_recipient_name'] == ''
+                                                OR $_POST['ecard_sender_email'] == ''
+                                                OR $_POST['ecard_recipient_email'] == ''
+                                                OR $_POST['ecard_title'] == ''
+                                                OR $_POST['ecard_message'] == '') {
+                                                return;
+                                        }
+                                        
+                                        if (($_POST['ecard_sender_email'] != '' AND !$piwecard->is_valid_email($_POST['ecard_sender_email']))
+                                                OR ($_POST['ecard_recipient_email'] != '' AND !$piwecard->is_valid_email($_POST['ecard_recipient_email']))) {
+                                                return;
+                                        }
                                         
                                         // If conf doesn't allow to modify the %yourmail% param, force it to user mail
@@ -322 +345 @@
                                         );
                                         unset_make_full_url();
-
+                                        
                                         $email_subject = htmlspecialchars_decode($this->parse($this->config['email_subject'], $_POST, $image_element));
                                         $email_message = htmlspecialchars_decode($this->parse($this->config['email_message'][$email_format], $_POST, $image_element));
@@ -355 +378 @@
                                         pwg_mail($_POST['ecard_recipient_email'], $email_arg);
                                 }
-                                
-                                $template->set_filenames(array('ecard_template' =>  PIWECARD_ROOT.'/template/ecard.tpl'));
-                                $template->concat('COMMENT_IMG', $template->parse('ecard_template', true));
                         }
                 }