Changeset 1703145

Timestamp:

07/26/2017 01:58:43 PM (9 years ago)

Author:

wp_media

Message:

Imagify 1.6.8 hotfix before public release.

Location:

imagify

Files:

• tags/1.6.8/inc/admin/ui/notices.php (modified) (2 diffs)
• tags/1.6.8/inc/admin/ui/options.php (modified) (1 diff)
• tags/1.6.8/inc/functions/attachments.php (modified) (3 diffs)
• trunk/inc/admin/ui/notices.php (modified) (2 diffs)
• trunk/inc/admin/ui/options.php (modified) (1 diff)
• trunk/inc/functions/attachments.php (modified) (3 diffs)

imagify/tags/1.6.8/inc/admin/ui/notices.php

@@ -354 +354 @@
     }
 
-    $filesystem     = imagify_get_filesystem();
-    $has_backup_dir = wp_mkdir_p( get_imagify_backup_dir_path() );
-
-    if ( $has_backup_dir && $filesystem->is_writable( get_imagify_backup_dir_path() ) ) {
-        return;
-    }
-
-    $backup_path = imagify_make_file_path_replative( get_imagify_backup_dir_path() );
+    if ( imagify_backup_dir_is_writable() ) {
+        return;
+    }
+
+    $filesystem = imagify_get_filesystem();
+
+    if ( $filesystem->exists( get_imagify_backup_dir_path() ) ) {
+        /* translators: %s is a file path. */
+        $message = __( 'The backup folder %s is not writable by the server, original images cannot be saved!', 'imagify' );
+    } else {
+        /* translators: %s is a file path. */
+        $message = __( 'The backup folder %s cannot be created. Is its parent directory writable by the server? Original images cannot be saved!', 'imagify' );
+    }
+
+    $backup_path = imagify_make_file_path_replative( get_imagify_backup_dir_path( true ) );
     ?>
     <div class="clear"></div>
@@ -369 +376 @@
         </div>
         <div class="imagify-notice-content">
-            <p><?php
-            /* translators: %s is a file path. */
-            printf( __( 'The backup folder %s can\'t be created, original images can\'t be saved!', 'imagify' ), "<code>$backup_path</code>" );
-            ?></p>
+            <p><?php printf( $message, "<code>$backup_path</code>" ); ?></p>
         </div>
     </div>

imagify/tags/1.6.8/inc/admin/ui/options.php

@@ -213 +213 @@
                                     <br/><strong id="backup-dir-is-writable" class="imagify-error<?php echo $backup_error_class; ?>" data-nonce="<?php echo esc_attr( wp_create_nonce( 'imagify_check_backup_dir_is_writable' ) ); ?>">
                                         <?php
-                                        $backup_path = imagify_make_file_path_replative( get_imagify_backup_dir_path() );
+                                        $backup_path = imagify_make_file_path_replative( get_imagify_backup_dir_path( true ) );
                                         /* translators: %s is a file path. */
-                                        printf( __( 'The backup folder %s can\'t be created, original images can\'t be saved!', 'imagify' ), "<code>$backup_path</code>" );
+                                        printf( __( 'The backup folder %s cannot be created or is not writable by the server, original images cannot be saved!', 'imagify' ), "<code>$backup_path</code>" );
                                         ?>
                                     </strong>

imagify/tags/1.6.8/inc/functions/attachments.php

@@ -51 +51 @@
  * @author Grégory Viguier
  *
- * @return string|bool Path to the backups directory. False on failure.
- */
-function get_imagify_backup_dir_path() {
+ * @param  bool $bypass_error True to return the path even if there is an error. This is used when we want to display this path in a message for example.
+ * @return string|bool        Path to the backups directory. False on failure.
+ */
+function get_imagify_backup_dir_path( $bypass_error = false ) {
     static $backup_dir;
 
@@ -60 +61 @@
     }
 
-    $upload_basedir = get_imagify_upload_basedir();
+    $upload_basedir = get_imagify_upload_basedir( $bypass_error );
 
     if ( ! $upload_basedir ) {
@@ -224 +225 @@
  *
  * @since  1.6.7
- * @author Grégory Viguier
- *
- * @return string|bool The path. False on failure.
- */
-function get_imagify_upload_basedir() {
+ * @since  1.6.8 Added the $bypass_error parameter.
+ * @author Grégory Viguier
+ *
+ * @param  bool $bypass_error True to return the path even if there is an error. This is used when we want to display this path in a message for example.
+ * @return string|bool        The path. False on failure.
+ */
+function get_imagify_upload_basedir( $bypass_error = false ) {
     static $upload_basedir;
+    static $upload_basedir_or_error;
 
     if ( isset( $upload_basedir ) ) {
-        return $upload_basedir;
-    }
-
-    $uploads = wp_upload_dir();
+        return $bypass_error ? $upload_basedir : $upload_basedir_or_error;
+    }
+
+    $uploads        = wp_upload_dir();
+    $upload_basedir = trailingslashit( wp_normalize_path( $uploads['basedir'] ) );
 
     if ( false !== $uploads['error'] ) {
-        $upload_basedir = false;
-        return $upload_basedir;
-    }
-
-    $upload_basedir = trailingslashit( wp_normalize_path( $uploads['basedir'] ) );
-
-    return $upload_basedir;
+        $upload_basedir_or_error = false;
+    } else {
+        $upload_basedir_or_error = $upload_basedir;
+    }
+
+    return $bypass_error ? $upload_basedir : $upload_basedir_or_error;
 }
 

imagify/trunk/inc/admin/ui/notices.php

@@ -354 +354 @@
     }
 
-    $filesystem     = imagify_get_filesystem();
-    $has_backup_dir = wp_mkdir_p( get_imagify_backup_dir_path() );
-
-    if ( $has_backup_dir && $filesystem->is_writable( get_imagify_backup_dir_path() ) ) {
-        return;
-    }
-
-    $backup_path = imagify_make_file_path_replative( get_imagify_backup_dir_path() );
+    if ( imagify_backup_dir_is_writable() ) {
+        return;
+    }
+
+    $filesystem = imagify_get_filesystem();
+
+    if ( $filesystem->exists( get_imagify_backup_dir_path() ) ) {
+        /* translators: %s is a file path. */
+        $message = __( 'The backup folder %s is not writable by the server, original images cannot be saved!', 'imagify' );
+    } else {
+        /* translators: %s is a file path. */
+        $message = __( 'The backup folder %s cannot be created. Is its parent directory writable by the server? Original images cannot be saved!', 'imagify' );
+    }
+
+    $backup_path = imagify_make_file_path_replative( get_imagify_backup_dir_path( true ) );
     ?>
     <div class="clear"></div>
@@ -369 +376 @@
         </div>
         <div class="imagify-notice-content">
-            <p><?php
-            /* translators: %s is a file path. */
-            printf( __( 'The backup folder %s can\'t be created, original images can\'t be saved!', 'imagify' ), "<code>$backup_path</code>" );
-            ?></p>
+            <p><?php printf( $message, "<code>$backup_path</code>" ); ?></p>
         </div>
     </div>

imagify/trunk/inc/admin/ui/options.php

@@ -213 +213 @@
                                     <br/><strong id="backup-dir-is-writable" class="imagify-error<?php echo $backup_error_class; ?>" data-nonce="<?php echo esc_attr( wp_create_nonce( 'imagify_check_backup_dir_is_writable' ) ); ?>">
                                         <?php
-                                        $backup_path = imagify_make_file_path_replative( get_imagify_backup_dir_path() );
+                                        $backup_path = imagify_make_file_path_replative( get_imagify_backup_dir_path( true ) );
                                         /* translators: %s is a file path. */
-                                        printf( __( 'The backup folder %s can\'t be created, original images can\'t be saved!', 'imagify' ), "<code>$backup_path</code>" );
+                                        printf( __( 'The backup folder %s cannot be created or is not writable by the server, original images cannot be saved!', 'imagify' ), "<code>$backup_path</code>" );
                                         ?>
                                     </strong>

imagify/trunk/inc/functions/attachments.php

@@ -51 +51 @@
  * @author Grégory Viguier
  *
- * @return string|bool Path to the backups directory. False on failure.
- */
-function get_imagify_backup_dir_path() {
+ * @param  bool $bypass_error True to return the path even if there is an error. This is used when we want to display this path in a message for example.
+ * @return string|bool        Path to the backups directory. False on failure.
+ */
+function get_imagify_backup_dir_path( $bypass_error = false ) {
     static $backup_dir;
 
@@ -60 +61 @@
     }
 
-    $upload_basedir = get_imagify_upload_basedir();
+    $upload_basedir = get_imagify_upload_basedir( $bypass_error );
 
     if ( ! $upload_basedir ) {
@@ -224 +225 @@
  *
  * @since  1.6.7
- * @author Grégory Viguier
- *
- * @return string|bool The path. False on failure.
- */
-function get_imagify_upload_basedir() {
+ * @since  1.6.8 Added the $bypass_error parameter.
+ * @author Grégory Viguier
+ *
+ * @param  bool $bypass_error True to return the path even if there is an error. This is used when we want to display this path in a message for example.
+ * @return string|bool        The path. False on failure.
+ */
+function get_imagify_upload_basedir( $bypass_error = false ) {
     static $upload_basedir;
+    static $upload_basedir_or_error;
 
     if ( isset( $upload_basedir ) ) {
-        return $upload_basedir;
-    }
-
-    $uploads = wp_upload_dir();
+        return $bypass_error ? $upload_basedir : $upload_basedir_or_error;
+    }
+
+    $uploads        = wp_upload_dir();
+    $upload_basedir = trailingslashit( wp_normalize_path( $uploads['basedir'] ) );
 
     if ( false !== $uploads['error'] ) {
-        $upload_basedir = false;
-        return $upload_basedir;
-    }
-
-    $upload_basedir = trailingslashit( wp_normalize_path( $uploads['basedir'] ) );
-
-    return $upload_basedir;
+        $upload_basedir_or_error = false;
+    } else {
+        $upload_basedir_or_error = $upload_basedir;
+    }
+
+    return $bypass_error ? $upload_basedir : $upload_basedir_or_error;
 }