Changeset 20202 for extensions/Piwecard/admin
- Timestamp:
- Jan 17, 2013, 12:06:49 AM (11 years ago)
- Location:
- extensions/Piwecard/admin
- Files:
-
- 4 edited
-
admin_configuration.php (modified) (3 diffs)
-
admin_management.php (modified) (3 diffs)
-
template/admin_configuration.tpl (modified) (3 diffs)
-
template/admin_management.tpl (modified) (4 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}
Note: See TracChangeset
for help on using the changeset viewer.
