Changeset 20080
- Timestamp:
- Jan 12, 2013, 12:31:47 AM (11 years ago)
- Location:
- extensions/Piwecard
- Files:
-
- 28 added
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/Piwecard/admin/admin_authorizations.php
r20059 r20080 13 13 // Switch on right side (=>) 14 14 if (isset($_POST['falsify']) and isset($_POST['cat_true']) and count($_POST['cat_true']) > 0) { 15 $piwecard->my_config['authorized_cats'] = 'selected'; 16 15 17 foreach ($_POST['cat_true'] as $cat) 16 18 unset($piwecard->my_config['selected_cats'][array_search($cat, $piwecard->my_config['selected_cats'])]); … … 23 25 $result = pwg_query($query); 24 26 27 $piwecard->my_config['authorized_cats'] = 'selected'; 28 25 29 if (!empty($result)) { 26 30 while ($cat = pwg_db_fetch_assoc($result)) -
extensions/Piwecard/admin/admin_configuration.php
r20059 r20080 24 24 'style_error_text' => 'display: inline;', 25 25 ); 26 $configuration['show_image_infos'] = $_POST['ecard_show_image_infos'];26 $configuration['show_image_infos'] = ((isset($_POST['ecard_show_image_infos']) && $_POST['ecard_show_image_infos'] == '1') ? '1' : '0'); 27 27 $configuration['default_guest_email'] = $_POST['ecard_default_guest_email']; 28 28 if ($configuration['default_guest_email'] !='' && !$piwecard->is_valid_email($configuration['default_guest_email'])) -
extensions/Piwecard/admin/admin_management.php
r20059 r20080 27 27 } 28 28 } else { 29 array_push($page['errors'], l10n('You mustconfirm deletion'));29 array_push($page['errors'], l10n('You need to confirm deletion')); 30 30 } 31 31 } … … 67 67 $template->assign('nb_ecard_valid_total', $nb_ecard_valid_total); 68 68 $template->assign('ecard_nb_ecard_page', $piwecard->my_config['nb_ecard_page']); 69 $template->assign('navbar', $ecard_navbar 69 $template->assign('navbar', $ecard_navbar); 70 70 71 71 $template->set_filename('plugin_admin_management', dirname(__FILE__) . '/template/admin_management.tpl'); -
extensions/Piwecard/admin/template/admin_configuration.tpl
r20059 r20080 5 5 $("#ecard_form_line_default_text").css("display","inline"); 6 6 } else { 7 $("#ecard_ email_format_default_text").css("display","none");7 $("#ecard_form_line_default_text").css("display","none"); 8 8 } 9 9 if ($("#ecard_email_format_html").prop('checked') == true) { … … 93 93 </div> 94 94 <div class="ecard_form_line"> 95 <input type="checkbox" name="ecard_show_image_infos" id="ecard_show_image_infos" {$ecard_show_image_infos} /> <label for="ecard_show_image_infos">{'piwecard_show_image_infos'|@translate}</label>95 <input type="checkbox" name="ecard_show_image_infos" id="ecard_show_image_infos" {$ecard_show_image_infos} value="1" /><label for="ecard_show_image_infos"> {'piwecard_show_image_infos'|@translate}</label> 96 96 </div> 97 97 </fieldset> … … 100 100 <legend>{'piwecard_email_configuration'|@translate}</legend> 101 101 <div class="ecard_form_line"> 102 <input type="checkbox" name="ecard_sender_copy" id="ecard_sender_copy" {$ecard_sender_copy}/> <label for="ecard_sender_copy">{'piwecard_sender_copy'|@translate}</label>102 <input type="checkbox" name="ecard_sender_copy" id="ecard_sender_copy" {$ecard_sender_copy}/><label for="ecard_sender_copy"> {'piwecard_sender_copy'|@translate}</label> 103 103 </div> 104 104 <div class="ecard_form_line"> 105 <input type="checkbox" name="ecard_sender_email_change" id="ecard_sender_email_change" {$ecard_sender_email_change}/> <label for="ecard_sender_email_change">{'piwecard_sender_email_change'|@translate}</label>105 <input type="checkbox" name="ecard_sender_email_change" id="ecard_sender_email_change" {$ecard_sender_email_change}/><label for="ecard_sender_email_change"> {'piwecard_sender_email_change'|@translate}</label> 106 106 </div> 107 107 <div class="ecard_form_line"> … … 111 111 <div> 112 112 {foreach from=$ecard_email_format item=ecard_email_format} 113 <span><input type="checkbox" name="ecard_email_format[{$ecard_email_format.id}]" id="ecard_email_format_{$ecard_email_format.id}" value="{$ecard_email_format.id}" {$ecard_email_format.selected}/> <label for="ecard_email_format_{$ecard_email_format.id}">{$ecard_email_format.language_string|@translate}</label></span>113 <span><input type="checkbox" name="ecard_email_format[{$ecard_email_format.id}]" id="ecard_email_format_{$ecard_email_format.id}" value="{$ecard_email_format.id}" {$ecard_email_format.selected}/><label for="ecard_email_format_{$ecard_email_format.id}"> {$ecard_email_format.language_string|@translate}</label></span> 114 114 {/foreach} 115 115 </div> … … 119 119 <div> 120 120 {foreach from=$ecard_email_format_default item=ecard_email_format_default} 121 <span id="ecard_form_line_default_{$ecard_email_format_default.id}"><input type="radio" name="ecard_email_format_default" id="ecard_email_format_default_{$ecard_email_format_default.id}" value="{$ecard_email_format_default.id}" {$ecard_email_format_default.selected_default}/> <label for="ecard_email_format_default_{$ecard_email_format_default.id}">{$ecard_email_format_default.language_string|@translate}</label></span>121 <span id="ecard_form_line_default_{$ecard_email_format_default.id}"><input type="radio" name="ecard_email_format_default" id="ecard_email_format_default_{$ecard_email_format_default.id}" value="{$ecard_email_format_default.id}" {$ecard_email_format_default.selected_default}/><label for="ecard_email_format_default_{$ecard_email_format_default.id}"> {$ecard_email_format_default.language_string|@translate}</label></span> 122 122 {/foreach} 123 123 <span class="ecard_admin_error" id="ecard_email_format_default_error" style="{$piwecard_errors.email_format_default.style_error_text}">{'piwecard_error'|@translate} {'piwecard_email_format_default_error'|@translate}</span> … … 125 125 </div> 126 126 <div class="ecard_form_line ecard_email_config"> 127 <label for=" piwecard_default_guest_email">{'piwecard_default_guest_email'|@translate}<span class="ecard_admin_error" id="ecard_default_guest_email_error" style="{$ecard_errors.default_guest_email.style_error_text}">{'piwecard_error'|@translate} {'piwecard_error_email'|@translate}</span><br />127 <label for="ecard_default_guest_email">{'piwecard_default_guest_email'|@translate}</label><span class="ecard_admin_error" id="ecard_default_guest_email_error" style="{$ecard_errors.default_guest_email.style_error_text}">{'piwecard_error'|@translate} {'piwecard_error_email'|@translate}</span><br /> 128 128 <input type="text" maxlength="50" name="ecard_default_guest_email" id="ecard_default_guest_email" {$ecard_errors.default_guest_email.style_error_input} value="{$ecard_default_guest_email}" onblur="ecard_checkField(this, 1);" /> 129 129 </div> 130 130 <div class="ecard_form_line ecard_email_config"> 131 <label for="ecard_email_subject">{'piwecard_email_subject'|@translate}</label> 131 <label for="ecard_email_subject">{'piwecard_email_subject'|@translate}</label><span class="ecard_admin_error" id="ecard_email_subject_error" style="{$ecard_errors.email_subject.style_error_text}">{'piwecard_error'|@translate} {'piwecard_error_text'|@translate}</span><br /> 132 132 <input type="text" maxlength="255" name="ecard_email_subject" id="ecard_email_subject" {$ecard_errors.email_subject.style_error_input} value="{$ecard_email_subject}" /> 133 133 </div> 134 134 <div class="ecard_form_line ecard_email_config"> 135 <label for="ecard_email_message_text">{'piwecard_email_message_text'|@translate}</label> 135 <label for="ecard_email_message_text">{'piwecard_email_message_text'|@translate}</label><span class="ecard_admin_error" id="ecard_email_message_text_error" style="{$ecard_errors.email_message.text.style_error_text}">{'piwecard_error'|@translate} {'piwecard_error_text'|@translate}</span><br /> 136 136 <textarea name="ecard_email_message_text" id="ecard_email_message_text" {$ecard_errors.email_message.text.style_error_input}>{$ecard_email_message_text}</textarea> 137 137 </div> 138 138 <div class="ecard_form_line ecard_email_config"> 139 <label for="ecard_email_message_html">{'piwecard_email_message_html'|@translate}</label> 139 <label for="ecard_email_message_html">{'piwecard_email_message_html'|@translate}</label><span class="ecard_admin_error" id="ecard_email_message_html_error" style="{$ecard_errors.email_message.html.style_error_text}">{'piwecard_error'|@translate} {'piwecard_error_text'|@translate}</span><br /> 140 140 <textarea name="ecard_email_message_html" id="ecard_email_message_html" {$ecard_errors.email_message.html.style_error_input}>{$ecard_email_message_html}</textarea> 141 141 </div> -
extensions/Piwecard/admin/template/admin_management.tpl
r20059 r20080 63 63 <td> </td> 64 64 <td>{'Title'|@translate}</td> 65 <td>{' date'|@translate}</td>65 <td>{'Date'|@translate}</td> 66 66 <td>{'piwecard_sender_name'|@translate}</td> 67 67 <td>{'piwecard_recipient_name'|@translate}</td> -
extensions/Piwecard/include/config_param.inc.php
r20059 r20080 12 12 '%websiteurl%' => get_absolute_root_url() , 13 13 '%ecardurl%' => isset($image_element['ecard_url']) ? $image_element['ecard_url'] : '' , 14 '%ecard title%'=> isset($_POST['ecard_title']) ? $_POST['ecard_title'] : '' ,14 '%ecardsubject%' => isset($_POST['ecard_title']) ? $_POST['ecard_title'] : '' , 15 15 '%ecardmessage%' => isset($_POST['ecard_message']) ? $_POST['ecard_message'] : '' , 16 16 '%pictureurl%' => DerivativeImage::thumb_url($image_element) , -
extensions/Piwecard/include/piwecard.class.php
r20069 r20080 246 246 } 247 247 } 248 248 249 249 foreach ($this->my_config['email_format_authorized'] as $email_format) { 250 250 $template->append('ecard_email_format', array( 251 251 'id' => $email_format, 252 252 'name' => l10n('piwecard_email_format_'.$email_format), 253 'selected' => (($this->my_config['email_format_default'] == $email_format) ? ' ' : 'checked'),253 'selected' => (($this->my_config['email_format_default'] == $email_format) ? 'checked' : ''), 254 254 ) 255 255 ); … … 274 274 275 275 // Generate random number 276 $image_element['next_element_id'] = $this->random(64); 276 $next_element_id_random = $this->random(64); 277 while (pwg_db_num_rows(pwg_query('SELECT id FROM '.PIWECARD_TABLE.' WHERE id="'.$next_element_id_random.'";')) != 0) { 278 $next_element_id_random = $this->random(64); 279 } 280 $image_element['next_element_id'] = $next_element_id_random; 277 281 278 282 // Image infos -
extensions/Piwecard/include/publish.inc.php
r20059 r20080 40 40 'sender_email' => $result_array['sender_email'], 41 41 'sender_name' => $result_array['sender_name'], 42 'image_title' => $ecard->my_config['show_image_infos'] ? $row['name'] : null,43 'image_author' => $ecard->my_config['show_image_infos'] ? $row['author'] : null42 'image_title' => (($ecard->my_config['show_image_infos'] == '1') ? $row['name'] : null), 43 'image_author' => (($ecard->my_config['show_image_infos'] == '1') ? $row['author'] : null), 44 44 )); 45 45 -
extensions/Piwecard/install/default_values.inc.php
r20059 r20080 7 7 $ecard_default_values['validity'] = array('0', '5', '10', '15'); //Number of days a card is available 8 8 $ecard_default_values['validity_default'] = '10'; //Default number of days a card is available 9 $ecard_default_values['validity_choice'] = true;//Add function for a user to choose the valid duration of an ecard9 $ecard_default_values['validity_choice'] = '1'; //Add function for a user to choose the valid duration of an ecard 10 10 $ecard_default_values['sender_copy'] = false; //Send a copy to sender 11 11 $ecard_default_values['sender_email_change'] = false; //Possibility for the user to change the sender email … … 13 13 $ecard_default_values['email_format_default'] = 'html'; //Default email format 14 14 $ecard_default_values['email_format_authorized'] = array('text', 'html'); //Type of mail sent : 'text' or 'html' or both 15 $ecard_default_values['show_image_infos'] = true; //Default : show infos under the image in ecard15 $ecard_default_values['show_image_infos'] = '1'; //Default : show infos under the image in ecard 16 16 $ecard_default_values['default_guest_email'] = ''; //Default email used for guest user 17 17 $ecard_default_values['email_subject'] = "Une eCard vous a ete envoyee par %yourname%"; //Subject of the email for plain text emails 18 18 $ecard_default_values['email_message']['text'] = 19 19 "Bonjour %recipientname% ! 20 %yourname% vous a envoye une eCarddepuis le site %website%.20 %yourname% vous a envoye une carte virtuelle depuis le site %website%. 21 21 Vous pouvez la consulter sur %ecardurl%. 22 22 A bientot sur %website% (%websiteurl%) ! -
extensions/Piwecard/language/en_UK/plugin.lang.php
r20059 r20080 33 33 $lang['piwecard_default_guest_email'] = 'Default e-mail address for guests'; 34 34 $lang['piwecard_email_configuration'] = 'e-mail configuration'; 35 $lang['piwecard_email_subject'] = ' Subject';35 $lang['piwecard_email_subject'] = 'e-mail subject'; 36 36 $lang['piwecard_email_message_text'] = 'Message when the e-mail format is text'; 37 37 $lang['piwecard_email_message_html'] = 'Message when the e-mail format is HTML'; … … 47 47 $lang['piwecard_ecard_image_infos'] = 'Image infos (title and author)'; 48 48 49 50 //admin_management.php51 52 53 49 //admin_management.tpl 54 50 $lang['piwecard_list'] = 'List of e-cards'; … … 56 52 $lang['piwecard_delete_all_invalid'] = 'Delete all expired e-card'; 57 53 $lang['piwecard_validity'] = 'Validity date'; 54 $lang['piwecard_delete'] = 'Delete selected e-cards'; 58 55 $lang['piwecard_deleted'] = 'Selected e-cards have been deleted.'; 59 56 $lang['piwecard_invalid_deleted'] = 'All expired e-cards have been deleted.'; … … 81 78 //publish.tpl 82 79 $lang['piwecard_invalid_ecard'] = 'Invalid or expired e-card'; 83 $lang['piwecard_publish_footer'] = 'This e-card wassent by ';80 $lang['piwecard_publish_footer'] = 'This e-card has been sent by '; 84 81 85 82 //piwecard.class.php 86 83 $lang['piwecard_message'] = 'Message'; 87 $lang['piwecard_recipient_name'] = 'Recipient name';88 $lang['piwecard_recipient_email'] = 'Recipient e-mail';89 84 $lang['piwecard_days'] = 'days'; 90 85 ?> -
extensions/Piwecard/language/fr_FR/plugin.lang.php
r20079 r20080 33 33 $lang['piwecard_default_guest_email'] = 'Adresse email par défaut pour les guests'; 34 34 $lang['piwecard_email_configuration'] = 'Configurations des emails'; 35 $lang['piwecard_email_subject'] = 'Objet ';35 $lang['piwecard_email_subject'] = 'Objet de l\'email'; 36 36 $lang['piwecard_email_message_text'] = 'Message pour les envois au format texte'; 37 37 $lang['piwecard_email_message_html'] = 'Message pour les envois au format HTML'; … … 52 52 $lang['piwecard_delete_all_invalid'] = 'Supprimer toutes les cartes virtuelles périmées'; 53 53 $lang['piwecard_validity'] = 'Date de péremption'; 54 $lang['piwecard_delete'] = 'Supprimer les cartes sélectionnées'; 54 55 $lang['piwecard_deleted'] = 'Les cartes virtuelles sélectionnées ont été supprimées.'; 55 56 $lang['piwecard_invalid_deleted'] = 'Toutes les cartes périmées ont été supprimées.'; … … 81 82 //piwecard.class.php 82 83 $lang['piwecard_message'] = 'Message'; 83 $lang['piwecard_recipient_name'] = 'Nom du destinataire';84 $lang['piwecard_recipient_email'] = 'email de l\'expéditeur';85 84 $lang['piwecard_days'] = 'jours'; 86 85 ?>
Note: See TracChangeset
for help on using the changeset viewer.