<!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][11145] trunk/src: Groups: Introduce group type functionality on the Groups Directory page.</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/11145">11145</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/11145","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>r-a-y</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-09-21 22:53:11 +0000 (Wed, 21 Sep 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'>Groups: Introduce group type functionality on the Groups Directory page.
If a group type of `foo` is registered with the `has_directory` parameter,
you can view a group directory for `foo` at:
`example.com/groups/type/foo/`
See <a href="http://buddypress.trac.wordpress.org/ticket/7210">#7210</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcoretemplatephp">trunk/src/bp-core/bp-core-template.php</a></li>
<li><a href="#trunksrcbpgroupsbpgroupsfunctionsphp">trunk/src/bp-groups/bp-groups-functions.php</a></li>
<li><a href="#trunksrcbpgroupsbpgroupsscreensphp">trunk/src/bp-groups/bp-groups-screens.php</a></li>
<li><a href="#trunksrcbpgroupsbpgroupstemplatephp">trunk/src/bp-groups/bp-groups-template.php</a></li>
<li><a href="#trunksrcbpgroupsclassesclassbpgroupscomponentphp">trunk/src/bp-groups/classes/class-bp-groups-component.php</a></li>
<li><a href="#trunksrcbpgroupsclassesclassbpgroupsthemecompatphp">trunk/src/bp-groups/classes/class-bp-groups-theme-compat.php</a></li>
<li><a href="#trunksrcbptemplatesbplegacybuddypressgroupsgroupsloopphp">trunk/src/bp-templates/bp-legacy/buddypress/groups/groups-loop.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcoretemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-template.php 2016-09-21 22:40:12 UTC (rev 11144)
+++ trunk/src/bp-core/bp-core-template.php 2016-09-21 22:53:11 UTC (rev 11145)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2686,7 +2686,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return True if the current page is the groups directory.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_is_groups_directory() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( bp_is_groups_component() && ! bp_current_action() && ! bp_current_item() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( bp_is_groups_component() && ! bp_is_group() && ( ! bp_current_action() || ( bp_action_variable() && bp_is_current_action( bp_get_groups_group_type_base() ) ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbpgroupsbpgroupsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/bp-groups-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/bp-groups-functions.php 2016-09-21 22:40:12 UTC (rev 11144)
+++ trunk/src/bp-groups/bp-groups-functions.php 2016-09-21 22:53:11 UTC (rev 11145)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2445,6 +2445,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Get the "current" group type, if one is provided, in group directories.
+ *
+ * @since 2.7.0
+ *
+ * @return string
+ */
+function bp_get_current_group_directory_type() {
+
+ /**
+ * Filters the "current" group type, if one is provided, in group directories.
+ *
+ * @since 2.7.0
+ *
+ * @param string $value "Current" group type.
+ */
+ return apply_filters( 'bp_get_current_group_directory_type', buddypress()->groups->current_directory_type );
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Delete a group's type when the group is deleted.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.6.0
</span></span></pre></div>
<a id="trunksrcbpgroupsbpgroupsscreensphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/bp-groups-screens.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/bp-groups-screens.php 2016-09-21 22:40:12 UTC (rev 11144)
+++ trunk/src/bp-groups/bp-groups-screens.php 2016-09-21 22:53:11 UTC (rev 11145)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,6 +25,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function groups_directory_groups_setup() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( bp_is_groups_directory() ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Set group type if available.
+ if ( bp_is_current_action( bp_get_groups_group_type_base() ) && bp_action_variable() ) {
+ $matched_types = bp_groups_get_group_types( array(
+ 'has_directory' => true,
+ 'directory_slug' => bp_action_variable(),
+ ) );
+
+ // Redirect back to group directory if no match.
+ if ( empty( $matched_types ) ) {
+ bp_core_redirect( bp_get_groups_directory_permalink() );
+ }
+
+ // Set our global variable.
+ buddypress()->groups->current_directory_type = reset( $matched_types );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> bp_update_is_directory( true, 'groups' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/bp-groups-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/bp-groups-template.php 2016-09-21 22:40:12 UTC (rev 11144)
+++ trunk/src/bp-groups/bp-groups-template.php 2016-09-21 22:53:11 UTC (rev 11145)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,6 +72,36 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Output the group type base slug.
+ *
+ * @since 2.7.0
+ */
+function bp_groups_group_type_base() {
+ echo esc_url( bp_get_groups_group_type_base() );
+}
+ /**
+ * Get the group type base slug.
+ *
+ * The base slug is the string used as the base prefix when generating group
+ * type directory URLs. For example, in example.com/groups/type/foo/, 'foo' is
+ * the group type and 'type' is the base slug.
+ *
+ * @since 2.7.0
+ *
+ * @return string
+ */
+ function bp_get_groups_group_type_base() {
+ /**
+ * Filters the group type URL base.
+ *
+ * @since 2.7.0
+ *
+ * @param string $base
+ */
+ return apply_filters( 'bp_groups_group_type_base', _x( 'type', 'group type URL base', 'buddypress' ) );
+ }
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Output group directory permalink.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,6 +203,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $slug = bp_get_current_group_slug();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $group_type = bp_get_current_group_directory_type();
+ if ( ! $group_type && ! empty( $_GET['group_type'] ) ) {
+ if ( is_array( $_GET['group_type'] ) ) {
+ $group_type = $_GET['group_type'];
+ } else {
+ // Can be a comma-separated list.
+ $group_type = explode( ',', $_GET['group_type'] );
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Default search string (too soon to escape here).
</span><span class="cx" style="display: block; padding: 0 10px"> $search_query_arg = bp_core_get_component_search_query_arg( 'groups' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_REQUEST[ $search_query_arg ] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -196,7 +236,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => bp_displayed_user_id(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => $slug,
</span><span class="cx" style="display: block; padding: 0 10px"> 'search_terms' => $search_terms,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'group_type' => '',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'group_type' => $group_type,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'group_type__in' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'group_type__not_in' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_query' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5079,6 +5119,36 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Echo the current group type message.
+ *
+ * @since 2.7.0
+ */
+function bp_current_group_directory_type_message() {
+ echo bp_get_current_group_directory_type_message();
+}
+ /**
+ * Generate the current group type message.
+ *
+ * @since 2.7.0
+ *
+ * @return string
+ */
+ function bp_get_current_group_directory_type_message() {
+ $type_object = bp_groups_get_group_type_object( bp_get_current_group_directory_type() );
+
+ $message = sprintf( __( 'Viewing groups of the type: %s', 'buddypress' ), '<strong>' . $type_object->labels['singular_name'] . '</strong>' );
+
+ /**
+ * Filters the current group type message.
+ *
+ * @since 2.7.0
+ *
+ * @param string $message Message to filter.
+ */
+ return apply_filters( 'bp_get_current_group_type_message', $message );
+ }
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Is the current page a specific group admin screen?
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.1.0
</span></span></pre></div>
<a id="trunksrcbpgroupsclassesclassbpgroupscomponentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/classes/class-bp-groups-component.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/classes/class-bp-groups-component.php 2016-09-21 22:40:12 UTC (rev 11144)
+++ trunk/src/bp-groups/classes/class-bp-groups-component.php 2016-09-21 22:53:11 UTC (rev 11145)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,6 +85,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $types = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Current directory group type.
+ *
+ * @see groups_directory_groups_setup()
+ *
+ * @since 2.7.0
+ * @var string
+ */
+ public $current_directory_type = '';
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Start the groups component creation process.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span></span></pre></div>
<a id="trunksrcbpgroupsclassesclassbpgroupsthemecompatphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/classes/class-bp-groups-theme-compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/classes/class-bp-groups-theme-compat.php 2016-09-21 22:40:12 UTC (rev 11144)
+++ trunk/src/bp-groups/classes/class-bp-groups-theme-compat.php 2016-09-21 22:53:11 UTC (rev 11145)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,7 +40,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Group Directory.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! bp_current_action() && ! bp_current_item() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( bp_is_groups_directory() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> bp_update_is_directory( true, 'groups' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcbptemplatesbplegacybuddypressgroupsgroupsloopphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-legacy/buddypress/groups/groups-loop.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-legacy/buddypress/groups/groups-loop.php 2016-09-21 22:40:12 UTC (rev 11144)
+++ trunk/src/bp-templates/bp-legacy/buddypress/groups/groups-loop.php 2016-09-21 22:53:11 UTC (rev 11145)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,6 +19,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'bp_before_groups_loop' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php if ( bp_get_current_group_directory_type() ) : ?>
+ <p class="current-group-type"><?php bp_current_group_directory_type_message() ?></p>
+<?php endif; ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( bp_has_groups( bp_ajax_querystring( 'groups' ) ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="pag-top" class="pagination">
</span></span></pre>
</div>
</div>
</body>
</html>