mgallery: mgtool.php annotate

annotate mgtool.php @ 326:782c1520984e

Bump copyright years.

author	Matti Hamalainen <ccr@tnsp.org>
date	Fri, 11 Feb 2022 19:38:30 +0200
parents	9a4297e59a40
children	c1de5571b59c

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>
326 782c1520984e Bump copyright years. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	7 // (C) Copyright 2015-2022 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 //
282 d458ec179c87 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 281 diff changeset	12 // Operating modes and update flags
d458ec179c87 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 281 diff changeset	13 //
d458ec179c87 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 281 diff changeset	14 define("GCMD_UPDATE" , 1);
d458ec179c87 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 281 diff changeset	15 define("GCMD_RESCAN" , 2);
d458ec179c87 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 281 diff changeset	16 define("GCMD_CLEAN" , 3);
d458ec179c87 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 281 diff changeset	17
d458ec179c87 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 281 diff changeset	18 define("GCLEAN_CACHES" , 0x01);
d458ec179c87 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 281 diff changeset	19 define("GCLEAN_IMAGES" , 0x02);
d458ec179c87 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 281 diff changeset	20 define("GCLEAN_TRASH" , 0x04);
d458ec179c87 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 281 diff changeset	21 define("GCLEAN_ALL" , 0x0f);
d458ec179c87 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 281 diff changeset	22
d458ec179c87 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 281 diff changeset	23 define("GUPD_MED_IMAGE" , 0x01);
d458ec179c87 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 281 diff changeset	24 define("GUPD_TN_IMAGE" , 0x02);
d458ec179c87 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 281 diff changeset	25 define("GUPD_IMAGES" , 0x0f);
d458ec179c87 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 281 diff changeset	26 define("GUPD_EXIF_INFO" , 0x10);
d458ec179c87 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 281 diff changeset	27 define("GUPD_CAPTION" , 0x20);
d458ec179c87 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 281 diff changeset	28
d458ec179c87 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 281 diff changeset	29
d458ec179c87 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 281 diff changeset	30 //
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	31 // Array for specifying what will be copied and converted
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	32 // from the image file's EXIF information tag(s).
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	33 //
283 1bcaab2d3e6a Define named constants for $galExifConversions array fields. Matti Hamalainen <ccr@tnsp.org> parents: 282 diff changeset	34 define("GEC_TYPE" , 0);
1bcaab2d3e6a Define named constants for $galExifConversions array fields. Matti Hamalainen <ccr@tnsp.org> parents: 282 diff changeset	35 define("GEC_NAME" , 1);
1bcaab2d3e6a Define named constants for $galExifConversions array fields. Matti Hamalainen <ccr@tnsp.org> parents: 282 diff changeset	36 define("GEC_FIELDS" , 2);
286 878d2a772fd6 Add new $galExifConversions field, a boolean to distinguish unique and non-unique metadata fields. Matti Hamalainen <ccr@tnsp.org> parents: 284 diff changeset	37 define("GEC_IS_UNIQUE" , 3);
283 1bcaab2d3e6a Define named constants for $galExifConversions array fields. Matti Hamalainen <ccr@tnsp.org> parents: 282 diff changeset	38
45 d555734526d6 Use newer PHP array syntax. Matti Hamalainen <ccr@tnsp.org> parents: 37 diff changeset	39 $galExifConversions =
d555734526d6 Use newer PHP array syntax. Matti Hamalainen <ccr@tnsp.org> parents: 37 diff changeset	40 [
286 878d2a772fd6 Add new $galExifConversions field, a boolean to distinguish unique and non-unique metadata fields. Matti Hamalainen <ccr@tnsp.org> parents: 284 diff changeset	41 [ MG_STR, "caption" , "ImageDescription" , TRUE ],
878d2a772fd6 Add new $galExifConversions field, a boolean to distinguish unique and non-unique metadata fields. Matti Hamalainen <ccr@tnsp.org> parents: 284 diff changeset	42 [ MG_STR, "copyright" , "Copyright" , FALSE ],
878d2a772fd6 Add new $galExifConversions field, a boolean to distinguish unique and non-unique metadata fields. Matti Hamalainen <ccr@tnsp.org> parents: 284 diff changeset	43 [ MG_STR, "model" , "Model" , FALSE ],
878d2a772fd6 Add new $galExifConversions field, a boolean to distinguish unique and non-unique metadata fields. Matti Hamalainen <ccr@tnsp.org> parents: 284 diff changeset	44 [ MG_STR, "lensmodel" , "UndefinedTag:0xA434" , FALSE ],
878d2a772fd6 Add new $galExifConversions field, a boolean to distinguish unique and non-unique metadata fields. Matti Hamalainen <ccr@tnsp.org> parents: 284 diff changeset	45 [ MG_INT, "width" , ["COMPUTED", "Width"] , TRUE ],
878d2a772fd6 Add new $galExifConversions field, a boolean to distinguish unique and non-unique metadata fields. Matti Hamalainen <ccr@tnsp.org> parents: 284 diff changeset	46 [ MG_INT, "height" , ["COMPUTED", "Height"] , TRUE ],
878d2a772fd6 Add new $galExifConversions field, a boolean to distinguish unique and non-unique metadata fields. Matti Hamalainen <ccr@tnsp.org> parents: 284 diff changeset	47 [ MG_DVA, "fnumber" , "FNumber" , TRUE ],
878d2a772fd6 Add new $galExifConversions field, a boolean to distinguish unique and non-unique metadata fields. Matti Hamalainen <ccr@tnsp.org> parents: 284 diff changeset	48 [ MG_DVA, "exposure" , "ExposureTime" , TRUE ],
878d2a772fd6 Add new $galExifConversions field, a boolean to distinguish unique and non-unique metadata fields. Matti Hamalainen <ccr@tnsp.org> parents: 284 diff changeset	49 [ MG_INT, "iso" , "ISOSpeedRatings" , TRUE ],
878d2a772fd6 Add new $galExifConversions field, a boolean to distinguish unique and non-unique metadata fields. Matti Hamalainen <ccr@tnsp.org> parents: 284 diff changeset	50 [ MG_DVA, "focallength" , "FocalLength" , TRUE ],
878d2a772fd6 Add new $galExifConversions field, a boolean to distinguish unique and non-unique metadata fields. Matti Hamalainen <ccr@tnsp.org> parents: 284 diff changeset	51 [ MG_DATE, "datetime" , "DateTimeOriginal" , TRUE ],
878d2a772fd6 Add new $galExifConversions field, a boolean to distinguish unique and non-unique metadata fields. Matti Hamalainen <ccr@tnsp.org> parents: 284 diff changeset	52 [ MG_DATE, "datetime" , "DateTimeDigitized" , TRUE ],
878d2a772fd6 Add new $galExifConversions field, a boolean to distinguish unique and non-unique metadata fields. Matti Hamalainen <ccr@tnsp.org> parents: 284 diff changeset	53 [ MG_INT, "filesize" , "FileSize" , TRUE ],
878d2a772fd6 Add new $galExifConversions field, a boolean to distinguish unique and non-unique metadata fields. Matti Hamalainen <ccr@tnsp.org> parents: 284 diff changeset	54 [ MG_STR, "keywords" , "keywords" , FALSE ],
45 d555734526d6 Use newer PHP array syntax. Matti Hamalainen <ccr@tnsp.org> parents: 37 diff changeset	55 ];
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	56
275 bc7bda1d1410 Comments and cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 272 diff changeset	57
290 19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	58 //
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	59 // SQL table schemas
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	60 //
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	61 $galSQLTables =
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	62 [
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	63 "images" => [
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	64 ["id" , "INTEGER", "PRIMARY KEY", "AUTOINCREMENT"],
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	65 ["path_id" , "INTEGER"],
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	66 ["filename" , "VARCHAR(64)"],
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	67 ],
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	68
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	69 "paths" => [
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	70 ["id" , "INTEGER", "PRIMARY KEY", "AUTOINCREMENT"],
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	71 ["path" , "VARCHAR(128)"],
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	72 ],
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	73
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	74 "metadata" => [
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	75 ["id" , "INTEGER", "PRIMARY KEY", "AUTOINCREMENT"],
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	76 ["field" , "VARCHAR(64)"],
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	77 ["data" , "VARCHAR(64)", "UNIQUE"],
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	78 ["status" , "INTEGER"],
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	79 ],
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	80
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	81 "images_meta" => [
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	82 ["image_id" , "INTEGER"],
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	83 ["meta_id" , "INTEGER"],
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	84 ],
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	85 ];
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	86
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	87
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	88 //
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	89 // Convert and scale image file function, for generating
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	90 // 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	91 // PHP ImageMagick or GraphicsMagick bindings.
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	92 //
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	93 function mgConvertImage($inFilename, $outFilename, $outDim, $outFormat, $outQuality, $thumb)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	94 {
261 32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	95 if (extension_loaded("imagick"))
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	96 {
261 32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	97 // 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	98 try
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	99 {
261 32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	100 $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	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 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	103 {
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	104 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	105 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	106
261 32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	107 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	108 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	109
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	110 $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	111 $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	112 $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	113 $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	114
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	115 if ($outDim !== FALSE)
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	116 {
261 32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	117 // 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	118 $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	119 $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	120
301 b72da68991ed Improve few comments. Matti Hamalainen <ccr@tnsp.org> parents: 300 diff changeset	121 // Width smaller than height? Swap dimensions
261 32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	122 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	123 {
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	124 $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	125 $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	126 $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	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
301 b72da68991ed Improve few comments. Matti Hamalainen <ccr@tnsp.org> parents: 300 diff changeset	129 // Compute new height if needed
261 32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	130 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	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 $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	133 }
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 // 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	136 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	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 $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	139 $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	140 $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	141 }
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
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	144 $img->setImageDepth(8);
303 6bb434968623 Add new MG_STR_LC setting type, which is string but automatically lowercased. Matti Hamalainen <ccr@tnsp.org> parents: 301 diff changeset	145 switch ($outFormat)
261 32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	146 {
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	147 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	148 $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	149 $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	150 break;
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	151
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	152 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	153 $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	154 $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	155 break;
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	156
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	157 default:
303 6bb434968623 Add new MG_STR_LC setting type, which is string but automatically lowercased. Matti Hamalainen <ccr@tnsp.org> parents: 301 diff changeset	158 return mgError("Unsupported MGallery med/tn format '".$outFormat."'.\n");
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	159 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	160
261 32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	161 $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	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 $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	164 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	165 $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	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 $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	168 $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	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 else
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	171 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	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 // 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	174 try
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	175 {
261 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 = 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	177 }
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	178 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	179 {
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	180 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	181 }
261 32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	182
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	183 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	184 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	185
284 403f2e1e5e79 Indentation. Matti Hamalainen <ccr@tnsp.org> parents: 283 diff changeset	186 //$profiles = $img->getImageProfile("icc");
403f2e1e5e79 Indentation. Matti Hamalainen <ccr@tnsp.org> parents: 283 diff changeset	187 //$img->setImageDepth(16);
403f2e1e5e79 Indentation. Matti Hamalainen <ccr@tnsp.org> parents: 283 diff changeset	188 //$img->setImageColorspace(Gmagick::COLORSPACE_SRGB);
261 32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	189
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	190 if ($outDim !== FALSE)
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	191 {
261 32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	192 // 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	193 $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	194 //$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	195
301 b72da68991ed Improve few comments. Matti Hamalainen <ccr@tnsp.org> parents: 300 diff changeset	196 // Compute new height if needed
261 32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	197 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	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 $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	200 $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	201 $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	202 }
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	203
301 b72da68991ed Improve few comments. Matti Hamalainen <ccr@tnsp.org> parents: 300 diff changeset	204 // Compute new height if needed
261 32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	205 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	206 {
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	207 $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	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
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	210 // 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	211 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	212 {
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	213 $img->resizeImage($outDim[0], $outDim[1], Gmagick::FILTER_LANCZOS, 1);
268 07b2b271c12a Some fixes to GraphicsMagick image conversion. Matti Hamalainen <ccr@tnsp.org> parents: 265 diff changeset	214 $img->cropImage($outDim[0], $outDim[1], 0, 0);
07b2b271c12a Some fixes to GraphicsMagick image conversion. Matti Hamalainen <ccr@tnsp.org> parents: 265 diff changeset	215 $img->unsharpMaskImage(0, 0.5, 1, 0.05);
261 32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	216 }
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	217 }
261 32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	218
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	219 $img->setImageDepth(8);
303 6bb434968623 Add new MG_STR_LC setting type, which is string but automatically lowercased. Matti Hamalainen <ccr@tnsp.org> parents: 301 diff changeset	220 switch ($outFormat)
261 32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	221 {
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	222 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	223 $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	224 $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	225 break;
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	226
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	227 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	228 $img->setFormat("WEBP");
284 403f2e1e5e79 Indentation. Matti Hamalainen <ccr@tnsp.org> parents: 283 diff changeset	229 //$img->setOption('webp:method', '6');
261 32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	230 break;
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	231
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	232 default:
303 6bb434968623 Add new MG_STR_LC setting type, which is string but automatically lowercased. Matti Hamalainen <ccr@tnsp.org> parents: 301 diff changeset	233 return mgError("Unsupported MGallery med/tn format '".$outFormat."'.\n");
261 32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	234 }
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	235
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	236 $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	237
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	238 $img->stripImage();
284 403f2e1e5e79 Indentation. Matti Hamalainen <ccr@tnsp.org> parents: 283 diff changeset	239 //if (!empty($profiles))
403f2e1e5e79 Indentation. Matti Hamalainen <ccr@tnsp.org> parents: 283 diff changeset	240 // $img->profileImage("icc", $profiles);
261 32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	241
32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	242 $img->writeImage($outFilename);
268 07b2b271c12a Some fixes to GraphicsMagick image conversion. Matti Hamalainen <ccr@tnsp.org> parents: 265 diff changeset	243 $img->destroy();
261 32c13f594e39 Add support for PHP GraphicsMagick bindings, though it kind of sucks due to Matti Hamalainen <ccr@tnsp.org> parents: 257 diff changeset	244 }
0 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 return TRUE;
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 //
314 020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	251 // Read EXIF and XMP data from a file
279 54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	252 //
314 020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	253 // TODO XXX: Perhaps support XMP sidecar files?
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	254 //
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	255 function mgReadEXIFAndXMPData($filename, &$exif, &$xmp)
279 54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	256 {
314 020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	257 $exif = FALSE;
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	258 $xmp = FALSE;
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	259
279 54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	260 if (($fh = @fopen($filename, 'rb')) === FALSE)
314 020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	261 return "Could not open file for reading.";
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	262
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	263 $fileData = fstat($fh);
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	264
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	265 // Probe the file for type
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	266 $probeSize = 4 * 3;
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	267 if (($probeData = @fread($fh, $probeSize)) === FALSE)
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	268 return "Error reading file for type probe";
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	269
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	270 $probe = unpack("C4magic/L1riffsize/c4riffid", $probeData);
279 54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	271
314 020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	272 // Check for RIFF / WEBP
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	273 if ($probe["magic1"] == 0x52 && $probe["magic2"] == 0x49 &&
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	274 $probe["magic3"] == 0x46 && $probe["magic4"] == 0x46 &&
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	275 $probe["riffid1"] == 0x57 && $probe["riffid2"] == 0x45 &&
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	276 $probe["riffid3"] == 0x42 && $probe["riffid4"] == 0x50)
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	277 {
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	278 if ($probe["riffsize"] > $fileData["size"])
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	279 return "Invalid WebP file, chunk size larger than file size";
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	280
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	281 $done = 0;
319 bf4115b6dc2a Improve WebP parsing resiliency. feof($fh) does not return true when ftell() == filesize exactly. Matti Hamalainen <ccr@tnsp.org> parents: 317 diff changeset	282 while (!feof($fh) && ftell($fh) < $fileData["size"] && $done < 2)
314 020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	283 {
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	284 // Read chunk header
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	285 if (($data = @fread($fh, 2 * 4)) == FALSE)
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	286 return "File read error in WebP RIFF chunk header";
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	287
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	288 $chunk = unpack("c4id/L1size", $data);
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	289
320 a4c6937dfaaf Add some debug messages. Matti Hamalainen <ccr@tnsp.org> parents: 319 diff changeset	290 mgDebug(sprintf("WebP chunk: '%c%c%c%c' (%02x %02x %02x %02x) size=%d\n",
314 020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	291 $chunk["id1"], $chunk["id2"], $chunk["id3"], $chunk["id4"],
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	292 $chunk["id1"], $chunk["id2"], $chunk["id3"], $chunk["id4"],
320 a4c6937dfaaf Add some debug messages. Matti Hamalainen <ccr@tnsp.org> parents: 319 diff changeset	293 $chunk["size"]));
279 54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	294
314 020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	295 // Check for EXIF chunk
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	296 if ($chunk["id1"] == 0x45 && $chunk["id2"] == 0x58 &&
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	297 $chunk["id3"] == 0x49 && $chunk["id4"] == 0x46)
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	298 {
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	299 // This is an incredibly stupid hack to work around the
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	300 // fact that PHP's exif_read_data() wants to seek to stream
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	301 // start and probe things .. if we just had a direct parser
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	302 // function we would not need this shit.
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	303 if (($tmpEXIF = @fread($fh, $chunk["size"])) === FALSE)
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	304 return "Error reading WebP EXIF chunk";
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	305
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	306 // Create a temporary file for the EXIF data
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	307 if (($tmpFile = @tmpfile()) === FALSE)
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	308 return "Could not create temporary WebP EXIF data file";
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	309
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	310 if ((@fwrite($tmpFile, $tmpEXIF, $chunk["size"])) === FALSE)
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	311 {
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	312 fclose($tmpFile);
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	313 return "Error writing WebP EXIT chunk to temporary file";
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	314 }
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	315
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	316 // Parse the EXIF from the temp file
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	317 $exif = @exif_read_data($tmpFile);
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	318 fclose($tmpFile);
279 54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	319
316 af5ce7bf7eeb Fix EXIF FileSize field for WebP files. Matti Hamalainen <ccr@tnsp.org> parents: 315 diff changeset	320 // We need to fix the FileSize data as size comes from the temp file
af5ce7bf7eeb Fix EXIF FileSize field for WebP files. Matti Hamalainen <ccr@tnsp.org> parents: 315 diff changeset	321 if (is_array($exif))
af5ce7bf7eeb Fix EXIF FileSize field for WebP files. Matti Hamalainen <ccr@tnsp.org> parents: 315 diff changeset	322 {
af5ce7bf7eeb Fix EXIF FileSize field for WebP files. Matti Hamalainen <ccr@tnsp.org> parents: 315 diff changeset	323 $exif["FileSize"] = $fileData["size"];
af5ce7bf7eeb Fix EXIF FileSize field for WebP files. Matti Hamalainen <ccr@tnsp.org> parents: 315 diff changeset	324 }
af5ce7bf7eeb Fix EXIF FileSize field for WebP files. Matti Hamalainen <ccr@tnsp.org> parents: 315 diff changeset	325
314 020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	326 $done++;
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	327 }
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	328 else
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	329 if ($chunk["id1"] == 0x58 && $chunk["id2"] == 0x4d &&
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	330 $chunk["id3"] == 0x50 && $chunk["id4"] == 0x20)
279 54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	331 {
314 020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	332 // Read and parse XMP data chunk
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	333 if (($xmpStr = fread($fh, $chunk["size"])) === FALSE)
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	334 return "File read error in XMP data read";
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	335
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	336 $xmp = mgParseXMPData($xmpStr);
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	337
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	338 $done++;
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	339 }
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	340 else
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	341 {
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	342 // Skip other chunks
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	343 if (fseek($fh, $chunk["size"], SEEK_CUR) < 0)
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	344 return "File seek error in chunk skip";
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	345 }
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	346
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	347 // If the chunk size is not aligned, skip one byte
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	348 if ($chunk["size"] & 1)
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	349 {
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	350 if (fseek($fh, 1, SEEK_CUR) < 0)
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	351 return "File seek error in chunk skip";
279 54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	352 }
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	353 }
314 020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	354
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	355 return TRUE;
279 54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	356 }
314 020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	357 else
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	358 {
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	359 // Other fileformats, e.g. JPEG, PNG, GIF, ..
320 a4c6937dfaaf Add some debug messages. Matti Hamalainen <ccr@tnsp.org> parents: 319 diff changeset	360 mgDebug("Falling back to generic XMP/EXIF read.\n");
314 020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	361
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	362 // Read EXIF ..
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	363 if (fseek($fh, 0, SEEK_SET) < 0)
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	364 return "File seek error in EXIF fptr restore";
279 54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	365
314 020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	366 $exif = @exif_read_data($fh);
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	367
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	368 if (fseek($fh, 0, SEEK_SET) < 0)
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	369 return "File seek error in EXIF fptr restore";
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	370
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	371 // Read XMP data block from the file .. it's a horrible hack.
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	372 $xmpStartTag = "<x:xmpmeta";
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	373 $xmpEndTag = "</x:xmpmeta>";
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	374 $xmpBlockSize = 64 * 1024;
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	375
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	376 // Check for start tag
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	377 $buffer = "";
279 54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	378 $xmpOK = FALSE;
314 020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	379 while (!feof($fh))
279 54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	380 {
314 020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	381 if (($tmp = fread($fh, $xmpBlockSize)) === FALSE)
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	382 return "File read error in JPEG XMP read";
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	383
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	384 $buffer .= $tmp;
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	385 if (($spos1 = strpos($buffer, "<")) !== FALSE)
279 54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	386 {
314 020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	387 $buffer = substr($buffer, $spos1);
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	388 if (($spos2 = strpos($buffer, $xmpStartTag)) !== FALSE)
279 54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	389 {
314 020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	390 $buffer = substr($buffer, $spos2);
279 54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	391 $xmpOK = TRUE;
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	392 break;
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	393 }
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	394 }
314 020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	395 else
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	396 $buffer = "";
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	397 }
279 54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	398
314 020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	399 // Check for end tag if start tag was found
279 54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	400 if ($xmpOK)
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	401 {
314 020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	402 $xmpOK = FALSE;
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	403 $buffer2 = $buffer;
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	404 do
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	405 {
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	406 if (($spos1 = strpos($buffer2, "<")) !== FALSE)
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	407 {
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	408 $buffer2 = substr($buffer2, $spos1);
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	409 if (($spos2 = strpos($buffer2, $xmpEndTag)) !== FALSE)
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	410 {
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	411 $xmpOK = TRUE;
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	412 break;
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	413 }
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	414 }
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	415
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	416 if (($tmp = @fread($fh, $xmpBlockSize)) !== FALSE)
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	417 {
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	418 $buffer2 .= $tmp;
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	419 $buffer .= $tmp;
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	420 }
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	421 else
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	422 {
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	423 $xmpOK = FALSE;
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	424 break;
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	425 }
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	426 } while (!$xmpOK);
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	427
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	428 if ($xmpOK)
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	429 {
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	430 if (($spos = strpos($buffer, $xmpEndTag)) !== FALSE)
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	431 $buffer = substr($buffer, 0, $spos + strlen($xmpEndTag));
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	432 else
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	433 $xmpOK = FALSE;
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	434 }
279 54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	435 }
314 020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	436
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	437 $xmp = mgParseXMPData($buffer);
279 54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	438
314 020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	439 return TRUE;
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	440 }
279 54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	441 }
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	442
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	443
315 8a69e693e08c Add (unused) helper function mgConvertAttribute(). Matti Hamalainen <ccr@tnsp.org> parents: 314 diff changeset	444 function mgConvertAttribute(&$dst, &$src, $dstName, $srcName)
8a69e693e08c Add (unused) helper function mgConvertAttribute(). Matti Hamalainen <ccr@tnsp.org> parents: 314 diff changeset	445 {
8a69e693e08c Add (unused) helper function mgConvertAttribute(). Matti Hamalainen <ccr@tnsp.org> parents: 314 diff changeset	446 if (isset($src[$srcName]))
8a69e693e08c Add (unused) helper function mgConvertAttribute(). Matti Hamalainen <ccr@tnsp.org> parents: 314 diff changeset	447 $dst[$dstName] = (string) $src[$srcName];
8a69e693e08c Add (unused) helper function mgConvertAttribute(). Matti Hamalainen <ccr@tnsp.org> parents: 314 diff changeset	448 }
8a69e693e08c Add (unused) helper function mgConvertAttribute(). Matti Hamalainen <ccr@tnsp.org> parents: 314 diff changeset	449
8a69e693e08c Add (unused) helper function mgConvertAttribute(). Matti Hamalainen <ccr@tnsp.org> parents: 314 diff changeset	450
279 54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	451 function mgParseXMPData($xmpStr)
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	452 {
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	453 // SimpleXML apparently can't handle namespaces,
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	454 // so we will crudely remove them with some regexes
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	455 $xmpPatterns =
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	456 [
312 326935332784 Remove <?xpacket ?> from the XMP, as SimpleXML can't parse it. Matti Hamalainen <ccr@tnsp.org> parents: 311 diff changeset	457 "/<\?xpacket\s+.*?\?>/",
279 54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	458 "/[a-zA-Z]+:/",
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	459 "/\/[a-zA-Z]+:/",
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	460 "/<\/?(Bag\|Alt\|Seq)>/"
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	461 ];
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	462
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	463 $xmpReplacements =
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	464 [
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	465 "",
312 326935332784 Remove <?xpacket ?> from the XMP, as SimpleXML can't parse it. Matti Hamalainen <ccr@tnsp.org> parents: 311 diff changeset	466 "",
279 54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	467 "\/",
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	468 "",
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	469 ];
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	470
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	471 $xmpStr = preg_replace($xmpPatterns, $xmpReplacements, $xmpStr);
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	472
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	473 // Parse XML to a SimpleXMLElement structure
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	474 if (($xmpOb = @simplexml_load_string($xmpStr)) === FALSE)
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	475 return FALSE;
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	476
301 b72da68991ed Improve few comments. Matti Hamalainen <ccr@tnsp.org> parents: 300 diff changeset	477 // Process structure to simple flat array of data for the desired elements only
279 54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	478 $xmpData = [];
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	479
313 d94b0ebe97c6 Add some commented out / unused example code in mgParseXMPData(). Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	480 /*
d94b0ebe97c6 Add some commented out / unused example code in mgParseXMPData(). Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	481 // We get these from EXIF, or at least we should .. also EXIF contains information
d94b0ebe97c6 Add some commented out / unused example code in mgParseXMPData(). Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	482 // that XMP does not have, for some reason (like width/height, ISO, etc.)
d94b0ebe97c6 Add some commented out / unused example code in mgParseXMPData(). Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	483 // Leaving this code here just as an example.
d94b0ebe97c6 Add some commented out / unused example code in mgParseXMPData(). Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	484 if (($xres = $xmpOb->xpath("RDF/Description")) !== FALSE)
d94b0ebe97c6 Add some commented out / unused example code in mgParseXMPData(). Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	485 {
d94b0ebe97c6 Add some commented out / unused example code in mgParseXMPData(). Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	486 $tmp = $xres[0]->attributes();
d94b0ebe97c6 Add some commented out / unused example code in mgParseXMPData(). Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	487 mgConvertAttribute($xmpData, $tmp, "lensmodel", "Lens");
d94b0ebe97c6 Add some commented out / unused example code in mgParseXMPData(). Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	488 mgConvertAttribute($xmpData, $tmp, "datetime", "CreateDate");
d94b0ebe97c6 Add some commented out / unused example code in mgParseXMPData(). Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	489 }
279 54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	490
313 d94b0ebe97c6 Add some commented out / unused example code in mgParseXMPData(). Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	491 if (($xres = $xmpOb->xpath("RDF/Description/description/li")) !== FALSE)
d94b0ebe97c6 Add some commented out / unused example code in mgParseXMPData(). Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	492 $xmpData["description"] = implode(" ", array_map(function($xe) { return (string) $xe; }, $xres));
d94b0ebe97c6 Add some commented out / unused example code in mgParseXMPData(). Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	493 */
d94b0ebe97c6 Add some commented out / unused example code in mgParseXMPData(). Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	494
d94b0ebe97c6 Add some commented out / unused example code in mgParseXMPData(). Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	495 // What EXIF does NOT have are the keywords .. so grab them.
279 54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	496 if (($xres = $xmpOb->xpath("RDF/Description/subject/li")) !== FALSE)
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	497 {
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	498 $xmpData["keywords"] = array_map(function($xkw) { return (string) $xkw; }, $xres);
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	499 }
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	500
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	501 return $xmpData;
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	502 }
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	503
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	504
54a54921426c Add functions for extracting XMP information from files and parsing the XMP Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	505 //
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	506 // Converts one value (mainly from EXIF tag information)
52 5fbc443be538 Typofix. Matti Hamalainen <ccr@tnsp.org> parents: 51 diff changeset	507 // by doing explicit type casting and special conversions.
0 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 function mgConvertExifData($val, $vtype)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	510 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	511 switch ($vtype)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	512 {
46 e58292065b01 Let arrays through mgConvertExifData() when the type is MG_STR without Matti Hamalainen <ccr@tnsp.org> parents: 45 diff changeset	513 case MG_STR: return is_array($val) ? $val : (string) $val;
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	514 case MG_INT: return intval($val);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	515 case MG_BOOL: return intval($val);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	516 case MG_DVA:
223 438277861f51 Implement better interpretation of DVA values (exposure times, for example), Matti Hamalainen <ccr@tnsp.org> parents: 189 diff changeset	517 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	518 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	519 if ($v1 < $v2)
249 abcd21b01829 Use floating point formatting for certain DVA values. Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	520 return sprintf("1/%1.1f", $v2 / $v1);
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	521 else
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	522 return sprintf("%1.1f", $v1 / $v2);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	523 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	524 else
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	525 return $val;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	526
124 eac2cf04261a Change how date timestamps are stored and handled. This breaks cache file Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	527 case MG_DATE:
276 be152168d945 Use DateTime objects instead of UNIX timestamp integers for MG_DATE values. Matti Hamalainen <ccr@tnsp.org> parents: 275 diff changeset	528 return date_create_from_format("Y:m:d H:i:s", $val);
124 eac2cf04261a Change how date timestamps are stored and handled. This breaks cache file Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	529
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	530 default:
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	531 return $val;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	532 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	533 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	534
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	535
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	536 //
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	537 // Conditionally copies one "field" from an associated array/hash to another.
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	538 // 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	539 // 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	540 // a default value will be used, if provided.
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	541 // Source may have multi-depth keys, destination has one key.
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	542 //
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	543 function mgCopyEntryData(&$dst, $src, $vtype, $dkey, $skeys, $default = NULL)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	544 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	545 // Is destination already set?
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	546 if (isset($dst[$dkey]))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	547 return FALSE;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	548
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	549 // If input key is not array, change it into one
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	550 if (!is_array($skeys))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	551 $skeys = array($skeys);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	552
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	553 // Traverse input array by using consequent keys
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	554 $tmp = &$src;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	555 foreach ($skeys as $skey)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	556 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	557 if (!array_key_exists($skey, $tmp))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	558 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	559 // Key didn't exist, try for default
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	560 if ($default !== NULL)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	561 $dst[$dkey] = $default;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	562 return FALSE;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	563 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	564 else
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	565 $tmp = &$tmp[$skey];
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	566 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	567
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	568 // Optionally convert the input value
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	569 $dst[$dkey] = mgConvertExifData($tmp, $vtype);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	570 return TRUE;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	571 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	572
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	573
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	574 //
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	575 // Attempt to get gallery album data from various sources.
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	576 //
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	577 function mgGetAlbumData($galBasePath, $galPath)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	578 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	579 // Check path permissions
60 ef9f17280372 Use modern PHP array definition in some places. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	580 $galData = [];
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	581 if (is_readable($galPath))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	582 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	583 // First, try to read gallery/album info file
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	584 $filename = mgGetPath($galPath, "info_file");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	585 if ($filename !== FALSE && file_exists($filename))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	586 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	587 mgDebug("Reading INFOFILE: ".$filename."\n");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	588 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	589 $galData = [];
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	590 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	591
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	592 // 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	593 $filename = mgGetPath($galPath, "header_file");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	594 if ($filename !== FALSE && file_exists($filename) &&
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	595 !isset($galData["header"]))
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 mgDebug("Reading HEADERFILE: ".$filename."\n");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	598 $galData["header"] = file_get_contents($filename);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	599 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	600
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	601 // Check for alternate key/values for album title/caption
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	602 if (isset($galData["title"]) && !isset($galData["caption"]))
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 $galData["caption"] = $galData["title"];
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	605 unset($galData["title"]);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	606 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	607 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	608 else
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	609 $galData["hide"] = TRUE;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	610
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	611 // If caption is not set, use last path component for
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	612 // a fallback value in case we don't discover proper title
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	613 // from other sources we can't check here yet.
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	614 $path = explode("/", $galPath);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	615 $galData["fallback_caption"] = ucfirst(str_replace("_", " ", end($path)));
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	616
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	617 // Last, store the current gallery path
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	618 $len = strlen($galBasePath);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	619 if ($len < strlen($galPath) && substr($galPath, 0, $len) == $galBasePath)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	620 $galData["path"] = substr($galPath, $len);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	621 else
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	622 $galData["path"] = "";
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	623
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	624 return $galData;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	625 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	626
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	627
165 da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	628 //
da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	629 // 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	630 // Lines starting with "# " are comments (note the whitespace), empty lines ignored.
da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	631 // First continuous non-whitespace text is file/dirname, followed
da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	632 // by caption text, which is separate with whitespace from the filename.
da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	633 // Filenames starting with # will be made hidden entries.
da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	634 // Filenames starging with % will hide contents.
da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	635 //
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	636 function mgReadCaptionsFile($galBasePath, $galPath)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	637 {
60 ef9f17280372 Use modern PHP array definition in some places. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	638 $captions = [];
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	639 $filename = mgGetPath($galPath, "captions_file");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	640 if ($filename === FALSE \|\| ($fp = @fopen($filename, "rb")) === FALSE)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	641 return $captions;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	642
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	643 mgDebug("Reading CAPTIONS: ".$filename."\n");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	644
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	645 // Read and parse data
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	646 while (!feof($fp))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	647 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	648 $str = trim(fgets($fp));
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	649 // Ignore comments and empty lines
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	650 if ($str != "#" && $str != "")
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	651 {
11 0b097770061d Improve content hiding functionality. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	652 if (preg_match("/^([#%]?)\s*(\S+?)\s+(.+)$/", $str, $m))
45 d555734526d6 Use newer PHP array syntax. Matti Hamalainen <ccr@tnsp.org> parents: 37 diff changeset	653 $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	654 else
11 0b097770061d Improve content hiding functionality. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	655 if (preg_match("/^([#%]?)\s*(\S+?)$/", $str, $m))
45 d555734526d6 Use newer PHP array syntax. Matti Hamalainen <ccr@tnsp.org> parents: 37 diff changeset	656 $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	657 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	658 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	659
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	660 fclose($fp);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	661 return $captions;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	662 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	663
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	664
165 da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	665 //
da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	666 // Create directory with specified permissions
da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	667 //
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	668 function mgMakeDir($path, $perm)
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 if (!file_exists($path))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	671 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	672 if (mkdir($path, $perm, TRUE) === false)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	673 return mgError("Could not create directory '".$path."'\n");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	674 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	675 return TRUE;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	676 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	677
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	678
165 da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	679 //
da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	680 // Print a simple yes/no prompt with given message
da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	681 // and default value.
da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	682 //
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	683 function mgYesNoPrompt($msg, $default = FALSE)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	684 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	685 echo $msg." [".($default ? "Y/n" : "y/N")."]? ";
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	686 $sprompt = strtolower(trim(fgets(STDIN)));
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	687
166 d8387b48b08d Improve yes/no prompt check. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	688 if ($sprompt == "")
d8387b48b08d Improve yes/no prompt check. Matti Hamalainen <ccr@tnsp.org> parents: 165 diff changeset	689 return $default;
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	690 else
165 da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	691 return $sprompt[0] == 'y';
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	692 }
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
165 da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	695 //
182 c0439644da6a Clarify a comment. Matti Hamalainen <ccr@tnsp.org> parents: 166 diff changeset	696 // Delete given directory OR file, recursively
165 da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	697 //
183 74889db8e6a2 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	698 function mgDelete($path, $showFiles)
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	699 {
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	700 global $flagDoDelete, $countDoDelete;
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	701 if (is_dir($path))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	702 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	703 if (($dirHandle = @opendir($path)) === FALSE)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	704 return mgError("Could not read directory '".$path."'.\n");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	705
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	706 while (($dirFile = @readdir($dirHandle)) !== FALSE)
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 if ($dirFile != "." && $dirFile != "..")
183 74889db8e6a2 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	709 mgDelete($path."/".$dirFile, $showFiles);
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	710 }
183 74889db8e6a2 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	711
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	712 closedir($dirHandle);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	713
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	714 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	715 $countDoDelete++;
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	716 if ($flagDoDelete)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	717 rmdir($path);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	718 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	719 else
54 624c50e1b52d Fix 'mgtool clean' to not attempt deleting files that do not exist. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	720 if (file_exists($path))
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	721 {
183 74889db8e6a2 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	722 if ($showFiles)
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	723 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	724
62 3f60a5f5b4b3 Actually fix checking for files to be deleted to work. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	725 $countDoDelete++;
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	726 if ($flagDoDelete)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	727 unlink($path);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	728 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	729 }
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
256 6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	732 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	733 {
256 6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	734 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	735 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	736 {
d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	737 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	738 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	739
d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	740 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	741 {
d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	742 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	743 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	744 }
d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	745
d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	746 closedir($dirHandle);
d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	747
d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	748 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	749 {
256 6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	750 $countDoDelete++;
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	751 if ($flagDoDelete)
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	752 rmdir($path);
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	753 else
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	754 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	755 }
d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	756 }
d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	757 else
d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	758 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	759 {
256 6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	760 $countDoDelete++;
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	761 if ($flagDoDelete)
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	762 unlink($path);
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	763 else
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	764 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	765 }
d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	766 }
d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	767
d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	768
165 da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	769 //
da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	770 // Check if we have received the quit signal
da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	771 // and if yes, quit cleanly now.
da70f1c05ebe Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	772 //
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	773 function mgCheckQuit($now = FALSE)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	774 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	775 global $flagQuit;
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 // Dispatch pending signals
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	778 pcntl_signal_dispatch();
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	779
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	780 // Check result
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	781 if ($now && $flagQuit)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	782 mgFatal("Quitting.\n");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	783
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	784 return $flagQuit;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	785 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	786
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 function mgNeedUpdate($entry, $field, $cvalue)
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 if (!array_key_exists($field, $entry))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	791 return TRUE;
80 121613e40d87 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	792
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	793 return ($entry[$field] < $cvalue);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	794 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	795
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	796
30 f2c21a8b9071 Sort images in a folder by their capture timestamp. Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	797 function mgSortFunc($a, $b)
f2c21a8b9071 Sort images in a folder by their capture timestamp. Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	798 {
299 338bc2941976 For images that have no EXIF timestamp information, always sort them "lower" compared to ones that have. Matti Hamalainen <ccr@tnsp.org> parents: 297 diff changeset	799 if (isset($a["datetime"]) && is_object($a["datetime"]) &&
338bc2941976 For images that have no EXIF timestamp information, always sort them "lower" compared to ones that have. Matti Hamalainen <ccr@tnsp.org> parents: 297 diff changeset	800 isset($b["datetime"]) && is_object($b["datetime"]))
338bc2941976 For images that have no EXIF timestamp information, always sort them "lower" compared to ones that have. Matti Hamalainen <ccr@tnsp.org> parents: 297 diff changeset	801 $cres = $b["datetime"]->getTimestamp() - $a["datetime"]->getTimestamp();
338bc2941976 For images that have no EXIF timestamp information, always sort them "lower" compared to ones that have. Matti Hamalainen <ccr@tnsp.org> parents: 297 diff changeset	802 else
338bc2941976 For images that have no EXIF timestamp information, always sort them "lower" compared to ones that have. Matti Hamalainen <ccr@tnsp.org> parents: 297 diff changeset	803 if (isset($a["datetime"]) && is_object($a["datetime"]) &&
338bc2941976 For images that have no EXIF timestamp information, always sort them "lower" compared to ones that have. Matti Hamalainen <ccr@tnsp.org> parents: 297 diff changeset	804 isset($b["base"]))
338bc2941976 For images that have no EXIF timestamp information, always sort them "lower" compared to ones that have. Matti Hamalainen <ccr@tnsp.org> parents: 297 diff changeset	805 $cres = -1;
338bc2941976 For images that have no EXIF timestamp information, always sort them "lower" compared to ones that have. Matti Hamalainen <ccr@tnsp.org> parents: 297 diff changeset	806 else
338bc2941976 For images that have no EXIF timestamp information, always sort them "lower" compared to ones that have. Matti Hamalainen <ccr@tnsp.org> parents: 297 diff changeset	807 if (isset($b["datetime"]) && is_object($b["datetime"]) &&
338bc2941976 For images that have no EXIF timestamp information, always sort them "lower" compared to ones that have. Matti Hamalainen <ccr@tnsp.org> parents: 297 diff changeset	808 isset($a["base"]))
338bc2941976 For images that have no EXIF timestamp information, always sort them "lower" compared to ones that have. Matti Hamalainen <ccr@tnsp.org> parents: 297 diff changeset	809 $cres = 1;
30 f2c21a8b9071 Sort images in a folder by their capture timestamp. Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	810 else
325 9a4297e59a40 Adjust sorting so that if timestamp difference is 0, compare names. Matti Hamalainen <ccr@tnsp.org> parents: 322 diff changeset	811 $cres = 0;
9a4297e59a40 Adjust sorting so that if timestamp difference is 0, compare names. Matti Hamalainen <ccr@tnsp.org> parents: 322 diff changeset	812
9a4297e59a40 Adjust sorting so that if timestamp difference is 0, compare names. Matti Hamalainen <ccr@tnsp.org> parents: 322 diff changeset	813 if ($cres == 0 && isset($a["base"]) && isset($b["base"]))
299 338bc2941976 For images that have no EXIF timestamp information, always sort them "lower" compared to ones that have. Matti Hamalainen <ccr@tnsp.org> parents: 297 diff changeset	814 $cres = strcmp($b["base"], $a["base"]);
338bc2941976 For images that have no EXIF timestamp information, always sort them "lower" compared to ones that have. Matti Hamalainen <ccr@tnsp.org> parents: 297 diff changeset	815
338bc2941976 For images that have no EXIF timestamp information, always sort them "lower" compared to ones that have. Matti Hamalainen <ccr@tnsp.org> parents: 297 diff changeset	816 return $cres;
30 f2c21a8b9071 Sort images in a folder by their capture timestamp. Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	817 }
f2c21a8b9071 Sort images in a folder by their capture timestamp. Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	818
f2c21a8b9071 Sort images in a folder by their capture timestamp. Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	819
292 418f932763f2 Backed out changeset 13a23b120e72 Matti Hamalainen <ccr@tnsp.org> parents: 291 diff changeset	820 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	821 {
290 19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	822 global $galBackend, $db, $galExifConversions, $flagSQL;
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	823
15 805f93962cf9 Factorize gallery cache file writing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	824 // 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	825 $images = [];
ef9f17280372 Use modern PHP array definition in some places. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	826 $albums = [];
61 ee82f7c8d44c Do not include hidden entries in the entry list. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	827 $output = [];
60 ef9f17280372 Use modern PHP array definition in some places. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	828
64 9a01e14b27ef Implement hide_contents setting for galleries, which hides contents of an album. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	829 // 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	830 if (!$parentEntry["hide_contents"])
15 805f93962cf9 Factorize gallery cache file writing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	831 {
64 9a01e14b27ef Implement hide_contents setting for galleries, which hides contents of an album. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	832 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	833 {
9a01e14b27ef Implement hide_contents setting for galleries, which hides contents of an album. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	834 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	835 continue;
15 805f93962cf9 Factorize gallery cache file writing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	836
64 9a01e14b27ef Implement hide_contents setting for galleries, which hides contents of an album. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	837 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	838 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	839 $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	840 else
9a01e14b27ef Implement hide_contents setting for galleries, which hides contents of an album. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	841 $albums[$ename] = &$edata;
61 ee82f7c8d44c Do not include hidden entries in the entry list. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	842
64 9a01e14b27ef Implement hide_contents setting for galleries, which hides contents of an album. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	843 $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	844 }
30 f2c21a8b9071 Sort images in a folder by their capture timestamp. Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	845
64 9a01e14b27ef Implement hide_contents setting for galleries, which hides contents of an album. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	846 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	847 krsort($albums);
15 805f93962cf9 Factorize gallery cache file writing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	848
317 d66caa602023 Add better checks for custom/user selected album cover image. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	849 // Choose gallery album cover image
64 9a01e14b27ef Implement hide_contents setting for galleries, which hides contents of an album. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	850 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	851 {
317 d66caa602023 Add better checks for custom/user selected album cover image. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	852 // Is the cover image set in the album data?
d66caa602023 Add better checks for custom/user selected album cover image. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	853 if (isset($gallery["albumpic"]))
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	854 {
317 d66caa602023 Add better checks for custom/user selected album cover image. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	855 if (!isset($images[$gallery["albumpic"]]))
d66caa602023 Add better checks for custom/user selected album cover image. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	856 mgError("Album cover picture '".$gallery["albumpic"]."' set, but is not found in \n");
d66caa602023 Add better checks for custom/user selected album cover image. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	857 else
d66caa602023 Add better checks for custom/user selected album cover image. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	858 $parentEntry["image"] = $gallery["albumpic"];
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	859 }
317 d66caa602023 Add better checks for custom/user selected album cover image. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	860
d66caa602023 Add better checks for custom/user selected album cover image. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	861 // Got anything?
d66caa602023 Add better checks for custom/user selected album cover image. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	862 if (!isset($parentEntry["image"]))
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	863 {
317 d66caa602023 Add better checks for custom/user selected album cover image. Matti Hamalainen <ccr@tnsp.org> parents: 316 diff changeset	864 // No, use the last image in the album
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	865 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	866 $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	867 }
64 9a01e14b27ef Implement hide_contents setting for galleries, which hides contents of an album. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	868 }
9a01e14b27ef Implement hide_contents setting for galleries, which hides contents of an album. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	869 else
9a01e14b27ef Implement hide_contents setting for galleries, which hides contents of an album. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	870 {
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	871 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	872 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	873 {
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	874 $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	875 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	876 }
64 9a01e14b27ef Implement hide_contents setting for galleries, which hides contents of an album. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	877 }
35 985596db0f01 Implement recursive depth album covers. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	878 }
16 3491ab93630e Add sub-gallery thumbnails to gallery cache data. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	879
300 7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	880 if ($galBackend == "sql" && $flagSQL)
290 19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	881 {
300 7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	882 mgDBBeginTransaction();
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	883
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	884 if (($path_id = mgFetchSQLColumn(mgPrepareSQL("SELECT id FROM paths WHERE path=%s", $gallery["path"]))) === FALSE &&
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	885 ($path_id = mgExecSQLInsert(mgPrepareSQL("INSERT INTO paths (path) VALUES (%s)", $gallery["path"]))) === FALSE)
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	886 mgFatal("SQL path select failed.\n");
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	887
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	888 foreach ($output as $entry => &$edata)
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	889 if ($edata["type"] == 0)
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	890 {
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	891 $ekeys = ["path_id", "filename"];
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	892 $evals = [$path_id, mgDBGetSQLParam($db, "s", $entry)];
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	893 $esets = [];
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	894
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	895 foreach ($galExifConversions as $econv)
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	896 if ($econv[GEC_IS_UNIQUE])
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	897 {
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	898 $ekey = $econv[GEC_NAME];
290 19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	899
300 7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	900 // Skip unset and special case(s)
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	901 if (!isset($esets[$ekey]) && isset($edata[$ekey]))
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	902 {
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	903 $esets[$ekey] = TRUE;
290 19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	904
300 7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	905 switch ($econv[GEC_TYPE])
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	906 {
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	907 case MG_DATE: $etype = "D"; break;
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	908 case MG_INT: $etype = "d"; break;
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	909 default: $etype = "s"; break;
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	910 }
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	911
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	912 $ekeys[] = $ekey;
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	913 $evals[] = mgDBGetSQLParam($db, $etype, $edata[$ekey]);
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	914 }
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	915 }
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	916
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	917 $sql = "INSERT INTO images (".implode(",", $ekeys).") VALUES (".implode(",", $evals).")";
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	918 if (($image_id = mgExecSQLInsert($sql)) === FALSE)
290 19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	919 mgFatal("Failed.\n");
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	920
300 7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	921 // Special handling for non-unique fields
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	922 foreach ($galExifConversions as $econv)
290 19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	923 {
300 7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	924 $ekey = $econv[GEC_NAME];
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	925 if (!$econv[GEC_IS_UNIQUE] &&
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	926 array_key_exists($econv[GEC_NAME], $edata))
290 19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	927 {
300 7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	928 if (is_array($edata[$ekey]))
290 19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	929 {
300 7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	930 foreach ($edata[$ekey] as $kw)
290 19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	931 {
300 7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	932 $sql = mgPrepareSQL("INSERT INTO metadata (field,data,status) VALUES (%s,%s,0) ON CONFLICT(data) DO UPDATE SET status=1", $ekey, $kw);
290 19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	933 if (($id = mgExecSQLInsert($sql)) === FALSE)
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	934 mgFatal("Failure!\n");
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	935
300 7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	936 $sql = mgPrepareSQL("INSERT INTO images_meta (image_id,meta_id) VALUES (%d,%d)", $image_id, $id);
290 19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	937 if (($id = mgExecSQL($sql)) === FALSE)
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	938 mgFatal("Failure!\n");
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	939 }
300 7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	940 }
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	941 else
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	942 {
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	943 $sql = mgPrepareSQL("INSERT INTO metadata (field,data,status) VALUES (%s,%s,0) ON CONFLICT(data) DO UPDATE SET status=1", $ekey, $edata[$ekey]);
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	944 if (($id = mgExecSQLInsert($sql)) === FALSE)
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	945 mgFatal("Failure!\n");
290 19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	946
300 7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	947 $sql = mgPrepareSQL("INSERT INTO images_meta (image_id,meta_id) VALUES (%d,%d)", $image_id, $id);
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	948 if (($id = mgExecSQL($sql)) === FALSE)
7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	949 mgFatal("Failure!\n");
290 19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	950 }
300 7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	951
290 19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	952 }
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	953 }
300 7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	954 }
290 19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	955
300 7bccb4204e6e Cleanup indent and use if instead of switch/case. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	956 mgDBCommitTransaction();
290 19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	957 }
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	958
15 805f93962cf9 Factorize gallery cache file writing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	959 $str =
271 4a1d0f3ffa66 Use PHP long tag. Matti Hamalainen <ccr@tnsp.org> parents: 268 diff changeset	960 "<?php\n".
292 418f932763f2 Backed out changeset 13a23b120e72 Matti Hamalainen <ccr@tnsp.org> parents: 291 diff changeset	961 "\$galData = ".var_export($gallery, TRUE).";\n".
15 805f93962cf9 Factorize gallery cache file writing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	962 "\$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	963 "\$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	964 "\$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	965 "?>";
805f93962cf9 Factorize gallery cache file writing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	966
805f93962cf9 Factorize gallery cache file writing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	967 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	968 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	969
805f93962cf9 Factorize gallery cache file writing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	970 return TRUE;
805f93962cf9 Factorize gallery cache file writing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	971 }
805f93962cf9 Factorize gallery cache file writing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 11 diff changeset	972
16 3491ab93630e Add sub-gallery thumbnails to gallery cache data. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	973
3491ab93630e Add sub-gallery thumbnails to gallery cache data. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	974 function mgHandleDirectory($mode, $basepath, $path, &$parentData, &$parentEntry, $writeMode, $startAt)
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	975 {
185 cb7019690a73 Separate medium image and thumbnail directories / handling. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	976 global $galExifConversions, $galTNPath, $galMedPath, $galCleanFlags;
0 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 // Get cache file path
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	979 if (($cacheFilename = mgGetPath($path, "cache_file")) === FALSE)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	980 return mgError("Cache filename / path not set.\n");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	981
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	982 mgCheckQuit(TRUE);
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 // Read directory contents
60 ef9f17280372 Use modern PHP array definition in some places. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	985 $entries = [];
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	986 if (($dirHandle = @opendir($path)) === FALSE)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	987 return mgError("Could not read directory '".$path."'.\n");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	988
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	989 while (($dirFile = @readdir($dirHandle)) !== FALSE)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	990 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	991 $realFile = $path."/".$dirFile;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	992 if (is_dir($realFile))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	993 {
185 cb7019690a73 Separate medium image and thumbnail directories / handling. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	994 if ($dirFile[0] != "." && $dirFile != $galTNPath && $dirFile != $galMedPath)
63 1c32ece9acde Some residual array() => [] conversions. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	995 $entries[$dirFile] = ["type" => 1, "base" => $dirFile, "ext" => "", "mtime" => filemtime($realFile)];
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	996 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	997 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	998 if (preg_match("/^([^\/]+)(".mgGetSetting("format_exts").")$/i", $dirFile, $dirMatch))
63 1c32ece9acde Some residual array() => [] conversions. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	999 $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	1000 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1001 closedir($dirHandle);
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 mgCheckQuit();
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1004
256 6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	1005 $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	1006 $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	1007 $generatedFiles = [];
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	1008 $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	1009 $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	1010
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1011 // Cleanup mode
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1012 if ($mode == GCMD_CLEAN)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1013 {
293 486398fb60ea Allow album-specific {tn,med}_{width,height,format} settings. Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	1014 $gallery = mgGetAlbumData($basepath, $path);
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1015
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1016 if ($writeMode)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1017 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1018 if ($galCleanFlags & GCLEAN_CACHES)
183 74889db8e6a2 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	1019 mgDelete($cacheFilename, TRUE);
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1020
251 19dab8b0c340 Remove clean command suboptions 'thumbnails' and 'mediums' and replace them with 'images'. Matti Hamalainen <ccr@tnsp.org> parents: 250 diff changeset	1021 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	1022 {
183 74889db8e6a2 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	1023 mgDelete($path."/".$galTNPath, FALSE);
185 cb7019690a73 Separate medium image and thumbnail directories / handling. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	1024 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	1025 }
256 6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	1026
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	1027 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	1028 {
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	1029 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	1030 {
293 486398fb60ea Allow album-specific {tn,med}_{width,height,format} settings. Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	1031 $medFilename = $medPath."/".$ename.".".mgGetAlbumSetting($gallery, "med_format");
486398fb60ea Allow album-specific {tn,med}_{width,height,format} settings. Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	1032 $tnFilename = $tnPath."/".$ename.".".mgGetAlbumSetting($gallery, "tn_format");
256 6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	1033 $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	1034 $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	1035 }
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	1036
6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	1037 // 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	1038 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	1039 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	1040 }
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1041 }
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 else
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1044 // Update modes
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1045 if ($mode == GCMD_UPDATE \|\| $mode == GCMD_RESCAN)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1046 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1047 // 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	1048 $galEntries = [];
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1049 $cacheTime = -1;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1050 if ($mode == GCMD_UPDATE && file_exists($cacheFilename))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1051 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1052 $cacheTime = filemtime($cacheFilename);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1053 @include $cacheFilename;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1054 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1055
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1056 // Read caption data
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1057 $captions = mgReadCaptionsFile($basepath, $path);
292 418f932763f2 Backed out changeset 13a23b120e72 Matti Hamalainen <ccr@tnsp.org> parents: 291 diff changeset	1058 $gallery = mgGetAlbumData($basepath, $path);
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1059 if ($parentData !== NULL && $parentEntry !== NULL)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1060 {
292 418f932763f2 Backed out changeset 13a23b120e72 Matti Hamalainen <ccr@tnsp.org> parents: 291 diff changeset	1061 $gallery["parent"] = &$parentData;
418f932763f2 Backed out changeset 13a23b120e72 Matti Hamalainen <ccr@tnsp.org> parents: 291 diff changeset	1062 mgCopyEntryData($gallery, $parentEntry, MG_STR, "caption", "caption");
0 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 // Start actual processing
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1066 $nentries = count($entries);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1067 $nentry = 0;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1068 echo $path." .. ";
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1069 foreach ($entries as $ename => &$edata)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1070 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1071 printf("\r%s (%1.1f%%) ..", $path, ($nentry * 100.0) / $nentries);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1072
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1073 $nentry++;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1074 $efilename = $path."/".$ename;
293 486398fb60ea Allow album-specific {tn,med}_{width,height,format} settings. Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	1075 $medFilename = $medPath."/".$ename.".".mgGetAlbumSetting($gallery, "med_format");
486398fb60ea Allow album-specific {tn,med}_{width,height,format} settings. Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	1076 $tnFilename = $tnPath."/".$ename.".".mgGetAlbumSetting($gallery, "tn_format");
256 6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	1077 $capFilename = $path."/".$edata["base"].".txt";
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1078
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1079 if (array_key_exists($ename, $galEntries))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1080 $galEntry = &$galEntries[$ename];
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1081 else
63 1c32ece9acde Some residual array() => [] conversions. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	1082 $galEntry = [];
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1083
57 29bb365e3ee2 Be more responsive when processing images, check for signals after each Matti Hamalainen <ccr@tnsp.org> parents: 56 diff changeset	1084 mgCheckQuit(TRUE);
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1085
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1086 // Update with captions file data, if any
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1087 if (array_key_exists($ename, $captions))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1088 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1089 foreach ($captions[$ename] as $ckey => $cval)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1090 $edata[$ckey] = $cval;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1091 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1092
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1093 // Handle entry based on type
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1094 if ($edata["type"] == 0)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1095 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1096 $updFlags = 0;
255 d0bcc6c7fc66 Automatically clean any unnecessary "trash" from thumbnail and medium image directories. Matti Hamalainen <ccr@tnsp.org> parents: 253 diff changeset	1097
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1098 // Check what we need to update ..
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1099 if (!file_exists($medFilename) \|\| filemtime($medFilename) < $edata["mtime"])
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1100 $updFlags \|= GUPD_MED_IMAGE;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1101
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1102 if (!file_exists($tnFilename) \|\| filemtime($tnFilename) < $edata["mtime"])
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1103 $updFlags \|= GUPD_TN_IMAGE;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1104
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1105 if (mgNeedUpdate($galEntry, "mtime", $edata["mtime"]))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1106 $updFlags \|= GUPD_EXIF_INFO;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1107
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1108 if (file_exists($capFilename) &&
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1109 mgNeedUpdate($galEntry, "mtime", filemtime($capFilename)))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1110 $updFlags \|= GUPD_CAPTION;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1111
311 8fd5c850f921 Minor cleanup to XMP/EXIF fetching. Matti Hamalainen <ccr@tnsp.org> parents: 310 diff changeset	1112 // Check for EXIF and XMP info
314 020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	1113 if (($updFlags & GUPD_EXIF_INFO) &&
020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	1114 ($res = mgReadEXIFAndXMPData($efilename, $exif, $xmp)) === TRUE)
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1115 {
314 020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	1116 if ($xmp !== FALSE)
311 8fd5c850f921 Minor cleanup to XMP/EXIF fetching. Matti Hamalainen <ccr@tnsp.org> parents: 310 diff changeset	1117 {
314 020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	1118 echo "@";
311 8fd5c850f921 Minor cleanup to XMP/EXIF fetching. Matti Hamalainen <ccr@tnsp.org> parents: 310 diff changeset	1119 foreach ($galExifConversions as $conv)
8fd5c850f921 Minor cleanup to XMP/EXIF fetching. Matti Hamalainen <ccr@tnsp.org> parents: 310 diff changeset	1120 mgCopyEntryData($edata, $xmp, $conv[GEC_TYPE], $conv[GEC_NAME], $conv[GEC_FIELDS]);
8fd5c850f921 Minor cleanup to XMP/EXIF fetching. Matti Hamalainen <ccr@tnsp.org> parents: 310 diff changeset	1121 }
8fd5c850f921 Minor cleanup to XMP/EXIF fetching. Matti Hamalainen <ccr@tnsp.org> parents: 310 diff changeset	1122
314 020d155a179d Refactor EXIF handling and integrate it with XMP handling. With a disgusting Matti Hamalainen <ccr@tnsp.org> parents: 313 diff changeset	1123 if ($exif !== FALSE)
304 da150fe627b6 Collect dimension/size (width/height) information of thumbnail and medium images into the cache. Matti Hamalainen <ccr@tnsp.org> parents: 303 diff changeset	1124 {
da150fe627b6 Collect dimension/size (width/height) information of thumbnail and medium images into the cache. Matti Hamalainen <ccr@tnsp.org> parents: 303 diff changeset	1125 echo "%";
da150fe627b6 Collect dimension/size (width/height) information of thumbnail and medium images into the cache. Matti Hamalainen <ccr@tnsp.org> parents: 303 diff changeset	1126 foreach ($galExifConversions as $conv)
da150fe627b6 Collect dimension/size (width/height) information of thumbnail and medium images into the cache. Matti Hamalainen <ccr@tnsp.org> parents: 303 diff changeset	1127 mgCopyEntryData($edata, $exif, $conv[GEC_TYPE], $conv[GEC_NAME], $conv[GEC_FIELDS]);
da150fe627b6 Collect dimension/size (width/height) information of thumbnail and medium images into the cache. Matti Hamalainen <ccr@tnsp.org> parents: 303 diff changeset	1128 }
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1129 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1130 else
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1131 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1132 // Copy old data that is not yet in new
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1133 echo "*";
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1134 foreach ($galEntry as $okey => $odata)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1135 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1136 if (!array_key_exists($okey, $edata))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1137 $edata[$okey] = $odata;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1138 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1139 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1140
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1141 // Generate thumbnails, etc.
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1142 if ($updFlags & GUPD_IMAGES)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1143 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1144 mgMakeDir($tnPath, 0755);
185 cb7019690a73 Separate medium image and thumbnail directories / handling. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	1145 mgMakeDir($medPath, 0755);
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1146
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1147 if ($updFlags & GUPD_MED_IMAGE)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1148 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1149 echo "1";
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1150 mgConvertImage($efilename, $medFilename,
293 486398fb60ea Allow album-specific {tn,med}_{width,height,format} settings. Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	1151 [mgGetAlbumSetting($gallery, "med_width"), mgGetAlbumSetting($gallery, "med_height")],
486398fb60ea Allow album-specific {tn,med}_{width,height,format} settings. Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	1152 mgGetAlbumSetting($gallery, "med_format"), mgGetAlbumSetting($gallery, "med_quality"), TRUE);
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1153 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1154
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1155 if ($updFlags & GUPD_TN_IMAGE)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1156 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1157 echo "2";
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1158 mgConvertImage($efilename, $tnFilename,
293 486398fb60ea Allow album-specific {tn,med}_{width,height,format} settings. Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	1159 [mgGetAlbumSetting($gallery, "tn_width"), mgGetAlbumSetting($gallery, "tn_height")],
486398fb60ea Allow album-specific {tn,med}_{width,height,format} settings. Matti Hamalainen <ccr@tnsp.org> parents: 292 diff changeset	1160 mgGetAlbumSetting($gallery, "tn_format"), mgGetAlbumSetting($gallery, "tn_quality"), TRUE);
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1161 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1162 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1163
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1164 // Check for .txt caption file
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1165 if ($updFlags & GUPD_CAPTION)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1166 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1167 echo "?";
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1168 if (($tmpData = @file_get_contents($capFilename)) !== FALSE)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1169 $edata["caption"] = $tmpData;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1170 }
310 b1fc8a908eac Get med/tn image sizes after they have been generated. Matti Hamalainen <ccr@tnsp.org> parents: 308 diff changeset	1171
b1fc8a908eac Get med/tn image sizes after they have been generated. Matti Hamalainen <ccr@tnsp.org> parents: 308 diff changeset	1172 if ($updFlags & GUPD_EXIF_INFO)
b1fc8a908eac Get med/tn image sizes after they have been generated. Matti Hamalainen <ccr@tnsp.org> parents: 308 diff changeset	1173 {
b1fc8a908eac Get med/tn image sizes after they have been generated. Matti Hamalainen <ccr@tnsp.org> parents: 308 diff changeset	1174 // Get width/height information for thumbnails and mediums
b1fc8a908eac Get med/tn image sizes after they have been generated. Matti Hamalainen <ccr@tnsp.org> parents: 308 diff changeset	1175 $edata["med"] = [];
b1fc8a908eac Get med/tn image sizes after they have been generated. Matti Hamalainen <ccr@tnsp.org> parents: 308 diff changeset	1176 if (($info = getimagesize($medFilename)) !== FALSE && count($info) >= 2)
b1fc8a908eac Get med/tn image sizes after they have been generated. Matti Hamalainen <ccr@tnsp.org> parents: 308 diff changeset	1177 {
b1fc8a908eac Get med/tn image sizes after they have been generated. Matti Hamalainen <ccr@tnsp.org> parents: 308 diff changeset	1178 $edata["med"]["width"] = $info[0];
b1fc8a908eac Get med/tn image sizes after they have been generated. Matti Hamalainen <ccr@tnsp.org> parents: 308 diff changeset	1179 $edata["med"]["height"] = $info[1];
b1fc8a908eac Get med/tn image sizes after they have been generated. Matti Hamalainen <ccr@tnsp.org> parents: 308 diff changeset	1180 echo "+";
b1fc8a908eac Get med/tn image sizes after they have been generated. Matti Hamalainen <ccr@tnsp.org> parents: 308 diff changeset	1181 }
b1fc8a908eac Get med/tn image sizes after they have been generated. Matti Hamalainen <ccr@tnsp.org> parents: 308 diff changeset	1182 else
b1fc8a908eac Get med/tn image sizes after they have been generated. Matti Hamalainen <ccr@tnsp.org> parents: 308 diff changeset	1183 echo "-";
b1fc8a908eac Get med/tn image sizes after they have been generated. Matti Hamalainen <ccr@tnsp.org> parents: 308 diff changeset	1184
b1fc8a908eac Get med/tn image sizes after they have been generated. Matti Hamalainen <ccr@tnsp.org> parents: 308 diff changeset	1185 $edata["tn"] = [];
b1fc8a908eac Get med/tn image sizes after they have been generated. Matti Hamalainen <ccr@tnsp.org> parents: 308 diff changeset	1186 if (($info = @getimagesize($tnFilename)) !== FALSE && count($info) > 0)
b1fc8a908eac Get med/tn image sizes after they have been generated. Matti Hamalainen <ccr@tnsp.org> parents: 308 diff changeset	1187 {
b1fc8a908eac Get med/tn image sizes after they have been generated. Matti Hamalainen <ccr@tnsp.org> parents: 308 diff changeset	1188 $edata["tn"]["width"] = $info[0];
b1fc8a908eac Get med/tn image sizes after they have been generated. Matti Hamalainen <ccr@tnsp.org> parents: 308 diff changeset	1189 $edata["tn"]["height"] = $info[1];
b1fc8a908eac Get med/tn image sizes after they have been generated. Matti Hamalainen <ccr@tnsp.org> parents: 308 diff changeset	1190 echo "+";
b1fc8a908eac Get med/tn image sizes after they have been generated. Matti Hamalainen <ccr@tnsp.org> parents: 308 diff changeset	1191 }
b1fc8a908eac Get med/tn image sizes after they have been generated. Matti Hamalainen <ccr@tnsp.org> parents: 308 diff changeset	1192 else
b1fc8a908eac Get med/tn image sizes after they have been generated. Matti Hamalainen <ccr@tnsp.org> parents: 308 diff changeset	1193 echo "-";
b1fc8a908eac Get med/tn image sizes after they have been generated. Matti Hamalainen <ccr@tnsp.org> parents: 308 diff changeset	1194 }
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1195 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1196 else
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1197 if ($edata["type"] == 1)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1198 {
10 d63d2f0307b0 Added a comment. Matti Hamalainen <ccr@tnsp.org> parents: 9 diff changeset	1199 // Set some of the album data here
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1200 $tmp = mgGetAlbumData($basepath, $efilename);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1201 mgCopyEntryData($edata, $tmp, MG_STR, "caption", "caption");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1202 mgCopyEntryData($edata, $tmp, MG_STR, "caption", "fallback_caption");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1203 mgCopyEntryData($edata, $tmp, MG_STR, "caption", "title");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1204 mgCopyEntryData($edata, $tmp, MG_BOOL, "hide", "hide", FALSE);
11 0b097770061d Improve content hiding functionality. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	1205 mgCopyEntryData($edata, $tmp, MG_BOOL, "hide_contents", "hide_contents", FALSE);
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1206 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1207 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1208
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1209 echo "\r".$path." ..... DONE\n";
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1210
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1211 mgCheckQuit(TRUE);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1212 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1213 else
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1214 mgFatal("Invalid work mode '".$mode."'.\n");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1215
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1216 mgCheckQuit(TRUE);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1217
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1218 // 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	1219 foreach ($entries as $ename => &$edata)
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1220 if ($edata["type"] == 1)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1221 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1222 $epath = $path."/".$ename."/";
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1223 $newWriteMode = ($writeMode === FALSE && $epath == $startAt) \|\| $writeMode;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1224
292 418f932763f2 Backed out changeset 13a23b120e72 Matti Hamalainen <ccr@tnsp.org> parents: 291 diff changeset	1225 if (!mgHandleDirectory($mode, $basepath, $epath, $gallery, $edata, $newWriteMode, $startAt))
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1226 return FALSE;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1227 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1228
16 3491ab93630e Add sub-gallery thumbnails to gallery cache data. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	1229 // Finish update modes
3491ab93630e Add sub-gallery thumbnails to gallery cache data. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	1230 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	1231 {
3491ab93630e Add sub-gallery thumbnails to gallery cache data. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	1232 // Store gallery cache for this directory
292 418f932763f2 Backed out changeset 13a23b120e72 Matti Hamalainen <ccr@tnsp.org> parents: 291 diff changeset	1233 if ($writeMode && !mgWriteGalleryCache($cacheFilename, $gallery, $entries, $parentEntry))
16 3491ab93630e Add sub-gallery thumbnails to gallery cache data. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	1234 return FALSE;
3491ab93630e Add sub-gallery thumbnails to gallery cache data. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	1235 }
3491ab93630e Add sub-gallery thumbnails to gallery cache data. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	1236
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1237 mgCheckQuit(TRUE);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1238
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1239 return TRUE;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1240 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1241
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1242
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1243 function mgSigHandler($signo)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1244 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1245 global $flagQuit;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1246 switch ($signo)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1247 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1248 case SIGTERM:
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1249 mgFatal("Received SIGTERM.\n");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1250 break;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1251
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1252 case SIGQUIT:
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1253 case SIGINT:
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1254 $flagQuit = TRUE;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1255 break;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1256
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1257 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1258 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1259
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1260
185 cb7019690a73 Separate medium image and thumbnail directories / handling. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	1261 function mgCheckMPath($path, $id)
cb7019690a73 Separate medium image and thumbnail directories / handling. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	1262 {
cb7019690a73 Separate medium image and thumbnail directories / handling. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	1263 if ($path."/" != mgGetSetting($id))
cb7019690a73 Separate medium image and thumbnail directories / handling. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	1264 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	1265
cb7019690a73 Separate medium image and thumbnail directories / handling. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	1266 if (strpos($path, "/") !== FALSE \|\| $path == "")
cb7019690a73 Separate medium image and thumbnail directories / handling. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	1267 mgFatal("Invalid ".$id." '".$path."'.\n");
cb7019690a73 Separate medium image and thumbnail directories / handling. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	1268 }
cb7019690a73 Separate medium image and thumbnail directories / handling. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	1269
cb7019690a73 Separate medium image and thumbnail directories / handling. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	1270
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1271 function mgProcessGalleries($cmd, $path)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1272 {
290 19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1273 global $galTNPath, $galMedPath, $galSQLTables, $flagSQL;
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1274
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1275 // Check validity of some settings
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1276 $galPath = mgGetSetting("base_path");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1277 $galTNPath = mgCleanPath(TRUE, mgGetSetting("tn_path"));
185 cb7019690a73 Separate medium image and thumbnail directories / handling. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	1278 $galMedPath = mgCleanPath(TRUE, mgGetSetting("med_path"));
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1279
185 cb7019690a73 Separate medium image and thumbnail directories / handling. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	1280 mgCheckMPath($galTNPath, "tn_path");
cb7019690a73 Separate medium image and thumbnail directories / handling. Matti Hamalainen <ccr@tnsp.org> parents: 184 diff changeset	1281 mgCheckMPath($galMedPath, "med_path");
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1282
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1283 $parentData = $parentEntry = NULL;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1284 $writeMode = TRUE;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1285 $startAt = NULL;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1286
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1287 // Check for path argument
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1288 if ($path !== FALSE)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1289 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1290 // Check the given path, needs to be "under" the gallery path
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1291 $cmp = mgCleanPath(TRUE, mgRealPath($galPath))."/";
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1292 $tmp = mgCleanPath(TRUE, mgRealPath($path))."/";
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1293 if (substr($tmp, 0, strlen($cmp)) != $cmp)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1294 mgFatal("Path '".$path."' ('".$tmp."') does not reside under '".$galPath."' ('".$cmp."')!\n");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1295
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1296 // Check if we need to bootstrap
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1297 if ($cmp != $tmp)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1298 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1299 $bpath = mgCleanPath(TRUE, mgRealPath($tmp."../"));
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1300
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1301 if ($cmd != GCMD_CLEAN)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1302 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1303 $cacheFile = mgGetPath($bpath, "cache_file");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1304 if (!file_exists($cacheFile))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1305 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	1306
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1307 @include($cacheFile);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1308 if (!isset($galEntries) \|\| !isset($galData))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1309 mgFatal("Cache file '".$cacheFile."' is broken or stale.\n");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1310 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1311
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1312 $writeMode = FALSE;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1313 $startAt = $tmp;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1314 $path = $bpath;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1315
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1316 echo "Starting: '".$startAt."' inside '".$path."'.\n";
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1317 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1318 else
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1319 $path = $tmp;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1320 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1321 else
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1322 $path = $galPath;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1323
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1324 // Start working
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1325 echo "Gallery path: '".$galPath."', starting at '".$path."' ...\n";
290 19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1326
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1327 if (($cmd == GCMD_CLEAN \|\| $cmd == GCMD_RESCAN) && $flagSQL)
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1328 {
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1329 foreach ($galSQLTables as $tname => $tdata)
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1330 {
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1331 if (mgExecSQL("DELETE FROM ".$tname) === FALSE)
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1332 mgFatal("Failed to purge table '".$tname."'.\n");
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1333 }
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1334 }
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1335
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1336 mgHandleDirectory($cmd, $galPath, $path, $parentData, $parentEntry, $writeMode, $startAt);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1337 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1338
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1339
322 2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1340 function mgGetDValStr($key, $mdata, $val, $format, $multi)
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1341 {
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1342 $vfmt = "%s";
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1343
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1344 switch ($mdata[0])
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1345 {
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1346 case MG_STR_ARRAY:
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1347 if ($val === FALSE)
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1348 $val = [];
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1349 else
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1350 if (is_array($val) \|\| is_string($val))
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1351 {
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1352 $vfmt = "\"%s\"";
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1353 if (is_string($val))
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1354 $val = [ $val ];
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1355 }
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1356 else
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1357 $val = "ERROR1";
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1358 break;
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1359
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1360 case MG_STR:
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1361 case MG_STR_LC:
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1362 if (is_string($val))
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1363 {
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1364 $vfmt = "\"%s\"";
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1365 if ($mdata[0] == MG_STR_LC)
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1366 $val = strtolower($val);
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1367 }
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1368 else
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1369 $val = "ERROR2";
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1370 break;
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1371
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1372 case MG_BOOL:
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1373 $val = $val ? "yes" : "no";
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1374 break;
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1375
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1376 case MG_FLAGS:
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1377 {
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1378 $mstr = [];
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1379 foreach ($mdata[2] as $vkey => $vval)
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1380 {
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1381 if ($val & $vval)
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1382 $mstr[] = $vkey;
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1383 }
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1384
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1385 $val = "\"".implode(" \| ", $mstr)."\"";
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1386 }
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1387 break;
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1388
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1389 case MG_INT:
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1390 $val = (string) $val;
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1391 break;
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1392
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1393 default:
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1394 $val = "ERROR";
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1395 }
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1396
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1397 if (!is_array($val))
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1398 {
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1399 if ($val === NULL \|\| $val === FALSE)
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1400 $val = [];
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1401 else
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1402 $val = [ $val ];
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1403 }
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1404
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1405 $res = (count($val) == 0) ? "# " : "";
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1406
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1407 if ($multi)
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1408 {
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1409 if (count($val) > 0)
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1410 {
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1411 foreach ($val as $vv)
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1412 $res .= sprintf($format, $key, sprintf($vfmt, $vv));
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1413 }
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1414 else
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1415 $res .= sprintf($format, $key, "");
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1416 }
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1417 else
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1418 {
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1419 $res .= sprintf($format, $key,
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1420 implode(", ", array_map(function($vv) use ($vfmt) { return sprintf($vfmt, $vv); }, $val)));
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1421 }
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1422
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1423 return $res;
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1424 }
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1425
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1426
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1427 function mgShowCopyright()
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1428 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1429 global $mgProgVersion, $mgProgCopyright,
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1430 $mgProgInfo, $mgProgEmail;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1431
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1432 echo
184 087df916b6b4 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 183 diff changeset	1433 "MGTool ".$mgProgVersion." - MGallery management tool\n".
087df916b6b4 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 183 diff changeset	1434 $mgProgInfo." ".$mgProgEmail."\n".
087df916b6b4 Cosmetic indentation. Matti Hamalainen <ccr@tnsp.org> parents: 183 diff changeset	1435 "(C) Copyright ".$mgProgCopyright."\n";
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1436 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1437
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1438
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1439 function mgShowHelp()
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1440 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1441 global $argv;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1442 echo
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1443 "Usage: ".basename($argv[0])." <command> [arguments]\n".
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1444 "\n".
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1445 " --help - Show this help.\n".
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1446 " --version - Show version information.\n".
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1447 "\n".
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1448 " update [path]\n".
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1449 " Update directories under <path> or all gallery dirs.\n".
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1450 " Conditionally scans dirs for new or changed images and\n".
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1451 " updates cache files as needed.\n".
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1452 "\n".
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1453 " rescan [path]\n".
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1454 " Like 'update', but forces all cache files to be regenerated\n".
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1455 " and EXIF/caption/etc information to be re-scanned even\n".
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1456 " if the file timestamps do not justify re-scanning.\n".
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1457 "\n".
256 6ad17bc3d1a6 Add 'trash' option to 'clean' command to clean up any unmanaged files Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	1458 " 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	1459 " 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	1460 " 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	1461 " 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	1462 " trash - Delete any 'unmanaged' files inside thumbnail/medium dirs\n".
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1463 "\n".
281 cec96665993a Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 279 diff changeset	1464 " NOTICE! You usually probably want to use only the 'caches' and\n".
308 b9530dda7ff0 Cosmetic fix in mgtool help. Matti Hamalainen <ccr@tnsp.org> parents: 306 diff changeset	1465 " 'trash' options. Unless you know what you are doing, that is.\n".
281 cec96665993a Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 279 diff changeset	1466 "\n".
159 b010c763a1fc Document mgtool 'dump' command. Matti Hamalainen <ccr@tnsp.org> parents: 130 diff changeset	1467 " config\|dump\n".
b010c763a1fc Document mgtool 'dump' command. Matti Hamalainen <ccr@tnsp.org> parents: 130 diff changeset	1468 " Display configuration values (with extra information) or\n".
b010c763a1fc Document mgtool 'dump' command. Matti Hamalainen <ccr@tnsp.org> parents: 130 diff changeset	1469 " \"dump\" current configuration as is.\n".
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1470 "\n";
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1471 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1472
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1473
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1474 //
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1475 // Main code starts
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1476 //
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1477 if (php_sapi_name() != "cli" \|\| !empty($_SERVER["REMOTE_ADDR"]))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1478 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1479 header("Status: 404 Not Found");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1480 die();
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1481 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1482
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1483 pcntl_signal(SIGTERM, "mgSigHandler");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1484 pcntl_signal(SIGHUP, "mgSigHandler");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1485 pcntl_signal(SIGQUIT, "mgSigHandler");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1486 pcntl_signal(SIGINT, "mgSigHandler");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1487
265 a31ff7ecb785 Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	1488 // Check for improperly configured PHP
264 745af791367d Move Imagick/Gmagick module check to script startup. Matti Hamalainen <ccr@tnsp.org> parents: 262 diff changeset	1489 if (extension_loaded("imagick") && extension_loaded("gmagick"))
745af791367d Move Imagick/Gmagick module check to script startup. Matti Hamalainen <ccr@tnsp.org> parents: 262 diff changeset	1490 {
745af791367d Move Imagick/Gmagick module check to script startup. Matti Hamalainen <ccr@tnsp.org> parents: 262 diff changeset	1491 mgError("FATAL ERROR! Both ImageMagick AND GraphicsMagick modules enabled in PHP! This will cause problems! Refusing to work.\n");
745af791367d Move Imagick/Gmagick module check to script startup. Matti Hamalainen <ccr@tnsp.org> parents: 262 diff changeset	1492 exit(1);
745af791367d Move Imagick/Gmagick module check to script startup. Matti Hamalainen <ccr@tnsp.org> parents: 262 diff changeset	1493 }
745af791367d Move Imagick/Gmagick module check to script startup. Matti Hamalainen <ccr@tnsp.org> parents: 262 diff changeset	1494 else
745af791367d Move Imagick/Gmagick module check to script startup. Matti Hamalainen <ccr@tnsp.org> parents: 262 diff changeset	1495 if (!extension_loaded("imagick") && !extension_loaded("gmagick"))
745af791367d Move Imagick/Gmagick module check to script startup. Matti Hamalainen <ccr@tnsp.org> parents: 262 diff changeset	1496 {
745af791367d Move Imagick/Gmagick module check to script startup. Matti Hamalainen <ccr@tnsp.org> parents: 262 diff changeset	1497 mgError("No ImageMagick OR GraphicsMagick module available in PHP!\n");
745af791367d Move Imagick/Gmagick module check to script startup. Matti Hamalainen <ccr@tnsp.org> parents: 262 diff changeset	1498 exit(1);
745af791367d Move Imagick/Gmagick module check to script startup. Matti Hamalainen <ccr@tnsp.org> parents: 262 diff changeset	1499 }
745af791367d Move Imagick/Gmagick module check to script startup. Matti Hamalainen <ccr@tnsp.org> parents: 262 diff changeset	1500
265 a31ff7ecb785 Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	1501 // Check settings
297 77f85b1f35f2 Improve configuration file handling. Matti Hamalainen <ccr@tnsp.org> parents: 293 diff changeset	1502 if (mgReadSettings($searchPaths) === FALSE)
77f85b1f35f2 Improve configuration file handling. Matti Hamalainen <ccr@tnsp.org> parents: 293 diff changeset	1503 {
77f85b1f35f2 Improve configuration file handling. Matti Hamalainen <ccr@tnsp.org> parents: 293 diff changeset	1504 die("MGallery is not configured, failed to find a configuration file.\n".
77f85b1f35f2 Improve configuration file handling. Matti Hamalainen <ccr@tnsp.org> parents: 293 diff changeset	1505 "Attempted search paths:\n".implode("\n", $searchPaths)."\n");
77f85b1f35f2 Improve configuration file handling. Matti Hamalainen <ccr@tnsp.org> parents: 293 diff changeset	1506 }
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	1507
265 a31ff7ecb785 Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	1508 // Configure the timezone
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	1509 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	1510 date_default_timezone_set($pageTimeZone);
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1511
290 19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1512 // Check backend
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1513 if (($galBackend = mgGetSetting("backend")) === null)
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1514 die("MGallery backend mode not set.\n");
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1515
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1516 switch ($galBackend = strtolower($galBackend))
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1517 {
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1518 case "sql":
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1519 // Connect to database
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1520 if (mgConnectSQLDB() === FALSE)
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1521 die("Could not open database connection.\n");
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1522
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1523 // Create SQL schema elements for metadata fields
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1524 $tmpSQL = [];
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1525 foreach ($galExifConversions as $econv)
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1526 if ($econv[GEC_IS_UNIQUE])
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1527 {
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1528 switch ($econv[GEC_TYPE])
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1529 {
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1530 case MG_STR: $etype = "VARCHAR(256)"; break;
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1531 case MG_INT: $etype = "INTEGER"; break;
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1532 case MG_DVA: $etype = "VARCHAR(32)"; break;
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1533 case MG_DATE: $etype = "DATETIME"; break;
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1534 }
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1535
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1536 $tmpSQL[$econv[GEC_NAME]] = $etype;
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1537 }
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1538
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1539 // Merge to base "images" table schema
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1540 foreach ($tmpSQL as $ekey => $etype)
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1541 $galSQLTables["images"][] = [$ekey, $etype];
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1542
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1543 // Check tables
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1544 foreach ($galSQLTables as $name => $schemaData)
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1545 {
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1546 $schema = mgDBGetTableSchema($db, $schemaData);
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1547 if (!mgDBCreateOneTable($db, $name, $schema))
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1548 die("Failed to create SQL table '".$name."'.\n");
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1549 }
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1550 break;
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1551
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1552 case "php":
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1553 break;
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1554
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1555 default:
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1556 die("Invalid MGallery backend mode '".$galBackend."'.\n");
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1557 }
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1558
265 a31ff7ecb785 Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	1559
a31ff7ecb785 Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 264 diff changeset	1560 // Check for commandline arguments
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1561 $cmd = mgCArgLC(1);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1562 switch ($cmd)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1563 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1564 case "--version":
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1565 case "version":
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1566 case "ver":
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1567 mgShowCopyright();
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1568 break;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1569
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1570 case FALSE:
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1571 // No arguments
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1572 mgError("Nothing to do. Showing help:\n");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1573
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1574 case "--help":
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1575 case "help":
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1576 if ($cmd !== FALSE)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1577 mgShowCopyright();
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1578 mgShowHelp();
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1579 break;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1580
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1581 case "update": case "up": case "upd": case "upda":
290 19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1582 $farg = mgCArg(2);
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1583 if ($farg == "--sql")
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1584 {
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1585 $farg = FALSE;
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1586 $flagSQL = TRUE;
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1587 }
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1588 else
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1589 $flagSQL = mgCArg(3) == "--sql";
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1590
19fbf800b1f7 Work on very early form of virtual gallery support. Matti Hamalainen <ccr@tnsp.org> parents: 286 diff changeset	1591 mgProcessGalleries(GCMD_UPDATE, $farg);
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1592 break;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1593
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1594 case "rescan": case "re": case "res":
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1595 mgProcessGalleries(GCMD_RESCAN, mgCArg(2));
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1596 break;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1597
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1598 case "clean": case "cl": case "cle":
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1599 $cmode = mgCArgLC(2, 2);
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1600 switch ($cmode)
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1601 {
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1602 case "al": $galCleanFlags = GCLEAN_ALL; break;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1603 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	1604 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	1605 case "tr": $galCleanFlags = GCLEAN_TRASH; break;
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1606 case FALSE:
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1607 mgFatal("Cleaning requires a mode argument.\n");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1608
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1609 default:
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1610 mgFatal("Invalid clean mode '".mgCArg(2)."'.\n");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1611 }
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	1612 $countDoDelete = 0;
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1613 $flagDoDelete = FALSE;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1614 mgProcessGalleries(GCMD_CLEAN, mgCArg(3));
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1615 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	1616 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	1617 {
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	1618 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	1619 }
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	1620 else
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1621 if (mgYesNoPrompt("Really delete the above files and directories?"))
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1622 {
25 c698618e6f67 Actually implement deletion. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	1623 echo "Deleting ...\n";
c698618e6f67 Actually implement deletion. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	1624 $flagDoDelete = TRUE;
c698618e6f67 Actually implement deletion. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	1625 mgProcessGalleries(GCMD_CLEAN, mgCArg(3));
c698618e6f67 Actually implement deletion. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	1626 }
c698618e6f67 Actually implement deletion. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	1627 else
c698618e6f67 Actually implement deletion. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	1628 {
c698618e6f67 Actually implement deletion. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	1629 echo "Okay, canceling operation.\n";
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1630 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1631 break;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1632
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1633 case "config":
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1634 case "dump":
322 2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1635 foreach ($mgDefaults as $ckey => $cdata)
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1636 {
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1637 $sval = mgGetSetting($ckey);
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1638
26 59cf3acc4440 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	1639 if ($cmd == "dump")
59cf3acc4440 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	1640 {
322 2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1641 echo mgGetDValStr($ckey, $cdata, $sval, "%1\$-15s = %2\$s\n", FALSE);
26 59cf3acc4440 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	1642 }
59cf3acc4440 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	1643 else
59cf3acc4440 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	1644 {
322 2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1645 echo mgGetDValStr($ckey, $cdata, $sval, "%1\$-15s = %2\$s", TRUE).
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1646 (($cdata[1] !== NULL && $sval !== $cdata[1]) ?
2f4e3e458714 Improve configuration handling, and add "string array" configuration item type. Matti Hamalainen <ccr@tnsp.org> parents: 320 diff changeset	1647 " (default: ".mgGetDValStr($ckey, $cdata, $cdata[1], "%2\$s", FALSE).")" : "")."\n";
26 59cf3acc4440 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	1648 }
0 ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1649 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1650 break;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1651
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1652 default:
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1653 mgError("Unknown option/command '".$cmd."'.\n");
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1654 break;
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1655 }
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1656
ac688606ec4b Initial import of code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1657 ?>

Mercurial > hg > mgallery

annotate mgtool.php @ 326:782c1520984e