From 54049c5f41b55a1c6bca5b94eea3cbe37a652c35 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Tue, 9 Sep 2008 22:31:22 +0000
Subject: [PATCH] add_settings_section() and add_settings_field(). see #7682

git-svn-id: http://svn.automattic.com/wordpress/trunk@8855 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/template.php  | 86 ++++++++++++++++++++++++++++++++-
 wp-admin/options-discussion.php |  4 +-
 wp-admin/options-general.php    |  3 ++
 wp-admin/options-misc.php       |  5 +-
 wp-admin/options-permalink.php  |  4 ++
 wp-admin/options-privacy.php    |  3 ++
 wp-admin/options-reading.php    |  1 +
 wp-admin/options-writing.php    |  8 ++-
 8 files changed, 110 insertions(+), 4 deletions(-)

diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 3661d582a..c599cd76c 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -1507,7 +1507,6 @@ function add_meta_box($id, $title, $callback, $page, $context = 'advanced', $pri
 	$wp_meta_boxes[$page][$context][$priority][$id] = array('id' => $id, 'title' => $title, 'callback' => $callback);
 }
 
-// crazyhorse - this can be made simpler
 function do_meta_boxes($page, $context, $object) {
 	global $wp_meta_boxes;
 	static $already_sorted = false;
@@ -1602,4 +1601,89 @@ function meta_box_prefs($page) {
 		}
 	}
 }
+
+/**
+ * Add a new section to a settings page
+ *
+ * @since 2.7
+ *
+ * @param string $id String for use in the 'id' attribute of tags.
+ * @param string $title Title of the section
+ * @param string $callback Function that fills the section with the desired content.  The function should echo its output.
+ * @param string $page The type of settings page on which to show the section (general, reading, writing, ...)
+ */
+function add_settings_section($id, $title, $callback, $page) {
+	global $wp_settings_sections;
+
+	if  ( !isset($wp_settings_sections) )
+		$wp_settings_sections = array();
+	if ( !isset($wp_settings_sections[$page]) )
+		$wp_settings_sections[$page] = array();
+	if ( !isset($wp_settings_sections[$page][$id]) )
+		$wp_settings_sections[$page][$id] = array();
+
+	$wp_settings_sections[$page][$id] = array('id' => $id, 'title' => $title, 'callback' => $callback);
+}
+
+/**
+ * Add a new field to a settings page
+ *
+ * @since 2.7
+ *
+ * @param string $id String for use in the 'id' attribute of tags.
+ * @param string $title Title of the field
+ * @param string $callback Function that fills the field with the desired content.  The function should echo its output.
+ * @param string $page The type of settings page on which to show the field (general, reading, writing, ...)
+ * @param string $section The section of the settingss page in which to show the box (default, ...)
+ * @param array $args Additional arguments
+ */
+function add_settings_field($id, $title, $callback, $page, $section = 'default', $args = array()) {
+	global $wp_settings_fields;
+
+	if  ( !isset($wp_settings_fields) )
+		$wp_settings_fields = array();
+	if ( !isset($wp_settings_fields[$page]) )
+		$wp_settings_fields[$page] = array();
+	if ( !isset($wp_settings_fields[$page][$section]) )
+		$wp_settings_fields[$page][$section] = array();
+
+	$wp_settings_fields[$page][$section][$id] = array('id' => $id, 'title' => $title, 'callback' => $callback, 'args' => $args);
+}
+
+function do_settings_sections($page) {
+	global $wp_settings_sections, $wp_settings_fields;
+
+	if ( !isset($wp_settings_sections) || !isset($wp_settings_sections[$page]) )
+		return;
+
+	foreach ( (array) $wp_settings_sections[$page] as $section ) {
+		echo "<h3>{$section['title']}</h3>\n";
+		call_user_func($section['callback'], $section);
+		if ( !isset($wp_settings_fields) || !isset($wp_settings_fields[$page]) || !isset($wp_settings_fields[$page][$section['id']]) )
+			continue;
+		echo '<table class="form-table">';
+		do_settings_fields($page, $section['id']);
+		echo '</table>';
+	}
+}
+
+function do_settings_fields($page, $section) {
+	global $wp_settings_fields;
+
+	if ( !isset($wp_settings_fields) || !isset($wp_settings_fields[$page]) || !isset($wp_settings_fields[$page][$section]) )
+		return;
+
+	foreach ( (array) $wp_settings_fields[$page][$section] as $field ) {
+		echo '<tr valign="top">';
+		if ( !empty($field['args']['label_for']) )
+			echo '<th scope="row"><label for="' . $field['args']['label_for'] . '">' . $field['title'] . '</label></th>';
+		else
+			echo '<th scope="row">' . $field['title'] . '</th>';
+		echo '<td>';
+		call_user_func($field['callback']);
+		echo '</td>';
+		echo '</tr>';
+	}	
+}
+
 ?>
diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php
index fe063aac6..ea75c9ef0 100644
--- a/wp-admin/options-discussion.php
+++ b/wp-admin/options-discussion.php
@@ -83,6 +83,7 @@ include('admin-header.php');
 </p>
 </fieldset></td>
 </tr>
+<?php do_settings_fields('discussion', 'default'); ?>
 </table>
 
 <h3><?php _e('Avatars') ?></h3>
@@ -154,9 +155,10 @@ echo apply_filters('default_avatar_select', $avatar_list);
 
 </fieldset></td>
 </tr>
-
+<?php do_settings_fields('discussion', 'avatars'); ?>
 </table>
 
+<?php do_settings_sections('discussion'); ?>
 
 <p class="submit">
 <input type="hidden" name="action" value="update" />
diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index aac087e86..fbf945269 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -117,8 +117,11 @@ endfor;
 ?>
 </select></td>
 </tr>
+<?php do_settings_fields('general', 'default'); ?>
 </table>
 
+<?php do_settings_sections('general'); ?>
+
 <p class="submit"><input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" />
 <input type="hidden" name="action" value="update" />
 </p>
diff --git a/wp-admin/options-misc.php b/wp-admin/options-misc.php
index fc98fa64f..3023dde65 100644
--- a/wp-admin/options-misc.php
+++ b/wp-admin/options-misc.php
@@ -45,6 +45,7 @@ include('admin-header.php');
 </label>
 </th>
 </tr>
+<?php do_settings_fields('misc', 'default'); ?>
 </table>
 
 <h3><?php _e('Image sizes') ?></h3>
@@ -130,7 +131,7 @@ include('admin-header.php');
 ?>
 </fieldset></td>
 </tr>
-
+<?php do_settings_fields('misc', 'images'); ?>
 </table>
 
 
@@ -157,6 +158,8 @@ include('admin-header.php');
 
 </table>
 
+<?php do_settings_sections('misc'); ?>
+
 <p class="submit">
 <input type="hidden" name="action" value="update" />
 <input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" class="button" />
diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php
index 689c83a6d..e0f2b345d 100644
--- a/wp-admin/options-permalink.php
+++ b/wp-admin/options-permalink.php
@@ -191,7 +191,11 @@ $structures = array(
 		<th><label for="tag_base"><?php _e('Tag base'); ?></label></th>
 		<td><input name="tag_base" id="tag_base" type="text" class="code"  value="<?php echo attribute_escape($tag_base); ?>" size="30" /></td>
 	</tr>
+	<?php do_settings_fields('permalink', 'optional'); ?>
 </table>
+
+<?php do_settings_sections('permalink'); ?>
+
 <p class="submit"><input type="submit" name="submit" class="button" value="<?php _e('Save Changes') ?>" /></p>
   </form>
 <?php if ( $permalink_structure && !$usingpi && !$writable ) : ?>
diff --git a/wp-admin/options-privacy.php b/wp-admin/options-privacy.php
index e787f07b4..7e936c8bb 100644
--- a/wp-admin/options-privacy.php
+++ b/wp-admin/options-privacy.php
@@ -31,8 +31,11 @@ include('./admin-header.php');
 <?php do_action('blog_privacy_selector'); ?>
 </fieldset></td>
 </tr>
+<?php do_settings_fields('privacy', 'default'); ?>
 </table>
 
+<?php do_settings_sections('privacy'); ?>
+
 <p class="submit"><input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" />
 <input type="hidden" name="action" value="update" />
 </p>
diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php
index 8cedc7635..af2bf1634 100644
--- a/wp-admin/options-reading.php
+++ b/wp-admin/options-reading.php
@@ -72,6 +72,7 @@ include('admin-header.php');
 <td><input name="blog_charset" type="text" id="blog_charset" value="<?php form_option('blog_charset'); ?>" size="20" class="code" /><br />
 <?php _e('The character encoding you write your blog in (UTF-8 is <a href="http://developer.apple.com/documentation/macos8/TextIntlSvcs/TextEncodingConversionManager/TEC1.5/TEC.b0.html">recommended</a>)') ?></td>
 </tr>
+<?php do_settings_fields('reading', 'default'); ?>
 </table>
 <p class="submit">
 <input type="hidden" name="action" value="update" />
diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php
index 0d7d6b2c3..71ac9c56d 100644
--- a/wp-admin/options-writing.php
+++ b/wp-admin/options-writing.php
@@ -63,6 +63,7 @@ endforeach;
 ?>
 </select></td>
 </tr>
+<?php do_settings_fields('writing', 'default'); ?>
 </table>
 
 <h3><?php _e('Remote Publishing') ?></h3>
@@ -83,7 +84,9 @@ endforeach;
 <input name="enable_xmlrpc" type="checkbox" id="enable_xmlrpc" value="1" <?php checked('1', get_option('enable_xmlrpc')); ?> />
 <?php _e('Enable the WordPress, Movable Type, MetaWeblog and Blogger XML-RPC publishing protocols.') ?></label><br />
 </fieldset></td>
-</tr></table>
+</tr>
+<?php do_settings_fields('writing', 'remote_publishing'); ?>
+</table>
 
 <h3><?php _e('Post via e-mail') ?></h3>
 <p><?php printf(__('To post to WordPress by e-mail you must set up a secret e-mail account with POP3 access. Any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret. Here are three random strings you could use: <code>%s</code>, <code>%s</code>, <code>%s</code>.'), wp_generate_password(8, false), wp_generate_password(8, false), wp_generate_password(8, false)) ?></p>
@@ -120,6 +123,7 @@ endforeach;
 ?>
 </select></td>
 </tr>
+<?php do_settings_fields('writing', 'post_via_email'); ?>
 </table>
 
 <h3><?php _e('Update Services') ?></h3>
@@ -136,6 +140,8 @@ endforeach;
 
 <?php endif; ?>
 
+<?php do_settings_sections('writing'); ?>
+
 <p class="submit">
 <input type="hidden" name="action" value="update" />
 <input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" />