Changeset 1038273

Timestamp:

12/04/2014 04:35:30 PM (11 years ago)

Author:

PaulHughes01

Message:

3.0.2.3 Hotfix

Location:

muut/tags/3.0.2.3/lib

Files:

• admin/admin-field-validation.utility.class.php (modified) (1 diff)
• admin/admin-settings.class.php (modified) (1 diff)
• escaped-fragments.class.php (modified) (1 diff)
• muut.class.php (modified) (2 diffs)
• shortcodes.class.php (modified) (1 diff)

muut/tags/3.0.2.3/lib/admin/admin-field-validation.utility.class.php

@@ -114 +114 @@
             }
         }
+
+        /**
+         * Function to validate that a is regular-expression save (does not need to be escaped in any way)..
+         *
+         * @param string $value The value that we are validating.
+         * @return bool Whether the field is valid or not.
+         * @author Paul Hughes
+         * @since 3.0.2
+         */
+        public static function validateNoRegexEscaping( $value ) {
+            $escaped = preg_quote( $value );
+
+            if ( $escaped != $value ) {
+                return false;
+            } else {
+                return true;
+            }
+        }
     }
 }

muut/tags/3.0.2.3/lib/admin/admin-settings.class.php

@@ -291 +291 @@
                     $value = trim( $value );
                     // Make sure the forum name has no whitespace.
-                    $valid = Muut_Field_Validation::validateHasNoWhitespace( $value );
+                    $valid = Muut_Field_Validation::validateHasNoWhitespace( $value ) && Muut_Field_Validation::validateNoRegexEscaping( $value );
 
                     if ( !$valid ) {
                         $error_args = array(
                             'name' => $name,
-                            'message' => __( 'Forum name must contain no spaces of any kind. Make sure the forum name is the name you registered with Muut when you set up the forum.', 'muut' ),
+                            'message' => __( 'Forum name must contain no spaces or special characters of any kind. Make sure the forum name is the name you registered with Muut when you set up the forum.', 'muut' ),
                             'field' => 'muut_forum_name',
                             'new_value' => $value,

muut/tags/3.0.2.3/lib/escaped-fragments.class.php

@@ -184 +184 @@
             if ( $this->isUsingEscapedFragments() )  {
                 $post_commenting_options = Muut_Post_Utility::getPostOption( $post_id, 'commenting_settings' );
-                if ( $post_commenting_options['type'] == 'threaded' ) {
+                if ( isset( $post_commenting_options['type'] ) && $post_commenting_options['type'] == 'threaded' ) {
                     $this->context = 'threaded-commenting';
                 } else {

muut/tags/3.0.2.3/lib/muut.class.php

@@ -345 +345 @@
                     'RewriteEngine On',
                     'RewriteBase /',
-                    'RewriteRule ^i/(' . $this->getForumName() . ')(/.*)?$ ' . $this->getProxyContentServer() . '/$1$2 [P]',
+                    'RewriteRule ^i/(' . preg_quote( $this->getForumName() ) . ')(/.*)?$ ' . $this->getProxyContentServer() . '/$1$2 [P]',
                     'RewriteRule ^m/(.*)$ http://' . self::MUUTSERVERS . '/m/$1 [P]',
                     '</IfModule>',
@@ -372 +372 @@
             $permastruct = get_option( 'permalink_structure', '' );
 
-            $muut_rules = "RewriteRule ^i/(" . $this->getForumName() . ")(/.*)?\$ " . $this->getProxyContentServer() . "/\$1\$2 [P]\n";
+            $muut_rules = "RewriteRule ^i/(" . preg_quote( $this->getForumName() ) . ")(/.*)?\$ " . $this->getProxyContentServer() . "/\$1\$2 [P]\n";
             $muut_rules .=  "RewriteRule ^m/(.*)$ http://" . self::MUUTSERVERS . "/m/\$1 [P]";
 

muut/tags/3.0.2.3/lib/shortcodes.class.php

@@ -283 +283 @@
                     $post = get_post( $page_id );
                 }
-                if ( has_shortcode( $post->post_content, 'muut' ) || has_shortcode( $post->post_content, 'moot' ) ) {
+                if (  isset( $post ) && is_a( $post, 'WP_Post' ) && ( has_shortcode( $post->post_content, 'muut' ) || has_shortcode( $post->post_content, 'moot' ) ) ) {
                     $requires_resources = true;
                 }