Changeset 27594
- Timestamp:
- Mar 7, 2014, 3:22:34 PM (10 years ago)
- Location:
- extensions/Piwecard
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/Piwecard/admin/admin_management.php
r24973 r27594 121 121 $valid = $piwecard->is_valid($file['ecard_id']); 122 122 123 $template->append('ecard_file ',array(123 $template->append('ecard_files',array( 124 124 'id' => $file['ecard_id'], 125 125 'title' => $file['title'], -
extensions/Piwecard/admin/template/admin_configuration.tpl
r20421 r27594 6 6 {combine_script id='colorpicker' load="footer" path='plugins/Piwecard/js/colorpicker/js/colorpicker.js'} 7 7 {combine_css path="plugins/Piwecard/js/colorpicker/css/colorpicker.css"} 8 {combine_css path='themes/default/js/plugins/jquery.tokeninput.css'} 8 9 9 10 {footer_script require="piwecard"} … … 136 137 jQuery(document).ready(function() {ldelim} 137 138 jQuery('select[name="ecard_validity_list"]').tokenInput( 138 [{foreach from=$validity item=validity name=validity}{ldelim}"{$validity|@escape:'javascript'}"{rdelim}{if !$smarty.foreach.validity.last},{/if}{/foreach}],139 [{foreach from=$validity item=validity_item name=validity}{ldelim}"{$validity_item|@escape:'javascript'}"{rdelim}{if !$smarty.foreach.validity.last},{/if}{/foreach}], 139 140 {ldelim} 140 141 searchDelay: 0, … … 146 147 animateDropdown: false, 147 148 preventDuplicates: true, 148 allow Creation: true,149 allowFreeTagging: true, 149 150 onAdd:function(item){ldelim}$("<option value=\""+item.name+"\">"+((item.name == '0') ? "{'piwecard_nolimit'|@translate}" : item.name+" {'piwecard_days'|@translate}")+"</option>").appendTo("#ecard_validity_default");{rdelim}, 150 151 onDelete:function(item){ldelim}$("#ecard_validity_default option[value="+item.name+"]").remove();{rdelim}, … … 170 171 <span class="ecard_error" id="ecard_validity_list_error" style="{$ecard_errors.validity.style_error_text}">{'piwecard_error'|@translate} {'piwecard_error_validity_list'|@translate}</span> 171 172 <select id="ecard_validity_list" name="ecard_validity_list"> 172 {foreach from=$ecard_validity_list item=ecard_validity_ list}173 <option value="{$ecard_validity_ list}">{$ecard_validity_list}</option>173 {foreach from=$ecard_validity_list item=ecard_validity_item} 174 <option value="{$ecard_validity_item}">{$ecard_validity_item}</option> 174 175 {/foreach} 175 176 </select> … … 178 179 {'piwecard_validity_default'|@translate} 179 180 <select id="ecard_validity_default" name="ecard_validity_default"> 180 {foreach from=$ecard_validity item=ecard_validity }181 <option value="{$ecard_validity .id}" {$ecard_validity.selected}>{$ecard_validity.name}</option>181 {foreach from=$ecard_validity item=ecard_validity_item} 182 <option value="{$ecard_validity_item.id}" {$ecard_validity_item.selected}>{$ecard_validity_item.name}</option> 182 183 {/foreach} 183 184 </select> … … 239 240 </div> 240 241 <div> 241 {foreach from=$ecard_email_format item=ecard_email_format }242 <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>242 {foreach from=$ecard_email_format item=ecard_email_format_item} 243 <span><input type="checkbox" name="ecard_email_format[{$ecard_email_format_item.id}]" id="ecard_email_format_{$ecard_email_format_item.id}" value="{$ecard_email_format_item.id}" {$ecard_email_format_item.selected}/><label for="ecard_email_format_{$ecard_email_format_item.id}"> {$ecard_email_format_item.language_string|@translate}</label></span> 243 244 {/foreach} 244 245 </div> … … 247 248 </div> 248 249 <div> 249 {foreach from=$ecard_email_format_default item=ecard_email_format_default }250 <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>250 {foreach from=$ecard_email_format_default item=ecard_email_format_default_item} 251 <span id="ecard_form_line_default_{$ecard_email_format_default_item.id}"><input type="radio" name="ecard_email_format_default" id="ecard_email_format_default_{$ecard_email_format_default_item.id}" value="{$ecard_email_format_default_item.id}" {$ecard_email_format_default_item.selected_default}/><label for="ecard_email_format_default_{$ecard_email_format_default_item.id}"> {$ecard_email_format_default_item.language_string|@translate}</label></span> 251 252 {/foreach} 252 253 <span class="ecard_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> -
extensions/Piwecard/admin/template/admin_management.tpl
r20284 r27594 76 76 </form> 77 77 </fieldset> 78 {if count($ecard_file )}78 {if count($ecard_files)} 79 79 <form method="post" id="ecard_form_delete"> 80 80 <table class="table2" width="97%"> … … 90 90 </thead> 91 91 <tbody> 92 {foreach from=$ecard_file item=ecard_file name=foreach_ecard_file}92 {foreach from=$ecard_files item=ecard_file name=foreach_ecard_file} 93 93 {if $smarty.foreach.foreach_ecard_file.iteration is even} 94 94 <tr class="row1"> -
extensions/Piwecard/include/piwecard.class.php
r25071 r27594 467 467 } 468 468 } 469 470 /** 471 * Encodes a string using Q form if required (RFC2045) 472 * mail headers MUST contain only US-ASCII characters 473 * 474 * This function was in Piwigo core include/functions_mail.inc.php, but 475 * was removed from version 2.6. 476 */ 477 function encode_mime_header($str) 478 { 479 $x = preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches); 480 if ($x==0) 481 { 482 return $str; 483 } 484 // Replace every high ascii, control =, ? and _ characters 485 $str = preg_replace('/([\000-\011\013\014\016-\037\075\077\137\177-\377])/e', 486 "'='.sprintf('%02X', ord('\\1'))", $str); 487 488 // Replace every spaces to _ (more readable than =20) 489 $str = str_replace(" ", "_", $str); 490 491 global $lang_info; 492 return '=?'.get_pwg_charset().'?Q?'.$str.'?='; 493 } 469 494 470 495 /** … … 478 503 479 504 $from = '"'.$email_infos['from_name'].'" <'.$email_infos['from_email'].'>'; 480 $subject = encode_mime_header(trim(preg_replace('#[\n\r]+#s', '', $email_infos['subject'])));505 $subject = $this->encode_mime_header(trim(preg_replace('#[\n\r]+#s', '', $email_infos['subject']))); 481 506 $boundary = '_----------='.md5(uniqid(mt_rand())); 482 507 -
extensions/Piwecard/template/ecard.tpl
r20421 r27594 164 164 <span class="ecard_label">{'piwecard_email_format'|@translate} : </span> 165 165 <span> 166 {foreach from=$ecard_email_format item=ecard_email_format }167 <input type="radio" name="ecard_email_format" 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.name} </label>166 {foreach from=$ecard_email_format item=ecard_email_format_item} 167 <input type="radio" name="ecard_email_format" id="ecard_email_format_{$ecard_email_format_item.id}" value="{$ecard_email_format_item.id}" {$ecard_email_format_item.selected}><label for="ecard_email_format_{$ecard_email_format_item.id}"> {$ecard_email_format_item.name} </label> 168 168 {/foreach} 169 169 </span> … … 173 173 <span class="ecard_label">{'piwecard_validity_label'|@translate} :</span> 174 174 <span> 175 {foreach from=$ecard_validity item=ecard_validity }176 <input type="radio" name="ecard_validity" id="ecard_validity_{$ecard_validity .id}" value="{$ecard_validity.id}" {$ecard_validity.selected}><label for="ecard_validity_{$ecard_validity.id}"> {$ecard_validity.name} </label>175 {foreach from=$ecard_validity item=ecard_validity_item} 176 <input type="radio" name="ecard_validity" id="ecard_validity_{$ecard_validity_item.id}" value="{$ecard_validity_item.id}" {$ecard_validity_item.selected}><label for="ecard_validity_{$ecard_validity_item.id}"> {$ecard_validity_item.name} </label> 177 177 {/foreach} 178 178 </span>
Note: See TracChangeset
for help on using the changeset viewer.