WordPress.org
Get WordPress

Plugin Directory

Changeset 3136524


Ignore:
Timestamp:
08/16/2024 10:36:25 AM (17 months ago)
Author:
belovdigital
Message:

4.2.0 release

Location:
wp-calorie-calculator
Files:
69 added
4 edited

Legend:

Unmodified
Added
Removed

  • wp-calorie-calculator/trunk/languages/wp-calorie-calculator.pot

    r3078572 r3136524  
    254254msgstr ""
    255255
    256 #: public/class-wp-calorie-calculator-public.php:179, admin/partials/wp-calorie-calculator-admin-display.php:120
     256#: public/class-wp-calorie-calculator-public.php:196, admin/partials/wp-calorie-calculator-admin-display.php:120
    257257msgid "Your optimal calories"
    258258msgstr ""
    259259
    260 #: public/class-wp-calorie-calculator-public.php:180
     260#: public/class-wp-calorie-calculator-public.php:197
    261261msgid "Hi!"
    262262msgstr ""
    263263
    264 #: public/class-wp-calorie-calculator-public.php:181, admin/partials/wp-calorie-calculator-admin-display.php:123
     264#: public/class-wp-calorie-calculator-public.php:198, admin/partials/wp-calorie-calculator-admin-display.php:123
    265265msgid "It’s Calorie Calculator."
    266266msgstr ""
    267267
    268 #: public/class-wp-calorie-calculator-public.php:182, admin/partials/wp-calorie-calculator-admin-display.php:124
     268#: public/class-wp-calorie-calculator-public.php:199, admin/partials/wp-calorie-calculator-admin-display.php:124
    269269msgid "Looks like you requested your target daily calorie intake."
    270270msgstr ""
    271271
    272 #: public/class-wp-calorie-calculator-public.php:183
     272#: public/class-wp-calorie-calculator-public.php:200
    273273msgid "It is %s"
    274274msgstr ""
    275275
    276 #: public/class-wp-calorie-calculator-public.php:184, admin/partials/wp-calorie-calculator-admin-display.php:140
     276#: public/class-wp-calorie-calculator-public.php:201, admin/partials/wp-calorie-calculator-admin-display.php:140
    277277msgid "Your parameters:"
    278278msgstr ""
    279279
    280280#. translators: %s: sex
    281 #: public/class-wp-calorie-calculator-public.php:185, admin/partials/wp-calorie-calculator-admin-display.php:142
     281#: public/class-wp-calorie-calculator-public.php:202, admin/partials/wp-calorie-calculator-admin-display.php:142
    282282msgid "Sex: %s"
    283283msgstr ""
    284284
    285285#. translators: %s: age
    286 #: public/class-wp-calorie-calculator-public.php:186, admin/partials/wp-calorie-calculator-admin-display.php:144
     286#: public/class-wp-calorie-calculator-public.php:203, admin/partials/wp-calorie-calculator-admin-display.php:144
    287287msgid "Age: %s"
    288288msgstr ""
    289289
    290290#. translators: %s: height
    291 #: public/class-wp-calorie-calculator-public.php:187, admin/partials/wp-calorie-calculator-admin-display.php:146
     291#: public/class-wp-calorie-calculator-public.php:204, admin/partials/wp-calorie-calculator-admin-display.php:146
    292292msgid "Height: %s"
    293293msgstr ""
    294294
    295295#. translators: %s: weight
    296 #: public/class-wp-calorie-calculator-public.php:188, admin/partials/wp-calorie-calculator-admin-display.php:148
     296#: public/class-wp-calorie-calculator-public.php:205, admin/partials/wp-calorie-calculator-admin-display.php:148
    297297msgid "Weight: %s"
    298298msgstr ""
    299299
    300300#. translators: %s: activity
    301 #: public/class-wp-calorie-calculator-public.php:189, admin/partials/wp-calorie-calculator-admin-display.php:150
     301#: public/class-wp-calorie-calculator-public.php:206, admin/partials/wp-calorie-calculator-admin-display.php:150
    302302msgid "Activity level: %s"
    303303msgstr ""
    304304
    305305#. translators: %s: goal
    306 #: public/class-wp-calorie-calculator-public.php:190, admin/partials/wp-calorie-calculator-admin-display.php:152
     306#: public/class-wp-calorie-calculator-public.php:207, admin/partials/wp-calorie-calculator-admin-display.php:152
    307307msgid "Goal: %s"
    308308msgstr ""
    309309
    310 #: public/class-wp-calorie-calculator-public.php:191
     310#: public/class-wp-calorie-calculator-public.php:208
    311311msgid "You go!"
    312312msgstr ""
    313313
    314 #: public/class-wp-calorie-calculator-public.php:192, public/class-wp-calorie-calculator-public.php:201, admin/partials/wp-calorie-calculator-admin-display.php:154, admin/partials/wp-calorie-calculator-admin-display.php:165
     314#: public/class-wp-calorie-calculator-public.php:209, public/class-wp-calorie-calculator-public.php:219, admin/partials/wp-calorie-calculator-admin-display.php:154, admin/partials/wp-calorie-calculator-admin-display.php:165
    315315msgid "Best regards,"
    316316msgstr ""
    317317
    318 #: public/class-wp-calorie-calculator-public.php:193, public/class-wp-calorie-calculator-public.php:202, admin/partials/wp-calorie-calculator-admin-display.php:155, admin/partials/wp-calorie-calculator-admin-display.php:166
     318#: public/class-wp-calorie-calculator-public.php:210, public/class-wp-calorie-calculator-public.php:220, admin/partials/wp-calorie-calculator-admin-display.php:155, admin/partials/wp-calorie-calculator-admin-display.php:166
    319319msgid "Calorie Calculator."
    320320msgstr ""
    321321
    322 #: public/class-wp-calorie-calculator-public.php:197, admin/partials/wp-calorie-calculator-admin-display.php:157
     322#: public/class-wp-calorie-calculator-public.php:215, admin/partials/wp-calorie-calculator-admin-display.php:157
    323323msgid "New Calorie Calculator user"
    324324msgstr ""
    325325
    326 #: public/class-wp-calorie-calculator-public.php:198, admin/partials/wp-calorie-calculator-admin-display.php:159
     326#: public/class-wp-calorie-calculator-public.php:216, admin/partials/wp-calorie-calculator-admin-display.php:159
    327327msgid "Hey, someone just shared their email address with you."
    328328msgstr ""
    329329
    330 #: public/class-wp-calorie-calculator-public.php:199
     330#: public/class-wp-calorie-calculator-public.php:217
    331331msgid "Here it is: %s"
    332332msgstr ""
    333333
    334 #: public/class-wp-calorie-calculator-public.php:200, admin/partials/wp-calorie-calculator-admin-display.php:164
     334#: public/class-wp-calorie-calculator-public.php:218, admin/partials/wp-calorie-calculator-admin-display.php:164
    335335msgid "Make it the beginning of your brand’s active conversation."
    336336msgstr ""
    337337
    338 #: public/class-wp-calorie-calculator-public.php:239
    339 msgid "Zapier Webhook is missing or not enabled!"
     338#: public/class-wp-calorie-calculator-public.php:241
     339msgid "Zapier is not enabled!"
     340msgstr ""
     341
     342#: public/class-wp-calorie-calculator-public.php:261
     343msgid "Zapier Webhook is missing!"
    340344msgstr ""
    341345

  • wp-calorie-calculator/trunk/public/class-wp-calorie-calculator-public.php

    r3078572 r3136524  
    176176        $server_response['zapier'] = $this->send_data_to_zapier( $zapier_data );
    177177
     178        // Headers.
     179        $headers    = array();
     180        $sitename   = wp_parse_url( network_home_url(), PHP_URL_HOST );
     181        $from_name  = get_bloginfo( 'name' );
     182        $reply_to   = get_bloginfo( 'admin_email' );
     183        $from_email = 'notification@';
     184
     185        if ( null !== $sitename ) {
     186            if ( str_starts_with( $sitename, 'www.' ) ) {
     187                $sitename = substr( $sitename, 4 );
     188            }
     189
     190            $from_email .= $sitename;
     191        }
     192        $headers['From']     = 'From: "' . wp_strip_all_tags( $from_name, true ) . '" <' . $from_email . '>';
     193        $headers['Reply-To'] = "Reply-To: {$reply_to}";
     194
    178195        // Email to user.
    179         $subject                            = __( 'Your optimal calories', 'wp-calorie-calculator' );
    180         $message                            = __( 'Hi!', 'wp-calorie-calculator' ) . "\n";
    181         $message                           .= __( 'It’s Calorie Calculator.', 'wp-calorie-calculator' ) . "\n";
    182         $message                           .= __( 'Looks like you requested your target daily calorie intake.', 'wp-calorie-calculator' ) . "\n";
    183         $message                           .= sprintf( __( 'It is %s', 'wp-calorie-calculator' ), $result ) . "\n\n";
    184         $message                           .= __( 'Your parameters:', 'wp-calorie-calculator' ) . "\n\n";
    185         $message                           .= sprintf( __( 'Sex: %s', 'wp-calorie-calculator' ), $gender ) . "\n";
    186         $message                           .= sprintf( __( 'Age: %s', 'wp-calorie-calculator' ), $age ) . "\n";
    187         $message                           .= sprintf( __( 'Height: %s', 'wp-calorie-calculator' ), $height_string ) . "\n";
    188         $message                           .= sprintf( __( 'Weight: %s', 'wp-calorie-calculator' ), $weight_string ) . "\n";
    189         $message                           .= sprintf( __( 'Activity level: %s', 'wp-calorie-calculator' ), $activity ) . "\n";
    190         $message                           .= sprintf( __( 'Goal: %s', 'wp-calorie-calculator' ), $goal ) . "\n\n";
    191         $message                           .= __( 'You go!', 'wp-calorie-calculator' ) . "\n\n";
    192         $message                           .= __( 'Best regards,', 'wp-calorie-calculator' ) . "\n";
    193         $message                           .= __( 'Calorie Calculator.', 'wp-calorie-calculator' );
    194         $server_response['user_email_sent'] = wp_mail( $user_email, $subject, $message );
     196        $subject  = __( 'Your optimal calories', 'wp-calorie-calculator' );
     197        $message  = __( 'Hi!', 'wp-calorie-calculator' ) . "\n";
     198        $message .= __( 'It’s Calorie Calculator.', 'wp-calorie-calculator' ) . "\n";
     199        $message .= __( 'Looks like you requested your target daily calorie intake.', 'wp-calorie-calculator' ) . "\n";
     200        $message .= sprintf( __( 'It is %s', 'wp-calorie-calculator' ), $result ) . "\n\n";
     201        $message .= __( 'Your parameters:', 'wp-calorie-calculator' ) . "\n\n";
     202        $message .= sprintf( __( 'Sex: %s', 'wp-calorie-calculator' ), $gender ) . "\n";
     203        $message .= sprintf( __( 'Age: %s', 'wp-calorie-calculator' ), $age ) . "\n";
     204        $message .= sprintf( __( 'Height: %s', 'wp-calorie-calculator' ), $height_string ) . "\n";
     205        $message .= sprintf( __( 'Weight: %s', 'wp-calorie-calculator' ), $weight_string ) . "\n";
     206        $message .= sprintf( __( 'Activity level: %s', 'wp-calorie-calculator' ), $activity ) . "\n";
     207        $message .= sprintf( __( 'Goal: %s', 'wp-calorie-calculator' ), $goal ) . "\n\n";
     208        $message .= __( 'You go!', 'wp-calorie-calculator' ) . "\n\n";
     209        $message .= __( 'Best regards,', 'wp-calorie-calculator' ) . "\n";
     210        $message .= __( 'Calorie Calculator.', 'wp-calorie-calculator' );
     211
     212        $server_response['user_email_sent'] = wp_mail( $user_email, $subject, $message, $headers );
    195213
    196214        // Notification email.
    … …  
    201219        $message                                   .= __( 'Best regards,', 'wp-calorie-calculator' ) . "\n";
    202220        $message                                   .= __( 'Calorie Calculator.', 'wp-calorie-calculator' );
    203         $server_response['notification_email_sent'] = wp_mail( $notification_email, $subject, $message );
     221        $server_response['notification_email_sent'] = wp_mail( $notification_email, $subject, $message, $headers );
    204222
    205223        // Send the contact to Zapier.
    … …  
    220238        $enable_zapier  = get_option( 'wpcc_enable_zapier', '' );
    221239
    222         if ( $zapier_webhook && 'true' === $enable_zapier ) :
     240        if ( 'true' !== $enable_zapier ) {
     241            return __( 'Zapier is not enabled!', 'wp-calorie-calculator' );
     242        }
     243
     244        if ( $zapier_webhook ) :
    223245            $response = wp_remote_post(
    224246                $zapier_webhook,
    … …  
    237259
    238260        else :
    239             return __( 'Zapier Webhook is missing or not enabled!', 'wp-calorie-calculator' );
     261            return __( 'Zapier Webhook is missing!', 'wp-calorie-calculator' );
    240262        endif;
    241263

  • wp-calorie-calculator/trunk/readme.txt

    r3078572 r3136524  
    33Tags: calorie calculator, plan, health, nutrition, macros, sport, fitness, gym, lifestyle
    44Requires at least: 4.7
    5 Tested up to: 6.5.2
     5Tested up to: 6.6.1
    66Requires PHP: 5.6
    7 Stable tag: 4.1.0
     7Stable tag: 4.2.0
    88License: GPLv2 or later
    99License URI: http://www.gnu.org/licenses/gpl-2.0.html
    … …  
    196196== Changelog ==
    197197
     198= 4.2.0 2024-08-15 =
     199- Added site name instead of the default WordPress in the email sender header.
     200- WordPress 6.6.1 compatibility added.
     201
    198202= 4.1.0 2024-04-29 =
    199203- Added integration with ConvertKit.

  • wp-calorie-calculator/trunk/wp-calorie-calculator.php

    r3078572 r3136524  
    99 * Plugin Name:       WP Calorie Calculator
    1010 * Description:       Calorie Calculator gives you the shortcode with the flexible settings that you can place into the page, post or sidebar widget. Or actually anywhere you can place the shortcode.
    11  * Version:           4.1.0
     11 * Version:           4.2.0
    1212 * Requires at least: 4.7
    1313 * Requires PHP:      5.6
    … …  
    2828 * Plugin constants
    2929 */
    30 define( 'WP_CALORIE_CALCULATOR_VERSION', '4.1.0' );
     30define( 'WP_CALORIE_CALCULATOR_VERSION', '4.2.0' );
    3131define( 'WP_CALORIE_CALCULATOR_PLUGIN_FILE', plugin_basename( __FILE__ ) );
    3232define( 'WP_CALORIE_CALCULATOR_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
Note: See TracChangeset for help on using the changeset viewer.