mgallery: mgtool.php annotate

annotate mgtool.php @ 262:3c9ce1ad3c45

Fix gmagick/imagick checking.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sun, 16 Dec 2018 16:53:48 +0200
parents	32c13f594e39
children	745af791367d

rev	line source
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1 #!/usr/bin/php
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2 <?php
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3 //
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	4 // Yet Another Image Gallery
69 7777887bc515 Update header/copyright blurbs. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	5 // -- Commandline tool for creating / updating gallery
7777887bc515 Update header/copyright blurbs. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	6 // Programmed and designed by Matti 'ccr' Hamalainen <ccr@tnsp.org>
161 458c2d6637b1 Bump copyright years. Matti Hamalainen <ccr@tnsp.org> parents: 160 diff changeset	7 // (C) Copyright 2015-2018 Tecnic Software productions (TNSP)
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	8 //
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	9 require_once "mgallery.inc.php";
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	10
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	11 //
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	12 // Array for specifying what will be copied and converted
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	13 // from the image file's EXIF information tag(s).
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	14 //
45 d555734526d6 Use newer PHP array syntax. Matti Hamalainen <ccr@tnsp.org> parents: 37 diff changeset	15 $galExifConversions =
d555734526d6 Use newer PHP array syntax. Matti Hamalainen <ccr@tnsp.org> parents: 37 diff changeset	16 [
124 eac2cf04261a Change how date timestamps are stored and handled. This breaks cache file Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	17 [ MG_STR, "caption" , "ImageDescription" ],
eac2cf04261a Change how date timestamps are stored and handled. This breaks cache file Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	18 [ MG_STR, "copyright" , "Copyright" ],
eac2cf04261a Change how date timestamps are stored and handled. This breaks cache file Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	19 [ MG_STR, "model" , "Model" ],
eac2cf04261a Change how date timestamps are stored and handled. This breaks cache file Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	20 [ MG_INT, "width" , ["COMPUTED", "Width"] ],
eac2cf04261a Change how date timestamps are stored and handled. This breaks cache file Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	21 [ MG_INT, "height" , ["COMPUTED", "Height"] ],
eac2cf04261a Change how date timestamps are stored and handled. This breaks cache file Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	22 [ MG_DVA, "fnumber" , "FNumber" ],
eac2cf04261a Change how date timestamps are stored and handled. This breaks cache file Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	23 [ MG_DVA, "exposure" , "ExposureTime" ],
eac2cf04261a Change how date timestamps are stored and handled. This breaks cache file Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	24 [ MG_INT, "iso" , "ISOSpeedRatings" ],
eac2cf04261a Change how date timestamps are stored and handled. This breaks cache file Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	25 [ MG_STR, "lensmodel" , "UndefinedTag:0xA434" ],
eac2cf04261a Change how date timestamps are stored and handled. This breaks cache file Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	26 [ MG_DVA, "focallength" , "FocalLength" ],
eac2cf04261a Change how date timestamps are stored and handled. This breaks cache file Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	27 [ MG_DATE, "datetime" , "DateTimeOriginal" ],
eac2cf04261a Change how date timestamps are stored and handled. This breaks cache file Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	28 [ MG_DATE, "datetime" , "DateTimeDigitized" ],
eac2cf04261a Change how date timestamps are stored and handled. This breaks cache file Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	29 [ MG_INT, "filesize" , "FileSize" ],
45 d555734526d6 Use newer PHP array syntax. Matti Hamalainen <ccr@tnsp.org> parents: 37 diff changeset	30 ];
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	31
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	32 define("GCMD_UPDATE" , 1);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	33 define("GCMD_RESCAN" , 2);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	34 define("GCMD_CLEAN" , 3);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	35
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	36 define("GCLEAN_CACHES" , 0x01);
251 19dab8b0c340 Remove clean command suboptions 'thumbnails' and 'mediums' and replace them with 'images'. Matti Hamalainen <ccr@tnsp.org> parents: 250 diff changeset	37 define("GCLEAN_IMAGES" , 0x02);
256 6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	38 define("GCLEAN_TRASH" , 0x04);
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	39 define("GCLEAN_ALL" , 0x0f);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	40
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	41 define("GUPD_MED_IMAGE" , 0x01);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	42 define("GUPD_TN_IMAGE" , 0x02);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	43 define("GUPD_IMAGES" , 0x0f);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	44 define("GUPD_EXIF_INFO" , 0x10);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	45 define("GUPD_CAPTION" , 0x20);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	46
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	47
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	48 //
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	49 // Convert and scale image file function, for generating
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	50 // the intermediate size images and thumbnails. Uses the
261 32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	51 // PHP ImageMagick or GraphicsMagick bindings.
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	52 //
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	53 function mgConvertImage($inFilename, $outFilename, $outDim, $outFormat, $outQuality, $thumb)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	54 {
262 3c9ce1ad3c45 Fix gmagick/imagick checking. Matti Hamalainen <ccr@tnsp.org> parents: 261 diff changeset	55 if (extension_loaded("imagick") && extension_loaded("gmagick"))
53 4c0a08b0ef65 Handle ImageMagick exceptions for loading input images. Matti Hamalainen <ccr@tnsp.org> parents: 52 diff changeset	56 {
262 3c9ce1ad3c45 Fix gmagick/imagick checking. Matti Hamalainen <ccr@tnsp.org> parents: 261 diff changeset	57 mgError("FATAL ERROR! Both ImageMagick AND GraphicsMagick modules enabled in PHP! This will cause problems! Refusing to work.\n");
3c9ce1ad3c45 Fix gmagick/imagick checking. Matti Hamalainen <ccr@tnsp.org> parents: 261 diff changeset	58 exit(1);
53 4c0a08b0ef65 Handle ImageMagick exceptions for loading input images. Matti Hamalainen <ccr@tnsp.org> parents: 52 diff changeset	59 }
4c0a08b0ef65 Handle ImageMagick exceptions for loading input images. Matti Hamalainen <ccr@tnsp.org> parents: 52 diff changeset	60
261 32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	61 if (extension_loaded("imagick"))
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	62 {
261 32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	63 // Create conversion entity
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	64 try
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	65 {
261 32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	66 $img = new Imagick($inFilename);
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	67 }
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	68 catch (Exception $e)
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	69 {
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	70 return mgError("ImageMagick exception for file '".$inFilename."':\n".$e->getMessage()."\n");
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	71 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	72
261 32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	73 if ($img === FALSE)
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	74 return mgError("ImageMagick could not digest '".$inFilename."'.\n");
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	75
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	76 $profiles = $img->getImageProfiles("icc", true);
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	77 $img->setImageDepth(16);
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	78 $img->transformImageColorspace(Imagick::COLORSPACE_SRGB);
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	79 $img->setImageColorspace(Imagick::COLORSPACE_SRGB);
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	80
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	81 if ($outDim !== FALSE)
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	82 {
261 32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	83 // Get dimensions, setup background
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	84 $dim = $img->getImageGeometry();
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	85 $img->setGravity(imagick::GRAVITY_CENTER);
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	86
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	87 if ($dim["width"] < $dim["height"])
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	88 {
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	89 $stmp = $outDim[0];
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	90 $outDim[0] = $outDim[1];
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	91 $outDim[1] = $stmp;
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	92 }
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	93
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	94 if ($dim["width"] != $outDim[0] \|\| $dim["height"] != $outDim[1])
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	95 {
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	96 $outDim[1] = ($dim["height"] * $outDim[0]) / $dim["width"];
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	97 }
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	98
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	99 // Act based on image size vs. desired size and $thumb mode
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	100 if ($thumb \|\| $dim["width"] != $outDim[0] \|\| $dim["height"] != $outDim[1])
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	101 {
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	102 $img->resizeImage($outDim[0], $outDim[1], Imagick::FILTER_LANCZOS, 1);
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	103 $img->setImageExtent($outDim[0], $outDim[1]);
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	104 $img->unsharpMaskImage(0, 0.5, 1, 0.05);
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	105 }
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	106 }
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	107
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	108 $img->setImageDepth(8);
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	109 $tfmt = strtolower($outFormat);
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	110 switch ($tfmt)
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	111 {
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	112 case "jpeg":
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	113 $img->setFormat("JPEG");
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	114 $img->setImageCompression(Imagick::COMPRESSION_JPEG);
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	115 break;
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	116
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	117 case "webp":
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	118 $img->setFormat("WEBP");
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	119 $img->setOption('webp:method', '6');
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	120 break;
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	121
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	122 default:
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	123 return mgError("Unsupported MGallery med/tn format '".$tfmt."'.\n");
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	124 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	125
261 32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	126 $img->setImageCompressionQuality($outQuality);
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	127
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	128 $img->stripImage();
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	129 if (!empty($profiles))
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	130 $img->profileImage("icc", $profiles["icc"]);
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	131
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	132 $img->writeImage($outFilename);
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	133 $img->removeImage();
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	134 }
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	135 else
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	136 if (extension_loaded("gmagick"))
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	137 {
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	138 // Create conversion entity
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	139 try
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	140 {
261 32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	141 $img = new Gmagick($inFilename);
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	142 }
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	143 catch (Exception $e)
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	144 {
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	145 return mgError("GraphicsMagick exception for file '".$inFilename."':\n".$e->getMessage()."\n");
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	146 }
261 32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	147
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	148 if ($img === FALSE)
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	149 return mgError("GraphicsMagick could not digest '".$inFilename."'.\n");
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	150
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	151 // $profiles = $img->getImageProfile("icc");
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	152 // $img->setImageDepth(16);
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	153 // $img->setImageColorspace(Gmagick::COLORSPACE_SRGB);
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	154
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	155 if ($outDim !== FALSE)
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	156 {
261 32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	157 // Get dimensions, setup background
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	158 $dim = $img->getImageGeometry();
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	159 //$img->setGravity(Gmagick::GRAVITY_CENTER);
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	160
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	161 if ($dim["width"] < $dim["height"])
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	162 {
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	163 $stmp = $outDim[0];
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	164 $outDim[0] = $outDim[1];
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	165 $outDim[1] = $stmp;
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	166 }
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	167
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	168 if ($dim["width"] != $outDim[0] \|\| $dim["height"] != $outDim[1])
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	169 {
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	170 $outDim[1] = ($dim["height"] * $outDim[0]) / $dim["width"];
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	171 }
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	172
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	173 // Act based on image size vs. desired size and $thumb mode
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	174 if ($thumb \|\| $dim["width"] != $outDim[0] \|\| $dim["height"] != $outDim[1])
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	175 {
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	176 $img->resizeImage($outDim[0], $outDim[1], Gmagick::FILTER_LANCZOS, 1);
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	177 //$img->setImageExtent($outDim[0], $outDim[1]);
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	178 //$img->unsharpMaskImage(0, 0.5, 1, 0.05);
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	179 }
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	180 }
261 32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	181
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	182 $img->setImageDepth(8);
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	183 $tfmt = strtolower($outFormat);
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	184 switch ($tfmt)
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	185 {
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	186 case "jpeg":
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	187 $img->setFormat("JPEG");
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	188 $img->setImageCompression(Gmagick::COMPRESSION_JPEG);
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	189 break;
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	190
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	191 case "webp":
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	192 $img->setFormat("WEBP");
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	193 // $img->setOption('webp:method', '6');
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	194 break;
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	195
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	196 default:
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	197 return mgError("Unsupported MGallery med/tn format '".$tfmt."'.\n");
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	198 }
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	199
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	200 $img->setCompressionQuality($outQuality);
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	201
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	202 $img->stripImage();
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	203 // if (!empty($profiles))
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	204 // $img->profileImage("icc", $profiles);
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	205
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	206 $img->writeImage($outFilename);
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	207 $img->removeImage();
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	208 }
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	209 else
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	210 {
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	211 return mgError("No ImageMagick OR GraphicsMagick module in PHP!\n");
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	212 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	213
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	214 return TRUE;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	215 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	216
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	217
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	218 //
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	219 // Converts one value (mainly from EXIF tag information)
52 5fbc443be538 Typofix. Matti Hamalainen <ccr@tnsp.org> parents: 51 diff changeset	220 // by doing explicit type casting and special conversions.
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	221 //
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	222 function mgConvertExifData($val, $vtype)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	223 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	224 switch ($vtype)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	225 {
46 e58292065b01 Let arrays through mgConvertExifData() when the type is MG_STR without Matti Hamalainen <ccr@tnsp.org> parents: 45 diff changeset	226 case MG_STR: return is_array($val) ? $val : (string) $val;
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	227 case MG_INT: return intval($val);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	228 case MG_BOOL: return intval($val);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	229 case MG_DVA:
223 438277861f51 Implement better interpretation of DVA values (exposure times, for example), Matti Hamalainen <ccr@tnsp.org> parents: 189 diff changeset	230 if (sscanf($val, "%d/%d", $v1, $v2) == 2 && $v2 != 0 && $v1 != 0)
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	231 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	232 if ($v1 < $v2)
249 abcd21b01829 Use floating point formatting for certain DVA values. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	233 return sprintf("1/%1.1f", $v2 / $v1);
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	234 else
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	235 return sprintf("%1.1f", $v1 / $v2);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	236 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	237 else
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	238 return $val;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	239
124 eac2cf04261a Change how date timestamps are stored and handled. This breaks cache file Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	240 case MG_DATE:
eac2cf04261a Change how date timestamps are stored and handled. This breaks cache file Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	241 return date_timestamp_get(date_create_from_format("Y:m:d H:i:s", $val));
eac2cf04261a Change how date timestamps are stored and handled. This breaks cache file Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	242
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	243 default:
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	244 return $val;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	245 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	246 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	247
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	248
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	249 //
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	250 // Conditionally copies one "field" from an associated array/hash to another.
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	251 // If destination is already SET, nothing will be done. If source does
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	252 // not exist (e.g. one or more of the keys do not exist in source array),
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	253 // a default value will be used, if provided.
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	254 // Source may have multi-depth keys, destination has one key.
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	255 //
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	256 function mgCopyEntryData(&$dst, $src, $vtype, $dkey, $skeys, $default = NULL)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	257 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	258 // Is destination already set?
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	259 if (isset($dst[$dkey]))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	260 return FALSE;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	261
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	262 // If input key is not array, change it into one
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	263 if (!is_array($skeys))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	264 $skeys = array($skeys);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	265
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	266 // Traverse input array by using consequent keys
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	267 $tmp = &$src;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	268 foreach ($skeys as $skey)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	269 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	270 if (!array_key_exists($skey, $tmp))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	271 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	272 // Key didn't exist, try for default
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	273 if ($default !== NULL)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	274 $dst[$dkey] = $default;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	275 return FALSE;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	276 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	277 else
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	278 $tmp = &$tmp[$skey];
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	279 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	280
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	281 // Optionally convert the input value
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	282 $dst[$dkey] = mgConvertExifData($tmp, $vtype);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	283 return TRUE;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	284 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	285
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	286
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	287 //
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	288 // Attempt to get gallery album data from various sources.
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	289 //
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	290 function mgGetAlbumData($galBasePath, $galPath)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	291 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	292 // Check path permissions
60 ef9f17280372 Use modern PHP array definition in some places. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	293 $galData = [];
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	294 if (is_readable($galPath))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	295 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	296 // First, try to read gallery/album info file
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	297 $filename = mgGetPath($galPath, "info_file");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	298 if ($filename !== FALSE && file_exists($filename))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	299 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	300 mgDebug("Reading INFOFILE: ".$filename."\n");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	301 if (($galData = parse_ini_file($filename, FALSE)) === FALSE)
60 ef9f17280372 Use modern PHP array definition in some places. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	302 $galData = [];
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	303 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	304
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	305 // Read header file, if any, and we don't have "header" field set yet
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	306 $filename = mgGetPath($galPath, "header_file");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	307 if ($filename !== FALSE && file_exists($filename) &&
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	308 !isset($galData["header"]))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	309 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	310 mgDebug("Reading HEADERFILE: ".$filename."\n");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	311 $galData["header"] = file_get_contents($filename);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	312 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	313
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	314 // Check for alternate key/values for album title/caption
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	315 if (isset($galData["title"]) && !isset($galData["caption"]))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	316 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	317 $galData["caption"] = $galData["title"];
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	318 unset($galData["title"]);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	319 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	320 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	321 else
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	322 $galData["hide"] = TRUE;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	323
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	324 // If caption is not set, use last path component for
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	325 // a fallback value in case we don't discover proper title
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	326 // from other sources we can't check here yet.
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	327 $path = explode("/", $galPath);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	328 $galData["fallback_caption"] = ucfirst(str_replace("_", " ", end($path)));
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	329
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	330 // Last, store the current gallery path
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	331 $len = strlen($galBasePath);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	332 if ($len < strlen($galPath) && substr($galPath, 0, $len) == $galBasePath)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	333 $galData["path"] = substr($galPath, $len);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	334 else
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	335 $galData["path"] = "";
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	336
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	337 return $galData;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	338 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	339
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	340
165 da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	341 //
da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	342 // Parse a simple image captions file, with format of one entry per line.
da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	343 // Lines starting with "# " are comments (note the whitespace), empty lines ignored.
da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	344 // First continuous non-whitespace text is file/dirname, followed
da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	345 // by caption text, which is separate with whitespace from the filename.
da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	346 // Filenames starting with # will be made hidden entries.
da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	347 // Filenames starging with % will hide contents.
da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	348 //
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	349 function mgReadCaptionsFile($galBasePath, $galPath)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	350 {
60 ef9f17280372 Use modern PHP array definition in some places. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	351 $captions = [];
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	352 $filename = mgGetPath($galPath, "captions_file");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	353 if ($filename === FALSE \|\| ($fp = @fopen($filename, "rb")) === FALSE)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	354 return $captions;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	355
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	356 mgDebug("Reading CAPTIONS: ".$filename."\n");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	357
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	358 // Read and parse data
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	359 while (!feof($fp))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	360 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	361 $str = trim(fgets($fp));
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	362 // Ignore comments and empty lines
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	363 if ($str != "#" && $str != "")
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	364 {
11 0b097770061d Improve content hiding functionality. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	365 if (preg_match("/^([#%]?)\s*(\S+?)\s+(.+)$/", $str, $m))
45 d555734526d6 Use newer PHP array syntax. Matti Hamalainen <ccr@tnsp.org> parents: 37 diff changeset	366 $captions[$m[2]] = ["caption" => $m[3], "hide" => ($m[1] == "#"), "hide_contents" => ($m[1] == "%"), "used" => FALSE];
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	367 else
11 0b097770061d Improve content hiding functionality. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	368 if (preg_match("/^([#%]?)\s*(\S+?)$/", $str, $m))
45 d555734526d6 Use newer PHP array syntax. Matti Hamalainen <ccr@tnsp.org> parents: 37 diff changeset	369 $captions[$m[2]] = ["hide" => ($m[1] == "#"), "hide_contents" => ($m[1] == "%"), "used" => FALSE];
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	370 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	371 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	372
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	373 fclose($fp);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	374 return $captions;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	375 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	376
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	377
165 da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	378 //
da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	379 // Create directory with specified permissions
da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	380 //
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	381 function mgMakeDir($path, $perm)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	382 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	383 if (!file_exists($path))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	384 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	385 if (mkdir($path, $perm, TRUE) === false)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	386 return mgError("Could not create directory '".$path."'\n");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	387 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	388 return TRUE;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	389 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	390
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	391
165 da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	392 //
da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	393 // Print a simple yes/no prompt with given message
da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	394 // and default value.
da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	395 //
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	396 function mgYesNoPrompt($msg, $default = FALSE)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	397 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	398 echo $msg." [".($default ? "Y/n" : "y/N")."]? ";
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	399 $sprompt = strtolower(trim(fgets(STDIN)));
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	400
166 d8387b48b08d Improve yes/no prompt check. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	401 if ($sprompt == "")
d8387b48b08d Improve yes/no prompt check. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	402 return $default;
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	403 else
165 da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	404 return $sprompt[0] == 'y';
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	405 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	406
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	407
165 da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	408 //
182 c0439644da6a Clarify a comment. Matti Hamalainen <ccr@tnsp.org> parents: 166 diff changeset	409 // Delete given directory OR file, recursively
165 da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	410 //
183 74889db8e6a2 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	411 function mgDelete($path, $showFiles)
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	412 {
56 7384504d7b52 Do not prompt for deletion in cleanup if there are no files/directories to delete. Matti Hamalainen <ccr@tnsp.org> parents: 55 diff changeset	413 global $flagDoDelete, $countDoDelete;
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	414 if (is_dir($path))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	415 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	416 if (($dirHandle = @opendir($path)) === FALSE)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	417 return mgError("Could not read directory '".$path."'.\n");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	418
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	419 while (($dirFile = @readdir($dirHandle)) !== FALSE)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	420 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	421 if ($dirFile != "." && $dirFile != "..")
183 74889db8e6a2 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	422 mgDelete($path."/".$dirFile, $showFiles);
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	423 }
183 74889db8e6a2 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	424
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	425 closedir($dirHandle);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	426
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	427 echo " - ".$path." [DIR]\n";
62 3f60a5f5b4b3 Actually fix checking for files to be deleted to work. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	428 $countDoDelete++;
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	429 if ($flagDoDelete)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	430 rmdir($path);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	431 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	432 else
54 624c50e1b52d Fix 'mgtool clean' to not attempt deleting files that do not exist. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	433 if (file_exists($path))
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	434 {
183 74889db8e6a2 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	435 if ($showFiles)
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	436 echo " - ".$path."\n";
56 7384504d7b52 Do not prompt for deletion in cleanup if there are no files/directories to delete. Matti Hamalainen <ccr@tnsp.org> parents: 55 diff changeset	437
62 3f60a5f5b4b3 Actually fix checking for files to be deleted to work. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	438 $countDoDelete++;
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	439 if ($flagDoDelete)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	440 unlink($path);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	441 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	442 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	443
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	444
256 6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	445 function mgDeleteConditional($path, &$noDelete)
255 d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	446 {
256 6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	447 global $flagDoDelete, $countDoDelete;
255 d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	448 if (is_dir($path))
d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	449 {
d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	450 if (($dirHandle = @opendir($path)) === FALSE)
d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	451 return mgError("Could not read directory '".$path."'.\n");
d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	452
d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	453 while (($dirFile = @readdir($dirHandle)) !== FALSE)
d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	454 {
d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	455 if ($dirFile != "." && $dirFile != "..")
256 6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	456 mgDeleteConditional($path."/".$dirFile, $noDelete);
255 d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	457 }
d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	458
d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	459 closedir($dirHandle);
d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	460
d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	461 if (!array_key_exists($path, $noDelete))
d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	462 {
256 6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	463 $countDoDelete++;
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	464 if ($flagDoDelete)
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	465 rmdir($path);
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	466 else
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	467 echo "DEL DIR '".$path."'\n";
255 d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	468 }
d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	469 }
d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	470 else
d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	471 if (file_exists($path) && !array_key_exists($path, $noDelete))
d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	472 {
256 6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	473 $countDoDelete++;
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	474 if ($flagDoDelete)
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	475 unlink($path);
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	476 else
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	477 echo "DEL FILE '".$path."'\n";
255 d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	478 }
d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	479 }
d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	480
d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	481
165 da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	482 //
da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	483 // Check if we have received the quit signal
da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	484 // and if yes, quit cleanly now.
da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	485 //
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	486 function mgCheckQuit($now = FALSE)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	487 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	488 global $flagQuit;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	489
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	490 // Dispatch pending signals
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	491 pcntl_signal_dispatch();
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	492
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	493 // Check result
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	494 if ($now && $flagQuit)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	495 mgFatal("Quitting.\n");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	496
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	497 return $flagQuit;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	498 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	499
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	500
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	501 function mgNeedUpdate($entry, $field, $cvalue)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	502 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	503 if (!array_key_exists($field, $entry))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	504 return TRUE;
80 121613e40d87 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	505
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	506 return ($entry[$field] < $cvalue);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	507 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	508
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	509
30 f2c21a8b9071 Sort images in a folder by their capture timestamp. Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	510 function mgSortFunc($a, $b)
f2c21a8b9071 Sort images in a folder by their capture timestamp. Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	511 {
f2c21a8b9071 Sort images in a folder by their capture timestamp. Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	512 if (isset($a["datetime"]) && isset($b["datetime"]))
124 eac2cf04261a Change how date timestamps are stored and handled. This breaks cache file Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	513 return $b["datetime"] - $a["datetime"];
30 f2c21a8b9071 Sort images in a folder by their capture timestamp. Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	514 else
108 417cdd9f8864 Use image file base name for sorting if timestamps are not available. Matti Hamalainen <ccr@tnsp.org> parents: 80 diff changeset	515 if (isset($a["base"]) && isset($b["base"]))
417cdd9f8864 Use image file base name for sorting if timestamps are not available. Matti Hamalainen <ccr@tnsp.org> parents: 80 diff changeset	516 return strcmp($b["base"], $a["base"]);
417cdd9f8864 Use image file base name for sorting if timestamps are not available. Matti Hamalainen <ccr@tnsp.org> parents: 80 diff changeset	517 else
30 f2c21a8b9071 Sort images in a folder by their capture timestamp. Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	518 return 0;
f2c21a8b9071 Sort images in a folder by their capture timestamp. Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	519 }
f2c21a8b9071 Sort images in a folder by their capture timestamp. Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	520
f2c21a8b9071 Sort images in a folder by their capture timestamp. Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	521
16 3491ab93630e Add sub-gallery thumbnails to gallery cache data. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	522 function mgWriteGalleryCache($cacheFilename, &$gallery, &$entries, &$parentEntry)
15 805f93962cf9 Factorize gallery cache file writing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	523 {
805f93962cf9 Factorize gallery cache file writing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	524 // Store gallery cache for this directory
60 ef9f17280372 Use modern PHP array definition in some places. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	525 $images = [];
ef9f17280372 Use modern PHP array definition in some places. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	526 $albums = [];
61 ee82f7c8d44c Do not include hidden entries in the entry list. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	527 $output = [];
60 ef9f17280372 Use modern PHP array definition in some places. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	528
64 9a01e14b27ef Implement hide_contents setting for galleries, which hides contents of an album. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	529 // If we are hiding contents of an album, generate no data
9a01e14b27ef Implement hide_contents setting for galleries, which hides contents of an album. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	530 if (!$parentEntry["hide_contents"])
15 805f93962cf9 Factorize gallery cache file writing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	531 {
64 9a01e14b27ef Implement hide_contents setting for galleries, which hides contents of an album. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	532 foreach ($entries as $ename => &$edata)
9a01e14b27ef Implement hide_contents setting for galleries, which hides contents of an album. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	533 {
9a01e14b27ef Implement hide_contents setting for galleries, which hides contents of an album. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	534 if ($edata["hide"])
9a01e14b27ef Implement hide_contents setting for galleries, which hides contents of an album. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	535 continue;
15 805f93962cf9 Factorize gallery cache file writing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	536
64 9a01e14b27ef Implement hide_contents setting for galleries, which hides contents of an album. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	537 unset($edata["hide"]);
9a01e14b27ef Implement hide_contents setting for galleries, which hides contents of an album. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	538 if ($edata["type"] == 0)
9a01e14b27ef Implement hide_contents setting for galleries, which hides contents of an album. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	539 $images[$ename] = &$edata;
9a01e14b27ef Implement hide_contents setting for galleries, which hides contents of an album. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	540 else
9a01e14b27ef Implement hide_contents setting for galleries, which hides contents of an album. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	541 $albums[$ename] = &$edata;
61 ee82f7c8d44c Do not include hidden entries in the entry list. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	542
64 9a01e14b27ef Implement hide_contents setting for galleries, which hides contents of an album. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	543 $output[$ename] = &$edata;
9a01e14b27ef Implement hide_contents setting for galleries, which hides contents of an album. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	544 }
30 f2c21a8b9071 Sort images in a folder by their capture timestamp. Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	545
64 9a01e14b27ef Implement hide_contents setting for galleries, which hides contents of an album. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	546 uasort($images, "mgSortFunc");
9a01e14b27ef Implement hide_contents setting for galleries, which hides contents of an album. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	547 krsort($albums);
15 805f93962cf9 Factorize gallery cache file writing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	548
64 9a01e14b27ef Implement hide_contents setting for galleries, which hides contents of an album. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	549 // Choose gallery album image
9a01e14b27ef Implement hide_contents setting for galleries, which hides contents of an album. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	550 if (count($images) > 0)
9a01e14b27ef Implement hide_contents setting for galleries, which hides contents of an album. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	551 {
79 8d8b361a76af Allow setting "albumpic" in gallery.info for each album, e.g. forced album cover picture. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	552 if (isset($gallery["albumpic"]) &&
8d8b361a76af Allow setting "albumpic" in gallery.info for each album, e.g. forced album cover picture. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	553 isset($images[$gallery["albumpic"]]))
8d8b361a76af Allow setting "albumpic" in gallery.info for each album, e.g. forced album cover picture. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	554 {
8d8b361a76af Allow setting "albumpic" in gallery.info for each album, e.g. forced album cover picture. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	555 $parentEntry["image"] = $gallery["albumpic"];
8d8b361a76af Allow setting "albumpic" in gallery.info for each album, e.g. forced album cover picture. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	556 }
8d8b361a76af Allow setting "albumpic" in gallery.info for each album, e.g. forced album cover picture. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	557 else
8d8b361a76af Allow setting "albumpic" in gallery.info for each album, e.g. forced album cover picture. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	558 {
8d8b361a76af Allow setting "albumpic" in gallery.info for each album, e.g. forced album cover picture. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	559 end($images);
8d8b361a76af Allow setting "albumpic" in gallery.info for each album, e.g. forced album cover picture. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	560 $parentEntry["image"] = key($images);
8d8b361a76af Allow setting "albumpic" in gallery.info for each album, e.g. forced album cover picture. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	561 }
64 9a01e14b27ef Implement hide_contents setting for galleries, which hides contents of an album. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	562 }
9a01e14b27ef Implement hide_contents setting for galleries, which hides contents of an album. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	563 else
9a01e14b27ef Implement hide_contents setting for galleries, which hides contents of an album. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	564 {
79 8d8b361a76af Allow setting "albumpic" in gallery.info for each album, e.g. forced album cover picture. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	565 foreach ($albums as $aid => &$adata)
8d8b361a76af Allow setting "albumpic" in gallery.info for each album, e.g. forced album cover picture. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	566 if (isset($adata["image"]))
8d8b361a76af Allow setting "albumpic" in gallery.info for each album, e.g. forced album cover picture. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	567 {
8d8b361a76af Allow setting "albumpic" in gallery.info for each album, e.g. forced album cover picture. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	568 $parentEntry["image"] = &$adata;
8d8b361a76af Allow setting "albumpic" in gallery.info for each album, e.g. forced album cover picture. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	569 break;
8d8b361a76af Allow setting "albumpic" in gallery.info for each album, e.g. forced album cover picture. Matti Hamalainen <ccr@tnsp.org> parents: 69 diff changeset	570 }
64 9a01e14b27ef Implement hide_contents setting for galleries, which hides contents of an album. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	571 }
35 985596db0f01 Implement recursive depth album covers. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	572 }
16 3491ab93630e Add sub-gallery thumbnails to gallery cache data. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	573
15 805f93962cf9 Factorize gallery cache file writing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	574 $str =
805f93962cf9 Factorize gallery cache file writing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	575 "<?\n".
805f93962cf9 Factorize gallery cache file writing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	576 "\$galData = ".var_export($gallery, TRUE).";\n".
805f93962cf9 Factorize gallery cache file writing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	577 "\$galAlbumsIndex = ".var_export(array_keys($albums), TRUE).";\n".
805f93962cf9 Factorize gallery cache file writing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	578 "\$galImagesIndex = ".var_export(array_keys($images), TRUE).";\n".
61 ee82f7c8d44c Do not include hidden entries in the entry list. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	579 "\$galEntries = ".var_export($output, TRUE).";\n".
15 805f93962cf9 Factorize gallery cache file writing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	580 "?>";
805f93962cf9 Factorize gallery cache file writing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	581
805f93962cf9 Factorize gallery cache file writing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	582 if (@file_put_contents($cacheFilename, $str, LOCK_EX) === FALSE)
805f93962cf9 Factorize gallery cache file writing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	583 return mgError("Error writing '".$cacheFilename."'\n");
805f93962cf9 Factorize gallery cache file writing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	584
805f93962cf9 Factorize gallery cache file writing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	585 return TRUE;
805f93962cf9 Factorize gallery cache file writing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	586 }
805f93962cf9 Factorize gallery cache file writing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	587
16 3491ab93630e Add sub-gallery thumbnails to gallery cache data. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	588
3491ab93630e Add sub-gallery thumbnails to gallery cache data. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	589 function mgHandleDirectory($mode, $basepath, $path, &$parentData, &$parentEntry, $writeMode, $startAt)
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	590 {
185 cb7019690a73 Separate medium image and thumbnail directories / handling. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	591 global $galExifConversions, $galTNPath, $galMedPath, $galCleanFlags;
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	592
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	593 // Get cache file path
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	594 if (($cacheFilename = mgGetPath($path, "cache_file")) === FALSE)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	595 return mgError("Cache filename / path not set.\n");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	596
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	597 mgCheckQuit(TRUE);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	598
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	599 // Read directory contents
60 ef9f17280372 Use modern PHP array definition in some places. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	600 $entries = [];
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	601 if (($dirHandle = @opendir($path)) === FALSE)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	602 return mgError("Could not read directory '".$path."'.\n");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	603
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	604 while (($dirFile = @readdir($dirHandle)) !== FALSE)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	605 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	606 $realFile = $path."/".$dirFile;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	607 if (is_dir($realFile))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	608 {
185 cb7019690a73 Separate medium image and thumbnail directories / handling. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	609 if ($dirFile[0] != "." && $dirFile != $galTNPath && $dirFile != $galMedPath)
63 1c32ece9acde Some residual array() => [] conversions. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	610 $entries[$dirFile] = ["type" => 1, "base" => $dirFile, "ext" => "", "mtime" => filemtime($realFile)];
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	611 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	612 else
6 405a02586fc2 Fix handling of image files that have spaces in filename (regexp used \S, Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	613 if (preg_match("/^([^\/]+)(".mgGetSetting("format_exts").")$/i", $dirFile, $dirMatch))
63 1c32ece9acde Some residual array() => [] conversions. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	614 $entries[$dirFile] = ["type" => 0, "base" => $dirMatch[1], "ext" => $dirMatch[2], "mtime" => filemtime($realFile), "hide" => false];
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	615 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	616 closedir($dirHandle);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	617
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	618 mgCheckQuit();
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	619
256 6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	620 $tnPath = $path."/".$galTNPath;
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	621 $medPath = $path."/".$galMedPath;
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	622 $generatedFiles = [];
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	623 $generatedFiles[$tnPath] = 1;
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	624 $generatedFiles[$medPath] = 1;
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	625
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	626 // Cleanup mode
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	627 if ($mode == GCMD_CLEAN)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	628 {
60 ef9f17280372 Use modern PHP array definition in some places. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	629 $gallery = [];
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	630
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	631 if ($writeMode)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	632 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	633 if ($galCleanFlags & GCLEAN_CACHES)
183 74889db8e6a2 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	634 mgDelete($cacheFilename, TRUE);
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	635
251 19dab8b0c340 Remove clean command suboptions 'thumbnails' and 'mediums' and replace them with 'images'. Matti Hamalainen <ccr@tnsp.org> parents: 250 diff changeset	636 if ($galCleanFlags & GCLEAN_IMAGES)
19dab8b0c340 Remove clean command suboptions 'thumbnails' and 'mediums' and replace them with 'images'. Matti Hamalainen <ccr@tnsp.org> parents: 250 diff changeset	637 {
183 74889db8e6a2 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	638 mgDelete($path."/".$galTNPath, FALSE);
185 cb7019690a73 Separate medium image and thumbnail directories / handling. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	639 mgDelete($path."/".$galMedPath, FALSE);
251 19dab8b0c340 Remove clean command suboptions 'thumbnails' and 'mediums' and replace them with 'images'. Matti Hamalainen <ccr@tnsp.org> parents: 250 diff changeset	640 }
256 6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	641
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	642 if ($galCleanFlags & GCLEAN_TRASH)
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	643 {
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	644 foreach ($entries as $ename => &$edata)
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	645 {
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	646 $medFilename = $medPath."/".$ename.".".mgGetSetting("med_format");
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	647 $tnFilename = $tnPath."/".$ename.".".mgGetSetting("tn_format");
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	648 $generatedFiles[$medFilename] = 1;
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	649 $generatedFiles[$tnFilename] = 1;
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	650 }
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	651
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	652 // Delete any "trash" files from medium/thumbnail dirs
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	653 mgDeleteConditional($tnPath, $generatedFiles);
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	654 mgDeleteConditional($medPath, $generatedFiles);
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	655 }
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	656 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	657 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	658 else
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	659 // Update modes
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	660 if ($mode == GCMD_UPDATE \|\| $mode == GCMD_RESCAN)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	661 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	662 // Load current cache file, if it exists
60 ef9f17280372 Use modern PHP array definition in some places. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	663 $galEntries = [];
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	664 $cacheTime = -1;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	665 if ($mode == GCMD_UPDATE && file_exists($cacheFilename))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	666 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	667 $cacheTime = filemtime($cacheFilename);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	668 @include $cacheFilename;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	669 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	670
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	671 // Read caption data
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	672 $captions = mgReadCaptionsFile($basepath, $path);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	673 $gallery = mgGetAlbumData($basepath, $path);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	674 if ($parentData !== NULL && $parentEntry !== NULL)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	675 {
16 3491ab93630e Add sub-gallery thumbnails to gallery cache data. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	676 $gallery["parent"] = &$parentData;
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	677 mgCopyEntryData($gallery, $parentEntry, MG_STR, "caption", "caption");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	678 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	679
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	680 // Start actual processing
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	681 $nentries = count($entries);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	682 $nentry = 0;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	683 echo $path." .. ";
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	684 foreach ($entries as $ename => &$edata)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	685 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	686 printf("\r%s (%1.1f%%) ..", $path, ($nentry * 100.0) / $nentries);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	687
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	688 $nentry++;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	689 $efilename = $path."/".$ename;
256 6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	690 $medFilename = $medPath."/".$ename.".".mgGetSetting("med_format");
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	691 $tnFilename = $tnPath."/".$ename.".".mgGetSetting("tn_format");
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	692 $capFilename = $path."/".$edata["base"].".txt";
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	693
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	694 if (array_key_exists($ename, $galEntries))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	695 $galEntry = &$galEntries[$ename];
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	696 else
63 1c32ece9acde Some residual array() => [] conversions. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	697 $galEntry = [];
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	698
57 29bb365e3ee2 Be more responsive when processing images, check for signals after each Matti Hamalainen <ccr@tnsp.org> parents: 56 diff changeset	699 mgCheckQuit(TRUE);
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	700
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	701 // Update with captions file data, if any
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	702 if (array_key_exists($ename, $captions))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	703 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	704 foreach ($captions[$ename] as $ckey => $cval)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	705 $edata[$ckey] = $cval;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	706 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	707
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	708 // Handle entry based on type
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	709 if ($edata["type"] == 0)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	710 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	711 $updFlags = 0;
255 d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	712
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	713 // Check what we need to update ..
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	714 if (!file_exists($medFilename) \|\| filemtime($medFilename) < $edata["mtime"])
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	715 $updFlags \|= GUPD_MED_IMAGE;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	716
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	717 if (!file_exists($tnFilename) \|\| filemtime($tnFilename) < $edata["mtime"])
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	718 $updFlags \|= GUPD_TN_IMAGE;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	719
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	720 if (mgNeedUpdate($galEntry, "mtime", $edata["mtime"]))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	721 $updFlags \|= GUPD_EXIF_INFO;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	722
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	723 if (file_exists($capFilename) &&
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	724 mgNeedUpdate($galEntry, "mtime", filemtime($capFilename)))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	725 $updFlags \|= GUPD_CAPTION;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	726
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	727 // Check for EXIF info
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	728 if (($updFlags & GUPD_EXIF_INFO) &&
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	729 ($exif = @exif_read_data($efilename)) !== FALSE)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	730 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	731 echo "%";
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	732 foreach ($galExifConversions as $conv)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	733 mgCopyEntryData($edata, $exif, $conv[0], $conv[1], $conv[2]);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	734 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	735 else
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	736 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	737 // Copy old data that is not yet in new
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	738 echo "*";
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	739 foreach ($galEntry as $okey => $odata)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	740 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	741 if (!array_key_exists($okey, $edata))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	742 $edata[$okey] = $odata;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	743 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	744 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	745
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	746 // Generate thumbnails, etc.
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	747 if ($updFlags & GUPD_IMAGES)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	748 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	749 mgMakeDir($tnPath, 0755);
185 cb7019690a73 Separate medium image and thumbnail directories / handling. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	750 mgMakeDir($medPath, 0755);
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	751
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	752 if ($updFlags & GUPD_MED_IMAGE)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	753 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	754 echo "1";
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	755 mgConvertImage($efilename, $medFilename,
63 1c32ece9acde Some residual array() => [] conversions. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	756 [mgGetSetting("med_width"), mgGetSetting("med_height")],
250 3af3b3f50cb0 Add settings for med_format and tn_format (currently allowed values are Matti Hamalainen <ccr@tnsp.org> parents: 249 diff changeset	757 mgGetSetting("med_format"), mgGetSetting("med_quality"), TRUE);
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	758 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	759
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	760 if ($updFlags & GUPD_TN_IMAGE)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	761 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	762 echo "2";
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	763 mgConvertImage($efilename, $tnFilename,
63 1c32ece9acde Some residual array() => [] conversions. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	764 [mgGetSetting("tn_width"), mgGetSetting("tn_height")],
253 5b41efcec87d More work on webp/etc support implementation. Matti Hamalainen <ccr@tnsp.org> parents: 251 diff changeset	765 mgGetSetting("tn_format"), mgGetSetting("tn_quality"), TRUE);
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	766 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	767 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	768
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	769 // Check for .txt caption file
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	770 if ($updFlags & GUPD_CAPTION)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	771 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	772 echo "?";
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	773 if (($tmpData = @file_get_contents($capFilename)) !== FALSE)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	774 $edata["caption"] = $tmpData;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	775 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	776 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	777 else
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	778 if ($edata["type"] == 1)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	779 {
10 d63d2f0307b0 Added a comment. Matti Hamalainen <ccr@tnsp.org> parents: 9 diff changeset	780 // Set some of the album data here
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	781 $tmp = mgGetAlbumData($basepath, $efilename);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	782 mgCopyEntryData($edata, $tmp, MG_STR, "caption", "caption");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	783 mgCopyEntryData($edata, $tmp, MG_STR, "caption", "fallback_caption");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	784 mgCopyEntryData($edata, $tmp, MG_STR, "caption", "title");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	785 mgCopyEntryData($edata, $tmp, MG_BOOL, "hide", "hide", FALSE);
11 0b097770061d Improve content hiding functionality. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	786 mgCopyEntryData($edata, $tmp, MG_BOOL, "hide_contents", "hide_contents", FALSE);
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	787 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	788 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	789
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	790 echo "\r".$path." ..... DONE\n";
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	791
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	792 mgCheckQuit(TRUE);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	793 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	794 else
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	795 mgFatal("Invalid work mode '".$mode."'.\n");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	796
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	797 mgCheckQuit(TRUE);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	798
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	799 // Recurse to subdirectories
9 232086da1670 Fix generating of sub-album/dirs names without gallery.info to specify Matti Hamalainen <ccr@tnsp.org> parents: 6 diff changeset	800 foreach ($entries as $ename => &$edata)
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	801 if ($edata["type"] == 1)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	802 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	803 $epath = $path."/".$ename."/";
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	804 $newWriteMode = ($writeMode === FALSE && $epath == $startAt) \|\| $writeMode;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	805
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	806 if (!mgHandleDirectory($mode, $basepath, $epath, $gallery, $edata, $newWriteMode, $startAt))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	807 return FALSE;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	808 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	809
16 3491ab93630e Add sub-gallery thumbnails to gallery cache data. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	810 // Finish update modes
3491ab93630e Add sub-gallery thumbnails to gallery cache data. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	811 if ($mode == GCMD_UPDATE \|\| $mode == GCMD_RESCAN)
3491ab93630e Add sub-gallery thumbnails to gallery cache data. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	812 {
3491ab93630e Add sub-gallery thumbnails to gallery cache data. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	813 // Store gallery cache for this directory
3491ab93630e Add sub-gallery thumbnails to gallery cache data. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	814 if ($writeMode && !mgWriteGalleryCache($cacheFilename, $gallery, $entries, $parentEntry))
3491ab93630e Add sub-gallery thumbnails to gallery cache data. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	815 return FALSE;
3491ab93630e Add sub-gallery thumbnails to gallery cache data. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	816 }
3491ab93630e Add sub-gallery thumbnails to gallery cache data. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	817
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	818 mgCheckQuit(TRUE);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	819
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	820 return TRUE;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	821 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	822
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	823
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	824 function mgSigHandler($signo)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	825 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	826 global $flagQuit;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	827 switch ($signo)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	828 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	829 case SIGTERM:
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	830 mgFatal("Received SIGTERM.\n");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	831 break;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	832
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	833 case SIGQUIT:
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	834 case SIGINT:
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	835 $flagQuit = TRUE;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	836 break;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	837
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	838 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	839 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	840
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	841
185 cb7019690a73 Separate medium image and thumbnail directories / handling. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	842 function mgCheckMPath($path, $id)
cb7019690a73 Separate medium image and thumbnail directories / handling. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	843 {
cb7019690a73 Separate medium image and thumbnail directories / handling. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	844 if ($path."/" != mgGetSetting($id))
cb7019690a73 Separate medium image and thumbnail directories / handling. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	845 mgError("Invalid ".$id." '".mgGetSetting($id)."', using '".$path."'.\n");
cb7019690a73 Separate medium image and thumbnail directories / handling. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	846
cb7019690a73 Separate medium image and thumbnail directories / handling. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	847 if (strpos($path, "/") !== FALSE \|\| $path == "")
cb7019690a73 Separate medium image and thumbnail directories / handling. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	848 mgFatal("Invalid ".$id." '".$path."'.\n");
cb7019690a73 Separate medium image and thumbnail directories / handling. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	849 }
cb7019690a73 Separate medium image and thumbnail directories / handling. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	850
cb7019690a73 Separate medium image and thumbnail directories / handling. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	851
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	852 function mgProcessGalleries($cmd, $path)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	853 {
185 cb7019690a73 Separate medium image and thumbnail directories / handling. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	854 global $galTNPath, $galMedPath;
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	855
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	856 // Check validity of some settings
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	857 $galPath = mgGetSetting("base_path");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	858 $galTNPath = mgCleanPath(TRUE, mgGetSetting("tn_path"));
185 cb7019690a73 Separate medium image and thumbnail directories / handling. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	859 $galMedPath = mgCleanPath(TRUE, mgGetSetting("med_path"));
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	860
185 cb7019690a73 Separate medium image and thumbnail directories / handling. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	861 mgCheckMPath($galTNPath, "tn_path");
cb7019690a73 Separate medium image and thumbnail directories / handling. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	862 mgCheckMPath($galMedPath, "med_path");
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	863
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	864 $parentData = $parentEntry = NULL;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	865 $writeMode = TRUE;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	866 $startAt = NULL;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	867
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	868 // Check for path argument
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	869 if ($path !== FALSE)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	870 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	871 // Check the given path, needs to be "under" the gallery path
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	872 $cmp = mgCleanPath(TRUE, mgRealPath($galPath))."/";
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	873 $tmp = mgCleanPath(TRUE, mgRealPath($path))."/";
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	874 if (substr($tmp, 0, strlen($cmp)) != $cmp)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	875 mgFatal("Path '".$path."' ('".$tmp."') does not reside under '".$galPath."' ('".$cmp."')!\n");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	876
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	877 // Check if we need to bootstrap
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	878 if ($cmp != $tmp)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	879 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	880 $bpath = mgCleanPath(TRUE, mgRealPath($tmp."../"));
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	881
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	882 if ($cmd != GCMD_CLEAN)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	883 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	884 $cacheFile = mgGetPath($bpath, "cache_file");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	885 if (!file_exists($cacheFile))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	886 mgFatal("Can't start working from '".$path."', parent '".$cacheFile."' does not exist!\n");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	887
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	888 @include($cacheFile);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	889 if (!isset($galEntries) \|\| !isset($galData))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	890 mgFatal("Cache file '".$cacheFile."' is broken or stale.\n");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	891 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	892
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	893 $writeMode = FALSE;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	894 $startAt = $tmp;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	895 $path = $bpath;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	896
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	897 echo "Starting: '".$startAt."' inside '".$path."'.\n";
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	898 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	899 else
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	900 $path = $tmp;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	901 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	902 else
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	903 $path = $galPath;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	904
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	905 // Start working
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	906 echo "Gallery path: '".$galPath."', starting at '".$path."' ...\n";
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	907 mgHandleDirectory($cmd, $galPath, $path, $parentData, $parentEntry, $writeMode, $startAt);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	908 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	909
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	910
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	911 function mgShowCopyright()
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	912 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	913 global $mgProgVersion, $mgProgCopyright,
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	914 $mgProgInfo, $mgProgEmail;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	915
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	916 echo
184 087df916b6b4 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 183 diff changeset	917 "MGTool ".$mgProgVersion." - MGallery management tool\n".
087df916b6b4 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 183 diff changeset	918 $mgProgInfo." ".$mgProgEmail."\n".
087df916b6b4 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 183 diff changeset	919 "(C) Copyright ".$mgProgCopyright."\n";
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	920 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	921
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	922
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	923 function mgShowHelp()
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	924 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	925 global $argv;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	926 echo
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	927 "Usage: ".basename($argv[0])." <command> [arguments]\n".
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	928 "\n".
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	929 " --help - Show this help.\n".
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	930 " --version - Show version information.\n".
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	931 "\n".
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	932 " update [path]\n".
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	933 " Update directories under <path> or all gallery dirs.\n".
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	934 " Conditionally scans dirs for new or changed images and\n".
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	935 " updates cache files as needed.\n".
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	936 "\n".
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	937 " rescan [path]\n".
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	938 " Like 'update', but forces all cache files to be regenerated\n".
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	939 " and EXIF/caption/etc information to be re-scanned even\n".
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	940 " if the file timestamps do not justify re-scanning.\n".
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	941 "\n".
256 6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	942 " clean <option> [path]\n".
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	943 " all - Delete all generated files\n".
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	944 " images - Delete generated images (thumbnails/mediums)\n".
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	945 " caches - Delete mgallery data cache files\n".
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	946 " trash - Delete any 'unmanaged' files inside thumbnail/medium dirs\n".
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	947 "\n".
159 b010c763a1fc Document mgtool 'dump' command. Matti Hamalainen <ccr@tnsp.org> parents: 130 diff changeset	948 " config\|dump\n".
b010c763a1fc Document mgtool 'dump' command. Matti Hamalainen <ccr@tnsp.org> parents: 130 diff changeset	949 " Display configuration values (with extra information) or\n".
b010c763a1fc Document mgtool 'dump' command. Matti Hamalainen <ccr@tnsp.org> parents: 130 diff changeset	950 " \"dump\" current configuration as is.\n".
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	951 "\n";
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	952 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	953
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	954
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	955 //
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	956 // Main code starts
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	957 //
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	958 if (php_sapi_name() != "cli" \|\| !empty($_SERVER["REMOTE_ADDR"]))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	959 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	960 header("Status: 404 Not Found");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	961 die();
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	962 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	963
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	964 pcntl_signal(SIGTERM, "mgSigHandler");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	965 pcntl_signal(SIGHUP, "mgSigHandler");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	966 pcntl_signal(SIGQUIT, "mgSigHandler");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	967 pcntl_signal(SIGINT, "mgSigHandler");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	968
130 f825d644cf7a Implement new config setting "timezone" for specifying the timezone used for date/timestamp interpretation. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	969 if (mgReadSettings() === FALSE)
f825d644cf7a Implement new config setting "timezone" for specifying the timezone used for date/timestamp interpretation. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	970 die("MGallery is not configured, failed to find a configuration file.\n");
f825d644cf7a Implement new config setting "timezone" for specifying the timezone used for date/timestamp interpretation. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	971
f825d644cf7a Implement new config setting "timezone" for specifying the timezone used for date/timestamp interpretation. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	972 if (($pageTimeZone = mgGetSetting("timezone")) !== NULL)
f825d644cf7a Implement new config setting "timezone" for specifying the timezone used for date/timestamp interpretation. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	973 date_default_timezone_set($pageTimeZone);
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	974
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	975 $cmd = mgCArgLC(1);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	976 switch ($cmd)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	977 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	978 case "--version":
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	979 case "version":
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	980 case "ver":
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	981 mgShowCopyright();
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	982 break;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	983
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	984 case FALSE:
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	985 // No arguments
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	986 mgError("Nothing to do. Showing help:\n");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	987
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	988 case "--help":
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	989 case "help":
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	990 if ($cmd !== FALSE)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	991 mgShowCopyright();
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	992 mgShowHelp();
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	993 break;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	994
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	995 case "update": case "up": case "upd": case "upda":
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	996 mgProcessGalleries(GCMD_UPDATE, mgCArg(2));
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	997 break;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	998
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	999 case "rescan": case "re": case "res":
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1000 mgProcessGalleries(GCMD_RESCAN, mgCArg(2));
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1001 break;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1002
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1003 case "clean": case "cl": case "cle":
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1004 $cmode = mgCArgLC(2, 2);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1005 switch ($cmode)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1006 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1007 case "al": $galCleanFlags = GCLEAN_ALL; break;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1008 case "ca": $galCleanFlags = GCLEAN_CACHES; break;
251 19dab8b0c340 Remove clean command suboptions 'thumbnails' and 'mediums' and replace them with 'images'. Matti Hamalainen <ccr@tnsp.org> parents: 250 diff changeset	1009 case "im": $galCleanFlags = GCLEAN_IMAGES; break;
256 6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	1010 case "tr": $galCleanFlags = GCLEAN_TRASH; break;
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1011 case FALSE:
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1012 mgFatal("Cleaning requires a mode argument.\n");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1013
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1014 default:
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1015 mgFatal("Invalid clean mode '".mgCArg(2)."'.\n");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1016 }
56 7384504d7b52 Do not prompt for deletion in cleanup if there are no files/directories to delete. Matti Hamalainen <ccr@tnsp.org> parents: 55 diff changeset	1017 $countDoDelete = 0;
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1018 $flagDoDelete = FALSE;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1019 mgProcessGalleries(GCMD_CLEAN, mgCArg(3));
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1020 echo "--\n";
56 7384504d7b52 Do not prompt for deletion in cleanup if there are no files/directories to delete. Matti Hamalainen <ccr@tnsp.org> parents: 55 diff changeset	1021 if ($countDoDelete == 0)
7384504d7b52 Do not prompt for deletion in cleanup if there are no files/directories to delete. Matti Hamalainen <ccr@tnsp.org> parents: 55 diff changeset	1022 {
7384504d7b52 Do not prompt for deletion in cleanup if there are no files/directories to delete. Matti Hamalainen <ccr@tnsp.org> parents: 55 diff changeset	1023 echo "Nothing to clean!\n";
7384504d7b52 Do not prompt for deletion in cleanup if there are no files/directories to delete. Matti Hamalainen <ccr@tnsp.org> parents: 55 diff changeset	1024 }
7384504d7b52 Do not prompt for deletion in cleanup if there are no files/directories to delete. Matti Hamalainen <ccr@tnsp.org> parents: 55 diff changeset	1025 else
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1026 if (mgYesNoPrompt("Really delete the above files and directories?"))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1027 {
25 c698618e6f67 Actually implement deletion. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	1028 echo "Deleting ...\n";
c698618e6f67 Actually implement deletion. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	1029 $flagDoDelete = TRUE;
c698618e6f67 Actually implement deletion. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	1030 mgProcessGalleries(GCMD_CLEAN, mgCArg(3));
c698618e6f67 Actually implement deletion. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	1031 }
c698618e6f67 Actually implement deletion. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	1032 else
c698618e6f67 Actually implement deletion. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	1033 {
c698618e6f67 Actually implement deletion. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	1034 echo "Okay, canceling operation.\n";
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1035 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1036 break;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1037
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1038 case "config":
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1039 case "dump":
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1040
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1041 foreach ($mgDefaults as $key => $dval)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1042 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1043 $sval = mgGetSetting($key);
26 59cf3acc4440 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	1044 if ($cmd == "dump")
59cf3acc4440 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	1045 {
189 5e7319ccb7cf Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	1046 printf("%-20s = %s\n",
5e7319ccb7cf Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	1047 $key,
5e7319ccb7cf Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	1048 mgGetDValStr($dval, $sval));
26 59cf3acc4440 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	1049 }
59cf3acc4440 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	1050 else
59cf3acc4440 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	1051 {
59cf3acc4440 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	1052 printf("%-20s = %s%s\n",
59cf3acc4440 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	1053 $key,
114 c803235bd0f9 Implement flag config option type. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	1054 mgGetDValStr($dval, $sval),
c803235bd0f9 Implement flag config option type. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	1055 ($dval[1] !== NULL && $sval !== $dval[1]) ? " (default: ".mgGetDValStr($dval, $dval[1]).")" : "");
26 59cf3acc4440 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	1056 }
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1057 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1058 break;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1059
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1060 default:
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1061 mgError("Unknown option/command '".$cmd."'.\n");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1062 break;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1063 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1064
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1065 ?>

Mercurial > hg > mgallery

annotate mgtool.php @ 262:3c9ce1ad3c45