Хранилища Subversion ant

Сравнить редакции

Не учитывать пробелы Редакция 81 → Редакция 82

/trunk/process.php
38,9 → 38,9
 
$distlogo = 0;
if ($_FILES["distLOGO"]["type"]!=0) {
$folder = "./img/logo/".stripslashes($distua)."-orig.gif";
$folderN = "./img/logo/".stripslashes($distua).".gif";
$folderEM = "./img/logo/".stripslashes($distua)."-em.gif";
$folder = "./img/logo/".stripslashes($distua)."-orig.png";
$folderN = "./img/logo/".stripslashes($distua).".png";
$folderEM = "./img/logo/".stripslashes($distua)."-em.png";
if (move_uploaded_file($_FILES["distLOGO"]["tmp_name"],$folder)) {
chmod($folder, 0644);
list($width, $height) = GetImageSize($folder);
49,10 → 49,10
$newheight = $height * $percent;
$output = ImageCreateTrueColor($newwidth, $newheight);
$source = ImageCreateFromGIF($folder);
$source = ImageCreateFromPNG($folder);
 
ImageCopyResized($output, $source, 0, 0, 0, 0, $newwidth, $newheight, $width, $height);
ImageGIF($output, $folderEM);
ImagePNG($output, $folderEM);
 
$percent = 15/$height;
$newwidth = $width * $percent;
61,7 → 61,7
$output = ImageCreateTrueColor($newwidth, $newheight);
 
ImageCopyResized($output, $source, 0, 0, 0, 0, $newwidth, $newheight, $width, $height);
ImageGIF($output, $folderN);
ImagePNG($output, $folderN);
 
unlink($folder);
$distlogo = 1;
79,9 → 79,9
$distID = abs(intval($_POST["distID"]));
 
if ($_FILES["distLOGO"]["type"]!=0) {
$folder = "./img/logo/".stripslashes($distua)."-orig.gif";
$folderN = "./img/logo/".stripslashes($distua).".gif";
$folderEM = "./img/logo/".stripslashes($distua)."-em.gif";
$folder = "./img/logo/".stripslashes($distua)."-orig.png";
$folderN = "./img/logo/".stripslashes($distua).".png";
$folderEM = "./img/logo/".stripslashes($distua)."-em.png";
if (move_uploaded_file($_FILES["distLOGO"]["tmp_name"],$folder)) {
chmod ($folder, 0644);
list($width, $height) = GetImageSize($folder);
90,10 → 90,10
$newheight = $height * $percent;
 
$output = ImageCreateTrueColor($newwidth, $newheight);
$source = ImageCreateFromGIF($folder);
$source = ImageCreateFromPNG($folder);
 
ImageCopyResized($output, $source, 0, 0, 0, 0, $newwidth, $newheight, $width, $height);
ImageGIF($output, $folderEM);
ImagePNG($output, $folderEM);
 
$percent = 15/$height;
$newwidth = $width * $percent;
102,7 → 102,7
$output = ImageCreateTrueColor($newwidth, $newheight);
 
ImageCopyResized($output, $source, 0, 0, 0, 0, $newwidth, $newheight, $width, $height);
ImageGIF($output, $folderN);
ImagePNG($output, $folderN);
 
unlink($folder);
 
/trunk/lib/core.php
93,8 → 93,8
if ($req->numRows()>0) {
while ($req->fetchInto($dist, DB_FETCHMODE_ASSOC)) {
if ($dist["distlogo"]) {
$css .= ".".stripslashes($dist["distua"])." { display: inline; padding-left: 15px; background: transparent url(./img/logo/".$dist["distua"].".gif) top left no-repeat; }\n";
$css .= ".".stripslashes($dist["distua"])."-em { display: inline; padding-left: 32px; background: transparent url(./img/logo/".stripslashes($dist["distua"])."-em.gif) top left no-repeat; }\n";
$css .= ".".stripslashes($dist["distua"])." { display: inline; padding-left: 15px; background: transparent url(./img/logo/".$dist["distua"].".png) top left no-repeat; }\n";
$css .= ".".stripslashes($dist["distua"])."-em { display: inline; padding-left: 32px; background: transparent url(./img/logo/".stripslashes($dist["distua"])."-em.png) top left no-repeat; }\n";
} else {
$css .= "";
}