Permalink
Browse files

turns out, you can break quite a bit of stuff in a single commit.

  • Loading branch information...
1 parent d5fb0b9 commit b3cfb898b789ce3df4fecb808fa9f8f0fbf66b9c @JustinSainton JustinSainton committed Nov 4, 2015
@@ -30,7 +30,7 @@
<label for="edit_coupon_code"><?php _e( 'Coupon Code', 'wp-e-commerce' ); ?></label>
</th>
<td>
- <input name="edit_coupon_code" id="edit_coupon_code" type="text" value="<?php esc_attr( $coupon->get( 'coupon_code' ) ); ?>" style="width: 300px;"/>
+ <input name="edit_coupon_code" id="edit_coupon_code" type="text" value="<?php echo esc_attr( $coupon->get( 'coupon_code' ) ); ?>" style="width: 300px;"/>
<p class="description"><?php _e( 'The code entered to receive the discount', 'wp-e-commerce' ); ?></p>
</td>
</tr>
@@ -40,7 +40,7 @@
<label for="edit_coupon_amount"><?php _e( 'Discount', 'wp-e-commerce' ); ?></label>
</th>
<td>
- <input name="edit_coupon_amount" id="edit_coupon_amount" type="number" step=".01" value="<?php esc_attr( $coupon->get( 'value' ) ); ?>" class="small-text" min="0" style="width: 300px" />
+ <input name="edit_coupon_amount" id="edit_coupon_amount" type="number" step=".01" value="<?php echo esc_attr( $coupon->get( 'value' ) ); ?>" class="small-text" min="0" style="width: 300px" />
<p class="description"><?php _e( 'The discount amount', 'wp-e-commerce' ); ?></p>
</td>
</tr>
@@ -72,9 +72,9 @@
$end = $coupon->get( 'expiry' ) == '0000-00-00 00:00:00' ? '' : get_date_from_gmt( $coupon->get( 'expiry' ), 'Y-m-d' );
?>
<span class="description"><?php _e( 'Start: ', 'wp-e-commerce' ); ?></span>
- <input name="edit_coupon_start" id="edit_coupon_start" type="text" value="<?php esc_attr( $start ); ?>" class="regular-text pickdate" style="width: 100px"/>
+ <input name="edit_coupon_start" id="edit_coupon_start" type="text" value="<?php echo esc_attr( $start ); ?>" class="regular-text pickdate" style="width: 100px"/>
<span class="description"><?php _e( 'End: ', 'wp-e-commerce' ); ?></span>
- <input name="edit_coupon_end" id="edit_coupon_end" type="text" value="<?php esc_attr( $end ); ?>" class="regular-text pickdate" style="width: 100px"/>
+ <input name="edit_coupon_end" id="edit_coupon_end" type="text" value="<?php echo esc_attr( $end ); ?>" class="regular-text pickdate" style="width: 100px"/>
<p class="description"><?php _e( 'If date fields are left empty, there will be no expiration on this coupon.', 'wp-e-commerce' ); ?></p>
</td>
</tr>
@@ -159,7 +159,7 @@
<option value="category"<?php selected( 'category', $condition['logic'] ); ?>><?php _e( 'In Category', 'wp-e-commerce' ); ?></option>
</select>
- <input type="text" name="rules[value][]" value="<?php esc_attr( $condition['value'] ); ?>" style="width: 150px;"/>
+ <input type="text" name="rules[value][]" value="<?php echo esc_attr( $condition['value'] ); ?>" style="width: 150px;"/>
<a title="<?php esc_attr_e( 'Delete condition', 'wp-e-commerce' ); ?>" class="button-secondary wpsc-button-round wpsc-button-minus" href="#"><?php echo _x( '&ndash;', 'delete item', 'wp-e-commerce' ); ?></a>
<a title="<?php esc_attr_e( 'Add condition', 'wp-e-commerce' ); ?>" class="button-secondary wpsc-button-round wpsc-button-plus" href="#"><?php echo _x( '+', 'add item', 'wp-e-commerce' ); ?></a>
</div>
@@ -147,7 +147,7 @@ function wpsc_price_control_forms() {
?>
<em id="wpsc_product_price_metabox_live_title" class="wpsc_metabox_live_title">
<p>&nbsp;<?php echo esc_html( $ct_symb ); ?><span><?php echo esc_html( $sale_price ); ?></span></p>
- <del><?php esc_html( $ct_symb ); ?><span><?php esc_html( $price ) ?></span></del>
+ <del><?php echo esc_html( $ct_symb ); ?><span><?php echo esc_html( $price ) ?></span></del>
</em>
<input type="hidden" id="parent_post" name="parent_post" value="<?php echo $post->post_parent; ?>" />
<?php /* Lots of tedious work is avoided with this little line. */ ?>
@@ -81,7 +81,7 @@ public function display_shipping_module_settings_form( $selected_module_id = nul
}
?>
- <div id='wpsc_shipping_settings_<?php esc_attr( $selected_module_id ); ?>_form' class='shipping-module-settings-form'>
+ <div id='wpsc_shipping_settings_<?php echo esc_attr( $selected_module_id ); ?>_form' class='shipping-module-settings-form'>
<table class='form-table'>
<?php echo $content; ?>
</table>
@@ -146,14 +146,14 @@ public function display() {
<tr>
<th><?php esc_html_e( 'Shipping Origin City', 'wp-e-commerce' ); ?></th>
<td>
- <input type='text' name='wpsc_options[base_city]' value='<?php esc_attr( get_option( 'base_city' ) ); ?>' />
+ <input type='text' name='wpsc_options[base_city]' value='<?php echo esc_attr( get_option( 'base_city' ) ); ?>' />
<p class='description'><?php esc_html_e( 'The name of the city where you fulfill and ship orders from. This enables us to give your customers more accurate shipping pricing.', 'wp-e-commerce' ); ?></p>
</td>
</tr>
<tr>
<th><?php esc_html_e( 'Shipping Origin Zipcode/Postcode', 'wp-e-commerce' ); ?></th>
<td>
- <input type='text' name='wpsc_options[base_zipcode]' value='<?php esc_attr( get_option( 'base_zipcode' ) ); ?>' />
+ <input type='text' name='wpsc_options[base_zipcode]' value='<?php echo esc_attr( get_option( 'base_zipcode' ) ); ?>' />
<p class='description'>
<?php esc_html_e( 'The ZIP code / Postal code from where you fulfill and ship orders.', 'wp-e-commerce' ); ?><br />
<?php esc_html_e( 'If you are based in the United States, then this field is required in order for the UPS and USPS Shipping Calculators to work.', 'wp-e-commerce' ); ?>
@@ -187,11 +187,11 @@ public function display() {
<table>
<tr>
<th><?php esc_html_e( 'Shipwire Email', 'wp-e-commerce' ); ?></th>
- <td><input type="text" name='wpsc_options[shipwireemail]' value="<?php esc_attr( get_option( 'shipwireemail' ) ); ?>" /></td>
+ <td><input type="text" name='wpsc_options[shipwireemail]' value="<?php echo esc_attr( get_option( 'shipwireemail' ) ); ?>" /></td>
</tr>
<tr>
<th><?php esc_html_e( 'Shipwire Password', 'wp-e-commerce' ); ?></th>
- <td><input type="text" name='wpsc_options[shipwirepassword]' value="<?php esc_attr( get_option( 'shipwirepassword' ) ); ?>" /></td>
+ <td><input type="text" name='wpsc_options[shipwirepassword]' value="<?php echo esc_attr( get_option( 'shipwirepassword' ) ); ?>" /></td>
</tr>
<tr>
<th><?php esc_html_e( 'Use Test Server?', 'wp-e-commerce' ); ?></th>
@@ -470,7 +470,7 @@ public function display() {
<tr id="wpsc-grid-settings">
<th scope="row"><?php esc_html_e( 'Grid view settings:', 'wp-e-commerce' ) ?></th>
<td>
- <input type='number' min="0" name='wpsc_options[grid_number_per_row]' id='grid_number_per_row' size='2' value='<?php esc_attr( get_option( 'grid_number_per_row' ) ); ?>' class='small-text' />
+ <input type='number' min="0" name='wpsc_options[grid_number_per_row]' id='grid_number_per_row' size='2' value='<?php echo esc_attr( get_option( 'grid_number_per_row' ) ); ?>' class='small-text' />
<label for='grid_number_per_row'><?php esc_html_e( 'Products Per Row', 'wp-e-commerce' ); ?></label><br />
<input type='hidden' value='0' name='wpsc_options[show_images_only]' />
@@ -961,9 +961,9 @@ public function display() {
<td>
<fieldset class="wpsc-width-height-fields">
<label for="image_width"><?php esc_html_e( 'Width', 'wp-e-commerce' ); ?></label>
- <input name="wpsc_options[product_image_width]" type="number" step="1" min="0" id="product_image_width" value="<?php esc_attr( get_option( 'product_image_width' ) ); ?>" class="small-text">
+ <input name="wpsc_options[product_image_width]" type="number" step="1" min="0" id="product_image_width" value="<?php echo esc_attr( get_option( 'product_image_width' ) ); ?>" class="small-text">
<label for="large_size_h"><?php esc_html_e( 'Height', 'wp-e-commerce' ); ?></label>
- <input name="wpsc_options[product_image_height]" type="number" step="1" min="0" id="product_image_height" value="<?php esc_attr( get_option( 'product_image_height' ) ); ?>" class="small-text">
+ <input name="wpsc_options[product_image_height]" type="number" step="1" min="0" id="product_image_height" value="<?php echo esc_attr( get_option( 'product_image_height' ) ); ?>" class="small-text">
</fieldset>
</td>
</tr>
@@ -974,9 +974,9 @@ public function display() {
<td>
<fieldset class="wpsc-width-height-fields">
<label for="image_width"><?php esc_html_e( 'Width', 'wp-e-commerce' ); ?></label>
- <input name="wpsc_options[category_image_width]" type="number" step="1" min="0" id="category_image_width" value="<?php esc_attr( get_option( 'category_image_width' ) ); ?>" class="small-text">
+ <input name="wpsc_options[category_image_width]" type="number" step="1" min="0" id="category_image_width" value="<?php echo esc_attr( get_option( 'category_image_width' ) ); ?>" class="small-text">
<label for="large_size_h"><?php esc_html_e( 'Height', 'wp-e-commerce' ); ?></label>
- <input name="wpsc_options[category_image_height]" type="number" step="1" min="0" id="category_image_height" value="<?php esc_attr( get_option( 'category_image_height' ) ); ?>" class="small-text">
+ <input name="wpsc_options[category_image_height]" type="number" step="1" min="0" id="category_image_height" value="<?php echo esc_attr( get_option( 'category_image_height' ) ); ?>" class="small-text">
</fieldset>
</td>
</tr>
@@ -987,9 +987,9 @@ public function display() {
<td>
<fieldset class="wpsc-width-height-fields">
<label for="image_width"><?php esc_html_e( 'Width', 'wp-e-commerce' ); ?></label>
- <input name="wpsc_options[single_view_image_width]" type="number" step="1" min="0" id="single_view_image_width" value="<?php esc_attr( get_option( 'single_view_image_width' ) ); ?>" class="small-text">
+ <input name="wpsc_options[single_view_image_width]" type="number" step="1" min="0" id="single_view_image_width" value="<?php echo esc_attr( get_option( 'single_view_image_width' ) ); ?>" class="small-text">
<label for="large_size_h"><?php esc_html_e( 'Height', 'wp-e-commerce' ); ?></label>
- <input name="wpsc_options[single_view_image_height]" type="number" step="1" min="0" id="single_view_image_height" value="<?php esc_attr( get_option( 'single_view_image_height' ) ); ?>" class="small-text">
+ <input name="wpsc_options[single_view_image_height]" type="number" step="1" min="0" id="single_view_image_height" value="<?php echo esc_attr( get_option( 'single_view_image_height' ) ); ?>" class="small-text">
</fieldset>
</td>
</tr>
@@ -1113,8 +1113,8 @@ public function display() {
<?php esc_html_e( 'Gallery Thumbnail Image Size', 'wp-e-commerce' ); ?>:
</th>
<td>
- <?php esc_html_e( 'Width', 'wp-e-commerce' ); ?>:<input type='text' size='6' name='wpsc_options[wpsc_gallery_image_width]' value='<?php esc_attr( get_option( 'wpsc_gallery_image_width' ) ); ?>' />
- <?php esc_html_e( 'Height', 'wp-e-commerce' ); ?>:<input type='text' size='6' name='wpsc_options[wpsc_gallery_image_height]' value='<?php esc_attr( get_option( 'wpsc_gallery_image_height' ) ); ?>' /><br />
+ <?php esc_html_e( 'Width', 'wp-e-commerce' ); ?>:<input type='text' size='6' name='wpsc_options[wpsc_gallery_image_width]' value='<?php echo esc_attr( get_option( 'wpsc_gallery_image_width' ) ); ?>' />
+ <?php esc_html_e( 'Height', 'wp-e-commerce' ); ?>:<input type='text' size='6' name='wpsc_options[wpsc_gallery_image_height]' value='<?php echo esc_attr( get_option( 'wpsc_gallery_image_height' ) ); ?>' /><br />
</td>
</tr>
@@ -1204,7 +1204,7 @@ public function display() {
<input onclick='jQuery("#wpsc_enable_comments,.wpsc_comments_details").hide()' type='radio' value='0' name='wpsc_options[wpsc_enable_comments]' id='wpsc_enable_comments2' <?php echo $enable_comments2; ?> /> <label for='wpsc_enable_comments1'><?php _e( 'No', 'wp-e-commerce' ); ?></label><br />
<div id='wpsc_enable_comments' <?php echo $intense_debate_account_id_display_state; ?> >
<?php esc_html_e( 'IntenseDebate Account ID', 'wp-e-commerce' ); ?>:<br/>
- <input type='text' size='30' name='wpsc_options[wpsc_intense_debate_account_id]' value='<?php esc_attr( get_option( 'wpsc_intense_debate_account_id' ) ); ?>' /><br/>
+ <input type='text' size='30' name='wpsc_options[wpsc_intense_debate_account_id]' value='<?php echo esc_attr( get_option( 'wpsc_intense_debate_account_id' ) ); ?>' /><br/>
<small><a href='http://intensedebate.com/sitekey/' title='<?php esc_attr_e( 'Help on finding the Account ID', 'wp-e-commerce' ); ?>'><?php _e( 'Help on finding the Account ID', 'wp-e-commerce' ); ?></a></small>
</div>
</td>
@@ -158,7 +158,7 @@ function checkDropValue () {
</script>
<select id='drop_type' name='wpsc_ups_settings[DropoffType]' onChange='checkDropValue()' >
<?php foreach ( array_keys( (array) $this->drop_types ) as $dkey ): ?>
- <option value="<?php esc_attr( $dkey ); ?>" <?php selected( $dkey, $sel2_drop ); ?> >
+ <option value="<?php echo esc_attr( $dkey ); ?>" <?php selected( $dkey, $sel2_drop ); ?> >
<?php echo( $this->drop_types[$dkey] ); ?>
</option>
<?php endforeach; ?>
@@ -179,7 +179,7 @@ function checkDropValue () {
<td>
<select id='cust_type' name='wpsc_ups_settings[CustomerType]' <?php disabled( $wpsc_ups_settings['DropoffType'] != '11' ); ?> >
<?php foreach( array_keys( $this->cust_types ) as $dkey ): ?>
- <option value="<?php esc_attr( $dkey ); ?>" <?php selected( $sel3_drop == $dkey ); ?> >
+ <option value="<?php echo esc_attr( $dkey ); ?>" <?php selected( $sel3_drop == $dkey ); ?> >
<?php echo( $this->cust_types[$dkey] ); ?>
</option>
<?php endforeach; ?>
@@ -192,8 +192,8 @@ function checkDropValue () {
<td>
<select name='wpsc_ups_settings[48_container]'>
<?php foreach ( $packaging_options as $key => $name ): ?>
- <option value='<?php esc_attr( $key ); ?>' <?php selected( $key == $wpsc_ups_settings['48_container'] );?>>
- <?php esc_html( $name ); ?>
+ <option value='<?php echo esc_attr( $key ); ?>' <?php selected( $key == $wpsc_ups_settings['48_container'] );?>>
+ <?php echo esc_html( $name ); ?>
</option>
<?php endforeach; ?>
</select>
@@ -230,8 +230,8 @@ function checkDropValue () {
<td>
<div class="ui-widget-content multiple-select">
<?php foreach( array_keys( $this->Services ) as $service ): ?>
- <input type="checkbox" id="wps_ups_srv_<?php esc_attr( $service ); ?>" name="wpsc_ups_services[]" value="<?php esc_attr( $service ); ?>" <?php checked( is_array( $wpsc_ups_services ) && ( array_search( $service, $wpsc_ups_services ) !== false ) ); ?> />
- <label for="wps_ups_srv_<?php esc_attr( $service ); ?>"><?php esc_html( $this->Services[ $service ] ); ?></label><br />
+ <input type="checkbox" id="wps_ups_srv_<?php echo esc_attr( $service ); ?>" name="wpsc_ups_services[]" value="<?php echo esc_attr( $service ); ?>" <?php checked( is_array( $wpsc_ups_services ) && ( array_search( $service, $wpsc_ups_services ) !== false ) ); ?> />
+ <label for="wps_ups_srv_<?php echo esc_attr( $service ); ?>"><?php echo esc_html( $this->Services[ $service ] ); ?></label><br />
<?php endforeach; ?>
</div>
<p class='description'><?php _e( 'Note: All services used if no services selected', 'wp-e-commerce' ); ?></p>
@@ -244,25 +244,25 @@ function checkDropValue () {
<tr>
<td><?php _e( 'Account Number', 'wp-e-commerce' ); ?> *</td>
<td>
- <input type="text" name='wpsc_ups_settings[upsaccount]' value="<?php esc_attr( $wpsc_ups_settings['upsaccount'] ); ?>" />
+ <input type="text" name='wpsc_ups_settings[upsaccount]' value="<?php echo esc_attr( $wpsc_ups_settings['upsaccount'] ); ?>" />
</td>
</tr>
<tr>
<td><?php _e( 'Username', 'wp-e-commerce' ); ?></td>
<td>
- <input type="text" name='wpsc_ups_settings[upsusername]' value="<?php esc_attr( base64_decode( $wpsc_ups_settings['upsusername'] ) ); ?>" />
+ <input type="text" name='wpsc_ups_settings[upsusername]' value="<?php echo esc_attr( base64_decode( $wpsc_ups_settings['upsusername'] ) ); ?>" />
</td>
</tr>
<tr>
<td><?php _e( 'Password', 'wp-e-commerce' ); ?></td>
<td>
- <input type="password" name='wpsc_ups_settings[upspassword]' value="<?php esc_attr( base64_decode( $wpsc_ups_settings['upspassword'] ) ); ?>" />
+ <input type="password" name='wpsc_ups_settings[upspassword]' value="<?php echo esc_attr( base64_decode( $wpsc_ups_settings['upspassword'] ) ); ?>" />
</td>
</tr>
<tr>
<td><?php _e( 'UPS XML API Key', 'wp-e-commerce' ); ?></td>
<td>
- <input type="text" name='wpsc_ups_settings[upsid]' value="<?php esc_attr( base64_decode( $wpsc_ups_settings['upsid'] ) ); ?>" />
+ <input type="text" name='wpsc_ups_settings[upsid]' value="<?php echo esc_attr( base64_decode( $wpsc_ups_settings['upsid'] ) ); ?>" />
<p class='description'><?php printf( __( "Don't have an API login/ID? <a href='%s' target='_blank'>Sign up for My UPS</a>", 'wp-e-commerce' ), esc_url( "https://www.ups.com/upsdeveloperkit?loc=en_US" ) ); ?></p>
</td>
</tr>
@@ -201,7 +201,7 @@ function getForm() {
<tr>
<td><?php _e( 'USPS ID', 'wp-e-commerce' ); ?></td>
<td>
- <input type='text' name='wpec_usps[id]' value='<?php esc_attr( $settings["id"] ); ?>' />
+ <input type='text' name='wpec_usps[id]' value='<?php echo esc_attr( $settings["id"] ); ?>' />
<p class='description'><?php printf( __("Don't have a USPS API account? <a href='%s' target='_blank'>Register for USPS Web Tools</a>", 'wp-e-commerce' ), 'https://registration.shippingapis.com/' ); ?></p>
<p class='description'><?php _e( "Make sure your account has been activated with USPS. If you're unsure if this applies to you, then please check with USPS.", 'wp-e-commerce' ); ?></p>
<p class='description'><?php printf( __("Once you've completed integration, <a href='%s' target='_blank'>you'll need to submit a request to promote tools to production</a>.", 'wp-e-commerce' ), 'https://www.usps.com/business/web-tools-apis/developers-center.htm#learn-more--1-1' ); ?></p>
@@ -263,7 +263,7 @@ function getForm() {
<td>
<select id="wpec_usps_intl_pkg" name="wpec_usps[intl_pkg]">
<?php foreach ( $mt_array as $mt ): ?>
- <option value="<?php esc_attr( $mt ); ?>" <?php selected( $mt, $mt_selected );?> ><?php echo $mt; ?></option>
+ <option value="<?php echo esc_attr( $mt ); ?>" <?php selected( $mt, $mt_selected );?> ><?php echo $mt; ?></option>
<?php endforeach; ?>
</select>
</td>
@@ -285,7 +285,7 @@ function getForm() {
<td>
<select id="first_cls_type" name="wpec_usps[fcl_type]">
<?php foreach ( $fcl_types as $label => $value ): ?>
- <option value="<?php esc_attr( $value ); ?>" <?php selected( $value, $type_selected ); ?>><?php echo $label; ?></option>
+ <option value="<?php echo esc_attr( $value ); ?>" <?php selected( $value, $type_selected ); ?>><?php echo $label; ?></option>
<?php endforeach; ?>
</select>
<br />
Oops, something went wrong.

0 comments on commit b3cfb89

Please sign in to comment.