Skip to content
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

Image editor fixes - crop, resize, filter plugins #1489

Merged
merged 11 commits into from
Aug 21, 2023
Merged

Image editor fixes - crop, resize, filter plugins #1489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
18390e5
Call to an empty method was creating an error in the image editor
skenow Jun 10, 2023
af50282
Updating WideImage to v1.1.4 for PHP8 compatibility
skenow Jun 15, 2023
f870027
Changes needed in WideImage loading for the image editor
skenow Jun 15, 2023
1705137
Actually adding the new WideImage library and updating smarty plugin
skenow Jun 15, 2023
43c1368
The wideimage preload can be removed - the class autoloads
skenow Jun 15, 2023
99eb64a
Merge remote-tracking branch 'icms/1.5.x' into 1.5.x_PHP8_wideimage
skenow Jun 17, 2023
685caae
Merge remote-tracking branch 'icms/1.5.x' into 1.5.x_PHP8_wideimage
skenow Aug 19, 2023
2b2aef5
Fix fatal error in icms_random_str Fix #1488
skenow Aug 19, 2023
f87bec5
Add missing argument for strncmp - root cause of the image editor issue
skenow Aug 19, 2023
280a701
Adding missing line ending (;) - caused errors in parsing image editor
skenow Aug 19, 2023
52a585e
One more instance of a missing argument for strncnp
skenow Aug 20, 2023
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: 1 addition & 1 deletion htdocs/include/functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1785,7 +1785,7 @@ function icms_random_str($numchar){
$letras = "a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,x,w,y,z,1,2,3,4,5,6,7,8,9,0";
$array = explode(",", $letras);
shuffle($array);
$senha = implode($array, "");
$senha = implode($array);
return substr($senha, 0, $numchar);
}

Expand Down
2 changes: 1 addition & 1 deletion htdocs/libraries/image-editor/image-edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
if (!empty($op) && $op == 'cancel') {
/* make sure the file is in the temp folder and prevent arbitrary deletes of any file */
$valid_path = ICMS_IMANAGER_FOLDER_PATH . '/temp';
if (!empty($image_path) && strncmp(realpath($image_path), strlen($valid_path)) == 0) {
if (!empty($image_path) && strncmp(realpath($image_path), $image_path, strlen($valid_path)) == 0) {
$image_path = realpath($image_path);
} else {
$image_path = NULL;
Expand Down
2 changes: 1 addition & 1 deletion htdocs/libraries/image-editor/plugins/crop/crop_image.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

/* prevent remote file inclusion */
$valid_path = ICMS_IMANAGER_FOLDER_PATH . '/temp';
if (!empty($image_path) && strncmp(realpath($image_path), strlen($valid_path)) == 0) {
if (!empty($image_path) && strncmp(realpath($image_path), $image_path, strlen($valid_path)) == 0) {
$image_path = realpath($image_path);
} else {
$image_path = null;
Expand Down
Loading