<!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][11779] trunk/src/bp-core/bp-core-attachments.php: Core, Media: misc.</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/11779">11779</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/11779","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>djpaul</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-01-02 10:20:02 +0000 (Tue, 02 Jan 2018)</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'>Core, Media: misc. tidy-up for the attachments functions.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcoreattachmentsphp">trunk/src/bp-core/bp-core-attachments.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcoreattachmentsphp"></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-attachments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-attachments.php 2017-12-31 20:38:57 UTC (rev 11778)
+++ trunk/src/bp-core/bp-core-attachments.php 2018-01-02 10:20:02 UTC (rev 11779)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1189,36 +1189,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * error message otherwise.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_attachments_cover_image_ajax_upload() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Bail if not a POST action.
</del><span class="cx" style="display: block; padding: 0 10px"> if ( 'POST' !== strtoupper( $_SERVER['REQUEST_METHOD'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Sending the json response will be different if
- * the current Plupload runtime is html4
- */
- $is_html4 = false;
- if ( ! empty( $_POST['html4' ] ) ) {
- $is_html4 = true;
- }
-
- // Check the nonce.
</del><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'bp-uploader' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Init the BuddyPress parameters.
- $bp_params = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Sending the json response will be different if the current Plupload runtime is html4.
+ $is_html4 = ! empty( $_POST['html4' ] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // We need it to carry on.
- if ( ! empty( $_POST['bp_params'] ) ) {
- $bp_params = bp_parse_args( $_POST['bp_params'], array(
- 'object' => 'user',
- 'item_id' => bp_loggedin_user_id(),
- ), 'attachments_cover_image_ajax_upload' );
- } else {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $_POST['bp_params'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> bp_attachments_json_response( false, $is_html4 );
</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">+ $bp_params = bp_parse_args( $_POST['bp_params'], array(
+ 'object' => 'user',
+ 'item_id' => bp_loggedin_user_id(),
+ ), 'attachments_cover_image_ajax_upload' );
+
+ $bp_params['item_id'] = (int) $bp_params['item_id'];
+ $bp_params['object'] = sanitize_text_field( $bp_params['object'] );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // We need the object to set the uploads dir filter.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $bp_params['object'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> bp_attachments_json_response( false, $is_html4 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1297,10 +1288,8 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Default error message.
</del><span class="cx" style="display: block; padding: 0 10px"> $error_message = __( 'There was a problem uploading the cover image.', 'buddypress' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Get BuddyPress Attachments Uploads Dir datas.
</del><span class="cx" style="display: block; padding: 0 10px"> $bp_attachments_uploads_dir = bp_attachments_uploads_dir_get();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // The BP Attachments Uploads Dir is not set, stop.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1322,10 +1311,10 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
</ins><span class="cx" style="display: block; padding: 0 10px"> * Generate the cover image so that it fit to feature's dimensions
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Unlike the Avatar, Uploading and generating the cover image is happening during
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Unlike the avatar, uploading and generating the cover image is happening during
</ins><span class="cx" style="display: block; padding: 0 10px"> * the same Ajax request, as we already instantiated the BP_Attachment_Cover_Image
</span><span class="cx" style="display: block; padding: 0 10px"> * class, let's use it.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1336,17 +1325,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ), $cover_image_attachment );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $cover ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Upload error response.
</del><span class="cx" style="display: block; padding: 0 10px"> bp_attachments_json_response( false, $is_html4, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'upload_error',
</span><span class="cx" style="display: block; padding: 0 10px"> 'message' => $error_message,
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Build the url to the file.
</del><span class="cx" style="display: block; padding: 0 10px"> $cover_url = trailingslashit( $bp_attachments_uploads_dir['baseurl'] ) . $cover_subdir . '/' . $cover['cover_basename'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Init Feedback code, 1 is success.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 1 is success.
</ins><span class="cx" style="display: block; padding: 0 10px"> $feedback_code = 1;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // 0 is the size warning.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1391,7 +1378,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * error message otherwise.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_attachments_cover_image_ajax_delete() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Bail if not a POST action.
</del><span class="cx" style="display: block; padding: 0 10px"> if ( 'POST' !== strtoupper( $_SERVER['REQUEST_METHOD'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1437,10 +1423,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( "{$component}_cover_image_deleted", (int) $cover_image_data['item_id'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Defaults no cover image.
</del><span class="cx" style="display: block; padding: 0 10px"> $response = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'reset_url' => '',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'feedback_code' => 3 ,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'feedback_code' => 3,
</ins><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"> // Get cover image settings in case there's a default header.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1451,7 +1436,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $response['reset_url'] = $cover_params['default_cover'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Finally send the reset url.
</del><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_success( $response );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre>
</div>
</div>
</body>
</html>