Ticket #10386: 10386.patch

wp-admin/options-permalink.php

@@ -222 +222 @@
 </p>
   </form>
 <?php if ($iis7_permalinks) :
-        if ( isset($_POST['submit']) && $permalink_structure && ! $usingpi && ! $writable ) : ?>
+        if ( isset($_POST['submit']) && $permalink_structure && ! $usingpi && ! $writable ) : 
+                if ( file_exists($home_path . 'web.config') ) : ?>
 <p><?php _e('If your <code>web.config</code> file were <a href="http://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn&#8217;t so this is the url rewrite rule you should have in your <code>web.config</code> file. Click in the field and press <kbd>CTRL + a</kbd> to select all. Then insert this rule inside of the <code>/&lt;configuration&gt;/&lt;system.webServer&gt;/&lt;rewrite&gt;/&lt;rules&gt;</code> element in <code>web.config</code> file.') ?></p>
 <form action="options-permalink.php" method="post">
 <?php wp_nonce_field('update-permalink') ?>
-        <p><textarea rows="10" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_html($wp_rewrite->iis7_url_rewrite_rules()); ?></textarea></p>
+        <p><textarea rows="9" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_html($wp_rewrite->iis7_url_rewrite_rules()); ?></textarea></p>
 </form>
 <p><?php _e('If you temporarily make your <code>web.config</code> file writable for us to generate rewrite rules automatically, do not forget to revert the permissions after rule has been saved.')  ?></p>
+                <?php else : ?>
+<p><?php _e('If the root directory of your site were <a href="http://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn&#8217;t so this is the url rewrite rule you should have in your <code>web.config</code> file. Create a new file, called <code>web.config</code> in the root directory of your site. Click in the field and press <kbd>CTRL + a</kbd> to select all. Then insert this code into the <code>web.config</code> file.') ?></p>
+<form action="options-permalink.php" method="post">
+<?php wp_nonce_field('update-permalink') ?>
+        <p><textarea rows="18" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_html($wp_rewrite->iis7_url_rewrite_rules(true)); ?></textarea></p>
+</form>
+<p><?php _e('If you temporarily make your site&#8217;s root directory writable for us to generate the <code>web.config</code> file automatically, do not forget to revert the permissions after the file has been created.')  ?></p>                    
+                <?php endif; ?>
         <?php endif; ?>
 <?php else :
         if ( $permalink_structure && ! $usingpi && ! $writable ) : ?>

wp-includes/rewrite.php

@@ -1715 +1715 @@
          *
          * @return string
          */
-        function iis7_url_rewrite_rules(){
+        function iis7_url_rewrite_rules($add_parent_tags = false){
 
                 if ( ! $this->using_permalinks()) {
                         return '';
                 }
-                $rules  = "<rule name=\"wordpress\" patternSyntax=\"Wildcard\">\n";
-                $rules .= "     <match url=\"*\" />\n";
-                $rules .= "     <conditions>\n";
-                $rules .= "             <add input=\"{REQUEST_FILENAME}\" matchType=\"IsFile\" negate=\"true\" />\n";
-                $rules .= "             <add input=\"{REQUEST_FILENAME}\" matchType=\"IsDirectory\" negate=\"true\" />\n";
-                $rules .= "     </conditions>\n";
-                $rules .= "     <action type=\"Rewrite\" url=\"index.php\" />\n";
-                $rules .= "</rule>";
+                
+                $rules = '';
+                $indent = '';
+                if ( $add_parent_tags ) {
+                        $rules .= "<configuration>\n";
+                        $rules .= "  <system.webServer>\n";
+                        $rules .= "    <rewrite>\n";
+                        $rules .= "      <rules>\n";
+                        $indent = "        ";
+                }
+                
+                $rules .= $indent."<rule name=\"wordpress\" patternSyntax=\"Wildcard\">\n";
+                $rules .= $indent."  <match url=\"*\" />\n";
+                $rules .= $indent."  <conditions>\n";
+                $rules .= $indent."    <add input=\"{REQUEST_FILENAME}\" matchType=\"IsFile\" negate=\"true\" />\n";
+                $rules .= $indent."    <add input=\"{REQUEST_FILENAME}\" matchType=\"IsDirectory\" negate=\"true\" />\n";
+                $rules .= $indent."  </conditions>\n";
+                $rules .= $indent."  <action type=\"Rewrite\" url=\"index.php\" />\n";
+                $rules .= $indent."</rule>";
+                
+                if ( $add_parent_tags ) {
+                        $rules .= "\n      </rules>\n";
+                        $rules .= "    </rewrite>\n";
+                        $rules .= "  </system.webServer>\n";
+                        $rules .= "</configuration>\n";                 
+                }
 
                 $rules = apply_filters('iis7_url_rewrite_rules', $rules);