+ {assign var="exif" value=$block.exif.LoadExifInfo}
+ {if empty($ajax)}
+ {if $exif.blockNum == 1}
+ {/literal}
+ {/if}
+
{/if}
{/if}
diff --git a/Source/gallery2/modules/keyalbum/po/el.po b/Source/gallery2/modules/keyalbum/po/el.po
index adc48e4..54494a7 100644
--- a/Source/gallery2/modules/keyalbum/po/el.po
+++ b/Source/gallery2/modules/keyalbum/po/el.po
@@ -1,4 +1,4 @@
-# $Id: el.po 16475 2007-05-31 17:44:01Z mindless $
+# $Id: el.po 16476 2007-05-31 18:15:59Z mindless $
#
# Gallery - a web based photo album viewer and editor
# Copyright (C) 2000-2007 Bharat Mediratta
diff --git a/Source/gallery2/modules/keyalbum/po/sr.po b/Source/gallery2/modules/keyalbum/po/sr.po
index 8e11abb..1027e78 100644
--- a/Source/gallery2/modules/keyalbum/po/sr.po
+++ b/Source/gallery2/modules/keyalbum/po/sr.po
@@ -1,4 +1,4 @@
-# $Id: sr.po 16501 2007-06-02 18:37:40Z jozefs $
+# $Id: sr.po 16509 2007-06-05 01:25:06Z mindless $
#
# Gallery - a web based photo album viewer and editor
# Copyright (C) 2000-2007 Bharat Mediratta
diff --git a/Source/gallery2/modules/linkitem/MANIFEST b/Source/gallery2/modules/linkitem/MANIFEST
index d18a6db..e5b59a9 100644
--- a/Source/gallery2/modules/linkitem/MANIFEST
+++ b/Source/gallery2/modules/linkitem/MANIFEST
@@ -1,4 +1,4 @@
-# $Revision: 16636 $
+# $Revision: 16666 $
# File crc32 crc32(crlf) size size(crlf) or R File
modules/linkitem/ItemAddLinkItem.inc 1446560054 2152531137 8126 8380
modules/linkitem/LinkItemOption.inc 1206993501 263542032 2529 2613
@@ -12,7 +12,7 @@ modules/linkitem/classes/GalleryStorage/xml-src/A_GalleryLinkItem_1.0.xml 298054
modules/linkitem/classes/LinkItemToolkit.class 4050126237 3766852566 4401 4525
modules/linkitem/images/arrow.png 2771826340 2771826340 330 330
modules/linkitem/images/link.jpg 3372251726 3372251726 9207 9207
-modules/linkitem/module.inc 2374684836 2687375665 5802 5998
+modules/linkitem/module.inc 19118761 3536617954 5802 5998
modules/linkitem/templates/ItemAddLinkItem.tpl 3168698319 903434845 2000 2057
modules/linkitem/templates/LinkItemOption.tpl 3696569324 169892703 633 652
modules/linkitem/templates/LinkItemSiteAdmin.tpl 2428580714 1345386496 3099 3164
diff --git a/Source/gallery2/modules/linkitem/module.inc b/Source/gallery2/modules/linkitem/module.inc
index fd38084..063829c 100644
--- a/Source/gallery2/modules/linkitem/module.inc
+++ b/Source/gallery2/modules/linkitem/module.inc
@@ -21,7 +21,7 @@
/**
* @package LinkItem
* @author Alan Harder
+ {/if}
+
- {section name=outer loop=$block.exif.LoadExifInfo.exifData step=2}
+ {section name=outer loop=$exif.exifData step=2}
{/if}
-
+ {if empty($ajax)}{g->text text="Photo Properties"}
- {if isset($block.exif.LoadExifInfo.mode)} -
- {if ($block.exif.LoadExifInfo.mode == 'summary')}
+ {if isset($exif.mode)}
+
{/if}
- {if !empty($block.exif.LoadExifInfo.exifData)}
+ {if !empty($exif.exifData)}
{strip}
+ {if ($exif.mode == 'summary')}
{g->text text="summary"}
{else}
-
+
{g->text text="summary"}
{/if}
-
- {if ($block.exif.LoadExifInfo.mode == 'detailed')}
+
+ {if ($exif.mode == 'detailed')}
{g->text text="details"}
{else}
-
+
{g->text text="details"}
{/if}
-
+
+
+ {/strip}| - {g->text text=$block.exif.LoadExifInfo.exifData[inner].title} + {g->text text=$exif.exifData[inner].title} | - {$block.exif.LoadExifInfo.exifData[inner].value} + {$exif.exifData[inner].value} | {/section}
+
diff --git a/Source/gallery2/modules/reupload/test/phpunit/ReuploadOptionTest.class b/Source/gallery2/modules/reupload/test/phpunit/ReuploadOptionTest.class
new file mode 100644
index 0000000..2f0c30e
--- /dev/null
+++ b/Source/gallery2/modules/reupload/test/phpunit/ReuploadOptionTest.class
@@ -0,0 +1,208 @@
+
+ * @version $Revision: 16994 $
+ */
+class ReuploadOptionTest extends ItemEditOptionTestCase {
+ function ReuploadOptionTest($methodName) {
+ $this->ItemEditOptionTestCase($methodName, 'reupload', 'ReuploadPhotoOption');
+ }
+
+ function setUp() {
+ global $gallery;
+ parent::setUp();
+
+ list ($ret, $this->_album) = $this->_createRandomAlbum($this->_getRootId());
+ if ($ret) {
+ print $ret->getAsHtml();
+ return $this->failWithStatus($ret);
+ }
+
+ $this->_markForCleanup($this->_album);
+
+ /* Register a dummy toolkit */
+ $ret = GalleryCoreApi::registerFactoryImplementation(
+ 'GalleryToolkit', 'ReuploadOptionTestToolkit', 'ReuploadOptionTestToolkit',
+ 'modules/reupload/test/phpunit/ReuploadOptionTest.class', 'reuploadTest', null);
+ if ($ret) {
+ print $ret->getAsHtml();
+ return $this->failWithStatus($ret);
+ }
+ $this->_markToolkitForCleanup('ReuploadOptionTestToolkit');
+
+ $ret = GalleryCoreApi::registerToolkitProperty('ReuploadOptionTestToolkit',
+ array('image/known'), 'dimensions', 'int,int', 'desc');
+ if ($ret) {
+ print $ret->getAsHtml();
+ return $this->failWithStatus($ret);
+ }
+
+ list ($ret, $this->_item) =
+ $this->_createRandomDataItem($this->_album->getId(), 'image/known');
+ if ($ret) {
+ print $ret->getAsHtml();
+ return $this->failWithStatus($ret);
+ }
+ $this->_itemSize = $this->_item->getSize();
+
+ /* create custom platform to return dummy filesize, imagesize, etc. */
+ $gallery->setPlatform(new ReuploadOptionTestPlatform($gallery->getPlatform()));
+ }
+
+ function testReupload() {
+ $form['tmp_name']['reupload'] = 'bogus.tmp';
+ $form['size']['reupload'] = 800;
+ $form['serialNumber'] = $this->_item->getSerialNumber();
+
+ /* Perform the request and verify that we succeeded */
+ list ($errors, $warnings) = $this->_handleRequestAfterEdit($form, $this->_item);
+ $this->assertEquals(array(), $errors, 'Errors');
+ $this->assertEquals(array($this->_translate('Reuploaded file successfully.')),
+ $warnings, 'Warnings');
+ $this->assertEquals(800, $this->_item->getSize(), 'Item size');
+ }
+
+ /*
+ * This imitates the case when the file couldn't be uploaded.
+ * We are assuming that the reason is that filesize exceeds the limit
+ * which is most common case.
+ */
+ function testReuploadFailure() {
+ $form['tmp_name']['reupload'] = '';
+ $form['name']['reupload'] = 'itried.jpg';
+ $form['size']['reupload'] = 0;
+ $form['serialNumber'] = $this->_item->getSerialNumber();
+
+ /* Perform the request and verify that we failed and filesize didn't change */
+ list ($errors, $warnings) = $this->_handleRequestAfterEdit($form, $this->_item);
+ $this->assertEquals(array('form[error][reupload][failure]'), $errors, 'Errors');
+ $this->assertEquals(array(), $warnings, 'Warnings');
+ $this->assertEquals($this->_itemSize, $this->_item->getSize(), 'Item size');
+ }
+
+ /* This imitates the case when the new file has different mime type than the old one */
+ function testReuploadToolkitFailure() {
+ $form['tmp_name']['reupload'] = 'bogus.mpeg';
+ $form['size']['reupload'] = 1500;
+ $form['serialNumber'] = $this->_item->getSerialNumber();
+ GalleryUtilities::putRequestVariable('dimensions', 'bad_data');
+
+ /* Perform the request and verify that we failed and filesize didn't change */
+ list ($errors, $warnings) = $this->_handleRequestAfterEdit($form, $this->_item);
+ $this->assertEquals(array('form[error][reupload][toolkit]'), $errors, 'Errors');
+ $this->assertEquals(array(), $warnings, 'Warnings');
+ /* Size might been changed, but transaction was aborted */
+ list ($ret, $item) = $this->_item->refresh();
+ if ($ret) {
+ print $ret->getAsHtml();
+ return $this->failWithStatus($ret);
+ }
+ $this->assertEquals($this->_itemSize, $item->getSize(), 'Item size');
+ }
+
+ /*
+ * This imitates the case when we didn't even try to upload the file
+ * Shouldn't be any errors!
+ */
+ function testReuploadNothing() {
+ $form['tmp_name']['reupload'] = '';
+ $form['name']['reupload'] = '';
+ $form['size']['reupload'] = 0;
+ $form['serialNumber'] = $this->_item->getSerialNumber();
+
+ /* Perform the request and verify that we failed and filesize didn't change */
+ list ($errors, $warnings) = $this->_handleRequestAfterEdit($form, $this->_item);
+ $this->assertEquals(array(), $errors, 'Errors');
+ $this->assertEquals(array(), $warnings, 'Warnings');
+ }
+
+ /**
+ * Verify that attempt to reupload to a linked entity is blocked (UI doesn't allow it).
+ */
+ function testReuploadLinkedEntity() {
+ list ($ret, $linkedEntity) = $this->_createLinkedItem($this->_album->getId(), $this->_item);
+ if ($ret) {
+ return $ret;
+ }
+
+ $form['tmp_name']['reupload'] = 'bogus.tmp';
+ $form['size']['reupload'] = 800;
+ $form['serialNumber'] = $this->_item->getSerialNumber();
+
+ /* Perform the request and verify that we failed */
+ $this->_handleRequestAfterEdit($form, $this->_item, ERROR_BAD_PARAMETER);
+ }
+}
+
+/**
+ * Test platform
+ */
+class ReuploadOptionTestPlatform extends GalleryPlatform {
+ function ReuploadOptionTestPlatform($originalPlatform) {
+ $this->_savedPlatform = $originalPlatform;
+ }
+
+ function is_uploaded_file($file) {
+ return true;
+ }
+
+ function file_exists($file) {
+ return !strstr($file,'albumtest');
+ }
+
+ function unlink($file) {
+ return true;
+ }
+
+ function copy($input, $output) {
+ return true;
+ }
+
+ function filesize($path) {
+ return 800;
+ }
+}
+
+/**
+ * Test toolkit
+ */
+class ReuploadOptionTestToolkit extends GalleryToolkit {
+ /**
+ * @see GalleryToolkit::getProperty
+ */
+ function getProperty($mimeType, $propertyName, $file) {
+ if ($propertyName == 'dimensions') {
+ $dimensionRequest = GalleryUtilities::getRequestVariables('dimensions');
+ if ($dimensionRequest == 'bad_data') {
+ return array(GalleryCoreApi::error(ERROR_BAD_DATA_TYPE), null);
+ } else {
+ return array(null, array(2603, 1966));
+ }
+ }
+ return array(GalleryCoreApi::error(ERROR_UNIMPLEMENTED), null);
+ }
+}
+
+?>
diff --git a/Source/gallery2/modules/shutterfly/MANIFEST b/Source/gallery2/modules/shutterfly/MANIFEST
index fdc3295..28927be 100644
--- a/Source/gallery2/modules/shutterfly/MANIFEST
+++ b/Source/gallery2/modules/shutterfly/MANIFEST
@@ -1,92 +1,6 @@
-# $Revision: 16636 $
+# $Revision: 16666 $
# File crc32 crc32(crlf) size size(crlf) or R File
-modules/shutterfly/PrintPhotos.inc 2556871678 4141413962 6787 6999
+modules/shutterfly/PrintPhotos.inc 1500661381 1854036671 6787 6999
modules/shutterfly/classes/ShutterflyCartPlugin.class 3148012052 2708917180 2082 2145
-modules/shutterfly/locale/af/LC_MESSAGES/modules_shutterfly.mo 4137365090 4137365090 721 721
-modules/shutterfly/locale/cs/LC_MESSAGES/modules_shutterfly.mo 3336451554 3336451554 886 886
-modules/shutterfly/locale/da/LC_MESSAGES/modules_shutterfly.mo 1776362304 1776362304 722 722
-modules/shutterfly/locale/de/LC_MESSAGES/modules_shutterfly.mo 2347266850 2347266850 793 793
-modules/shutterfly/locale/en_GB/LC_MESSAGES/modules_shutterfly.mo 405699738 405699738 457 457
-modules/shutterfly/locale/es/LC_MESSAGES/modules_shutterfly.mo 2290006704 2290006704 813 813
-modules/shutterfly/locale/eu/LC_MESSAGES/modules_shutterfly.mo 4253229854 4253229854 717 717
-modules/shutterfly/locale/fi/LC_MESSAGES/modules_shutterfly.mo 3020629196 3020629196 847 847
-modules/shutterfly/locale/fr/LC_MESSAGES/modules_shutterfly.mo 3804831218 3804831218 742 742
-modules/shutterfly/locale/is/LC_MESSAGES/modules_shutterfly.mo 2559113618 2559113618 421 421
-modules/shutterfly/locale/it/LC_MESSAGES/modules_shutterfly.mo 1450031882 1450031882 750 750
-modules/shutterfly/locale/ja/LC_MESSAGES/modules_shutterfly.mo 3654593710 3654593710 763 763
-modules/shutterfly/locale/ko/LC_MESSAGES/modules_shutterfly.mo 129723486 129723486 819 819
-modules/shutterfly/locale/nl/LC_MESSAGES/modules_shutterfly.mo 3987191018 3987191018 763 763
-modules/shutterfly/locale/no/LC_MESSAGES/modules_shutterfly.mo 1587586981 1587586981 793 793
-modules/shutterfly/locale/pl/LC_MESSAGES/modules_shutterfly.mo 2605044609 2605044609 851 851
-modules/shutterfly/locale/ru/LC_MESSAGES/modules_shutterfly.mo 1759440214 1759440214 907 907
-modules/shutterfly/locale/sr/LC_MESSAGES/modules_shutterfly.mo 2523712830 2523712830 795 795
-modules/shutterfly/locale/sv/LC_MESSAGES/modules_shutterfly.mo 3738142713 3738142713 827 827
-modules/shutterfly/locale/tr/LC_MESSAGES/modules_shutterfly.mo 469920630 469920630 788 788
-modules/shutterfly/locale/zh_CN/LC_MESSAGES/modules_shutterfly.mo 1034308011 1034308011 649 649
-modules/shutterfly/locale/zh_TW/LC_MESSAGES/modules_shutterfly.mo 1672933735 1672933735 781 781
-modules/shutterfly/module.inc 1334715086 1000497923 4229 4375
-modules/shutterfly/po/GNUmakefile 1866879166 2808215985 98 103
-modules/shutterfly/po/af.po 15213025 3356514400 1700 1752
-modules/shutterfly/po/cs.po 2110308253 3774085379 1778 1830
-modules/shutterfly/po/da.po 1021636279 1124709370 1668 1716
-modules/shutterfly/po/de.po 1608077188 855000369 1785 1837
-modules/shutterfly/po/en_GB.po 1874870876 2358293883 1662 1710
-modules/shutterfly/po/es.po 2481117095 3567370329 1807 1858
-modules/shutterfly/po/eu.po 2889747112 1116268367 1597 1646
-modules/shutterfly/po/fi.po 3465613783 4060603069 1957 2012
-modules/shutterfly/po/fr.po 4145958873 1230411112 1673 1722
-modules/shutterfly/po/is.po 3324715778 1074436786 1512 1560
-modules/shutterfly/po/it.po 3469669614 2824482877 1626 1674
-modules/shutterfly/po/ja.po 3993029737 533534279 1639 1687
-modules/shutterfly/po/ko.po 98219034 1034312948 1743 1795
-modules/shutterfly/po/nl.po 1307791955 4070280534 1727 1777
-modules/shutterfly/po/no.po 2279626670 2988707793 1788 1839
-modules/shutterfly/po/pl.po 2611889567 2029208033 1736 1786
-modules/shutterfly/po/ru.po 4246536760 4087413434 1979 2034
-modules/shutterfly/po/sr.po 2108572326 3434507313 1673 1722
-modules/shutterfly/po/strings.raw 1553599558 1155958852 300 311
-modules/shutterfly/po/sv.po 903565190 2902255335 1707 1756
-modules/shutterfly/po/tr.po 963992739 2123227608 1672 1722
-modules/shutterfly/po/zh_CN.po 1530817950 114005678 1732 1784
-modules/shutterfly/po/zh_TW.po 1362724431 3238024022 1665 1714
-modules/shutterfly/templates/PrintPhotos.tpl 726738513 3186354616 2272 2327
-R modules/shutterfly/locale/cs_CZ/LC_MESSAGES/modules_shutterfly.mo
-R modules/shutterfly/locale/cs_CZ/LC_MESSAGES
-R modules/shutterfly/locale/cs_CZ
-R modules/shutterfly/locale/de_DE/LC_MESSAGES/modules_shutterfly.mo
-R modules/shutterfly/locale/de_DE/LC_MESSAGES
-R modules/shutterfly/locale/de_DE
-R modules/shutterfly/locale/fr_FR/LC_MESSAGES/modules_shutterfly.mo
-R modules/shutterfly/locale/fr_FR/LC_MESSAGES
-R modules/shutterfly/locale/fr_FR
-R modules/shutterfly/locale/is_IS/LC_MESSAGES/modules_shutterfly.mo
-R modules/shutterfly/locale/is_IS/LC_MESSAGES
-R modules/shutterfly/locale/is_IS
-R modules/shutterfly/locale/it_IT/LC_MESSAGES/modules_shutterfly.mo
-R modules/shutterfly/locale/it_IT/LC_MESSAGES
-R modules/shutterfly/locale/it_IT
-R modules/shutterfly/locale/ja_JP/LC_MESSAGES/modules_shutterfly.mo
-R modules/shutterfly/locale/ja_JP/LC_MESSAGES
-R modules/shutterfly/locale/ja_JP
-R modules/shutterfly/locale/nl_NL/LC_MESSAGES/modules_shutterfly.mo
-R modules/shutterfly/locale/nl_NL/LC_MESSAGES
-R modules/shutterfly/locale/nl_NL
-R modules/shutterfly/locale/ru_RU/LC_MESSAGES/modules_shutterfly.mo
-R modules/shutterfly/locale/ru_RU/LC_MESSAGES
-R modules/shutterfly/locale/ru_RU
-R modules/shutterfly/locale/sr_YU/LC_MESSAGES/modules_shutterfly.mo
-R modules/shutterfly/locale/sr_YU/LC_MESSAGES
-R modules/shutterfly/locale/sr_YU
-R modules/shutterfly/locale/tr_TR/LC_MESSAGES/modules_shutterfly.mo
-R modules/shutterfly/locale/tr_TR/LC_MESSAGES
-R modules/shutterfly/locale/tr_TR
-R modules/shutterfly/po/cs_CZ.po
-R modules/shutterfly/po/de_DE.po
-R modules/shutterfly/po/fr_FR.po
-R modules/shutterfly/po/is_IS.po
-R modules/shutterfly/po/it_IT.po
-R modules/shutterfly/po/ja_JP.po
-R modules/shutterfly/po/nl_NL.po
-R modules/shutterfly/po/ru_RU.po
-R modules/shutterfly/po/sr_YU.po
-R modules/shutterfly/po/tr_TR.po
+modules/shutterfly/module.inc 3506017372 3688249782 4229 4375
+modules/shutterfly/templates/PrintPhotos.tpl 2043612498 1594839499 2272 2327
diff --git a/Source/gallery2/modules/shutterfly/PrintPhotos.inc b/Source/gallery2/modules/shutterfly/PrintPhotos.inc
index 86ddc09..ca046ab 100644
--- a/Source/gallery2/modules/shutterfly/PrintPhotos.inc
+++ b/Source/gallery2/modules/shutterfly/PrintPhotos.inc
@@ -23,7 +23,7 @@
* @package Shutterfly
* @subpackage UserInterface
* @author Alan Harder {g->text text="Reupload Photo"}
+ + {if !$ReuploadPhotoOption.uploadsPermitted} +
+ {g->text text="Your webserver is configured to disallow file uploads from your web browser at this time. Please contact your system administrator for assistance."}
+
+ {else}
+ + {g->text text="Upload a new revision of this picture instead of the old one."} +
+ + {if $ReuploadPhotoOption.hasLinkedEntity} + {g->text text="You cannot reupload this item because it shares its data file with other items."} + {else} + {if $ReuploadPhotoOption.maxFileSize != 0} ++ {g->text text="Note: The new file cannot be larger than %s. If you want to upload a larger file you must ask your system administrator to allow larger uploads." + arg1=$ReuploadPhotoOption.maxFileSize} +
+ {/if} + +{g->text text="File"}
+ + + + + {if isset($form.error.reupload.failure)} +
+ {g->text text="Unable to reupload file."}
+ {if $ReuploadPhotoOption.maxFileSize > 0}
+ {g->text text="Please check the size and try again. The new file cannot be larger than %s."
+ arg1=$ReuploadPhotoOption.maxFileSize}
+ {/if}
+
+ {/if}
+ {if isset($form.error.reupload.toolkit)}
+
+ {g->text text="Unable to reupload file. Are you sure the file is of the same type (image, movie) as the original?"}
+
+ {/if}
+ {/if}
+ {/if}
+