Merge pull request #10 from justcoded/develop

Check requirements on settings page

Author: aprokopenko

assets/css/styles.css

@@ -6,6 +6,10 @@
     color: red;
 }
 
+.notice-nag {
+    border-left: 4px solid red;
+}
+
 .loader {
     border: 10px solid #f3f3f3;
     border-radius: 50%;

components/Optimizer.php

@@ -2,7 +2,6 @@
 
 namespace JustCoded\WP\ImageOptimizer\components;
 
-use JustCoded\WP\ImageOptimizer\models\Settings;
 use JustCoded\WP\ImageOptimizer\models\Media;
 use JustCoded\WP\ImageOptimizer\models\Log;
 
@@ -26,7 +25,10 @@ public function __construct() {
 	 * Run cron job by Settings param
 	 */
 	protected function setup_cron() {
-		if ( \JustImageOptimizer::$settings->auto_optimize ) {
+		if ( \JustImageOptimizer::$settings->saved()
+			&& \JustImageOptimizer::$settings->auto_optimize
+			&& \JustImageOptimizer::$settings->check_requirements()
+		) {
 			add_action( 'init', array( $this, 'check_cron_scheduled' ) );
 			add_filter( 'cron_schedules', array( $this, 'init_cron_schedule' ) );
 			add_action( 'just_image_optimizer_autorun', array( $this, 'auto_optimize' ) );
@@ -113,7 +115,7 @@ public function auto_optimize() {
 					unset( $attach_ids[ $key ] );
 				}
 			}
-		} while ( ! empty( $attach_ids ) && \JustImageOptimizer::$settings->tries_count > $tries++ );
+		} while ( ! empty( $attach_ids ) && \JustImageOptimizer::$settings->tries_count > $tries ++ );
 	}
 
 	/**
@@ -136,7 +138,7 @@ public function manual_optimize() {
 		do {
 			$this->optimize_images( [ $attach_id ] );
 			$optimize_status = $model->check_optimization_status( $attach_id );
-		} while ( Media::STATUS_PROCESSED !== $optimize_status && \JustImageOptimizer::$settings->tries_count > $tries++ );
+		} while ( Media::STATUS_PROCESSED !== $optimize_status && \JustImageOptimizer::$settings->tries_count > $tries ++ );
 
 		$attach_stats    = $model->get_total_attachment_stats( $attach_id );
 		$data_statistics = array(
@@ -195,6 +197,7 @@ protected function optimize_images( array $attach_ids ) {
 				update_post_meta( $attach_id, '_just_img_opt_status', $optimize_status );
 			}
 			$wp_filesystem->rmdir( $dir, true );
+
 			return false;
 		}
 
@@ -227,6 +230,7 @@ protected function optimize_images( array $attach_ids ) {
 		}
 
 		$wp_filesystem->rmdir( $dir, true );
+
 		return true;
 	}
 }

just-image-optimizer.php

@@ -4,7 +4,7 @@
 Plugin Name: Just Image Optimizer
 Description: Compress image files, improve performance and boost your SEO rank using Google Page Speed Insights compression and optimization.
 Tags: image, resize, optimize, optimise, compress, performance, optimisation, optimise JPG, pictures, optimizer, Google Page Speed
-Version: 1.1
+Version: 1.1.1
 Author: JustCoded
 License: GPLv2 or later
 */
@@ -78,7 +78,7 @@ protected function __construct() {
 		$loader = new core\PluginLoader();
 		// init plugin name and version.
 		self::$plugin_name = __( 'Just Image Optimizer', self::TEXTDOMAIN );
-		self::$version     = '1.100';
+		self::$version     = '1.101';
 		self::$opt_version = get_option( self::OPT_VERSION );
 		self::$settings    = new models\Settings();
 		self::$service     = services\ImageOptimizerFactory::create();

models/Settings.php

@@ -153,4 +153,13 @@ public function saved() {
 		return get_option( self::DB_OPT_KEEP_ORIGIN ) === '1';
 	}
 
+	/**
+	 * Check requirements for accesses wp-content.
+	 *
+	 * @return bool true or false.
+	 */
+	public function check_requirements() {
+		return wp_is_writable( WP_CONTENT_DIR );
+	}
+
 }

readme.txt

@@ -1,12 +1,12 @@
 === Just Image Optimizer ===
 Contributors: aprokopenko
 Plugin Name: Just Image Optimizer
-Version: 1.1
+Version: 1.1.1
 Description: Compress image files, improve performance and boost your SEO rank using Google Page Speed Insights compression and optimization.
 Tags: image, resize, optimize, optimise, compress, performance, optimisation, optimise JPG, pictures, optimizer, Google Page Speed
 Author: JustCoded
 Author URI: https://justcoded.com
-Requires at least: 4.4
+Requires at least: 4.5
 Tested up to: 4.9.4
 Requires PHP: >=5.6
 License: GPLv2 or later
@@ -65,6 +65,10 @@ No special actions are required during the upgrade.
 
 == Changelog ==
 
+= 1.1.1 =
+* New: Added notice if wp-content is not writable, cause it's required for storing files.
+* Bug fix: Fake cron run without plugin settings saved. 
+
 = 1.1 =
 * Added compatibility with Just Responsive Images plugin (v1.5+)
 * Added compatibility with Regenerate Thumbnails plugin (v3+)

views/dashboard/settings.php

@@ -1,6 +1,15 @@
 <div class="wrap">
 	<?php include( JUSTIMAGEOPTIMIZER_ROOT . '/views/_tabs.php' ); ?>
-	<?php if ( ! $model->saved() ) : ?>
+	<?php if ( ! $model->check_requirements() ) : ?>
+		<div class="update-nag notice-nag">
+			<strong>
+				<?php echo sprintf( __( 'Make %1$s writable using the chmod command through your ftp or server software.
+					(<em>chmod 775 %1$s</em>) and refresh this page for continued settings plugin.',
+					\JustImageOptimizer::TEXTDOMAIN ), WP_CONTENT_DIR ); ?>
+			</strong>
+		</div>
+	<?php endif; ?>
+	<?php if ( !$model->saved() && $model->check_requirements() ) : ?>
 		<div class="update-nag">
 			<strong>Please confirm the settings below and Save them.</strong>
 		</div><br>
@@ -15,21 +24,25 @@
 	<form method="post" action="<?php get_permalink(); ?>" enctype="multipart/form-data">
 		<table class="form-table">
 			<tr>
-				<th scope="row"><?php _e( 'Automatically optimize uploads', \JustImageOptimizer::TEXTDOMAIN ); ?></th>
+				<th scope="row">
+					<?php _e( 'Automatically optimize uploads', \JustImageOptimizer::TEXTDOMAIN ); ?>
+				</th>
 				<td>
 					<input type="hidden" name="auto_optimize" value="0">
-					<input <?php checked($model->auto_optimize); ?>
-						type="checkbox"
-						name="auto_optimize"
-						value="1">
+					<input <?php checked( $model->auto_optimize ); ?>
+							type="checkbox"
+							name="auto_optimize"
+							value="1">
 				</td>
 			</tr>
 			<tr class="image_sizes_set">
-				<th scope="row"><?php _e( 'Image sizes to optimize', \JustImageOptimizer::TEXTDOMAIN ); ?></th>
+				<th scope="row">
+					<?php _e( 'Image sizes to optimize', \JustImageOptimizer::TEXTDOMAIN ); ?>
+				</th>
 				<td class="additional_sizes">
 					<input type="hidden" name="image_sizes_all" value="0">
 					<label for="check_all_size">
-						<input <?php checked($model->image_sizes_all); ?>
+						<input <?php checked( $model->image_sizes_all ); ?>
 								id="check_all_size" type="checkbox" name="image_sizes_all"
 								value="1">All
 					</label>
@@ -58,7 +71,7 @@
 				<th scope="row"><?php _e( 'Bulk media limit', \JustImageOptimizer::TEXTDOMAIN ); ?></th>
 				<td>
 					<input type="text" name="image_limit"
-					       value="<?php echo $model->image_limit; ?>">
+						   value="<?php echo $model->image_limit; ?>">
 					<p class="description">How many Media can be optimized at a time</p>
 				</td>
 			</tr>
@@ -78,7 +91,7 @@
 				</td>
 			</tr>
 			<?php /*
-            // TODO: add support in future releases.
+			// TODO: add support in future releases.
 			<tr>
 				<th scope="row"><?php _e( 'Regenerate image thumbnails before optimize', \JustImageOptimizer::TEXTDOMAIN ); ?></th>
 				<td>
@@ -90,18 +103,19 @@
 					<p class="description">Can affect server performance if you upload images very often</p>
 				</td>
 			</tr>
-            */ ?>
+			*/ ?>
 		</table>
-		<input
-			type="submit" name="submit-settings" class="button button-primary" value="Save">
+		<input <?php echo( $model->check_requirements() ? '' : 'disabled' ); ?>
+				type="submit" name="submit-settings" class="button button-primary" value="Save">
 	</form>
 </div>
 <style>
 	.size_checked {
 		padding-top: 10px;
 	}
+
 	.label-checkbox {
-		width:200px;
+		width: 200px;
 		display: inline-block;
 	}
 </style>