Changeset 7963

Timestamp:

05/20/2008 06:09:38 PM (17 years ago)

Author:

ryan

Message:

Clean and escape

Location:

branches/2.5

Files:

• wp-admin/includes/dashboard.php (modified) (1 diff)
• wp-admin/includes/file.php (modified) (1 diff)
• wp-admin/includes/media.php (modified) (3 diffs)
• wp-admin/includes/widgets.php (modified) (2 diffs)
• wp-includes/functions.php (modified) (1 diff)
• wp-includes/theme.php (modified) (1 diff)

branches/2.5/wp-admin/includes/dashboard.php

@@ -217 +217 @@
             $sidebar_widget_name = $wp_registered_widget_controls[$widget_id]['name'];
             $params[1] = 'wp_dashboard_trigger_widget_control';
-            $sidebar_before_widget .= '<form action="' . remove_query_arg( 'edit' )  . '" method="post">';
+            $sidebar_before_widget .= '<form action="' . clean_url(remove_query_arg( 'edit' ))  . '" method="post">';
             $sidebar_after_widget   = "<div class='dashboard-widget-submit'><input type='hidden' name='sidebar' value='wp_dashboard' /><input type='hidden' name='widget_id' value='$widget_id' /><input type='submit' value='" . __( 'Save' ) . "' /></div></form>$sidebar_after_widget";
-            $links[] = '<a href="' . remove_query_arg( 'edit' ) . '">' . __( 'Cancel' ) . '</a>';
+            $links[] = '<a href="' . clean_url(remove_query_arg( 'edit' )) . '">' . __( 'Cancel' ) . '</a>';
         } else {
-            $links[] = '<a href="' . add_query_arg( 'edit', $widget_id ) . "#$widget_id" . '">' . __( 'Edit' ) . '</a>';
+            $links[] = '<a href="' . clean_url(add_query_arg( 'edit', $widget_id )) . "#$widget_id" . '">' . __( 'Edit' ) . '</a>';
         }
     }

branches/2.5/wp-admin/includes/file.php

@@ -55 +55 @@
 
     return '/tmp/';
-}
-
-function validate_file( $file, $allowed_files = '' ) {
-    if ( false !== strpos( $file, '..' ))
-        return 1;
-
-    if ( false !== strpos( $file, './' ))
-        return 1;
-
-    if (':' == substr( $file, 1, 1 ))
-        return 2;
-
-    if (!empty ( $allowed_files ) && (!in_array( $file, $allowed_files ) ) )
-        return 3;
-
-    return 0;
 }
 

branches/2.5/wp-admin/includes/media.php

@@ -42 +42 @@
                 $class = " class='current'";
             $href = add_query_arg(array('tab'=>$callback, 's'=>false, 'paged'=>false, 'post_mime_type'=>false, 'm'=>false));
-            $link = "<a href='$href'$class>$text</a>";
-            echo "\t<li id='tab-$callback'>$link</li>\n";
+            $link = "<a href='" . clean_url($href) . "'$class>$text</a>";
+            echo "\t<li id='" . attribute_escape("tab-$callback") . "'>$link</li>\n";
         }
         echo "</ul>\n";
@@ -971 +971 @@
 if ( empty($_GET['post_mime_type']) || $_GET['post_mime_type'] == 'all' )
     $class = ' class="current"';
-$type_links[] = "<li><a href='" . add_query_arg(array('post_mime_type'=>'all', 'paged'=>false, 'm'=>false)) . "'$class>".__('All Types')."</a>";
+$type_links[] = "<li><a href='" . clean_url(add_query_arg(array('post_mime_type'=>'all', 'paged'=>false, 'm'=>false))) . "'$class>".__('All Types')."</a>";
 foreach ( $post_mime_types as $mime_type => $label ) {
     $class = '';
@@ -981 +981 @@
         $class = ' class="current"';
 
-    $type_links[] = "<li><a href='" . add_query_arg(array('post_mime_type'=>$mime_type, 'paged'=>false)) . "'$class>" . sprintf(__ngettext($label[2][0], $label[2][1], $num_posts[$mime_type]), "<span id='$mime_type-counter'>" . number_format_i18n( $num_posts[$mime_type] ) . '</span>') . '</a>';
+    $type_links[] = "<li><a href='" . clean_url(add_query_arg(array('post_mime_type'=>$mime_type, 'paged'=>false))) . "'$class>" . sprintf(__ngettext($label[2][0], $label[2][1], $num_posts[$mime_type]), "<span id='$mime_type-counter'>" . number_format_i18n( $num_posts[$mime_type] ) . '</span>') . '</a>';
 }
 echo implode(' | </li>', $type_links) . '</li>';

branches/2.5/wp-admin/includes/widgets.php

@@ -77 +77 @@
                 $add_query['add'] = $widget['id'];
                 $action = 'add';
-                $add_url = wp_nonce_url( add_query_arg( $add_query ), "add-widget_$widget[id]" );
+                $add_url = clean_url( wp_nonce_url( add_query_arg( $add_query ), "add-widget_$widget[id]" ) );
             } else {
                 $action = 'edit';
@@ -233 +233 @@
             <?php if ( $edit ) : ?>
 
-            <a class="widget-action widget-control-edit" href="<?php echo remove_query_arg( array( 'edit', 'key' ) ); ?>"><?php _e('Cancel'); ?></a>
+            <a class="widget-action widget-control-edit" href="<?php echo clean_url( remove_query_arg( array( 'edit', 'key' ) ) ); ?>"><?php _e('Cancel'); ?></a>
 
             <?php else : ?>

branches/2.5/wp-includes/functions.php

@@ -1750 +1750 @@
 }
 
+function validate_file( $file, $allowed_files = '' ) {
+    if ( false !== strpos( $file, '..' ))
+        return 1;
+
+    if ( false !== strpos( $file, './' ))
+        return 1;
+
+    if (':' == substr( $file, 1, 1 ))
+        return 2;
+
+    if (!empty ( $allowed_files ) && (!in_array( $file, $allowed_files ) ) )
+        return 3;
+
+    return 0;
+}
+
 ?>

branches/2.5/wp-includes/theme.php

@@ -420 +420 @@
         $template = '';
 
-    if ( !empty($template) && file_exists(TEMPLATEPATH . "/$template") )
+    if ( !empty($template) && !validate_file($template) && file_exists(TEMPLATEPATH . "/$template") )
         $template = TEMPLATEPATH . "/$template";
     elseif ( file_exists(TEMPLATEPATH . "/page.php") )