Commit 8427b652 authored by Skia's avatar Skia
Browse files

Update convert path

parent 7922cb13
......@@ -68,9 +68,9 @@ if ( is_dir("/var/www/var/img") && $_REQUEST["action"] == "setplanning" )
else
{
$src = $_FILES['file']['tmp_name'];
exec(escapeshellcmd("/usr/share/php5/exec/convert $src -thumbnail 140x100 -quality 95 \"$dest_small\""));
exec(escapeshellcmd("/usr/share/php5/exec/convert $src -thumbnail 680x510 -quality 95 \"$dest_diapo\""));
exec(escapeshellcmd("/usr/share/php5/exec/convert $src -quality 95 \"$dest_full\""));
exec(escapeshellcmd("/usr/bin/convert $src -thumbnail 140x100 -quality 95 \"$dest_small\""));
exec(escapeshellcmd("/usr/bin/convert $src -thumbnail 680x510 -quality 95 \"$dest_diapo\""));
exec(escapeshellcmd("/usr/bin/convert $src -quality 95 \"$dest_full\""));
$cts->add_title(2,"Planning mis à jour");
$cts->add_paragraph("<p><img src=\"".$topdir."images/actions/done.png\">Le planning a été correctement mis à jour.</p>");
}
......@@ -132,9 +132,9 @@ if ( is_dir("/var/www/var/img") && $_REQUEST["action"] == "setweekly_photo" )
$dest_diapo = "/var/www/var/img/com/weekly_photo-diapo.jpg";
$dest_full = "/var/www/var/img/com/weekly_photo.jpg";
exec(escapeshellcmd("/usr/share/php5/exec/convert $src -thumbnail 140x100 -quality 95 \"$dest_small\""));
exec(escapeshellcmd("/usr/share/php5/exec/convert $src -thumbnail 680x510 -quality 95 \"$dest_diapo\""));
exec(escapeshellcmd("/usr/share/php5/exec/convert $src -quality 95 \"$dest_full\""));
exec(escapeshellcmd("/usr/bin/convert $src -thumbnail 140x100 -quality 95 \"$dest_small\""));
exec(escapeshellcmd("/usr/bin/convert $src -thumbnail 680x510 -quality 95 \"$dest_diapo\""));
exec(escapeshellcmd("/usr/bin/convert $src -quality 95 \"$dest_full\""));
$cts->add_title(2,"Photo de la semaine mis à jour");
$cts->add_paragraph("<p><img src=\"".$topdir."images/actions/done.png\">La photo de la semaine a été correctement mis à jour.</p>");
......
......@@ -99,7 +99,7 @@ if ( $_REQUEST["action"] == "generate" )
$src = "/var/www/ae2/data/img/logos/".$row['nom_unix_asso_gest'].".png";
$logo = "/var/www/ae2/data/img/logos/".$row['nom_unix_asso_gest'].".jpg";
if ( !file_exists($logo) && file_exists($src) )
exec(escapeshellcmd("/usr/share/php5/exec/convert $src -background white $logo"));
exec(escapeshellcmd("/usr/bin/convert $src -background white $logo"));
if ( !file_exists($logo) )
{
......@@ -107,7 +107,7 @@ if ( $_REQUEST["action"] == "generate" )
$logo = "/var/www/ae2/data/img/logos/".$row['nom_unix_asso_prop'].".jpg";
if ( !file_exists($logo) && file_exists($src) )
exec(escapeshellcmd("/usr/share/php5/exec/convert $src -background white $logo"));
exec(escapeshellcmd("/usr/bin/convert $src -background white $logo"));
}
if ( !file_exists($logo) )
......
......@@ -334,14 +334,14 @@ class dfile extends fs
if ( file_exists($f) )
unlink($f);
exec(escapeshellcmd("/usr/share/php5/exec/convert ".$this->get_real_filename()." -thumbnail 128x128 -quality 95 $f"));
exec(escapeshellcmd("/usr/bin/convert ".$this->get_real_filename()." -thumbnail 128x128 -quality 95 $f"));
$f = $this->get_screensize_filename();
if ( file_exists($f) )
unlink($f);
exec(escapeshellcmd("/usr/share/php5/exec/convert ".$this->get_real_filename()." -thumbnail 500x1000 -quality 95 $f"));
exec(escapeshellcmd("/usr/bin/convert ".$this->get_real_filename()." -thumbnail 500x1000 -quality 95 $f"));
}
}
......
......@@ -331,14 +331,14 @@ class newdfile extends fs
if ( file_exists($f) )
unlink($f);
exec(escapeshellcmd("/usr/share/php5/exec/convert ".$this->get_real_filename()." -thumbnail 128x128 -quality 95 $f"));
exec(escapeshellcmd("/usr/bin/convert ".$this->get_real_filename()." -thumbnail 128x128 -quality 95 $f"));
$f = $this->get_screensize_filename();
if ( file_exists($f) )
unlink($f);
exec(escapeshellcmd("/usr/share/php5/exec/convert ".$this->get_real_filename()." -thumbnail 500x1000 -quality 95 $f"));
exec(escapeshellcmd("/usr/bin/convert ".$this->get_real_filename()." -thumbnail 500x1000 -quality 95 $f"));
}
}
......
......@@ -75,9 +75,9 @@ if(isset($_POST['action'])
$id = $user->id;
if ($avatar)
exec(escapeshellcmd("/usr/share/php5/exec/convert ".OUTPUT_DIR.$f." -rotate ".$rotation." -thumbnail 225x300 /data/matmatronch/".$id.".jpg"));
exec(escapeshellcmd("/usr/bin/convert ".OUTPUT_DIR.$f." -rotate ".$rotation." -thumbnail 225x300 /data/matmatronch/".$id.".jpg"));
else
exec(escapeshellcmd("/usr/share/php5/exec/convert ".OUTPUT_DIR.$f." -rotate ".$rotation." -thumbnail 225x300 /data/matmatronch/".$id.".identity.jpg"));
exec(escapeshellcmd("/usr/bin/convert ".OUTPUT_DIR.$f." -rotate ".$rotation." -thumbnail 225x300 /data/matmatronch/".$id.".identity.jpg"));
}
}
// Delete temp img
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment