Changeset 1387440

Timestamp:

04/05/2016 05:35:53 PM (10 years ago)

Author:

smartware.cc

Message:

Version 2.1 DEV-3

Location:

404page/trunk

Files:

• 404page.js (modified) (1 diff)
• 404page.php (modified) (15 diffs)
• readme.txt (modified) (2 diffs)

404page/trunk/404page.js

@@ -10 +10 @@
     window.location.href = jQuery( '#404page_test_link' ).text();
   });
-  jQuery( '#404page_admin_notice' ).click( function() {
+  jQuery( '#404page_admin_notice .notice-dismiss' ).click( function() {
     jQuery.ajax({
       url: ajaxurl,

404page/trunk/404page.php

@@ -4 +4 @@
 Plugin URI: http://smartware.cc/free-wordpress-plugins/404page/
 Description: Custom 404 the easy way! Set any page as custom 404 error page. No coding needed. Works with (almost) every Theme.
-Version: 2.1 DEV-2
+Version: 2.1 DEV-3
 Author: smartware.cc, Peter's Plugins
 Author URI: http://smartware.cc
@@ -26 +26 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
-
-
-/* As of Version 2.0 the 404page Plugin no longer uses the 404_template filter, because this does not work with WPML, bbPress and Customizr */
-/* The posts_results filter is the only solution that works for all of them */
 
 if ( ! defined( 'WPINC' ) ) {
@@ -46 +42 @@
         $this->plugin_name = '404page';
     $this->plugin_slug = '404page';
-        $this->version = '2.1 DEV-2';
+        $this->version = '2.1 DEV-3';
     $this->get_settings();
     $this->init();
@@ -59 +55 @@
     $this->settings['404page_method'] = $this->get_404page_method();
   }
-  
+ 
+  // do plugin init
   private function init() {
     
@@ -65 +62 @@
     
     if ( !is_admin() ) {
+      
+      add_action( 'init', array( $this, 'set_mode' ) );
+      
+    } else {
+      
+      add_action( 'admin_init', array( $this, 'admin_init' ) );
+      add_action( 'admin_menu', array( $this, 'admin_menu' ) );
+      add_action( 'admin_head', array( $this, 'admin_css' ) );
+      add_filter( 'plugin_action_links_' . plugin_basename( __FILE__ ), array( $this, 'add_settings_link' ) ); 
+      
+      if ( $this->settings['404page_hide'] and $this->settings['404page_page_id'] > 0 ) {
+        add_action( 'pre_get_posts' ,array ( $this, 'exclude_404page' ) );
+      }
+      
+      if ( 'NOT_DISMISSED' == get_option( '404page_notice_dismissed', 'NOT_DISMISSED' ) )  {
+        add_action( 'admin_notices', array( $this, 'admin_notice' ) );
+        add_action( 'wp_ajax_nopriv_404page_dismiss_admin_notice', array( $this, 'dismiss_admin_notice' ) );
+        add_action( 'wp_ajax_404page_dismiss_admin_notice', array( $this, 'dismiss_admin_notice' ) );
+      }
+    }
+    
+  }
+  
+  // init filters 
+  function set_mode() {
+    
+    if ( defined( 'CUSTOMIZR_VER' ) ) {
+      
+      // Customizr Compatibility Mode 
+     
+      add_filter( 'tc_404_header_content', array( $this, 'show404title_customizr_mode' ), 999 );
+      add_filter( 'tc_404_content', array( $this, 'show404_customizr_mode' ), 999 );
+      add_filter( 'tc_404_selectors', array( $this, 'show404articleselectors_customizr_mode' ), 999 );
+      
+    } else {
+      
       if ( $this->settings['404page_method'] != 'STD' ) {
-        add_filter( 'posts_results', array( $this, 'show404_compatiblity_mode' ), 999 ); 
+        
+        // Compatibility Mode
+        add_filter( 'posts_results', array( $this, 'show404_compatiblity_mode' ), 999 );
+        
       } else {
+        
+        // Standard Mode
         add_filter( '404_template', array( $this, 'show404_standard_mode' ), 999 );
         if ( $this->settings['404page_fire_error'] ) {
           add_action( 'template_redirect', array( $this, 'do_404_header_standard_mode' ) );
         }
-      }
-    } else {
-      add_action( 'admin_init', array( $this, 'admin_init' ) );
-      add_action( 'admin_menu', array( $this, 'admin_menu' ) );
-      add_action( 'admin_head', array( $this, 'admin_css' ) );
-      add_filter( 'plugin_action_links_' . plugin_basename( __FILE__ ), array( $this, 'add_settings_link' ) ); 
-      if ( $this->settings['404page_hide'] and $this->settings['404page_page_id'] > 0 ) {
-        add_action( 'pre_get_posts' ,array ( $this, 'exclude_404page' ) );
-      }
-      if ( 'NOT_DISMISSED' == get_option( '404page_notice_dismissed', 'NOT_DISMISSED' ) )  {
-        add_action( 'admin_notices', array( $this, 'admin_notice' ) );
-        add_action( 'wp_ajax_nopriv_404page_dismiss_admin_notice', array( $this, 'dismiss_admin_notice' ) );
-        add_action( 'wp_ajax_404page_dismiss_admin_notice', array( $this, 'dismiss_admin_notice' ) );
-      }
-    }
-    
-  }
-  
-  // redirect 404 page - standard mode
+        
+      }
+    }
+    
+  }
+  
+  // show 404 page - Standard Mode
   function show404_standard_mode( $template ) {
+    
     global $wp_query;
     $pageid = $this->settings['404page_page_id'];
@@ -104 +131 @@
     }
     return $template;
-  }
-  
-  // redirect 404 page - compatibility mode - introduced in version 2.0
-  // as of v2.1 we do not alter the posts argument here because this does not work with SiteOrigin's Page Builder Plugin, template_include filter introduced
+    
+  }
+  
+  // show 404 page - Compatibility Mode
   function show404_compatiblity_mode( $posts ) {
+    
     // remove the filter so we handle only the first query - no custom queries
-    remove_filter( 'posts_results', array( $this, 'show404' ), 999 ); 
+    remove_filter( 'posts_results', array( $this, 'show404_compatiblity_mode' ), 999 ); 
+    
     $pageid = $this->settings['404page_page_id'];
     if ( 0 != $pageid ) {
@@ -117 +146 @@
         
         if ( defined( 'ICL_SITEPRESS_VERSION' ) ) {
+          
           // WPML is active
           $pageid = apply_filters( 'wpml_object_id', $pageid, 'page', true );
+          
+        } elseif ( defined( 'POLYLANG_VERSION' ) ) {
+          
+          // Polylang is active
+          $translatedpageid = pll_get_post( $pageid );
+          if ( !empty( $translatedpageid ) && 'publish' == get_post_status( $translatedpageid ) ) {
+            $pageid = $translatedpageid;
+          }
         }
+        
+        // as of v2.1 we do not alter the posts argument here because this does not work with SiteOrigin's Page Builder Plugin, template_include filter introduced
         $this->postid = $pageid;
         $this->template = get_page_template_slug( $pageid );
@@ -135 +175 @@
         if ( $this->settings['404page_fire_error'] ) {
           $curpageid = $posts[0]->ID;
+          
           if ( defined( 'ICL_SITEPRESS_VERSION' ) ) {
-            // WPML is active - get the post ID of the default language
+           
+           // WPML is active - get the post ID of the default language
             global $sitepress;
             $curpageid = apply_filters( 'wpml_object_id', $curpageid, 'page', $sitepress->get_default_language() );
             $pageid = apply_filters( 'wpml_object_id', $pageid, 'page', $sitepress->get_default_language() );
+            
+          } elseif ( defined( 'POLYLANG_VERSION' ) ) {
+            
+            // Polylang is active - get the post ID of the default language
+            $curpageid = pll_get_post( $curpageid, pll_default_language() );
+            $pageid = pll_get_post( $pageid, pll_default_language() );
+          
           }
+          
           if ( $pageid == $curpageid ) {
             add_action( 'wp', array( $this, 'do_404_header' ) );
@@ -152 +202 @@
   }
   
-  // send a 404 HTTP header - standard mode
+  // send a 404 HTTP header - Standard Mode
   function do_404_header_standard_mode() {
     if ( is_page() && get_the_ID() == $this->settings['404page_page_id'] && !is_404() ) {
-      // we do not have to take care about WPML because WPML only works in compatibility mode
       status_header( 404 );
       nocache_headers();
@@ -161 +210 @@
   }
   
-  // send a 404 HTTP header - compatibility mode
+  // send a 404 HTTP header - Compatibility Mode
   function do_404_header() {
     // remove the action so we handle only the first query - no custom queries
@@ -175 +224 @@
   }
   
-  // here the real magic happens...
-  function template_include_404( $template ) {
-    // as of v2.1 we do not alter the posts in show404, because this does not work with SiteOrigin's Page Builder Plugin
-    global $wp_query;
-    $wp_query->posts = array();
-    $wp_query->posts[] = get_post( $this->postid );
-    $wp_query->queried_object_id = $this->postid;
-    $wp_query->queried_object = $wp_query->posts[0];
-    $wp_query->post_count = 1;
-    $wp_query->found_posts = 1;
-    $wp_query->current_post = -1;
-    $wp_query->is_page = true;
-    $wp_query->is_single = false;
-    $wp_query->is_404 = false;
-    if ( $this->template != '' ) {
-      $template = $this->template;
-    }
-    return $template;
+  // show title - Customizr Compatibility Mode
+  function show404title_customizr_mode( $title ) {
+    return '<h1 class="entry-title">' . get_the_title( $this->settings['404page_page_id'] ) . '</h1>';
+  }
+  
+  // show content - Customizr Compatibility Mode
+  function show404_customizr_mode( $content ) {
+    return '<div class="entry-content">' . apply_filters( 'the_content', get_post_field( 'post_content', $this->settings['404page_page_id'] ) ) . '</div>';
+  }
+  
+  // change article selectors - Customizr Compatibility Mode
+  function show404articleselectors_customizr_mode( $selectors ) {
+    return 'id="post-' . $this->settings['404page_page_id'] . '" ' . 'class="' . join( ' ', get_post_class( 'row-fluid', $this->settings['404page_page_id'] ) ) . '"';
   }
   
@@ -211 +255 @@
   // add css
   function admin_css() {
-    echo '<style type="text/css">#select404page" {width: 100%}</style>';
+    echo '<style type="text/css">#select404page {width: 100%; }';
+    if ( $this->settings['404page_page_id'] > 0 ) {
+      echo ' #the-list #post-' . $this->settings['404page_page_id'] . ' .column-title {min-height: 32px; background-position: left top; background-repeat: no-repeat; background-image: url(' . plugins_url( 'pluginicon.png', __FILE__ ) . '); padding-left: 40px;}';
+    }
+    echo '</style>';
   }
   
@@ -242 +290 @@
   // handle the settings field method
   function admin_method() {
-    echo '<p><input type="radio" id="404page_settings_method_standard" name="404page_method" value="STD"' . checked( 'STD', $this->settings['404page_method'], false ) . '/>';
+    if ( defined( 'CUSTOMIZR_VER' ) || defined( 'ICL_SITEPRESS_VERSION' ) || defined( 'POLYLANG_VERSION' ) || defined( 'SITEORIGIN_PANELS_VERSION' ) || class_exists( 'bbPress' ) ) {
+      $dis = ' disabled="disabled"';
+    } else {
+      $dis = '';
+    }
+    echo '<p><input type="radio" id="404page_settings_method_standard" name="404page_method" value="STD"' . checked( 'STD', $this->settings['404page_method'], false ) . $dis . ' />';
     echo '<label for="404page_settings_method_standard">' . __( 'Standard Mode', '404page' ) . '</label></p>';
      
-    echo '<p><input type="radio" id="404page_settings_method_compatibility" name="404page_method" value="CMP"' . checked( 'CMP', $this->settings['404page_method'], false ) . '/>';
+    echo '<p><input type="radio" id="404page_settings_method_compatibility" name="404page_method" value="CMP"' . checked( 'CMP', $this->settings['404page_method'], false ) . $dis . '/>';
     echo '<label for="404page_settings_method_compatibility">' . __( 'Compatibility Mode', '404page' ) . '</label></p>';
     
-    echo '<p><span class="dashicons dashicons-info"></span>&nbsp;' . __( 'Standard Mode uses the WordPress Template System and should work in most cases. If the 404page plugin does not work properly, probably you are using a theme or plugin that modifies the WordPress Template System. In this case the Compatibility Mode maybe can fix the problem, although it cannot be guaranteed that every possible configuration can be handled by Compatibility Mode. Standard Mode is the recommended method, only switch to Compatibility Mode if you have any problems.', '404page' ) . '</p>';
+    if ( defined( 'CUSTOMIZR_VER' ) ) {
+      echo '<p><span class="dashicons dashicons-warning"></span>&nbsp;' . __( 'Customizr Theme detected. The 404page Plugin works in Customizr Compatibility Mode.', '404page' ) . ' (<a href="#">' . __( 'Read more', '404page' ) . '</a>)</p>';
+    } elseif ( defined( 'ICL_SITEPRESS_VERSION' ) ) {
+      echo '<p><span class="dashicons dashicons-warning"></span>&nbsp;' . __( 'WPML Plugin detected. Operating Method set to Compatibility Mode automatically.', '404page' ) . ' (<a href="#">' . __( 'Read more', '404page' ) . '</a>)</p>';
+    } elseif ( defined( 'POLYLANG_VERSION' ) ) {
+      echo '<p><span class="dashicons dashicons-warning"></span>&nbsp;' . __( 'Polylang Plugin detected. Operating Method set to Compatibility Mode automatically', '404page' ) . ' (<a href="#">' . __( 'Read more', '404page' ) . '</a>)</p>';
+    } elseif ( defined( 'SITEORIGIN_PANELS_VERSION' ) ) {
+      echo '<p><span class="dashicons dashicons-warning"></span>&nbsp;' . __( 'Page Builder by SiteOrigin Plugin detected. Operating Method set to Compatibility Mode automatically', '404page' ) . ' (<a href="#">' . __( 'Read more', '404page' ) . '</a>)</p>';
+    } elseif ( class_exists( 'bbPress' ) ) {
+      echo '<p><span class="dashicons dashicons-warning"></span>&nbsp;' . __( 'bbPress Plugin detected. Operating Method set to Compatibility Mode automatically', '404page' ) . ' (<a href="#">' . __( 'Read more', '404page' ) . '</a>)</p>';
+    } else {
+      echo '<p><span class="dashicons dashicons-info"></span>&nbsp;' . __( 'Standard Mode uses the WordPress Template System and should work in most cases. If the 404page plugin does not work properly, probably you are using a theme or plugin that modifies the WordPress Template System. In this case the Compatibility Mode maybe can fix the problem, although it cannot be guaranteed that every possible configuration can be handled by Compatibility Mode. Standard Mode is the recommended method, only switch to Compatibility Mode if you have any problems.', '404page' ) . '</p>';
+    }
   }
   
@@ -312 +377 @@
     if ( current_user_can( 'manage_options' ) ) {
       echo '<div class="notice notice-info is-dismissible" id="404page_admin_notice"><p><strong>404page Plugin:</strong> ';
-      _e( 'Please check Operating Method in <a href="' . admin_url( 'themes.php?page=404pagesettings' ) . '">' . __( 'Settings', '404page' ) . '</a>', '404page' );
+      if ( defined( 'CUSTOMIZR_VER' ) ) {
+        // Customizr Theme
+        _e( 'Customizr Theme detected. The 404page Plugin works in Customizr Compatibility Mode.', '404page' );
+      } elseif ( defined( 'ICL_SITEPRESS_VERSION' ) ) {
+        // WPML
+        _e( 'WPML Plugin detected. Operating Method is set to Compatibility Mode automatically to make the 404page Plugin work with WPML.', '404page' );
+      } elseif ( defined( 'POLYLANG_VERSION' ) ) {
+        // Polylang
+        _e( 'Polylang Plugin detected. Operating Method is set to Compatibility Mode automatically to make the 404page Plugin work with Polylang.', '404page' );
+      } elseif ( defined( 'SITEORIGIN_PANELS_VERSION' ) ) {
+        // Page Builder by SiteOrigin
+        _e( 'Page Builder by SiteOrigin Plugin detected. Operating Method is set to Compatibility Mode automatically to make the 404page Plugin work with Page Builder by SiteOrigin.', '404page' );
+      } elseif ( class_exists( 'bbPress' ) ) {
+        // bbPress
+        _e( 'bbPress Plugin detected. Operating Method is set to Compatibility Mode automatically to make the 404page Plugin work with bbPress.', '404page' );
+      } else {
+        _e( 'Please check Operating Method.', '404page' );
+      }
+      echo '<br /><a href="' . admin_url( 'themes.php?page=404pagesettings' ) . '">' . __( 'Settings', '404page' ) . '</a>';
       echo '</p></div>';
     }
@@ -352 +435 @@
   // returns the selected method
   private function get_404page_method() {
-    return get_option( '404page_method', 'STD' );
+    if ( defined( 'ICL_SITEPRESS_VERSION' ) || defined( 'POLYLANG_VERSION' ) || defined( 'SITEORIGIN_PANELS_VERSION' ) || class_exists( 'bbPress' ) ) {
+      // WPML or bbPress is active
+      return 'CMP';
+    } else {
+      return get_option( '404page_method', 'STD' );
+    }
   }
   

404page/trunk/readme.txt

@@ -17 +17 @@
 **See also [Plugin Homepage](http://smartware.cc/free-wordpress-plugins/404page/) and [Plugin Doc](http://smartware.cc/docs/404page/)**
 
-= Version 2.0 Update Notice =
-* The settings page was moved from 'Settings' to 'Appearance' menu.
-* Version 2.0 is more or less a completely new development. This was necessary to solve several compatibility issues. 404page now works with the [WPML WordPress Multilingual Plugin](https://wpml.org/), the [bbPress Forum Plugin](https://wordpress.org/plugins/bbpress/) and the [Customizr Theme](https://wordpress.org/themes/customizr/). [Read more](http://smartware.cc/blog/2016/02/23/the-404page-plugin-now-works-with-wpml-and-other-enhancements/).
+= Version 2.1 Update Notice =
+Please take a look at the [release notes](LINK).
 
 https://www.youtube.com/watch?v=VTL07Lf0IsY
@@ -80 +79 @@
 == Changelog ==
 
+= 2.1 (2016-04-XX) =
+* introduction of selectable Operating Methods
+* several changes to Compatibility Mode for improved WPML and bbPress compatibility plus compatibility with Page Builder by SiteOrigin
+* Polylang compatibility
+* automatic switch to Compatibility Mode if WPML, bbPress, Polylang or Page Builder by SiteOrigin is detected
+* completely new Customizr (automatically enabled if Customizr is detected)
+* firing an 404 error in case of directly accessing the 404 error page can now be deactivated
+* option to hide the 404 error page from the Pages list
+* 404 error test
+
 = 2.0 (2016-03-08) =
 * WPML compatibility