Changeset 1577075

Timestamp:

01/18/2017 07:41:34 AM (9 years ago)

Author:

smartware.cc

Message:

v 2.4 DEV current test version

File:

• 404page/trunk/404page.php (modified) (15 diffs)

404page/trunk/404page.php

@@ -112 +112 @@
     
     global $wp_query;
-    $pageid = $this->settings['404page_page_id'];
+    $pageid = $this->get_page_id();
     if ( $pageid > 0 ) {
       if ( ! $this->settings['404page_native'] ) {
@@ -135 +135 @@
     remove_filter( 'posts_results', array( $this, 'show404_compatiblity_mode' ), 999 ); 
     
-    $pageid = $this->settings['404page_page_id'];
+    $pageid = $this->get_page_id();
     if ( $pageid > 0 && ! $this->settings['404page_native'] ) {
       if ( empty( $posts ) && is_main_query() && !is_robots() && !is_home() && !is_feed() && !is_search() && !is_archive() && ( !defined('DOING_AJAX') || !DOING_AJAX ) ) {
-        // we need to get the 404 page
-        
-        $pageid = $this->get_page_id( $pageid );
         
         // 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
@@ -227 +224 @@
   function show404title_customizr_mode( $title ) {
     if ( ! $this->settings['404page_native'] ) {
-      return '<h1 class="entry-title">' . get_the_title( $this->settings['404page_page_id'] ) . '</h1>';
+      return '<h1 class="entry-title">' . get_the_title( $this->get_page_id() ) . '</h1>';
     } else {
       return $title;
@@ -236 +233 @@
   function show404_customizr_mode( $content ) {
     if ( ! $this->settings['404page_native'] ) {
-      return '<div class="entry-content">' . apply_filters( 'the_content', get_post_field( 'post_content', $this->settings['404page_page_id'] ) ) . '</div>';
+      return '<div class="entry-content">' . apply_filters( 'the_content', get_post_field( 'post_content', $this->get_page_id() ) ) . '</div>';
     } else {
       return $content;
@@ -246 +243 @@
   function show404articleselectors_customizr_mode( $selectors ) {
     if ( ! $this->settings['404page_native'] ) {
-      return 'id="post-' . $this->settings['404page_page_id'] . '" ' . 'class="' . join( ' ', get_post_class( 'row-fluid', $this->settings['404page_page_id'] ) ) . '"';
+      return 'id="post-' . $this->get_page_id() . '" ' . 'class="' . join( ' ', get_post_class( 'row-fluid', $this->get_page_id() ) ) . '"';
     } else {
       return $selectors;
@@ -273 +270 @@
     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;}';
+      foreach ( $this->get_all_page_ids() as $pid ) {
+        echo ' #the-list #post-' . $pid . ' .column-title .row-title:before { content: "404"; background-color: #333; color: #FFF; display: inline-block; padding: 0 5px; margin-right: 10px; }';
+      }
     }
     echo '</style>';
@@ -322 +321 @@
       echo '<p><span class="dashicons dashicons-info"></span>&nbsp;' . __( 'This setting is not availbe because the 404page Plugin works in WPML Mode.', '404page' ) . ' (<a href="' . $this->dc_url . '/#special_modes">' . __( 'Read more', '404page' ) . '</a>)</p>';
       
-    } elseif ( defined( 'POLYLANG_VERSION' ) ) {
+    } elseif ( defined( 'xxxPOLYLANG_VERSION' ) ) {
     
       echo '<p><span class="dashicons dashicons-info"></span>&nbsp;' . __( 'This setting is not availbe because the 404page Plugin works in Polylang Mode.', '404page' ) . ' (<a href="' . $this->dc_url . '/#special_modes">' . __( 'Read more', '404page' ) . '</a>)</p>';
@@ -342 +341 @@
   // this function hides the selected page from the list of pages 
   function exclude_404page( $query ) {
-    if ( $this->settings['404page_page_id'] > 0 ) {
+    $pageid = $this->get_page_id();
+    if ( $pageid > 0 ) {
       global $pagenow;
       
@@ -349 +349 @@
       // as of v 2.3 we check the post_type on front end
       if( ( is_admin() && ( 'edit.php' == $pagenow && !current_user_can( 'create_users' ) ) ) || ( ! is_admin() && ( !empty( $post_type) && ( ('page' === $post_type || 'any' === $post_type) || ( is_array( $post_type ) && in_array( 'page', $post_type ) ) ) )) ) {
-        $pageid = $this->settings['404page_page_id'];
-        
-        // as of v 2.4 we hide all translations in admin
-        if ( ! is_admin() ) {
-          $pageid = array( $this->get_page_id( $pageid ) );
+        
+        // as of v 2.4 we hide all translations in admin for WPML
+        if ( is_admin() ) {
+          $pageids = $this->get_all_page_ids();
         } else {
-          $pageid = $this->get_page_id( $pageid, true );
+          $pageids = array( $pageid );
         }
         
         // as of v 2.3 we add the ID of the 404 page to post__not_in
         // using just $query->set() overrides existing settings but not adds a new setting
-        $query->set( 'post__not_in', array_merge( (array)$query->get( 'post__not_in', array() ), $pageid ) );
+        $query->set( 'post__not_in', array_merge( (array)$query->get( 'post__not_in', array() ), $pageids ) );
         
       }
@@ -368 +367 @@
   // this function removes the 404 page from get_pages result array
   function remove_404page_from_array( $pages, $r ) {
-    if ( $this->settings['404page_page_id'] > 0 ) {
-      $pageid = $this->get_page_id( $this->settings['404page_page_id'] );
+    $pageid = $this->get_page_id();
+    if ( $pageid > 0 ) {
       for ( $i = 0; $i < sizeof( $pages ); $i++ ) {         
         if ( $pages[$i]->ID == $pageid ) {
@@ -442 +441 @@
   // returns the selected method
   private function get_404page_method() {
-    if ( defined( 'ICL_SITEPRESS_VERSION' ) || defined( 'POLYLANG_VERSION' ) ) {
+    if ( defined( 'ICL_SITEPRESS_VERSION' ) || defined( 'xxxPOLYLANG_VERSION' ) ) {
       // WPML or Polylang is active
       return 'CMP';
@@ -460 +459 @@
   }
   
-  // this function gets the id of the translated page if WPML or Polylang is active - otherwise the original pageid is returned
-  // parameter $all was added in v 2.4
-  // if $all is set to true the function returns an array of ids 
-  private function get_page_id( $pageid, $all = false ) {
+  // as of version 2.4 this function returns the page id of the 404 page in the current language
+  // in previous versions this functions required a parameter and only did the translation if WPML or Polylang is active
+  // now we have all in one function
+  private function get_page_id() {
+    
+    $pageid = $this->settings['404page_page_id'];
+    
+    if ( $pageid > 0 ) {
+    
+      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;
+        }
+      }
+      
+    }
+    
+    return $pageid;
+    
+  }
+  
+  // if WPML is active this function returns an array of all page ids in all available languages
+  // otherwise it returns the page id as array
+  // introduced in v 2.4
+  private function get_all_page_ids() {
     
     if ( defined( 'ICL_SITEPRESS_VERSION' ) ) {
           
       // WPML is active
-      
-      if ( $all ) {
-        // get an array for all translations
-        $pages = array( $pageid );
+      // get an array for all translations
+      
+      $pageid = $this->settings['404page_page_id'];
+      $pages = array( $pageid );
+      if ( $pageid > 0 ) {
         $languages = apply_filters( 'wpml_active_languages', NULL );
         if ( !empty( $languages ) ) {
@@ -481 +510 @@
           }
         }
-        $pageid = array_unique( $pages, SORT_NUMERIC );
-        
-      } else {
-        // get the id of the translated page for the current language
-        $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;
-      }
-      
-    }
-    
-    return $pageid;
+      }
+      $pageids = array_unique( $pages, SORT_NUMERIC );
+        
+    } else {
+      
+      $pageids = array( $this->get_page_id() );
+      
+    }
+    
+    return $pageids;
     
   }
@@ -598 +619 @@
     $title = '';
     if ( $this->settings['404page_page_id'] > 0 && $this->settings['404page_native'] ) {
-      $title = get_the_title( $this->settings['404page_page_id'] );
+      $title = get_the_title( $this->get_page_id() );
     }
     return $title;
@@ -612 +633 @@
     $content = '';
     if ( $this->settings['404page_page_id'] > 0 && $this->settings['404page_native'] ) {
-      $content = apply_filters( 'the_content', get_post_field( 'post_content', $this->settings['404page_page_id'] ) );
+      $content = apply_filters( 'the_content', get_post_field( 'post_content', $this->get_page_id() ) );
     }
     return $content;