Changeset 20202
- Timestamp:
- Jan 17, 2013, 12:06:49 AM (11 years ago)
- Location:
- extensions/Piwecard
- Files:
-
- 14 edited
-
admin/admin_configuration.php (modified) (3 diffs)
-
admin/admin_management.php (modified) (3 diffs)
-
admin/template/admin_configuration.tpl (modified) (3 diffs)
-
admin/template/admin_management.tpl (modified) (4 diffs)
-
include/piwecard.class.php (modified) (11 diffs)
-
include/publish.inc.php (modified) (2 diffs)
-
install/default_values.inc.php (modified) (1 diff)
-
install/functions.inc.php (modified) (5 diffs)
-
js/piwecard.js (modified) (1 diff)
-
language/en_UK/plugin.lang.php (modified) (1 diff)
-
language/fr_FR/plugin.lang.php (modified) (1 diff)
-
maintain.inc.php (modified) (1 diff)
-
template/ecard.tpl (modified) (4 diffs)
-
template/publish.tpl (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
extensions/Piwecard/admin/admin_configuration.php
r20162 r20202 33 33 $configuration['sender_copy'] = ((isset($_POST['ecard_sender_copy']) && $_POST['ecard_sender_copy'] == '1') ? true : false); 34 34 $configuration['image_size'] = $_POST['ecard_image_size']; 35 $configuration['sender_email_change'] = ((isset($_POST['ecard_sender_email_change']) && $_POST['ecard_sender_email_change'] == '1') ? true : false); 35 36 $configuration['image_border']['display'] = ((isset($_POST['ecard_image_border']) && $_POST['ecard_image_border'] == '1') ? true : false); 37 $configuration['image_border']['style'] = $_POST['ecard_image_border_style']; 38 $configuration['image_border']['width'] = ((isset($_POST['ecard_image_border_width']) && $_POST['ecard_image_border_width'] != '1') ? $_POST['ecard_image_border_width'] : $piwecard->get_default_config_param('ecard_image_border_width')); 39 $configuration['image_border']['color'] = ((isset($_POST['ecard_image_border_color']) && $_POST['ecard_image_border_color'] != '1') ? $_POST['ecard_image_border_color'] : $piwecard->get_default_config_param('ecard_image_border_color')); 40 41 $configuration['sender_email_change'] = ((isset($_POST['ecard_sender_email_change']) && $_POST['ecard_sender_email_change'] == '1') ? true : false); 36 42 37 43 $ecard_email_format_array = array(); … … 87 93 88 94 if (isset($_POST['reset'])) { 89 require(PIWECARD_INSTALL_PATH.'default_values.inc.php'); 90 91 $piwecard->config['email_subject'] = $ecard_default_values['email_subject']; 92 $piwecard->config['email_message']['text'] = $ecard_default_values['email_message']['text']; 93 $piwecard->config['email_message']['html'] = $ecard_default_values['email_message']['html']; 95 $piwecard->config['email_subject'] = $piwecard->get_default_config_param('email_subject'); 96 $email_message = $piwecard->get_default_config_param('email_message'); 97 $piwecard->config['email_message']['text'] = $email_message['text']; 98 $piwecard->config['email_message']['html'] = $email_message['html']; 94 99 95 100 $piwecard->set_config(); … … 126 131 $template->assign('generate_derivatives_types', $derivative_map); 127 132 133 $template->assign('ecard_image_border', (($piwecard->config['image_border']['display']) ? 'checked="checked"' : '')); 134 $template->assign('ecard_image_border_style', array( 135 'solid' => (($piwecard->config['image_border']['style'] == 'solid') ? 'checked="checked"' : ''), 136 'dashed' => (($piwecard->config['image_border']['style'] == 'dashed') ? 'checked="checked"' : ''), 137 'dotted' => (($piwecard->config['image_border']['style'] == 'dotted') ? 'checked="checked"' : ''), 138 'double' => (($piwecard->config['image_border']['style'] == 'double') ? 'checked="checked"' : ''), 139 ) 140 ); 141 $template->assign('ecard_image_border_width', $piwecard->config['image_border']['width']); 142 $template->assign('ecard_image_border_color', $piwecard->config['image_border']['color']); 143 128 144 $template->assign('ecard_sender_copy', $piwecard->config['sender_copy'] ? 'checked="checked"' : ''); 129 145 $template->assign('ecard_sender_email_change', $piwecard->config['sender_email_change'] ? 'checked="checked"' : ''); -
extensions/Piwecard/admin/admin_management.php
r20112 r20202 6 6 $piwecard = get_plugin_data($plugin_id); 7 7 8 $query = 'SELECT *FROM '.PIWECARD_TABLE;8 $query = 'SELECT DISTINCT ecard_id, sender_name, sender_email, title, message, image, date_creation, date_validity FROM '.PIWECARD_TABLE; 9 9 10 10 if (isset($_POST['ecard_form_filter_submit'])) { … … 84 84 85 85 $start = (isset($_GET['start']) ? $_GET['start'] : 0); 86 if ($start != 0 and $piwecard->get_nb_ecard() == $piwecard->config['nb_ecard_page'])86 if ($start != 0 and $piwecard->get_nb_ecard() <= $piwecard->config['nb_ecard_page']) 87 87 $start = 0; 88 88 … … 101 101 102 102 while($file = pwg_db_fetch_assoc($result)) { 103 $ecard_url = embellish_url(get_absolute_root_url() . './index.php?/ecard/'.$file['id']); 103 //Recipients 104 $recipients = array(); 105 $query2 = 'SELECT recipient_name, recipient_email FROM piwigo_piwecard WHERE ecard_id="'.$file['ecard_id'].'";'; 106 $result2 = pwg_query($query2); 107 108 while($row = pwg_db_fetch_assoc($result2)) { 109 array_push($recipients, array( 110 'name' => $row['recipient_name'], 111 'email' => $row['recipient_email'], 112 ) 113 ); 114 } 115 116 $ecard_url = embellish_url(get_absolute_root_url() . './index.php?/ecard/'.$file['ecard_id']); 104 117 105 118 // Check if the ecard is valid 106 $valid = $piwecard->is_valid($file[' id']);119 $valid = $piwecard->is_valid($file['ecard_id']); 107 120 108 121 $template->append('ecard_file',array( 109 'id' => $file[' id'],122 'id' => $file['ecard_id'], 110 123 'title' => $file['title'], 111 124 'url' => $ecard_url, 112 125 'sender_name' => $file['sender_name'], 113 126 'sender_email' => $file['sender_email'], 114 'recipient_name' => $file['recipient_name'], 115 'recipient_email' => $file['recipient_email'], 127 'recipients' => $recipients, 116 128 'date_creation' => strftime('%d/%m/%y %H:%M', strtotime($file['date_creation'])), 117 129 'date_validity' => (isset($file['date_validity'])) ? strftime('%d/%m/%y %H:%M', strtotime($file['date_validity'])) : l10n('piwecard_nolimit'), -
extensions/Piwecard/admin/template/admin_configuration.tpl
r20162 r20202 3 3 {combine_script id='jquery.tokeninput' load='async' require='jquery' path='themes/default/js/plugins/jquery.tokeninput.js'} 4 4 {combine_script id='piwecard' load="footer" path='plugins/Piwecard/js/piwecard.js'} 5 {combine_script id='colorpicker' load="footer" path='plugins/Piwecard/js/colorpicker/js/colorpicker.js'} 6 {combine_css path="plugins/Piwecard/js/colorpicker/css/colorpicker.css"} 5 7 6 8 {footer_script require="piwecard"} … … 31 33 $("#ecard_email_format_default_text").prop('checked', true); 32 34 } 35 }); 36 37 if ($("#ecard_image_border").prop('checked') == true) { 38 $("#ecard_image_border_options").css("display","block"); 39 } else { 40 $("#ecard_image_border_options").css("display","none"); 41 } 42 43 $("#ecard_image_border").change(function(){ 44 if ($("#ecard_image_border").prop('checked') == true) { 45 $("#ecard_image_border_options").show("fast"); 46 } else { 47 $("#ecard_image_border_options").hide("fast"); 48 } 49 }); 50 51 $('#ecard_image_border_color').ColorPicker({ 52 onSubmit: function(hsb, hex, rgb, element) { 53 $(element).val(hex); 54 $(element).ColorPickerHide(); 55 }, 56 onBeforeShow: function () { 57 $(this).ColorPickerSetColor(this.value); 58 }, 59 onChange: function (hsb, hex, rgb) { 60 $('#ecard_image_border_color').val(hex); 61 } 62 }) 63 .bind('keyup', function(){ 64 $(this).ColorPickerSetColor(this.value); 33 65 }); 34 66 }); … … 110 142 {/foreach} 111 143 </div> 144 <div class="ecard_form_line"> 145 <div> 146 <input type="checkbox" name="ecard_image_border" id="ecard_image_border" {$ecard_image_border} value="1" /> 147 <label for="ecard_image_border"> {'piwecard_image_border'|@translate}</label> 148 </div> 149 <div id="ecard_image_border_options"> 150 <span> 151 <label for="ecard_image_border_style">{'piwecard_image_border_style'|@translate}</label> 152 <select name="ecard_image_border_style" id="ecard_image_border_style"> 153 <option value="solid" {$ecard_image_border_style.solid}>{'piwecard_image_border_solid'|@translate}</option> 154 <option value="dashed" {$ecard_image_border_style.dashed}>{'piwecard_image_border_dashed'|@translate}</option> 155 <option value="dotted" {$ecard_image_border_style.dotted}>{'piwecard_image_border_dotted'|@translate}</option> 156 <option value="double"{$ecard_image_border_style.double}>{'piwecard_image_border_double'|@translate}</option> 157 </select> 158 </span> 159 <span> 160 <label for="ecard_image_border_width">{'piwecard_image_border_width'|@translate}</label> 161 <input type="text" size="6" maxlength="20" name="ecard_image_border_width" id="ecard_image_border_width" value="{$ecard_image_border_width}" /> 162 </span> 163 <span> 164 <label for="ecard_image_border_color">{'piwecard_image_border_color'|@translate}</label> 165 <input type="text" maxlength="6" size="6" name="ecard_image_border_color" id="ecard_image_border_color" value="{$ecard_image_border_color}" /> 166 </span> 167 </div> 168 </div> 112 169 </fieldset> 113 170 -
extensions/Piwecard/admin/template/admin_management.tpl
r20112 r20202 103 103 </td> 104 104 <td> 105 <a href="{$ecard_file.url}" >{$ecard_file.title}</a>105 <a href="{$ecard_file.url}" target="_blank">{$ecard_file.title}</a> 106 106 </td> 107 107 <td> … … 109 109 </td> 110 110 <td> 111 {$ecard_file.recipient_name} ({$ecard_file.recipient_email}) 111 {foreach from=$ecard_file.recipients item=recipient} 112 {$recipient.name} ({$recipient.email})<br /> 113 {/foreach} 112 114 </td> 113 115 <td> … … 123 125 </tbody> 124 126 </table> 127 {if !empty($navbar)}{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if} 125 128 <fieldset> 126 129 <legend>{'piwecard_delete_selected'|@translate}</legend> … … 144 147 {/if} 145 148 </div> 146 {if !empty($navbar)}{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if} -
extensions/Piwecard/include/piwecard.class.php
r20180 r20202 34 34 } 35 35 36 //Get the default value of a parameter 37 function get_default_config_param($param) { 38 require(PIWECARD_INSTALL_PATH.'default_values.inc.php'); 39 return $ecard_default_values[$param]; 40 } 41 36 42 // Save general configuration to config_database 37 43 function set_config() { … … 80 86 // Get the number of ecard in the database 81 87 function get_nb_ecard() { 82 $query = 'SELECT COUNT(DISTINCT id) AS nb FROM '.PIWECARD_TABLE.' ORDER BY date_creation;';88 $query = 'SELECT COUNT(DISTINCT ecard_id) AS nb FROM '.PIWECARD_TABLE.' ORDER BY date_creation;'; 83 89 $result = pwg_query($query); 84 90 … … 92 98 // Get the number of valid ecard in the database 93 99 function get_nb_valid_ecard() { 94 $query = 'SELECT COUNT(DISTINCT id) AS nb FROM '.PIWECARD_TABLE.' WHERE date_validity IS NULL OR date_validity > NOW();';100 $query = 'SELECT COUNT(DISTINCT ecard_id) AS nb FROM '.PIWECARD_TABLE.' WHERE date_validity IS NULL OR date_validity > NOW();'; 95 101 $result = pwg_query($query); 96 102 … … 106 112 function get_ecard($ecard_id = null) { 107 113 if ($ecard_id!== null) { 108 $query = 'SELECT * FROM ' . PIWECARD_TABLE .' WHERE id="' . $ecard_id . '" LIMIT 1;';114 $query = 'SELECT * FROM ' . PIWECARD_TABLE .' WHERE ecard_id="' . $ecard_id . '" LIMIT 1;'; 109 115 110 116 $result = pwg_query($query); … … 144 150 function delete_ecard($ecard_id = null) { 145 151 if (isset($ecard_id)) { 146 $query = 'DELETE FROM ' . PIWECARD_TABLE .' WHERE id="' . $ecard_id . '";';152 $query = 'DELETE FROM ' . PIWECARD_TABLE .' WHERE ecard_id="' . $ecard_id . '";'; 147 153 pwg_query($query); 148 154 } else … … 294 300 return; 295 301 296 foreach ($_POST['ecard_recipient_name'] as $recipient)297 if ($recipient == '')298 return;299 300 foreach ($_POST['ecard_recipient_email'] as $recipient)301 if ($recipient == '' OR !$this->is_valid_email($recipient)) {302 return;303 }304 305 302 // Initialize the array for image element 306 303 $image_element = array(); … … 314 311 // Generate random number 315 312 $next_element_id_random = $this->random(64); 316 while (pwg_db_num_rows(pwg_query('SELECT id FROM '.PIWECARD_TABLE.' WHEREid="'.$next_element_id_random.'";')) != 0) {313 while (pwg_db_num_rows(pwg_query('SELECT ecard_id FROM '.PIWECARD_TABLE.' WHERE ecard_id="'.$next_element_id_random.'";')) != 0) { 317 314 $next_element_id_random = $this->random(64); 318 315 } … … 348 345 $recipient_infos = array_combine($_POST['ecard_recipient_name'], $_POST['ecard_recipient_email']); 349 346 foreach ($recipient_infos as $recipient_name => $recipient_email) { 347 if ($recipient_name == '' OR $recipient_email == '' OR !$this->is_valid_email($recipient_email)) 348 continue; 349 350 350 $parse_list = array( 351 351 'ecard_sender_name' => $_POST['ecard_sender_name'], … … 357 357 ); 358 358 359 $email_subject = htmlspecialchars_decode($this->parse($this->config['email_subject'], $parse_list, $image_element)); 360 $email_message = htmlspecialchars_decode($this->parse($this->config['email_message'][$email_format], $parse_list, $image_element)); 361 $email_arg=array( 'from' => $_POST['ecard_sender_email'], 362 'subject' => $email_subject, 363 ); 359 $email_infos = array( 360 'from_name' => $_POST['ecard_sender_name'], 361 'from_email' => (isset($_POST['ecard_sender_email']) ? $_POST['ecard_sender_email'] : $user['email']), 362 'to' => $recipient_email, 363 'subject' => htmlspecialchars_decode($this->parse($this->config['email_subject'], $parse_list, $image_element)), 364 ); 364 365 366 $email_message_text = stripslashes(strip_tags($this->parse($this->config['email_message']['text'], $parse_list, $image_element))); 367 $email_message_html = stripslashes($this->parse($this->config['email_message']['html'], $parse_list, $image_element)); 365 368 switch($email_format) { 366 369 case 'text': // text 367 $email_arg = array_merge($email_arg, array( 368 'content' => $email_message, 369 'content_format' => "text/html", 370 'email_format' => "text/plain" 371 ) 370 $email_infos['message'] = array( 371 'text' => $email_message_text 372 372 ); 373 373 break; 374 374 case 'html': // html 375 $email_arg = array_merge($email_arg, array( 376 'content' => '<html><head><title>'.$email_subject.'</title></head><body>'.$email_message.'</body></html>', 377 'content_format' => "text/html", 378 'email_format' => array("text/plain", "text/html"), 379 ) 375 $email_infos['message'] = array( 376 'text' => $email_message_text, 377 'html' => $email_message_html, 380 378 ); 381 379 default: … … 383 381 } 384 382 383 $this->mail($email_infos); 384 385 385 // Add the copy to expe if param. 386 386 if (isset($_POST['ecard_copy'])) // send copy to sender 387 $email_arg['Bcc'] = array((isset($_POST['ecard_sender_email']) ? $_POST['ecard_sender_email'] : $user['email'])); 388 389 pwg_mail($recipient_email, $email_arg); 390 387 $email_infos['bcc'] = $email_infos['from_email']; 388 389 //Insert into database 391 390 $insert = array( 392 ' id'=> $image_element['next_element_id'],391 'ecard_id' => $image_element['next_element_id'], 393 392 'sender_name' => $_POST['ecard_sender_name'], 394 393 'recipient_name' => $recipient_name, … … 412 411 } 413 412 } 413 414 //Send an email 415 function mail($email_infos) { 416 $from = $email_infos['from_name']." <".$email_infos['from_email'].">"; 417 $subject = encode_mime_header(trim(preg_replace('#[\n\r]+#s', '', $email_infos['subject']))); 418 $boundary = '_----------='.md5(uniqid(mt_rand())); 419 420 $headers = 'From: '.$from."\n"; 421 $headers .= 'Reply-To: '.$from."\n"; 422 if (!empty($email_infos['bcc'])) 423 $headers .= 'Bcc: '.$email_infos['bcc']."\n"; 424 $headers .= 'X-Sender: <'.get_absolute_root_url().'>'."\n"; 425 $headers .= 'X-Mailer: Piwigo Mailer'."\n"; 426 $headers .= 'X-auth-smtp-user: '.$from."\n"; 427 $headers .= 'X-abuse-contact: '.$from."\n"; 428 $headers .= 'Date: '.date("D, j M Y G:i:s O")."\n"; 429 430 $message = ''; 431 432 if (empty($email_infos['message']['html'])) { //Text plain email 433 $headers .= 'Content-Transfer-Encoding: 8bit'."\n"; 434 $message .= $email_infos['message']['text']; 435 } else { 436 $headers .= 'MIME-Version: 1.0'."\n"; 437 $headers .= 'Content-Type: multipart/alternative; boundary="'.$boundary.'"'; 438 $message .= 'This is a multi-part message in MIME format'."\n\n"; 439 $message .= '--'.$boundary."\n"; 440 $message .= 'Content-Type: text/plain; charset="'.get_pwg_charset().'"'."\n"; 441 $message .= 'Content-Transfer-Encoding: binary'."\n\n"; 442 $message .= $email_infos['message']['text']."\n\n"; 443 $message .= '--'.$boundary."\n"; 444 $message .= 'Content-Type: text/html; charset="'.get_pwg_charset().'"'."\n"; 445 $message .= 'Content-Transfer-Encoding: binary;'."\n\n"; 446 $message .= $email_infos['message']['html']."\n\n"; 447 $message .= '--'.$boundary."--\n"; 448 } 449 450 mail($email_infos['to'], $subject, $message, $headers); 451 } 414 452 } 415 453 ?> -
extensions/Piwecard/include/publish.inc.php
r20103 r20202 10 10 11 11 if (isset($ecard_id) and $ecard_id != '' and $piwecard->is_valid($ecard_id)) { 12 $query = 'SELECT * FROM '.PIWECARD_TABLE.' WHERE id ="'.$ecard_id.'";';12 $query = 'SELECT * FROM '.PIWECARD_TABLE.' WHERE ecard_id="'.$ecard_id.'";'; 13 13 $result = pwg_query($query); 14 14 $result_array = pwg_db_fetch_assoc($result); 15 15 16 if (isset($result_array[' id'])) {16 if (isset($result_array['ecard_id'])) { 17 17 //Recover img infos. 18 18 $query = 'SELECT DISTINCT * FROM '.IMAGES_TABLE.' AS img WHERE img.id = '.$result_array['image'].';'; … … 41 41 'image_title' => (($piwecard->config['show_image_infos'] == '1') ? $row['name'] : null), 42 42 'image_author' => (($piwecard->config['show_image_infos'] == '1') ? $row['author'] : null), 43 )); 43 'image_border' => array( 44 'display' => $piwecard->config['image_border']['display'], 45 'style' => $piwecard->config['image_border']['style'], 46 'width' => $piwecard->config['image_border']['width'], 47 'color' => $piwecard->config['image_border']['color'], 48 ), 49 ) 50 ); 44 51 45 52 } -
extensions/Piwecard/install/default_values.inc.php
r20180 r20202 12 12 $ecard_default_values['validity_default'] = '10'; //Default number of days a card is available 13 13 $ecard_default_values['validity_choice'] = true; //Add function for a user to choose the valid duration of an ecard 14 $ecard_default_values['image_border'] = array( //Add a border to the image in the ecard page 15 'display' => false, 16 'style' => 'solid', 17 'width' => '10px', 18 'color' => '#FFFFFF', 19 ); 14 20 $ecard_default_values['sender_copy'] = false; //Send a copy to sender 15 21 $ecard_default_values['image_size'] = 'small'; //Size of the image in the ecard -
extensions/Piwecard/install/functions.inc.php
r20104 r20202 2 2 function piwecard_db_create($table) { 3 3 $query = 'CREATE TABLE ' . $table . ' ( 4 id CHAR(64) NOT NULL, 4 unique_id INT NOT NULL AUTO_INCREMENT, 5 ecard_id CHAR(64) NOT NULL, 5 6 sender_name CHAR(100) NOT NULL, 6 7 sender_email CHAR(100) NOT NULL, … … 12 13 date_creation DATETIME NOT NULL, 13 14 date_validity DATETIME DEFAULT NULL, 14 PRIMARY KEY ( id)15 PRIMARY KEY (unique_id) 15 16 ) DEFAULT CHARSET=utf8;'; 16 17 pwg_query($query); … … 22 23 } 23 24 24 function piwecard_db_ populate($old_table, $new_table) {25 function piwecard_db_update_from_2_3($old_table, $new_table) { 25 26 $query = 'SELECT * FROM '.$old_table.';'; 26 27 $result = pwg_query($query); … … 28 29 while($data = pwg_db_fetch_assoc($result)) { 29 30 $insert = array( 30 ' id' => $data['numero'],31 'ecard_id' => $data['numero'], 31 32 'sender_name' => $data['nomexp'], 32 33 'sender_email' => $data['adrexp'], … … 48 49 } 49 50 51 function piwecard_db_update_from_2_4a_b3($table) { 52 $query = 'ALTER TABLE '.$table.' DROP PRIMARY KEY;'; 53 $result = pwg_query($query); 54 $query = 'ALTER TABLE '.$table.' ADD unique_id INT NOT NULL AUTO_INCREMENT FIRST, ADD PRIMARY KEY (unique_id);'; 55 $result = pwg_query($query); 56 $query = 'ALTER TABLE '.$table.' CHANGE id ecard_id CHAR(64) NOT NULL;'; 57 $result = pwg_query($query); 58 } 59 50 60 function piwecard_conf_create($name) { 51 61 $query = 'INSERT INTO '.CONFIG_TABLE.' (param,value,comment) VALUES ("'.$name.'","","'.ucfirst($name).' configuration");'; -
extensions/Piwecard/js/piwecard.js
r20180 r20202 11 11 switch (elementType) { 12 12 case TEXT: 13 if (element.value == '' || (element.value == element.title || element.className == "DefaultText")) {13 if (element.value == '' || element.className.indexOf("ecard_defaultTextActive") > 0) { 14 14 document.getElementById(element.id+'_error').style.display = 'block'; 15 15 element.className += " ecard_error_input"; -
extensions/Piwecard/language/en_UK/plugin.lang.php
r20180 r20202 56 56 $lang['piwecard_ecard_image_infos'] = 'Image info (title and author)'; 57 57 $lang['piwicard_email_reset'] = 'Reset * fields with default values in your language'; 58 $lang['piwecard_image_border'] = 'Add a border to the e-card image:'; 59 $lang['piwecard_image_border_style'] = 'Style:'; 60 $lang['piwecard_image_border_solid'] = 'Solid'; 61 $lang['piwecard_image_border_dashed'] = 'Dashed'; 62 $lang['piwecard_image_border_dotted'] = 'Dotted'; 63 $lang['piwecard_image_border_double'] = 'Double'; 64 $lang['piwecard_image_border_width'] = 'Width:'; 65 $lang['piwecard_image_border_color'] = 'Color:'; 58 66 59 67 //admin_management.tpl -
extensions/Piwecard/language/fr_FR/plugin.lang.php
r20180 r20202 56 56 $lang['piwecard_ecard_image_infos'] = 'Informations de l\'image (titre et auteur)'; 57 57 $lang['piwicard_email_reset'] = 'RAZ champs * avec les valeurs par défaut dans votre langue'; 58 $lang['piwecard_image_border'] = 'Ajoute une bordure à l\'image dans l\'ecard'; 59 $lang['piwecard_image_border_style'] = 'Style :'; 60 $lang['piwecard_image_border_solid'] = 'Continue'; 61 $lang['piwecard_image_border_dashed'] = 'Tirets'; 62 $lang['piwecard_image_border_dotted'] = 'Pointillés'; 63 $lang['piwecard_image_border_double'] = 'Double'; 64 $lang['piwecard_image_border_width'] = 'Largeur :'; 65 $lang['piwecard_image_border_color'] = 'Couleur :'; 58 66 59 67 //admin_management.tpl -
extensions/Piwecard/maintain.inc.php
r19956 r20202 27 27 if (pwg_db_num_rows($result_piwecard) == 0){ 28 28 piwecard_db_create($prefixeTable.'piwecard'); 29 piwecard_db_ populate($prefixeTable.'ecard', $prefixeTable.'piwecard');29 piwecard_db_update_from_2_3($prefixeTable.'ecard', $prefixeTable.'piwecard'); 30 30 } 31 31 piwecard_db_delete($prefixeTable.'ecard'); 32 32 33 33 piwecard_conf_rename('ecard', 'piwecard'); 34 } 35 36 $query_unique_id = 'SHOW COLUMNS FROM '.$prefixeTable.'piwecard LIKE "unique_id"'; 37 $result_unique_id = pwg_query($query_unique_id); 38 if(pwg_db_num_rows($result_unique_id) == 0) { 39 piwecard_db_update_from_2_4a_b3($prefixeTable.'piwecard'); 34 40 } 35 41 } -
extensions/Piwecard/template/ecard.tpl
r20180 r20202 3 3 4 4 {footer_script require="piwecard"}{literal} 5 jQuery(document).ready(function(){ 6 jQuery(" .createECardOpen").colorbox({5 jQuery(document).ready(function(){ 6 jQuery("#createECardOpen").colorbox({ 7 7 inline:true, 8 8 href:"#addECardForm", … … 11 11 height:"90%", 12 12 onComplete:function(){ 13 $("#cboxLoadedContent").css('background-color', $("#the_page #content").css('background-color')); 13 14 $(".ecard_defaultText").blur(); 14 15 } … … 79 80 var allRecipientEmailsOK = false; 80 81 81 recipientNameOK[0] = piwecard_checkField(form.ecard_recipient_name_0, 0); 82 recipientEMailOK[0] = piwecard_checkField(form.ecard_recipient_email_0, 1); 83 84 while(document.getElementById("ecard_recipient_email_" + (nbAdditionalRecipients++))) { 82 while(document.getElementById("ecard_recipient_email_" + nbAdditionalRecipients)) { 85 83 var id_name = "ecard_recipient_name_"+nbAdditionalRecipients; 86 84 var id_email = "ecard_recipient_email_"+nbAdditionalRecipients; 87 85 recipientEMailOK[nbAdditionalRecipients] = piwecard_checkField(document.getElementById(id_email), 1, true); 88 if (recipientEMailOK[nbAdditionalRecipients] && document.getElementById(id_email).value != '') 86 if (nbAdditionalRecipients == 0) { 87 recipientNameOK[0] = piwecard_checkField(form.ecard_recipient_name_0, 0); 88 recipientEMailOK[0] = piwecard_checkField(form.ecard_recipient_email_0, 1); 89 } else if (recipientEMailOK[nbAdditionalRecipients] && document.getElementById(id_email).value != '') { 89 90 recipientNameOK[nbAdditionalRecipients] = piwecard_checkField(document.getElementById(id_name), 0, true); 91 } 92 nbAdditionalRecipients++; 90 93 } 91 94 … … 184 187 </div> 185 188 <p> 186 <a href="#" class="createECardOpen" title="{'piwecard_send_link'|@translate}">{'piwecard_send_link'|@translate}</a>189 <a href="#" class="createECardOpen" id="createECardOpen" title="{'piwecard_send_link'|@translate}">{'piwecard_send_link'|@translate}</a> 187 190 </p><p> -
extensions/Piwecard/template/publish.tpl
r20059 r20202 1 {html_head} 2 {if $ecard.image_border.display} 3 <style type="text/css"> 4 #ecard_image {ldelim} 5 border-style: {$ecard.image_border.style} !important; 6 border-width: {$ecard.image_border.width} !important; 7 border-color: #{$ecard.image_border.color} !important; 8 {rdelim} 9 </style> 10 {/if} 11 {/html_head} 12 1 13 <div id="ecard"> 2 14 {if !isset($ecard)} … … 7 19 <div class="ecard_center"> 8 20 <a href="{$ecard.url}" alt="{$ecard.url}"> 9 <img class="theImage" src="{$ecard.image}" alt="{$ecard.name}" title="{$ecard.name}"/>21 <img class="theImage" id="ecard_image" src="{$ecard.image}" alt="{$ecard.name}" title="{$ecard.name}"/> 10 22 </a> 11 23
Note: See TracChangeset
for help on using the changeset viewer.
