<!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][10524] trunk/src/bp-settings: Move bp-settings class to its own file.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/10524">10524</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/10524","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-02-05 05:28:55 +0000 (Fri, 05 Feb 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Move bp-settings class to its own file.
See <a href="http://buddypress.trac.wordpress.org/ticket/6870">#6870</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpsettingsbpsettingsloaderphp">trunk/src/bp-settings/bp-settings-loader.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/src/bp-settings/classes/</li>
<li><a href="#trunksrcbpsettingsclassesclassbpsettingscomponentphp">trunk/src/bp-settings/classes/class-bp-settings-component.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpsettingsbpsettingsloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-settings/bp-settings-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-settings/bp-settings-loader.php 2016-02-05 05:26:45 UTC (rev 10523)
+++ trunk/src/bp-settings/bp-settings-loader.php 2016-02-05 05:28:55 UTC (rev 10524)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,210 +10,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Exit if accessed directly.
</span><span class="cx" style="display: block; padding: 0 10px"> defined( 'ABSPATH' ) || exit;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/**
- * Creates our Settings component.
- *
- * @since 1.5.0
- */
-class BP_Settings_Component extends BP_Component {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+require dirname( __FILE__ ) . '/classes/class-bp-settings-component.php';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Start the settings component creation process.
- *
- * @since 1.5.0
- */
- public function __construct() {
- parent::start(
- 'settings',
- __( 'Settings', 'buddypress' ),
- buddypress()->plugin_dir,
- array(
- 'adminbar_myaccount_order' => 100
- )
- );
- }
-
- /**
- * Include files.
- *
- * @since 1.5.0
- *
- * @param array $includes Array of values to include. Not used.
- */
- public function includes( $includes = array() ) {
- parent::includes( array(
- 'actions',
- 'screens',
- 'template',
- 'functions',
- ) );
- }
-
- /**
- * Setup globals.
- *
- * The BP_SETTINGS_SLUG constant is deprecated, and only used here for
- * backwards compatibility.
- *
- * @since 1.5.0
- *
- * @param array $args Array of arguments.
- */
- public function setup_globals( $args = array() ) {
-
- // Define a slug, if necessary.
- if ( ! defined( 'BP_SETTINGS_SLUG' ) ) {
- define( 'BP_SETTINGS_SLUG', $this->id );
- }
-
- // All globals for settings component.
- parent::setup_globals( array(
- 'slug' => BP_SETTINGS_SLUG,
- 'has_directory' => false,
- ) );
- }
-
- /**
- * Set up navigation.
- *
- * @since 1.5.0
- *
- * @param array $main_nav Array of main nav items.
- * @param array $sub_nav Array of sub nav items.
- */
- public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
-
- // Determine user to use.
- if ( bp_displayed_user_domain() ) {
- $user_domain = bp_displayed_user_domain();
- } elseif ( bp_loggedin_user_domain() ) {
- $user_domain = bp_loggedin_user_domain();
- } else {
- return;
- }
-
- $access = bp_core_can_edit_settings();
- $slug = bp_get_settings_slug();
- $settings_link = trailingslashit( $user_domain . $slug );
-
- // Add the settings navigation item.
- $main_nav = array(
- 'name' => __( 'Settings', 'buddypress' ),
- 'slug' => $slug,
- 'position' => 100,
- 'show_for_displayed_user' => $access,
- 'screen_function' => 'bp_settings_screen_general',
- 'default_subnav_slug' => 'general'
- );
-
- // Add General Settings nav item.
- $sub_nav[] = array(
- 'name' => __( 'General', 'buddypress' ),
- 'slug' => 'general',
- 'parent_url' => $settings_link,
- 'parent_slug' => $slug,
- 'screen_function' => 'bp_settings_screen_general',
- 'position' => 10,
- 'user_has_access' => $access
- );
-
- // Add Email nav item. Formerly called 'Notifications', we
- // retain the old slug and function names for backward compat.
- $sub_nav[] = array(
- 'name' => __( 'Email', 'buddypress' ),
- 'slug' => 'notifications',
- 'parent_url' => $settings_link,
- 'parent_slug' => $slug,
- 'screen_function' => 'bp_settings_screen_notification',
- 'position' => 20,
- 'user_has_access' => $access
- );
-
- // Add Spam Account nav item.
- if ( bp_current_user_can( 'bp_moderate' ) ) {
- $sub_nav[] = array(
- 'name' => __( 'Capabilities', 'buddypress' ),
- 'slug' => 'capabilities',
- 'parent_url' => $settings_link,
- 'parent_slug' => $slug,
- 'screen_function' => 'bp_settings_screen_capabilities',
- 'position' => 80,
- 'user_has_access' => ! bp_is_my_profile()
- );
- }
-
- // Add Delete Account nav item.
- if ( ( ! bp_disable_account_deletion() && bp_is_my_profile() ) || bp_current_user_can( 'delete_users' ) ) {
- $sub_nav[] = array(
- 'name' => __( 'Delete Account', 'buddypress' ),
- 'slug' => 'delete-account',
- 'parent_url' => $settings_link,
- 'parent_slug' => $slug,
- 'screen_function' => 'bp_settings_screen_delete_account',
- 'position' => 90,
- 'user_has_access' => ! is_super_admin( bp_displayed_user_id() )
- );
- }
-
- parent::setup_nav( $main_nav, $sub_nav );
- }
-
- /**
- * Set up the Toolbar.
- *
- * @since 1.5.0
- *
- * @param array $wp_admin_nav Array of Admin Bar items.
- */
- public function setup_admin_bar( $wp_admin_nav = array() ) {
-
- // Menus for logged in user.
- if ( is_user_logged_in() ) {
-
- // Setup the logged in user variables.
- $settings_link = trailingslashit( bp_loggedin_user_domain() . bp_get_settings_slug() );
-
- // Add main Settings menu.
- $wp_admin_nav[] = array(
- 'parent' => buddypress()->my_account_menu_id,
- 'id' => 'my-account-' . $this->id,
- 'title' => __( 'Settings', 'buddypress' ),
- 'href' => $settings_link
- );
-
- // General Account.
- $wp_admin_nav[] = array(
- 'parent' => 'my-account-' . $this->id,
- 'id' => 'my-account-' . $this->id . '-general',
- 'title' => __( 'General', 'buddypress' ),
- 'href' => $settings_link
- );
-
- // Notifications - only add the tab when there is something to display there.
- if ( has_action( 'bp_notification_settings' ) ) {
- $wp_admin_nav[] = array(
- 'parent' => 'my-account-' . $this->id,
- 'id' => 'my-account-' . $this->id . '-notifications',
- 'title' => __( 'Email', 'buddypress' ),
- 'href' => trailingslashit( $settings_link . 'notifications' )
- );
- }
-
- // Delete Account.
- if ( !bp_current_user_can( 'bp_moderate' ) && ! bp_core_get_root_option( 'bp-disable-account-deletion' ) ) {
- $wp_admin_nav[] = array(
- 'parent' => 'my-account-' . $this->id,
- 'id' => 'my-account-' . $this->id . '-delete-account',
- 'title' => __( 'Delete Account', 'buddypress' ),
- 'href' => trailingslashit( $settings_link . 'delete-account' )
- );
- }
- }
-
- parent::setup_admin_bar( $wp_admin_nav );
- }
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Instantiates the settings component.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcbpsettingsclassesclassbpsettingscomponentphpfromrev10515trunksrcbpsettingsbpsettingsloaderphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/bp-settings/classes/class-bp-settings-component.php (from rev 10515, trunk/src/bp-settings/bp-settings-loader.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-settings/classes/class-bp-settings-component.php (rev 0)
+++ trunk/src/bp-settings/classes/class-bp-settings-component.php 2016-02-05 05:28:55 UTC (rev 10524)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,215 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * BuddyPress Settings Loader.
+ *
+ * @package BuddyPress
+ * @subpackage SettingsLoader
+ * @since 1.5.0
+ */
+
+// Exit if accessed directly.
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * Creates our Settings component.
+ *
+ * @since 1.5.0
+ */
+class BP_Settings_Component extends BP_Component {
+
+ /**
+ * Start the settings component creation process.
+ *
+ * @since 1.5.0
+ */
+ public function __construct() {
+ parent::start(
+ 'settings',
+ __( 'Settings', 'buddypress' ),
+ buddypress()->plugin_dir,
+ array(
+ 'adminbar_myaccount_order' => 100
+ )
+ );
+ }
+
+ /**
+ * Include files.
+ *
+ * @since 1.5.0
+ *
+ * @param array $includes Array of values to include. Not used.
+ */
+ public function includes( $includes = array() ) {
+ parent::includes( array(
+ 'actions',
+ 'screens',
+ 'template',
+ 'functions',
+ ) );
+ }
+
+ /**
+ * Setup globals.
+ *
+ * The BP_SETTINGS_SLUG constant is deprecated, and only used here for
+ * backwards compatibility.
+ *
+ * @since 1.5.0
+ *
+ * @param array $args Array of arguments.
+ */
+ public function setup_globals( $args = array() ) {
+
+ // Define a slug, if necessary.
+ if ( ! defined( 'BP_SETTINGS_SLUG' ) ) {
+ define( 'BP_SETTINGS_SLUG', $this->id );
+ }
+
+ // All globals for settings component.
+ parent::setup_globals( array(
+ 'slug' => BP_SETTINGS_SLUG,
+ 'has_directory' => false,
+ ) );
+ }
+
+ /**
+ * Set up navigation.
+ *
+ * @since 1.5.0
+ *
+ * @param array $main_nav Array of main nav items.
+ * @param array $sub_nav Array of sub nav items.
+ */
+ public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
+
+ // Determine user to use.
+ if ( bp_displayed_user_domain() ) {
+ $user_domain = bp_displayed_user_domain();
+ } elseif ( bp_loggedin_user_domain() ) {
+ $user_domain = bp_loggedin_user_domain();
+ } else {
+ return;
+ }
+
+ $access = bp_core_can_edit_settings();
+ $slug = bp_get_settings_slug();
+ $settings_link = trailingslashit( $user_domain . $slug );
+
+ // Add the settings navigation item.
+ $main_nav = array(
+ 'name' => __( 'Settings', 'buddypress' ),
+ 'slug' => $slug,
+ 'position' => 100,
+ 'show_for_displayed_user' => $access,
+ 'screen_function' => 'bp_settings_screen_general',
+ 'default_subnav_slug' => 'general'
+ );
+
+ // Add General Settings nav item.
+ $sub_nav[] = array(
+ 'name' => __( 'General', 'buddypress' ),
+ 'slug' => 'general',
+ 'parent_url' => $settings_link,
+ 'parent_slug' => $slug,
+ 'screen_function' => 'bp_settings_screen_general',
+ 'position' => 10,
+ 'user_has_access' => $access
+ );
+
+ // Add Email nav item. Formerly called 'Notifications', we
+ // retain the old slug and function names for backward compat.
+ $sub_nav[] = array(
+ 'name' => __( 'Email', 'buddypress' ),
+ 'slug' => 'notifications',
+ 'parent_url' => $settings_link,
+ 'parent_slug' => $slug,
+ 'screen_function' => 'bp_settings_screen_notification',
+ 'position' => 20,
+ 'user_has_access' => $access
+ );
+
+ // Add Spam Account nav item.
+ if ( bp_current_user_can( 'bp_moderate' ) ) {
+ $sub_nav[] = array(
+ 'name' => __( 'Capabilities', 'buddypress' ),
+ 'slug' => 'capabilities',
+ 'parent_url' => $settings_link,
+ 'parent_slug' => $slug,
+ 'screen_function' => 'bp_settings_screen_capabilities',
+ 'position' => 80,
+ 'user_has_access' => ! bp_is_my_profile()
+ );
+ }
+
+ // Add Delete Account nav item.
+ if ( ( ! bp_disable_account_deletion() && bp_is_my_profile() ) || bp_current_user_can( 'delete_users' ) ) {
+ $sub_nav[] = array(
+ 'name' => __( 'Delete Account', 'buddypress' ),
+ 'slug' => 'delete-account',
+ 'parent_url' => $settings_link,
+ 'parent_slug' => $slug,
+ 'screen_function' => 'bp_settings_screen_delete_account',
+ 'position' => 90,
+ 'user_has_access' => ! is_super_admin( bp_displayed_user_id() )
+ );
+ }
+
+ parent::setup_nav( $main_nav, $sub_nav );
+ }
+
+ /**
+ * Set up the Toolbar.
+ *
+ * @since 1.5.0
+ *
+ * @param array $wp_admin_nav Array of Admin Bar items.
+ */
+ public function setup_admin_bar( $wp_admin_nav = array() ) {
+
+ // Menus for logged in user.
+ if ( is_user_logged_in() ) {
+
+ // Setup the logged in user variables.
+ $settings_link = trailingslashit( bp_loggedin_user_domain() . bp_get_settings_slug() );
+
+ // Add main Settings menu.
+ $wp_admin_nav[] = array(
+ 'parent' => buddypress()->my_account_menu_id,
+ 'id' => 'my-account-' . $this->id,
+ 'title' => __( 'Settings', 'buddypress' ),
+ 'href' => $settings_link
+ );
+
+ // General Account.
+ $wp_admin_nav[] = array(
+ 'parent' => 'my-account-' . $this->id,
+ 'id' => 'my-account-' . $this->id . '-general',
+ 'title' => __( 'General', 'buddypress' ),
+ 'href' => $settings_link
+ );
+
+ // Notifications - only add the tab when there is something to display there.
+ if ( has_action( 'bp_notification_settings' ) ) {
+ $wp_admin_nav[] = array(
+ 'parent' => 'my-account-' . $this->id,
+ 'id' => 'my-account-' . $this->id . '-notifications',
+ 'title' => __( 'Email', 'buddypress' ),
+ 'href' => trailingslashit( $settings_link . 'notifications' )
+ );
+ }
+
+ // Delete Account.
+ if ( !bp_current_user_can( 'bp_moderate' ) && ! bp_core_get_root_option( 'bp-disable-account-deletion' ) ) {
+ $wp_admin_nav[] = array(
+ 'parent' => 'my-account-' . $this->id,
+ 'id' => 'my-account-' . $this->id . '-delete-account',
+ 'title' => __( 'Delete Account', 'buddypress' ),
+ 'href' => trailingslashit( $settings_link . 'delete-account' )
+ );
+ }
+ }
+
+ parent::setup_admin_bar( $wp_admin_nav );
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>