Skip to content

Package updates and PHPCS fixes. #176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
XjSv merged 5 commits into from
Sep 19, 2026
Merged

Package updates and PHPCS fixes. #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e11887b
Package updates and PHPCS fixes.
mgiannopoulos24 Sep 11, 2026
5541f53
Change PHP version to 7.4 and update afterStart script
mgiannopoulos24 Sep 16, 2026
2d86951
Update i18n scripts for compatibility with ddev
mgiannopoulos24 Sep 16, 2026
b52e1c8
Change afterStart script to use wp-env run cli
mgiannopoulos24 Sep 16, 2026
9dd7d63
Merge branch 'develop' into chore/phpcs-fixes
XjSv Sep 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 38 additions & 38 deletions bun.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion phpcs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
</rule>

<rule ref="WordPress.NamingConventions.ValidVariableName.VariableNotSnakeCase">
<exclude-pattern>cooked.php</exclude-pattern>
<exclude-pattern>*.php</exclude-pattern>
</rule>

<rule ref="WordPress.DB.DirectDatabaseQuery">
Expand Down
124 changes: 72 additions & 52 deletions templates/admin/import.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,40 @@
<?php
/**
* Cooked Import admin page
*
* @package Cooked
* @subpackage Admin
* @since 1.8.2
*/

?>
<div id="cooked-settings-prewrap">
<div id="cooked-settings-wrap">
<form action="options.php" method="post">

<div class="cooked-settings-header">
<i class="cooked-icon cooked-icon-cooked-icon"></i>&nbsp;&nbsp;<?php esc_html_e('Cooked Import','cooked'); ?>
<i class="cooked-icon cooked-icon-cooked-icon"></i>&nbsp;&nbsp;<?php esc_html_e( 'Cooked Import', 'cooked' ); ?>
</div>
<div id="cooked-settings-panel" class="wrap"><?php
<div id="cooked-settings-panel" class="wrap">
<?php
require_once COOKED_DIR . 'includes/class.cooked-import.php';
require_once COOKED_DIR . 'includes/class.cooked-delicious-recipes.php';
require_once COOKED_DIR . 'includes/class.cooked-recipe-maker.php';
require_once COOKED_DIR . 'includes/class.cooked-csv-import.php';

global $_cooked_settings;

$Cooked_Import = new Cooked_Import();
$Cooked_Import = new Cooked_Import();
$cooked_settings_tabs_fields = $Cooked_Import->tabs_fields();

$tab_counter = 1;
echo '<ul id="cooked-settings-tabs" class="cooked-clearfix">';
foreach( $cooked_settings_tabs_fields as $tab_slug => $tab ):
echo '<li id="cooked-settings-tab-' . esc_attr( $tab_slug ) . '"' . ( $tab_counter == 1 ? ' class="active"' : '' ) . '><a href="#' . esc_attr( $tab_slug ) . '"><i class="cooked-icon cooked-icon-' . esc_attr( $tab['icon'] ) . '"></i>&nbsp;&nbsp;' . esc_attr( $tab['name'] ) . '</a></li>';
$tab_counter++;
foreach ( $cooked_settings_tabs_fields as $tab_slug => $tab ) :
echo '<li id="cooked-settings-tab-' . esc_attr( $tab_slug ) . '"' . ( 1 === $tab_counter ? ' class="active"' : '' ) . '><a href="#' . esc_attr( $tab_slug ) . '"><i class="cooked-icon cooked-icon-' . esc_attr( $tab['icon'] ) . '"></i>&nbsp;&nbsp;' . esc_attr( $tab['name'] ) . '</a></li>';
++$tab_counter;
endforeach;
echo '</ul>';
?>
?>

<?php settings_errors(); ?>

Expand All @@ -35,75 +46,82 @@
<div class="cooked-settings-tab-content-wrapper">
<?php
global $conditions;
$conditions = [];
$conditions = [];
$conditional_requirements_js = [];
$tab_counter = 1;
$tab_counter = 1;

foreach ( $cooked_settings_tabs_fields as $tab_slug => $tab ):
foreach ( $cooked_settings_tabs_fields as $tab_slug => $tab ) :
echo '<div id="cooked-settings-tab-content-' . esc_attr( $tab_slug ) . '" class="cooked-settings-tab-content">';

// Add a hidden H2 tag for the messages, if any, to show up below it.
if ($tab_counter == 1): echo '<h2 style="display:none;"></h2>'; endif;
foreach ( $tab['fields'] as $name => $field ):
$notitle = false;
$conditional_requirement = '';

$class = isset($field['class']) ? ' ' . $field['class'] : '';
$current_val = isset($_cooked_settings[$name]) ? $_cooked_settings[$name] : null;
$field_type = 'field_' . esc_attr( $field['type'] );
$field_options = isset($field['options']) ? $field['options'] : false;
$field_options = !$field_options ? ( isset($field['placeholder']) ? $field['placeholder'] : $field_options ) : $field_options;
$color = isset($field['color']) && $field['color'] ? $field['color'] : false;

if ( method_exists ( $Cooked_Import, $field_type ) ):

if ( $field['type'] == 'misc_button' || $field['type'] == 'nonce' ):
$notitle = true;
$field_options = isset($field['title']) ? $field['title'] : false;
if ( 1 === $tab_counter ) :
echo '<h2 style="display:none;"></h2>';
endif;
foreach ( $tab['fields'] as $name => $field ) :
$notitle = false;
$conditional_requirement = '';

$class = isset( $field['class'] ) ? ' ' . $field['class'] : '';
$current_val = isset( $_cooked_settings[ $name ] ) ? $_cooked_settings[ $name ] : null;
$field_type = 'field_' . esc_attr( $field['type'] );
$field_options = isset( $field['options'] ) ? $field['options'] : false;
$field_options = ! $field_options ? ( isset( $field['placeholder'] ) ? $field['placeholder'] : $field_options ) : $field_options;
$color = isset( $field['color'] ) && $field['color'] ? $field['color'] : false;

if ( method_exists( $Cooked_Import, $field_type ) ) :

if ( 'misc_button' === $field['type'] || 'nonce' === $field['type'] ) :
$notitle = true;
$field_options = isset( $field['title'] ) ? $field['title'] : false;
endif;

if ( isset($field['conditional_requirement']) && $field['conditional_requirement'] ):
if ( is_array($field['conditional_requirement']) ):
$conditional_requirement = ' v-show="' . implode( ' && ', $field['conditional_requirement'] ) . '"';
else:
$conditional_requirement = ' v-show="' . esc_attr($field['conditional_requirement']) . '"';
if ( isset( $field['conditional_requirement'] ) && $field['conditional_requirement'] ) :
if ( is_array( $field['conditional_requirement'] ) ) :
$conditional_requirement = ' v-show="' . implode( ' && ', $field['conditional_requirement'] ) . '"';
else :
$conditional_requirement = ' v-show="' . esc_attr( $field['conditional_requirement'] ) . '"';
endif;
endif;

echo $conditional_requirement ? '<transition name="fade">' : '';
echo '<div' . wp_kses( $conditional_requirement, array() ) . ' class="recipe-setting-block ' . esc_attr( $field['type'] ) . ' cooked-bm-25' . esc_attr( $class ) . '">';
echo !$notitle ? '<h3 class="cooked-settings-title">' . wp_kses_post( $field['title'] ) . '</h3>' : '';
echo isset($field['desc']) && $field['desc'] ? '<p>' . wp_kses_post( $field['desc'] ). '</p>' : '';
$Cooked_Import->$field_type( $name, $field_options, $color, $field );
echo '</div>';
echo $conditional_requirement ? '</transition>' : '';
echo $conditional_requirement ? '<transition name="fade">' : '';
echo '<div' . wp_kses( $conditional_requirement, array() ) . ' class="recipe-setting-block ' . esc_attr( $field['type'] ) . ' cooked-bm-25' . esc_attr( $class ) . '">';
echo ! $notitle ? '<h3 class="cooked-settings-title">' . wp_kses_post( $field['title'] ) . '</h3>' : '';
echo isset( $field['desc'] ) && $field['desc'] ? '<p>' . wp_kses_post( $field['desc'] ) . '</p>' : '';
$Cooked_Import->$field_type( $name, $field_options, $color, $field );
echo '</div>';
echo $conditional_requirement ? '</transition>' : '';

endif;

endforeach;
$tab_counter++;
++$tab_counter;

echo '</div>';
endforeach; ?>
endforeach;
?>

</div>

</div>

<?php if ( COOKED_DEV ):
<?php
if ( COOKED_DEV ) :
Cooked_Functions::wpml_xml( $cooked_settings_tabs_fields );
endif; ?>
endif;
?>

</div><?php
</div>
<?php

if ( !empty($conditions) ):
if ( ! empty( $conditions ) ) :

foreach( $conditions as $setting_name => $array ):
foreach( $array as $name => $true_val ):
$val = isset( $_cooked_settings[$setting_name] ) && is_array( $_cooked_settings[$setting_name] ) && in_array( $true_val, $_cooked_settings[$setting_name] ) ? 'true' : 'false';
foreach ( $conditions as $setting_name => $array ) :
foreach ( $array as $name => $true_val ) :
$val = isset( $_cooked_settings[ $setting_name ] ) && is_array( $_cooked_settings[ $setting_name ] ) && in_array( $true_val, $_cooked_settings[ $setting_name ], true ) ? 'true' : 'false';
$conditional_requirements_js[] = "'$name':$val";
endforeach;
endforeach; ?>
endforeach;
?>

<script type="text/javascript">
var vm = new Vue({
Expand All @@ -117,10 +135,12 @@
<style type="text/css">
.fade-enter-active { transition: opacity .5s }
.fade-enter, .fade-leave-to { opacity: 0 }
</style><?php
</style>
<?php

endif;

?></form>
?>
</form>
</div>
</div>
</div>
64 changes: 40 additions & 24 deletions templates/admin/pro.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,26 @@
<?php
/**
* Cooked Pro upsell admin page
*
* @package Cooked
* @subpackage Admin
* @since 1.0.0
*/

?>
<div id="cooked-welcome-screen">
<div class="wrap about-wrap">
<div id="cooked-welcome-panel" class="cooked-welcome-panel">

<img src="<?php echo esc_url( COOKED_URL . '/assets/admin/images/pro-banner.png' ); ?>" class="cooked-welcome-banner">

<div class="cooked-welcome-panel-intro">
<h1><?php
<h1>
<?php
/* translators: referring to "Cooked Pro" */
echo sprintf( esc_html__('Ready for %s?','cooked'), 'Cooked Pro' );
?></h1>
printf( esc_html__( 'Ready for %s?', 'cooked' ), 'Cooked Pro' );
?>
</h1>
<?php
/* translators: referring to "Cooked Pro" */
echo wp_kses_post( wpautop( sprintf( esc_html__( 'The %s upgrade adds loads of new features like ratings, favorites, user profiles, automatic nutrition information and more. Check out the list below for all of the details.', 'cooked' ), 'Cooked Pro' ) ) );
Expand All @@ -20,37 +32,41 @@
<div class="cooked-welcome-panel-column cooked-welcome-panel-full">
<div class="cooked-pro-features">
<ul class="cooked-whatsnew-list cooked-whatsnew-pro">
<li><i class="cooked-icon cooked-icon-star"></i> <?php esc_html_e( "Premium Support","cooked" ); ?></li>
<li><i class="cooked-icon cooked-icon-star"></i> <?php esc_html_e( "User Profiles","cooked" ); ?></li>
<li><i class="cooked-icon cooked-icon-star"></i> <?php esc_html_e( "User Ratings","cooked" ); ?></li>
<li><i class="cooked-icon cooked-icon-star"></i> <?php esc_html_e( "User Favorites","cooked" ); ?></li>
<li><i class="cooked-icon cooked-icon-star"></i> <?php esc_html_e( "Ingredient Links","cooked" ); ?></li>
<li><i class="cooked-icon cooked-icon-star"></i> <?php esc_html_e( 'Premium Support', 'cooked' ); ?></li>
<li><i class="cooked-icon cooked-icon-star"></i> <?php esc_html_e( 'User Profiles', 'cooked' ); ?></li>
<li><i class="cooked-icon cooked-icon-star"></i> <?php esc_html_e( 'User Ratings', 'cooked' ); ?></li>
<li><i class="cooked-icon cooked-icon-star"></i> <?php esc_html_e( 'User Favorites', 'cooked' ); ?></li>
<li><i class="cooked-icon cooked-icon-star"></i> <?php esc_html_e( 'Ingredient Links', 'cooked' ); ?></li>
</ul>
<ul class="cooked-whatsnew-list cooked-whatsnew-pro">
<li><i class="cooked-icon cooked-icon-star"></i> <?php esc_html_e( "Social Sharing","cooked" ); ?></li>
<li><i class="cooked-icon cooked-icon-star"></i> <?php esc_html_e( "Recipe Submissions","cooked" ); ?></li>
<li><i class="cooked-icon cooked-icon-star"></i> <?php esc_html_e( "Modern Grid Layout","cooked" ); ?></li>
<li><i class="cooked-icon cooked-icon-star"></i> <?php esc_html_e( "Full-Width Layout","cooked" ); ?></li>
<li><i class="cooked-icon cooked-icon-star"></i> <?php esc_html_e( "Pagination Options","cooked" ); ?></li>
<li><i class="cooked-icon cooked-icon-star"></i> <?php esc_html_e( "Auto Nutrition Facts","cooked" ); ?></li>
<li><i class="cooked-icon cooked-icon-star"></i> <?php esc_html_e( 'Social Sharing', 'cooked' ); ?></li>
<li><i class="cooked-icon cooked-icon-star"></i> <?php esc_html_e( 'Recipe Submissions', 'cooked' ); ?></li>
<li><i class="cooked-icon cooked-icon-star"></i> <?php esc_html_e( 'Modern Grid Layout', 'cooked' ); ?></li>
<li><i class="cooked-icon cooked-icon-star"></i> <?php esc_html_e( 'Full-Width Layout', 'cooked' ); ?></li>
<li><i class="cooked-icon cooked-icon-star"></i> <?php esc_html_e( 'Pagination Options', 'cooked' ); ?></li>
<li><i class="cooked-icon cooked-icon-star"></i> <?php esc_html_e( 'Auto Nutrition Facts', 'cooked' ); ?></li>
</ul>
<ul class="cooked-whatsnew-list cooked-whatsnew-pro">
<li><i class="cooked-icon cooked-icon-star"></i> <?php esc_html_e( "Compact List Layout","cooked" ); ?></li>
<li><i class="cooked-icon cooked-icon-star"></i> <?php esc_html_e( "Fitness Layout","cooked" ); ?></li>
<li><i class="cooked-icon cooked-icon-star"></i> <?php esc_html_e( "Cuisines","cooked" ); ?></li>
<li><i class="cooked-icon cooked-icon-star"></i> <?php esc_html_e( "Cooking Methods","cooked" ); ?></li>
<li><i class="cooked-icon cooked-icon-star"></i> <?php esc_html_e( "Tags","cooked" ); ?></li>
<li><i class="cooked-icon cooked-icon-star"></i> <?php esc_html_e( 'Compact List Layout', 'cooked' ); ?></li>
<li><i class="cooked-icon cooked-icon-star"></i> <?php esc_html_e( 'Fitness Layout', 'cooked' ); ?></li>
<li><i class="cooked-icon cooked-icon-star"></i> <?php esc_html_e( 'Cuisines', 'cooked' ); ?></li>
<li><i class="cooked-icon cooked-icon-star"></i> <?php esc_html_e( 'Cooking Methods', 'cooked' ); ?></li>
<li><i class="cooked-icon cooked-icon-star"></i> <?php esc_html_e( 'Tags', 'cooked' ); ?></li>
</ul>
</div>
<div class="cooked-welcome-bottom">
<a href="https://cooked.pro/" target="_blank" class="cooked-pro-button"><?php
<a href="https://cooked.pro/" target="_blank" class="cooked-pro-button">
<?php
/* translators: referring to "Cooked Pro" */
echo sprintf( esc_html__( "Get %s","cooked" ), "Cooked Pro" );
?></a>
<span class="cooked-coupon-code"><?php
printf( esc_html__( 'Get %s', 'cooked' ), 'Cooked Pro' );
?>
</a>
<span class="cooked-coupon-code">
<?php
/* translators: referring to the "COOKED10" coupon code to get "10%" off Cooked Pro */
echo wp_kses_post( sprintf( __( 'Use coupon code %1$s for %2$s off!', 'cooked' ), '<strong>COOKED10</strong>', '<strong>10%</strong>' ) );
?></span>
?>
</span>
</div>
</div>
</div>
Expand Down
Loading
Loading