Merge branch '3.8'

Conflicts: CHANGELOG.md bin/console bin/developer bin/setup bower.json composer.json composer.lock features/bootstrap/FeatureContext.php features/bootstrap/GuiContext.php lib/Alchemy/Phrasea/Authentication/Token/TokenValidator.php lib/Alchemy/Phrasea/Command/BuildMissingSubdefs.php lib/Alchemy/Phrasea/Command/CreateCollection.php lib/Alchemy/Phrasea/Command/Developer/JavascriptBuilder.php lib/Alchemy/Phrasea/Controller/Admin/Collection.php lib/Alchemy/Phrasea/Controller/Admin/Databoxes.php lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php lib/Alchemy/Phrasea/Controller/Api/V1.php lib/Alchemy/Phrasea/Controller/Client/Baskets.php lib/Alchemy/Phrasea/Controller/Client/Root.php lib/Alchemy/Phrasea/Controller/Prod/Basket.php lib/Alchemy/Phrasea/Controller/Prod/Export.php lib/Alchemy/Phrasea/Controller/Prod/Property.php lib/Alchemy/Phrasea/Controller/Prod/Records.php lib/Alchemy/Phrasea/Controller/Prod/Tools.php lib/Alchemy/Phrasea/Controller/Prod/Upload.php lib/Alchemy/Phrasea/Controller/Root/Login.php lib/Alchemy/Phrasea/Controller/Thesaurus/Thesaurus.php lib/Alchemy/Phrasea/Core/Event/ApiLoadEndEvent.php lib/Alchemy/Phrasea/Core/Event/ApiLoadStartEvent.php lib/Alchemy/Phrasea/Core/Provider/TaskManagerServiceProvider.php lib/Alchemy/Phrasea/Core/Version.php lib/Alchemy/Phrasea/Exception/XMLParseErrorException.php lib/Alchemy/Phrasea/Helper/DatabaseHelper.php lib/Alchemy/Phrasea/Helper/User/Edit.php lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php lib/Doctrine/Entities/AuthFailure.php lib/Doctrine/Entities/Basket.php lib/Doctrine/Entities/BasketElement.php lib/Doctrine/Entities/LazaretAttribute.php lib/Doctrine/Entities/LazaretCheck.php lib/Doctrine/Entities/LazaretFile.php lib/Doctrine/Entities/LazaretSession.php lib/Doctrine/Entities/Session.php lib/Doctrine/Entities/SessionModule.php lib/Doctrine/Entities/StoryWZ.php lib/Doctrine/Entities/UsrList.php lib/Doctrine/Entities/UsrListEntry.php lib/Doctrine/Entities/UsrListOwner.php lib/Doctrine/Entities/ValidationData.php lib/Doctrine/Entities/ValidationParticipant.php lib/Doctrine/Entities/ValidationSession.php lib/Doctrine/Logger/MonologSQLLogger.php lib/Doctrine/Repositories/BasketRepository.php lib/Doctrine/Repositories/ValidationParticipantRepository.php lib/Doctrine/Types/Binary.php lib/Doctrine/Types/Blob.php lib/Doctrine/Types/Enum.php lib/Doctrine/Types/LongBlob.php lib/Doctrine/Types/VarBinary.php lib/classes/API/OAuth2/Account.php lib/classes/API/OAuth2/Application.php lib/classes/API/OAuth2/Application/OfficePlugin.php lib/classes/API/OAuth2/AuthCode.php lib/classes/API/OAuth2/RefreshToken.php lib/classes/API/OAuth2/Token.php lib/classes/API/V1/Abstract.php lib/classes/API/V1/Interface.php lib/classes/API/V1/adapter.php lib/classes/API/V1/exception/abstract.php lib/classes/API/V1/exception/badrequest.php lib/classes/API/V1/exception/forbidden.php lib/classes/API/V1/exception/internalservererror.php lib/classes/API/V1/exception/maintenance.php lib/classes/API/V1/exception/methodnotallowed.php lib/classes/API/V1/exception/notfound.php lib/classes/API/V1/exception/unauthorized.php lib/classes/API/V1/result.php lib/classes/Exception/Feed/EntryNotFound.php lib/classes/Exception/Feed/ItemNotFound.php lib/classes/Exception/Feed/PublisherNotFound.php lib/classes/Feed/Abstract.php lib/classes/Feed/Adapter.php lib/classes/Feed/Aggregate.php lib/classes/Feed/Collection.php lib/classes/Feed/CollectionInterface.php lib/classes/Feed/Entry/Adapter.php lib/classes/Feed/Entry/Collection.php lib/classes/Feed/Entry/CollectionInterface.php lib/classes/Feed/Entry/Interface.php lib/classes/Feed/Entry/Item.php lib/classes/Feed/Entry/ItemInterface.php lib/classes/Feed/Interface.php lib/classes/Feed/Link.php lib/classes/Feed/LinkInterface.php lib/classes/Feed/Publisher/Adapter.php lib/classes/Feed/Publisher/Interface.php lib/classes/Feed/Token.php lib/classes/Feed/TokenAggregate.php lib/classes/Feed/XML/Abstract.php lib/classes/Feed/XML/Atom.php lib/classes/Feed/XML/Cooliris.php lib/classes/Feed/XML/Interface.php lib/classes/Feed/XML/RSS.php lib/classes/Feed/XML/RSS/Image.php lib/classes/Feed/XML/RSS/ImageInterface.php lib/classes/User/Adapter.php lib/classes/User/Interface.php lib/classes/appbox/register.php lib/classes/connection.php lib/classes/connection/abstract.php lib/classes/connection/interface.php lib/classes/connection/pdo.php lib/classes/connection/pdoStatementDebugger.php lib/classes/deprecated/countries.php lib/classes/deprecated/inscript.api.php lib/classes/eventsmanager/event/test.php lib/classes/ftpclient.php lib/classes/http/request.php lib/classes/media/subdef.php lib/classes/module/console/schedulerStart.php lib/classes/module/console/schedulerState.php lib/classes/module/console/schedulerStop.php lib/classes/module/console/taskState.php lib/classes/module/console/tasklist.php lib/classes/module/console/taskrun.php lib/classes/patch/320alpha4b.php lib/classes/patch/3715alpha1a.php lib/classes/patch/379alpha1a.php lib/classes/patch/380alpha10a.php lib/classes/patch/380alpha11a.php lib/classes/patch/380alpha13a.php lib/classes/patch/380alpha14a.php lib/classes/patch/380alpha15a.php lib/classes/patch/380alpha16a.php lib/classes/patch/380alpha17a.php lib/classes/patch/380alpha18a.php lib/classes/patch/380alpha3a.php lib/classes/patch/380alpha4a.php lib/classes/patch/380alpha6a.php lib/classes/patch/380alpha8a.php lib/classes/patch/380alpha9a.php lib/classes/patch/381alpha1b.php lib/classes/patch/381alpha2a.php lib/classes/patch/381alpha3a.php lib/classes/patch/381alpha4a.php lib/classes/patch/383alpha1a.php lib/classes/patch/383alpha2a.php lib/classes/patch/383alpha3a.php lib/classes/patch/383alpha4a.php lib/classes/record/adapter.php lib/classes/record/preview.php lib/classes/recordutils.php lib/classes/recordutils/audio.php lib/classes/recordutils/document.php lib/classes/recordutils/map.php lib/classes/recordutils/video.php lib/classes/registry.php lib/classes/registryInterface.php lib/classes/set/order.php lib/classes/system/url.php lib/classes/task/Scheduler.php lib/classes/task/appboxAbstract.php lib/classes/task/databoxAbstract.php lib/classes/task/manager.php lib/classes/task/period/RecordMover.php lib/classes/task/period/apibridge.php lib/classes/task/period/apiwebhooks.php lib/classes/task/period/archive.php lib/classes/task/period/cindexer.php lib/classes/task/period/emptyColl.php lib/classes/task/period/ftp.php lib/classes/task/period/ftpPull.php lib/classes/task/period/subdef.php lib/classes/task/period/test.php lib/classes/task/period/writemeta.php lib/conf.d/PhraseaFixture/AbstractWZ.php lib/conf.d/PhraseaFixture/Basket/LoadFiveBaskets.php lib/conf.d/PhraseaFixture/Basket/LoadOneBasket.php lib/conf.d/PhraseaFixture/Basket/LoadOneBasketEnv.php lib/conf.d/PhraseaFixture/Lazaret/LoadOneFile.php lib/conf.d/PhraseaFixture/Story/LoadOneStory.php lib/conf.d/PhraseaFixture/UsrLists/ListAbstract.php lib/conf.d/PhraseaFixture/UsrLists/UsrList.php lib/conf.d/PhraseaFixture/UsrLists/UsrListEntry.php lib/conf.d/PhraseaFixture/UsrLists/UsrListOwner.php lib/conf.d/PhraseaFixture/ValidationParticipant/LoadOneParticipant.php lib/conf.d/PhraseaFixture/ValidationParticipant/LoadParticipantWithSession.php lib/conf.d/PhraseaFixture/ValidationSession/LoadOneValidationSession.php templates/web/admin/collection/collection.html.twig templates/web/common/dialog_export.html.twig templates/web/common/menubar.html.twig templates/web/prod/actions/Tools/index.html.twig templates/web/prod/index.html.twig templates/web/prod/upload/upload-flash.html.twig templates/web/prod/upload/upload.html.twig templates/web/report/report_layout_child.html.twig templates/web/setup/step2.html.twig templates/web/thesaurus/new-synonym-dialog.html.twig templates/web/thesaurus/properties.html.twig templates/web/thesaurus/search.html.twig tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php tests/Alchemy/Tests/Phrasea/Cache/FactoryTest.php tests/Alchemy/Tests/Phrasea/Controller/Admin/AdminCollectionTest.php tests/Alchemy/Tests/Phrasea/Controller/Client/RootTest.php
2025-10-17 15:03:25 +00:00 · 2015-02-05 18:38:49 +01:00
parent 5e33fdafe4 e9fb3d44fc
commit 949bf06cac
759 changed files with 1932 additions and 1653 deletions
--- a/lib/classes/record/adapter.php
+++ b/lib/classes/record/adapter.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -312,6 +312,32 @@ class record_adapter implements record_Interface, cache_cacheableInterface
        return $this;
    }

+    public function set_mime($mime)
+    {
+        $old_mime = $this->get_mime();
+
+        // see http://lists.w3.org/Archives/Public/xml-dist-app/2003Jul/0064.html
+        if (!preg_match("/^[a-zA-Z0-9!#$%^&\*_\-\+{}\|'.`~]+\/[a-zA-Z0-9!#$%^&\*_\-\+{}\|'.`~]+$/", $mime)) {
+            throw new \Exception(sprintf('Unrecognized mime type %s', $mime));
+        }
+
+        $connection = connection::getPDOConnection($this->app, $this->get_sbas_id());
+
+        $sql = 'UPDATE record SET mime = :mime WHERE record_id = :record_id';
+        $stmt = $connection->prepare($sql);
+        $stmt->execute(array(':mime' => $mime, ':record_id' => $this->get_record_id()));
+        $stmt->closeCursor();
+
+        if ($mime !== $old_mime) {
+            $this->rebuild_subdefs();
+        }
+
+        $this->mime = $mime;
+        $this->delete_data_from_cache();
+
+        return $this;
+    }
+
    /**
     * Return true if the record is a grouping
     *
@@ -671,10 +697,6 @@ class record_adapter implements record_Interface, cache_cacheableInterface
                continue;
            }

-            if ($subdef->is_substituted()) {
-                continue;
-            }
-
            $subdefs[$subdef->get_name()] = $subdef;
        }

@@ -962,6 +984,77 @@ class record_adapter implements record_Interface, cache_cacheableInterface
        return $this->get_databox()->get_sbas_id();
    }

+    public function substitute_subdef($name, MediaInterface $media, Application $app)
+    {
+        $newfilename = $this->record_id . '_0_' . $name . '.' . $media->getFile()->getExtension();
+
+        $base_url = '';
+
+        $subdef_def = false;
+
+        if ($name == 'document') {
+            $baseprefs = $this->get_databox()->get_sxml_structure();
+
+            $pathhd = p4string::addEndSlash((string) ($baseprefs->path));
+
+            $filehd = $this->get_record_id() . "_document." . strtolower($media->getFile()->getExtension());
+            $pathhd = databox::dispatch($app['filesystem'], $pathhd);
+
+            $app['filesystem']->copy($media->getFile()->getRealPath(), $pathhd . $filehd, true);
+
+            $subdefFile = $pathhd . $filehd;
+
+            $meta_writable = true;
+        } else {
+            $type = $this->is_grouping() ? 'image' : $this->get_type();
+
+            $subdef_def = $this->get_databox()->get_subdef_structure()->get_subdef($type, $name);
+
+            if ($this->has_subdef($name) && $this->get_subdef($name)->is_physically_present()) {
+
+                $path_file_dest = $this->get_subdef($name)->get_pathfile();
+                $this->get_subdef($name)->remove_file();
+                $this->clearSubdefCache($name);
+            } else {
+                $path = databox::dispatch($app['filesystem'], $subdef_def->get_path());
+                $app['filesystem']->mkdir($path, 0750);
+                $path_file_dest = $path . $newfilename;
+            }
+
+            try {
+                $app['media-alchemyst']->turnInto(
+                    $media->getFile()->getRealPath(),
+                    $path_file_dest,
+                    $subdef_def->getSpecs()
+                );
+            } catch (\MediaAlchemyst\Exception\ExceptionInterface $e) {
+                return $this;
+            }
+
+            $subdefFile = $path_file_dest;
+
+            $meta_writable = $subdef_def->meta_writeable();
+        }
+
+        $app['filesystem']->chmod($subdefFile, 0760);
+        $media = $app['mediavorus']->guess($subdefFile);
+
+        $subdef = media_subdef::create($app, $this, $name, $media);
+        $subdef->set_substituted(true);
+
+        $this->delete_data_from_cache(self::CACHE_SUBDEFS);
+
+        if ($meta_writable) {
+            $this->write_metas();
+        }
+
+        if ($name == 'document') {
+            $this->rebuild_subdefs();
+        }
+
+        return $this;
+    }
+
    /**
     *
     * @param  DOMDocument    $dom_doc
@@ -1111,6 +1204,38 @@ class record_adapter implements record_Interface, cache_cacheableInterface
        return $this;
    }

+    public function get_missing_subdefs()
+    {
+        $databox = $this->get_databox();
+
+        try {
+            $this->get_hd_file();
+        } catch (\Exception $e) {
+            return array();
+        }
+
+        $subDefDefinitions = $databox->get_subdef_structure()->getSubdefGroup($this->get_type());
+        if (!$subDefDefinitions) {
+            return array();
+        }
+
+        $record = $this;
+        $wanted_subdefs = array_map(function($subDef) {
+           return  $subDef->get_name();
+        }, array_filter($subDefDefinitions, function($subDef) use ($record) {
+            return !$record->has_subdef($subDef->get_name());
+        }));
+
+
+        $missing_subdefs = array_map(function($subDef) {
+            return $subDef->get_name();
+        }, array_filter($this->get_subdefs(), function($subdef) {
+            return !$subdef->is_physically_present();
+        }));
+
+        return array_values(array_merge($wanted_subdefs, $missing_subdefs));
+    }
+
    /**
     *
     * @return record_adapter
@@ -1284,7 +1409,6 @@ class record_adapter implements record_Interface, cache_cacheableInterface
        $record->delete_data_from_cache(\record_adapter::CACHE_SUBDEFS);

        $record->insertTechnicalDatas($app['mediavorus']);
-        $record->rebuild_subdefs();

        return $record;
    }