Skip to content

Commit

Permalink
MDL-23202 gdlib api cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@skodak
skodak committed Jul 11, 2010
1 parent e88dd87 commit d08787a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 272 deletions.
16 changes: 7 additions & 9 deletions group/lib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,8 +299,6 @@ function groups_delete_group($grouporid) {
$DB->delete_records('groupings_groups', array('groupid'=>$groupid));
//delete members
$DB->delete_records('groups_members', array('groupid'=>$groupid));
//then imge
delete_profile_image($groupid, 'groups');
//group itself last
$DB->delete_records('groups', array('id'=>$groupid));

Expand Down Expand Up @@ -430,19 +428,16 @@ function groups_delete_groupings_groups($courseid, $showfeedback=false) {
*/
function groups_delete_groups($courseid, $showfeedback=false) {
global $CFG, $DB, $OUTPUT;
require_once($CFG->libdir.'/gdlib.php');

// delete any uses of groups
// Any associated files are deleted as part of groups_delete_groupings_groups
groups_delete_groupings_groups($courseid, $showfeedback);
groups_delete_group_members($courseid, 0, $showfeedback);

// delete group pictures
if ($groups = $DB->get_records('groups', array('courseid'=>$courseid))) {
foreach($groups as $group) {
delete_profile_image($group->id, 'groups');
}
}
// delete group pictures and descriptions
$context = get_context_instance(CONTEXT_COURSE, $courseid);
$fs = get_file_storage();
$fs->delete_area_files($context->id, 'group');

// delete group calendar events
$groupssql = "SELECT id FROM {groups} g WHERE g.courseid = ?";
Expand Down Expand Up @@ -473,6 +468,9 @@ function groups_delete_groups($courseid, $showfeedback=false) {
function groups_delete_groupings($courseid, $showfeedback=false) {
global $DB, $OUTPUT;

$context = get_context_instance(CONTEXT_COURSE, $courseid);
$fs = get_file_storage();

// delete any uses of groupings
$sql = "DELETE FROM {groupings_groups}
WHERE groupingid in (SELECT id FROM {groupings} g WHERE g.courseid = ?)";
Expand Down
263 changes: 0 additions & 263 deletions lib/gdlib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,65 +84,6 @@ function ImageCopyBicubic ($dst_img, $src_img, $dst_x, $dst_y, $src_x, $src_y, $
}
}

/**
* Delete profile images associated with user or group
*
* @global object
* @param int $id user or group id
* @param string $dir type of entity - 'groups' or 'users'
* @return boolean success
*/
function delete_profile_image($id, $dir='users') {
global $CFG;

//TODO: deprecate

require_once $CFG->libdir.'/filelib.php';
$location = $CFG->dataroot .'/'. $dir .'/'. $id;

if (file_exists($location)) {
return fulldelete($location);
}

return true;
}

/**
* Given an upload manager with the right settings, this function performs a virus scan, and then scales and crops
* it and saves it in the right place to be a "user" or "group" image.
*
* @global object
* @param int $id user or group id
* @param string $dir type of entity - groups, user, ...
* @return string $destination (profile image destination path) or false on error
*/
function create_profile_image_destination($id, $dir='user') {
global $CFG;

//TODO: deprecate

umask(0000);

if (!file_exists($CFG->dataroot .'/'. $dir)) {
if (!mkdir($CFG->dataroot .'/'. $dir, $CFG->directorypermissions)) {
return false;
}
}

if ($dir == 'user') {
$destination = make_user_directory($id, true);
} else {
$destination = "$CFG->dataroot/$dir/$id";
}

if (!file_exists($destination)) {
if (!make_upload_directory(str_replace($CFG->dataroot . '/', '', $destination))) {
return false;
}
}
return $destination;
}

/**
* Stores optimised icon images in icon file area
*
Expand Down Expand Up @@ -258,207 +199,3 @@ function process_new_icon($context, $component, $filearea, $itemid, $originalfil
return true;
}

/**
* Given an upload manager with the right settings, this function performs a virus scan, and then scales and crops
* it and saves it in the right place to be a "user" or "group" image.
*
* @param int $id user or group id
* @param object $userform with imagefile upload field
* @param string $dir type of entity - groups, user, ...
* @return boolean success
*/
function save_profile_image($id, $userform, $dir='user') {

//TODO: deprecate

$destination = create_profile_image_destination($id, $dir);
if ($destination === false) {
return false;
}

$filename = $userform->get_new_filename('imagefile');
$pathname = $destination.'/'.$filename;

if (!$userform->save_file('imagefile', $pathname, true)) {
return false;
}

return process_profile_image($pathname, $destination);
}

/**
* Given a path to an image file this function scales and crops it and saves it in
* the right place to be a "user" or "group" image.
*
* @global object
* @param string $originalfile the path of the original image file
* @param string $destination the final destination directory of the profile image
* @return boolean
*/
function process_profile_image($originalfile, $destination) {
global $CFG, $OUTPUT;

//TODO: deprecate

if(!(is_file($originalfile) && is_dir($destination))) {
return false;
}

if (empty($CFG->gdversion)) {
return false;
}

$imageinfo = GetImageSize($originalfile);

if (empty($imageinfo)) {
if (file_exists($originalfile)) {
unlink($originalfile);
}
return false;
}

$image->width = $imageinfo[0];
$image->height = $imageinfo[1];
$image->type = $imageinfo[2];

switch ($image->type) {
case IMAGETYPE_GIF:
if (function_exists('ImageCreateFromGIF')) {
$im = ImageCreateFromGIF($originalfile);
} else {
notice('GIF not supported on this server');
unlink($originalfile);
return false;
}
break;
case IMAGETYPE_JPEG:
if (function_exists('ImageCreateFromJPEG')) {
$im = ImageCreateFromJPEG($originalfile);
} else {
notice('JPEG not supported on this server');
unlink($originalfile);
return false;
}
break;
case IMAGETYPE_PNG:
if (function_exists('ImageCreateFromPNG')) {
$im = ImageCreateFromPNG($originalfile);
} else {
notice('PNG not supported on this server');
unlink($originalfile);
return false;
}
break;
default:
unlink($originalfile);
return false;
}

unlink($originalfile);

if (function_exists('ImageCreateTrueColor') and $CFG->gdversion >= 2) {
$im1 = ImageCreateTrueColor(100,100);
$im2 = ImageCreateTrueColor(35,35);
} else {
$im1 = ImageCreate(100,100);
$im2 = ImageCreate(35,35);
}

$cx = $image->width / 2;
$cy = $image->height / 2;

if ($image->width < $image->height) {
$half = floor($image->width / 2.0);
} else {
$half = floor($image->height / 2.0);
}

ImageCopyBicubic($im1, $im, 0, 0, $cx-$half, $cy-$half, 100, 100, $half*2, $half*2);
ImageCopyBicubic($im2, $im, 0, 0, $cx-$half, $cy-$half, 35, 35, $half*2, $half*2);

if (function_exists('ImageJpeg')) {
@touch($destination .'/f1.jpg'); // Helps in Safe mode
@touch($destination .'/f2.jpg'); // Helps in Safe mode
if (ImageJpeg($im1, $destination .'/f1.jpg', 90) and
ImageJpeg($im2, $destination .'/f2.jpg', 95) ) {
@chmod($destination .'/f1.jpg', 0666);
@chmod($destination .'/f2.jpg', 0666);
return 1;
}
} else {
echo $OUTPUT->notification('PHP has not been configured to support JPEG images. Please correct this.');
}
return 0;
}

/**
* Given a user id this function scales and crops the user images to remove
* the one pixel black border.
*
* @global object
* @param int $id
* @param string $dir
* @return boolean
*/
function upgrade_profile_image($id, $dir='users') {
global $CFG, $OUTPUT;

//TODO: deprecate

$im = ImageCreateFromJPEG($CFG->dataroot .'/'. $dir .'/'. $id .'/f1.jpg');

if (function_exists('ImageCreateTrueColor') and $CFG->gdversion >= 2) {
$im1 = ImageCreateTrueColor(100,100);
$im2 = ImageCreateTrueColor(35,35);
} else {
$im1 = ImageCreate(100,100);
$im2 = ImageCreate(35,35);
}

if (function_exists('ImageCopyResampled') and $CFG->gdversion >= 2) {
ImageCopyBicubic($im1, $im, 0, 0, 2, 2, 100, 100, 96, 96);
} else {
imagecopy($im1, $im, 0, 0, 0, 0, 100, 100);
$c = ImageColorsForIndex($im1,ImageColorAt($im1,2,2));
$color = ImageColorClosest ($im1, $c['red'], $c['green'], $c['blue']);
ImageSetPixel ($im1, 0, 0, $color);
$c = ImageColorsForIndex($im1,ImageColorAt($im1,2,97));
$color = ImageColorClosest ($im1, $c['red'], $c['green'], $c['blue']);
ImageSetPixel ($im1, 0, 99, $color);
$c = ImageColorsForIndex($im1,ImageColorAt($im1,97,2));
$color = ImageColorClosest ($im1, $c['red'], $c['green'], $c['blue']);
ImageSetPixel ($im1, 99, 0, $color);
$c = ImageColorsForIndex($im1,ImageColorAt($im1,97,97));
$color = ImageColorClosest ($im1, $c['red'], $c['green'], $c['blue']);
ImageSetPixel ($im1, 99, 99, $color);
for ($x = 1; $x < 99; $x++) {
$c1 = ImageColorsForIndex($im1,ImageColorAt($im,$x,1));
$color = ImageColorClosest ($im, $c1['red'], $c1['green'], $c1['blue']);
ImageSetPixel ($im1, $x, 0, $color);
$c2 = ImageColorsForIndex($im1,ImageColorAt($im1,$x,98));
$color = ImageColorClosest ($im, $c2['red'], $c2['green'], $c2['blue']);
ImageSetPixel ($im1, $x, 99, $color);
}
for ($y = 1; $y < 99; $y++) {
$c3 = ImageColorsForIndex($im1,ImageColorAt($im, 1, $y));
$color = ImageColorClosest ($im, $c3['red'], $c3['green'], $c3['blue']);
ImageSetPixel ($im1, 0, $y, $color);
$c4 = ImageColorsForIndex($im1,ImageColorAt($im1, 98, $y));
$color = ImageColorClosest ($im, $c4['red'], $c4['green'], $c4['blue']);
ImageSetPixel ($im1, 99, $y, $color);
}
}
ImageCopyBicubic($im2, $im, 0, 0, 2, 2, 35, 35, 96, 96);

if (function_exists('ImageJpeg')) {
if (ImageJpeg($im1, $CFG->dataroot .'/'. $dir .'/'. $id .'/f1.jpg', 90) and
ImageJpeg($im2, $CFG->dataroot .'/'. $dir .'/'. $id .'/f2.jpg', 95) ) {
@chmod($CFG->dataroot .'/'. $dir .'/'. $id .'/f1.jpg', 0666);
@chmod($CFG->dataroot .'/'. $dir .'/'. $id .'/f2.jpg', 0666);
return 1;
}
} else {
echo $OUTPUT->notification('PHP has not been configured to support JPEG images. Please correct this.');
}
return 0;
}

0 comments on commit d08787a

Please sign in to comment.