<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][5585] trunk/bp-core: Refactors the way that our Settings panel is saved, so that it does not rely on options.php and the WP Settings API to save submitted values.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/5585">5585</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-12-23 16:38:17 +0000 (Fri, 23 Dec 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactors the way that our Settings panel is saved, so that it does not rely on options.php and the WP Settings API to save submitted values.
Fixes some documentation related to the admin settings
Fixes some logic related to checked() in bp_admin_setting_callback_account_deletion()
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/3882">#3882</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcoreadminbpcoresettingsphp">trunk/bp-core/admin/bp-core-settings.php</a></li>
<li><a href="#trunkbpcorebpcoreoptionsphp">trunk/bp-core/bp-core-options.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcoreadminbpcoresettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-settings.php (5584 => 5585)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-settings.php 2011-12-23 07:31:05 UTC (rev 5584)
+++ trunk/bp-core/admin/bp-core-settings.php 2011-12-23 16:38:17 UTC (rev 5585)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> function bp_admin_setting_callback_avatar_uploads() {
</span><span class="cx"> ?>
</span><span class="cx">
</span><del>- <input id="_bp_enable_favorites" name="bp-disable-avatar-uploads" type="checkbox" value="1" <?php checked( !bp_disable_avatar_uploads( true ) ); ?> />
</del><ins>+ <input id="bp-disable-avatar-uploads" name="bp-disable-avatar-uploads" type="checkbox" value="1" <?php checked( !bp_disable_avatar_uploads( true ) ); ?> />
</ins><span class="cx"> <label for="bp-disable-avatar-uploads"><?php _e( 'Allow members to upload avatars', 'buddypress' ); ?></label>
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> function bp_admin_setting_callback_account_deletion() {
</span><span class="cx"> ?>
</span><span class="cx">
</span><del>- <input id="bp-disable-account-deletion" name="bp-disable-account-deletion" type="checkbox" value="1" <?php checked( bp_disable_account_deletion( true ) ); ?> />
</del><ins>+ <input id="bp-disable-account-deletion" name="bp-disable-account-deletion" type="checkbox" value="1" <?php checked( !bp_disable_account_deletion( true ) ); ?> />
</ins><span class="cx"> <label for="bp-disable-account-deletion"><?php _e( 'Allow members to delete their own accounts', 'buddypress' ); ?></label>
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="lines">@@ -177,6 +177,43 @@
</span><span class="cx"> * @uses do_settings_sections() To output the settings sections
</span><span class="cx"> */
</span><span class="cx"> function bp_core_admin_settings() {
</span><ins>+ global $wp_settings_fields;
+
+ // We're saving our own options, until the WP Settings API is updated to work with Multisite
+ $form_action = add_query_arg( 'page', 'bp-settings', bp_core_do_network_admin() ? network_admin_url( 'admin.php' ) : admin_url( 'admin.php' ) );
+
+ if ( !empty( $_POST['submit'] ) ) {
+ check_admin_referer( 'buddypress-options' );
+
+ // Because many settings are saved with checkboxes, and thus will have no values
+ // in the $_POST array when unchecked, we loop through the registered settings
+ if ( isset( $wp_settings_fields['buddypress'] ) ) {
+ foreach( (array)$wp_settings_fields['buddypress'] as $section => $settings ) {
+ foreach( $settings as $setting_name => $setting ) {
+ $value = isset( $_POST[$setting_name] ) ? $_POST[$setting_name] : '';
+
+ bp_update_option( $setting_name, $value );
+ }
+ }
+ }
+
+ // Some legacy options are not registered with the Settings API
+ $legacy_options = array(
+ 'bp-disable-profile-sync',
+ 'hide-loggedout-adminbar',
+ 'bp-disable-avatar-uploads',
+ 'bp-disable-account-deletion',
+ 'bp_restrict_group_creation'
+ );
+
+ foreach( $legacy_options as $legacy_option ) {
+ // Note: Each of these options is represented by its opposite in the UI
+ // Ie, the Profile Syncing option reads "Enable Sync", so when it's checked,
+ // the corresponding option should be unset
+ $value = isset( $_POST[$legacy_option] ) ? '' : 1;
+ bp_update_option( $legacy_option, $value );
+ }
+ }
</ins><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <div class="wrap">
</span><span class="lines">@@ -185,7 +222,7 @@
</span><span class="cx">
</span><span class="cx"> <h2 class="nav-tab-wrapper"><?php bp_core_admin_tabs( __( 'Settings', 'buddypress' ) ); ?></h2>
</span><span class="cx">
</span><del>- <form action="options.php" method="post">
</del><ins>+ <form action="<?php echo $form_action ?>" method="post">
</ins><span class="cx">
</span><span class="cx"> <?php settings_fields( 'buddypress' ); ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpcorebpcoreoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-options.php (5584 => 5585)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-options.php 2011-12-23 07:31:05 UTC (rev 5584)
+++ trunk/bp-core/bp-core-options.php 2011-12-23 16:38:17 UTC (rev 5585)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> // Allow users to delete their own accounts
</span><span class="cx"> 'bp-disable-account-deletion' => true,
</span><span class="cx">
</span><del>- // Allow anonymous posting
</del><ins>+ // Allow comments on blog and forum activity items
</ins><span class="cx"> 'bp-disable-blogforum-comments' => true,
</span><span class="cx">
</span><span class="cx"> // Use the WordPress editor when possible
</span></span></pre>
</div>
</div>
</body>
</html>