Skip to content

Feature/459 cropper2 #624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gruberroland merged 3 commits into from
Mar 20, 2026
Merged

Feature/459 cropper2 #624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1026518
#459 cropper 2 migration
gruberroland Sep 24, 2025
64e1c7e
#459 cropperjs update
gruberroland Mar 5, 2026
9041a18
#459 cropperjs update
gruberroland Mar 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lam/lib/html.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2695,6 +2695,8 @@ class htmlImage extends htmlElement {
echo '<input id="croppingDataY" type="hidden" name="croppingDataY" value="0"/>';
echo '<input id="croppingDataWidth" type="hidden" name="croppingDataWidth" value="0"/>';
echo '<input id="croppingDataHeight" type="hidden" name="croppingDataHeight" value="0"/>';
echo '<input id="croppingDataSelectionWidth" type="hidden" name="croppingDataSelectionWidth" value="0"/>';
echo '<input id="croppingDataSelectionHeight" type="hidden" name="croppingDataSelectionHeight" value="0"/>';
}
return [];
}
Expand Down
16 changes: 14 additions & 2 deletions lam/lib/modules/inetOrgPerson.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1620,7 +1620,13 @@ class inetOrgPerson extends baseModule implements passwordService, AccountStatus
try {
include_once __DIR__ . '/../imageutils.inc';
$imageManipulator = ImageManipulationFactory::getImageManipulator($this->attributes['jpegPhoto'][0]);
$imageManipulator->crop($_POST['croppingDataX'], $_POST['croppingDataY'], $_POST['croppingDataWidth'], $_POST['croppingDataHeight']);
$scaleFactor = $imageManipulator->getWidth() / intval($_POST['croppingDataWidth']);
$imageManipulator->crop(
(int) round(intval($_POST['croppingDataX']) * $scaleFactor),
(int) round(intval($_POST['croppingDataY']) * $scaleFactor),
(int) round($_POST['croppingDataSelectionWidth'] * $scaleFactor),
(int) round($_POST['croppingDataSelectionHeight'] * $scaleFactor)
);
$this->attributes['jpegPhoto'][0] = $imageManipulator->getImageData();
}
catch (Exception $e) {
Expand Down Expand Up @@ -3187,7 +3193,13 @@ class inetOrgPerson extends baseModule implements passwordService, AccountStatus
try {
include_once __DIR__ . '/../imageutils.inc';
$imageManipulator = ImageManipulationFactory::getImageManipulator($data);
$imageManipulator->crop($_POST['croppingDataX'], $_POST['croppingDataY'], $_POST['croppingDataWidth'], $_POST['croppingDataHeight']);
$scaleFactor = $imageManipulator->getWidth() / intval($_POST['croppingDataWidth']);
$imageManipulator->crop(
(int) round(intval($_POST['croppingDataX']) * $scaleFactor),
(int) round(intval($_POST['croppingDataY']) * $scaleFactor),
(int) round($_POST['croppingDataSelectionWidth'] * $scaleFactor),
(int) round($_POST['croppingDataSelectionHeight'] * $scaleFactor)
);
$data = $imageManipulator->getImageData();
$data = $this->resizeAndConvertImage($data, $moduleSettings);
if (!empty($moduleSettings['inetOrgPerson_jpegPhoto_maxSize'][0]) && ($moduleSettings['inetOrgPerson_jpegPhoto_maxSize'][0] < (strlen($data) / 1024))) {
Expand Down
16 changes: 14 additions & 2 deletions lam/lib/modules/windowsUser.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2524,7 +2524,13 @@ class windowsUser extends baseModule implements passwordService, AccountStatusPr
try {
include_once __DIR__ . '/../imageutils.inc';
$imageManipulator = ImageManipulationFactory::getImageManipulator($this->attributes['jpegPhoto'][0]);
$imageManipulator->crop($_POST['croppingDataX'], $_POST['croppingDataY'], $_POST['croppingDataWidth'], $_POST['croppingDataHeight']);
$scaleFactor = $imageManipulator->getWidth() / intval($_POST['croppingDataWidth']);
$imageManipulator->crop(
(int) round(intval($_POST['croppingDataX']) * $scaleFactor),
(int) round(intval($_POST['croppingDataY']) * $scaleFactor),
(int) round($_POST['croppingDataSelectionWidth'] * $scaleFactor),
(int) round($_POST['croppingDataSelectionHeight'] * $scaleFactor)
);
// resize if maximum values specified
if (!empty($this->moduleSettings['windowsUser_jpegPhoto_maxWidth'][0]) || !empty($this->moduleSettings['windowsUser_jpegPhoto_maxHeight'][0])) {
$maxWidth = empty($this->moduleSettings['windowsUser_jpegPhoto_maxWidth'][0]) ? $imageManipulator->getWidth() : $this->moduleSettings['windowsUser_jpegPhoto_maxWidth'][0];
Expand Down Expand Up @@ -2617,7 +2623,13 @@ class windowsUser extends baseModule implements passwordService, AccountStatusPr
try {
include_once __DIR__ . '/../imageutils.inc';
$imageManipulator = ImageManipulationFactory::getImageManipulator($this->attributes['thumbnailphoto'][0]);
$imageManipulator->crop($_POST['croppingDataX'], $_POST['croppingDataY'], $_POST['croppingDataWidth'], $_POST['croppingDataHeight']);
$scaleFactor = $imageManipulator->getWidth() / intval($_POST['croppingDataWidth']);
$imageManipulator->crop(
(int) round(intval($_POST['croppingDataX']) * $scaleFactor),
(int) round(intval($_POST['croppingDataY']) * $scaleFactor),
(int) round($_POST['croppingDataSelectionWidth'] * $scaleFactor),
(int) round($_POST['croppingDataSelectionHeight'] * $scaleFactor)
);
// resize if maximum values specified
if (!empty($this->moduleSettings['windowsUser_thumbnailphoto_maxWidth'][0]) || !empty($this->moduleSettings['windowsUser_thumbnailphoto_maxHeight'][0])) {
$maxWidth = empty($this->moduleSettings['windowsUser_thumbnailphoto_maxWidth'][0]) ? $imageManipulator->getWidth() : $this->moduleSettings['windowsUser_thumbnailphoto_maxWidth'][0];
Expand Down
4 changes: 4 additions & 0 deletions lam/style/500_layout.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1298,3 +1298,7 @@ div.whitepages-card-title {
font-weight: bold;
margin-bottom: 1rem;
}

cropper-canvas {
min-height: 300px;
}
309 changes: 0 additions & 309 deletions lam/style/600_cropper-1.6.2.css
View file
Open in desktop

This file was deleted.

Loading
Loading