hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
aina-esokia
2019-07-02 12:19:45 +04:00
parent d62d9cf962 22e3605153
commit 61a92d9cb0
185 changed files with 26044 additions and 3907 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/Alchemy/Phrasea/CLI.php
View File

@@ -73,9 +73,26 @@ class CLI extends Application
$this->bindRoutes();
$this['logger'] = $this->extend('logger', function () {
return new Console\Logger\ConsoleLogger(new Console\Output\ConsoleOutput(Console\Output\ConsoleOutput::VERBOSITY_DEBUG));
});
$logger = false;
if ($this['configuration.store']->isSetup()){
$config = $this['configuration.store']->getConfig();
if ((isset($config['console_logger_enabled_environments']) && in_array($environment, $config['console_logger_enabled_environments']))){
$logger = true;
}
}
if ($environment == self::ENV_DEV){
$logger = true;
}
if ($logger){
$this['logger'] = $this->extend('logger', function () {
return new Console\Logger\ConsoleLogger(new Console\Output\ConsoleOutput(Console\Output\ConsoleOutput::VERBOSITY_DEBUG));
});
}
error_reporting(-1);
ErrorHandler::register();

2
lib/Alchemy/Phrasea/Controller/Prod/LazaretController.php
View File

@@ -38,7 +38,7 @@ class LazaretController extends Controller
*
* @param Request $request The current request
*
* @return Response
* @return String
*/
public function listElement(Request $request)
{

18
lib/Alchemy/Phrasea/Controller/Prod/RootController.php
View File

@@ -20,6 +20,8 @@ use Alchemy\Phrasea\Model\Repositories\FeedRepository;
use Symfony\Component\Finder\Finder;
use Symfony\Component\Finder\SplFileInfo;
use Symfony\Component\HttpFoundation\Request;
// use Alchemy\Phrasea\Plugin\ActionBarPluginInterface;
class RootController extends Controller
{
@@ -85,6 +87,22 @@ class RootController extends Controller
/** @var \Closure $filter */
$filter = $this->app['plugin.filter_by_authorization'];
/* prepare work to extend whole taskbar... later
$menus = [
'push' => ['native'=>true, 'n'=>0],
'tools' => ['native'=>true, 'n'=>0],
];
/ ** @var ActionBarPluginInterface $plugin * /
foreach($filter('actionbar') as $kplugin=>$plugin) {
foreach($plugin->getActionBar() as $kmenu=>$menu) {
if(!array_key_exists($kmenu, $menus)) {
$menus[$kmenu] = ['native'=>false, 'n'=>0];
}
$menus[$kmenu]['n']++;
}
}
*/
$plugins = [
'workzone' => $filter('workzone'),
'actionbar' => $filter('actionbar'),

3
lib/Alchemy/Phrasea/Core/Configuration/DisplaySettingService.php
View File

@@ -41,7 +41,8 @@ class DisplaySettingService
'css' => '000000',
'start_page_query' => '',
'order_collection_by' => self::ORDER_BY_ADMIN,
'start_page' => 'QUERY',
'start_page' => 'LAST_QUERY',
'last_jsonquery' => '',
'rollover_thumbnail' => 'caption',
'technical_display' => '1',
'doctype_display' => '1',

2
lib/Alchemy/Phrasea/TaskManager/Notifier.php
View File

@@ -25,7 +25,7 @@ class Notifier implements NotifierInterface
private $logger;
/** @var integer */
private $timeout = 1;
private $timeout = 10;
public function __construct(\ZMQSocket $socket, LoggerInterface $logger)
{

121
lib/conf.d/configuration.yml
View File

@@ -1,12 +1,15 @@
servername: 'http://local.phrasea/'
languages:
available: []
available:
- fr
- en
- de
- nl
default: 'fr'
main:
maintenance: false
key: ''
api_require_ssl: true
delete-account-require-email-confirmation: true
database:
host: 'sql-host'
port: 3306
@@ -24,10 +27,33 @@ main:
options: {}
search-engine:
type: elasticsearch
# type: phrasea
options:
host: localhost
host: 'localhost'
port: 9200
index: ''
shards: 3
replicas: 0
minScore: 2
highlight: true
maxResultWindow: 500000
populate_order: RECORD_ID
populate_direction: DESC
activeTab: '#elastic-search'
base_aggregate_limit: 10
collection_aggregate_limit: 10
doctype_aggregate_limit: 0
camera_model_aggregate_limit: 0
iso_aggregate_limit: 0
aperture_aggregate_limit: 0
shutterspeed_aggregate_limit: 0
flashfired_aggregate_limit: 0
framerate_aggregate_limit: 0
audiosamplerate_aggregate_limit: 0
videocodec_aggregate_limit: 0
audiocodec_aggregate_limit: 0
orientation_aggregate_limit: 0
colorspace_aggregate_limit: 0
mimetype_aggregate_limit: 0
task-manager:
status: started
enabled: true
@@ -68,26 +94,20 @@ main:
download: null
lazaret: null
caption: null
bridge:
youtube:
enabled: false
client_id: null
client_secret: null
developer_key: null
flickr:
enabled: false
client_id: null
client_secret: null
dailymotion:
enabled: false
client_id: null
client_secret: null
trusted-proxies: []
debugger:
allowed-ips: []
border-manager:
enabled: true
extension-mapping: { }
extension-mapping:
otc: application/vnd.oasis.opendocument.chart-template
ttc: application/x-font-ttf
xlsx: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
docx: application/msword
pptx: application/vnd.ms-powerpoint
mxf: application/mxf
mp4: video/mp4
checkers:
-
type: Checker\Sha256
@@ -121,6 +141,9 @@ border-manager:
enabled: false
options:
mediatypes: [Audio, Document, Flash, Image, Video]
user_account:
deleting_policies:
email_confirmation: true
authentication:
auto-create:
templates: { }
@@ -202,8 +225,9 @@ embed_bundle:
video:
player: videojs
autoplay: false
coverSubdef: thumbnail
available-speeds:
cover_subdef: thumbnail
message_start: StartOfMessage
available_speeds:
- 1
- 1.5
- 3
@@ -211,37 +235,68 @@ embed_bundle:
player: videojs
autoplay: false
document:
player: flexpaper
enable-pdfjs: true
#player: flexpaper
enable_pdfjs: true
geocoding-providers:
-
name: 'mapBox'
map-provider: 'mapboxWebGL'
enabled: true
public-key: ''
map-layers:
-
name: Light
value: 'mapbox://styles/mapbox/light-v9'
-
name: Streets
value: 'mapbox://styles/mapbox/streets-v9'
-
name: Basic
value: 'mapbox://styles/mapbox/basic-v9'
-
name: Satellite
value: 'mapbox://styles/mapbox/satellite-v9'
-
name: Dark
value: 'mapbox://styles/mapbox/dark-v9'
transition-mapboxgl:
-
animate: true
speed: '2.2'
curve: '1.42'
default-position:
- 2.335062
- 48.879162
default-zoom: 2
marker-default-zoom: 11
position-fields:
-
name: GpsCompositePosition
type: latlng
position-fields: []
#-
# name: GpsCompositePosition
# type: latlng
# -
# name: Longitude
# type: lng
# -
# name: Latitude
# type: lat
geonames-field-mapping: true
cityfields: 'City, Ville'
provincefields: Province
countryfields: 'Country, Pays'
video-editor:
vttFieldName: VideoTextTrackChapters
seekBackwardStep: 1000 # in ms
seekForwardStep: 1000 # in ms
seekBackwardStep: 500 # in ms
seekForwardStep: 500 # in ms
playbackRates:
- 1
- '1.5'
- 3
rabbitmq:
server:
host: localhost
port: 5672
user: ''
password: ''
vhost: /
Console_logger_enabled_environments: [test]
user_account:
deleting_policies:
email_confirmation: true

34
lib/conf.d/data_templates/DublinCore.xml
View File

@@ -182,26 +182,26 @@
</subdefs>
<description>
<Title src="XMP-dc:Title" thumbtitle="1" report="1" />
<Creator src="XMP-dc:Creator" report="1" />
<Subject src="XMP-dc:Subject" multi="1"/>
<Description src="XMP-dc:Description" report="0" />
<Title src="XMP-dc:Title" type="string" thumbtitle="1" report="1" />
<Creator src="XMP-dc:Creator" type="string" report="1" />
<Subject src="XMP-dc:Subject" type="string" multi="1"/>
<Description src="XMP-dc:Description" type="string" report="0" />
<Publisher src="XMP-dc:Publisher" type="date" report="0" />
<Contributor src="XMP-dc:Contributor" report="0"/>
<Contributor src="XMP-dc:Contributor" type="string" report="0"/>
<Date src="XMP-dc:Date" type="date" report="0" />
<Type src="XMP-dc:Type" report="1" />
<Format src="XMP-dc:Format" report="0" />
<Identifier src="XMP-dc:Identifier" report="1" />
<Source src="XMP-dc:Source" report="0" />
<Language src="XMP-dc:Language" report="0" />
<Relation src="XMP-dc:Relation" report="0" />
<Coverage src="XMP-dc:Coverage" report="1" />
<Rights src="XMP-dc:Rights" report="0" />
<Comments src="" business="1" report="0" />
<Type src="XMP-dc:Type" type="string" report="1" />
<Format src="XMP-dc:Format" type="string" report="0" />
<Identifier src="XMP-dc:Identifier" type="string" report="1" />
<Source src="XMP-dc:Source" type="string" report="0" />
<Language src="XMP-dc:Language" type="string" report="0" />
<Relation src="XMP-dc:Relation" type="string" report="0" />
<Coverage src="XMP-dc:Coverage" type="string" report="1" />
<Rights src="XMP-dc:Rights" type="string" report="0" />
<Comments src="" business="1" type="string" report="0" />
<Filename src="Phraseanet:tf-basename" readonly="1" type="string" report="1"/>
<CameraDevice src="IFD0:Model" readonly="1" report="0" />
<Latitude src="GPS:GPSLatitude" readonly="1" report="0" />
<Longitude src="GPS:GPSLongitude" readonly="1" report="0"/>
<CameraDevice src="IFD0:Model" type="string" readonly="1" report="0" />
<Latitude src="GPS:GPSLatitude" type="number" readonly="1" report="0" />
<Longitude src="GPS:GPSLongitude" type="number" readonly="1" report="0"/>
<ArchiveDate src="Phraseanet:tf-archivedate" readonly="1" type="date" report="0" />
<LastEditDate src="Phraseanet:tf-editdate" readonly="1" type="date" report="0" />
</description>

40
lib/conf.d/data_templates/en-simple.xml
View File

@@ -182,27 +182,27 @@
</subdefs>
<description>
<Object src="IPTC:ObjectName" />
<Category src="IPTC:Category"/>
<SupplCategory src="IPTC:SupplementalCategories" multi="1"/>
<Keywords src="IPTC:Keywords" multi="1"/>
<SpecialInstruct src="IPTC:SpecialInstructions"/>
<Object src="IPTC:ObjectName" type="string"/>
<Category src="IPTC:Category" type="string"/>
<SupplCategory src="IPTC:SupplementalCategories" type="string" multi="1"/>
<Keywords src="IPTC:Keywords" type="string" multi="1"/>
<SpecialInstruct src="IPTC:SpecialInstructions" type="string"/>
<Date src="IPTC:DateCreated" type="date" />
<Byline src="IPTC:By-line"/>
<BylineTitle src="IPTC:By-lineTitle"/>
<City src="IPTC:City" />
<Province src="IPTC:Province-State" />
<Country src="IPTC:Country-PrimaryLocationName" />
<OriginalRef src="IPTC:OriginalTransmissionReference" />
<Headline src="IPTC:Headline" report="1" thumbtitle="1" />
<Credit src="IPTC:Credit" report="1" />
<Source src="IPTC:Source" />
<Caption src="IPTC:Caption-Abstract" />
<CaptionWriter src="IPTC:Writer-Editor" />
<Longitude src="GPS:GPSLongitude" readonly="1"/>
<Latitude src="GPS:GPSLatitude" readonly="1"/>
<CameraModel src="IFD0:Model" readonly="1"/>
<FileName src="Phraseanet:tf-basename" readonly="1" type="string" />
<Byline src="IPTC:By-line" type="string"/>
<BylineTitle src="IPTC:By-lineTitle" type="string"/>
<City src="IPTC:City" type="string"/>
<Province src="IPTC:Province-State" type="string"/>
<Country src="IPTC:Country-PrimaryLocationName" type="string"/>
<OriginalRef src="IPTC:OriginalTransmissionReference" type="string"/>
<Headline src="IPTC:Headline" type="string" report="1" thumbtitle="1"/>
<Credit src="IPTC:Credit" type="string" report="1"/>
<Source src="IPTC:Source" type="string"/>
<Caption src="IPTC:Caption-Abstract" type="string"/>
<CaptionWriter src="IPTC:Writer-Editor" type="string"/>
<Longitude src="GPS:GPSLongitude" type="number" readonly="1"/>
<Latitude src="GPS:GPSLatitude" type="number" readonly="1"/>
<CameraModel src="IFD0:Model" type="string" readonly="1"/>
<FileName src="Phraseanet:tf-basename" type="string" readonly="1"/>
</description>
<statbits>

42
lib/conf.d/data_templates/fr-simple.xml
View File

@@ -182,27 +182,27 @@
</subdefs>
<description>
<Objet src="IPTC:ObjectName" />
<Categorie src="IPTC:Category"/>
<AutresCategories src="IPTC:SupplementalCategories" multi="1"/>
<MotsCles src="IPTC:Keywords" multi="1"/>
<Observations src="IPTC:SpecialInstructions"/>
<Date src="IPTC:DateCreated" type="date" />
<Signature src="IPTC:By-line"/>
<TitreCredits src="IPTC:By-lineTitle"/>
<Ville src="IPTC:City" />
<Province src="IPTC:Province-State" />
<Pays src="IPTC:Country-PrimaryLocationName" />
<ReferencesOriginales src="IPTC:OriginalTransmissionReference" />
<Titre src="IPTC:Headline" report="1" thumbtitle="1" />
<Credit src="IPTC:Credit" report="1" />
<Source src="IPTC:Source" />
<Legende src="IPTC:Caption-Abstract" />
<Redacteur src="IPTC:Writer-Editor" />
<Longitude src="GPS:GPSLongitude" readonly="1"/>
<Latitude src="GPS:GPSLatitude" readonly="1"/>
<AppareilPhoto src="IFD0:Model" readonly="1"/>
<NomDeFichier src="Phraseanet:tf-basename" readonly="1" type="string" />
<Objet src="IPTC:ObjectName" type="string"/>
<Categorie src="IPTC:Category" type="string"/>
<AutresCategories src="IPTC:SupplementalCategories" type="string" multi="1"/>
<MotsCles src="IPTC:Keywords" type="string" multi="1"/>
<Observations src="IPTC:SpecialInstructions" type="string"/>
<Date src="IPTC:DateCreated" type="date"/>
<Signature src="IPTC:By-line" type="string"/>
<TitreCredits src="IPTC:By-lineTitle" type="string"/>
<Ville src="IPTC:City" type="string" />
<Province src="IPTC:Province-State" type="string"/>
<Pays src="IPTC:Country-PrimaryLocationName" type="string"/>
<ReferencesOriginales src="IPTC:OriginalTransmissionReference" type="string"/>
<Titre src="IPTC:Headline" type="string" report="1" thumbtitle="1" />
<Credit src="IPTC:Credit" type="string" report="1" />
<Source src="IPTC:Source" type="string"/>
<Legende src="IPTC:Caption-Abstract" type="string"/>
<Redacteur src="IPTC:Writer-Editor" type="string"/>
<Longitude src="GPS:GPSLongitude" type="number" readonly="1"/>
<Latitude src="GPS:GPSLatitude" type="number" readonly="1"/>
<AppareilPhoto src="IFD0:Model" type="string" readonly="1"/>
<NomDeFichier src="Phraseanet:tf-basename" type="string" readonly="1"/>
</description>
<statbits>