Changeset 8629

Timestamp:

07/15/2014 11:37:32 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Add conditional brackets and do some output type-casting in bp_core_add_cropper_inline_js().

File:

• trunk/src/bp-core/bp-core-cssjs.php (modified) (3 diffs)

trunk/src/bp-core/bp-core-cssjs.php

@@ -67 +67 @@
         // Bail if no image was uploaded
         $image = apply_filters( 'bp_inline_cropper_image', getimagesize( bp_core_avatar_upload_path() . buddypress()->avatar_admin->image->dir ) );
-        if ( empty( $image ) )
+        if ( empty( $image ) ) {
                 return;
+        }
 
-        //
+        // Get avatar full width and height
         $full_height = bp_core_avatar_full_height();
         $full_width  = bp_core_avatar_full_width();
@@ -92 +93 @@
                                 onChange: showPreview,
                                 onSelect: updateCoords,
-                                aspectRatio: <?php echo $aspect_ratio; ?>,
-                                setSelect: [ <?php echo $crop_left; ?>, <?php echo $crop_top; ?>, <?php echo $crop_right; ?>, <?php echo $crop_bottom; ?> ]
+                                aspectRatio: <?php echo (int) $aspect_ratio; ?>,
+                                setSelect: [ <?php echo (int) $crop_left; ?>, <?php echo (int) $crop_top; ?>, <?php echo (int) $crop_right; ?>, <?php echo (int) $crop_bottom; ?> ]
                         });
-                        updateCoords({x: <?php echo $crop_left; ?>, y: <?php echo $crop_top; ?>, w: <?php echo $crop_right; ?>, h: <?php echo $crop_bottom; ?>});
+                        updateCoords({x: <?php echo (int) $crop_left; ?>, y: <?php echo (int) $crop_top; ?>, w: <?php echo (int) $crop_right; ?>, h: <?php echo (int) $crop_bottom; ?>});
                 });
 
@@ -107 +108 @@
                 function showPreview(coords) {
                         if ( parseInt(coords.w) > 0 ) {
-                                var fw = <?php echo $full_width; ?>;
-                                var fh = <?php echo $full_height; ?>;
+                                var fw = <?php echo (int) $full_width; ?>;
+                                var fh = <?php echo (int) $full_height; ?>;
                                 var rx = fw / coords.w;
                                 var ry = fh / coords.h;
 
                                 jQuery( '#avatar-crop-preview' ).css({
-                                        width: Math.round(rx * <?php echo $image[0]; ?>) + 'px',
-                                        height: Math.round(ry * <?php echo $image[1]; ?>) + 'px',
+                                        width: Math.round(rx * <?php echo (int) $image[0]; ?>) + 'px',
+                                        height: Math.round(ry * <?php echo (int) $image[1]; ?>) + 'px',
                                         marginLeft: '-' + Math.round(rx * coords.x) + 'px',
                                         marginTop: '-' + Math.round(ry * coords.y) + 'px'