<!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][5278] trunk/bp-core/bp-core-moderation.php: Tidy up phpdoc and use bp_get_option for BuddyPress options in bp-core-moderation</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/5278">5278</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-11-05 21:31:05 +0000 (Sat, 05 Nov 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tidy up phpdoc and use bp_get_option for BuddyPress options in bp-core-moderation</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoremoderationphp">trunk/bp-core/bp-core-moderation.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoremoderationphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-moderation.php (5277 => 5278)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-moderation.php 2011-11-05 20:53:31 UTC (rev 5277)
+++ trunk/bp-core/bp-core-moderation.php 2011-11-05 21:31:05 UTC (rev 5278)
</span><span class="lines">@@ -1,5 +1,4 @@
</span><span class="cx"> <?php
</span><del>-
</del><span class="cx"> /**
</span><span class="cx"> * BuddyPress Moderation Functions
</span><span class="cx"> *
</span><span class="lines">@@ -19,19 +18,18 @@
</span><span class="cx"> * Check to make sure that a user is not making too many posts in a short amount
</span><span class="cx"> * of time.
</span><span class="cx"> *
</span><del>- * @since BuddyPress (1.6)
- *
</del><span class="cx"> * @param int $user_id User id to check for flood
</span><del>- * @uses get_option() To get the throttle time
</del><ins>+ * @return bool True if there is no flooding, true if there is
+ * @since 1.6
+ * @uses current_user_can() To check if the current user can throttle
+ * @uses bp_get_option() To get the throttle time
</ins><span class="cx"> * @uses get_transient() To get the last posted transient of the ip
</span><span class="cx"> * @uses get_user_meta() To get the last posted meta of the user
</span><del>- * @uses current_user_can() To check if the current user can throttle
- * @return bool True if there is no flooding, true if there is
</del><span class="cx"> */
</span><span class="cx"> function bp_core_check_for_flood( $user_id = 0 ) {
</span><span class="cx">
</span><span class="cx"> // Option disabled. No flood checks.
</span><del>- if ( !$throttle_time = get_option( '_bp_throttle_time' ) )
</del><ins>+ if ( !$throttle_time = bp_get_option( '_bp_throttle_time' ) )
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> // Bail if no user ID passed
</span><span class="lines">@@ -48,15 +46,14 @@
</span><span class="cx"> /**
</span><span class="cx"> * Check for moderation keys and too many links
</span><span class="cx"> *
</span><del>- * @since BuddyPress (1.6)
- *
</del><span class="cx"> * @param int $user_id Topic or reply author ID
</span><span class="cx"> * @param string $title The title of the content
</span><span class="cx"> * @param string $content The content being posted
</span><del>- * @uses is_super_admin() Allow super admins to bypass blacklist
- * @uses bbp_current_author_ip() To get current user IP address
- * @uses bbp_current_author_ua() To get current user agent
</del><span class="cx"> * @return bool True if test is passed, false if fail
</span><ins>+ * @since 1.6
+ * @uses bp_current_author_ip() To get current user IP address
+ * @uses bp_current_author_ua() To get current user agent
+ * @uses is_super_admin() Allow super admins to bypass blacklist
</ins><span class="cx"> */
</span><span class="cx"> function bp_core_check_for_moderation( $user_id = 0, $title = '', $content = '' ) {
</span><span class="cx">
</span><span class="lines">@@ -155,15 +152,14 @@
</span><span class="cx"> /**
</span><span class="cx"> * Checks for blocked keys
</span><span class="cx"> *
</span><del>- * @since bbPress (r3446)
- *
</del><span class="cx"> * @param int $user_id Topic or reply author ID
</span><span class="cx"> * @param string $title The title of the content
</span><span class="cx"> * @param string $content The content being posted
</span><del>- * @uses is_super_admin() Allow super admins to bypass blacklist
</del><ins>+ * @return bool True if test is passed, false if fail
</ins><span class="cx"> * @uses bp_current_author_ip() To get current user IP address
</span><span class="cx"> * @uses bp_current_author_ua() To get current user agent
</span><del>- * @return bool True if test is passed, false if fail
</del><ins>+ * @uses is_super_admin() Allow super admins to bypass blacklist
+ * @since 1.6
</ins><span class="cx"> */
</span><span class="cx"> function bp_core_check_for_blacklist( $user_id = 0, $title = '', $content = '' ) {
</span><span class="cx">
</span><span class="lines">@@ -221,8 +217,7 @@
</span><span class="cx"> // Skip empty lines
</span><span class="cx"> if ( empty( $word ) ) { continue; }
</span><span class="cx">
</span><del>- // Do some escaping magic so that '#' chars in the
- // spam words don't break things:
</del><ins>+ // Do some escaping magic so that '#' chars in the spam words don't break things:
</ins><span class="cx"> $word = preg_quote( $word, '#' );
</span><span class="cx"> $pattern = "#$word#i";
</span><span class="cx">
</span><span class="lines">@@ -245,9 +240,8 @@
</span><span class="cx"> /**
</span><span class="cx"> * Get the current-user IP address
</span><span class="cx"> *
</span><del>- * @since BuddyPress (1.6)
- *
</del><span class="cx"> * @return string
</span><ins>+ * @since 1.6
</ins><span class="cx"> */
</span><span class="cx"> function bp_core_current_user_ip() {
</span><span class="cx"> $retval = preg_replace( '/[^0-9a-fA-F:., ]/', '', $_SERVER['REMOTE_ADDR'] );
</span><span class="lines">@@ -258,9 +252,8 @@
</span><span class="cx"> /**
</span><span class="cx"> * Get the current-user user-agent
</span><span class="cx"> *
</span><del>- * @since BuddyPress (1.6)
- *
</del><span class="cx"> * @return string
</span><ins>+ * @since 1.6
</ins><span class="cx"> */
</span><span class="cx"> function bp_core_current_user_ua() {
</span><span class="cx">
</span><span class="lines">@@ -272,5 +265,4 @@
</span><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_core_current_user_ua', $retval );
</span><span class="cx"> }
</span><del>-
-?>
</del><ins>+?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>