Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Maarch
thirdPartyArchiving
Commits
d660964d
Commit
d660964d
authored
Apr 19, 2019
by
Cyril Vazquez
Browse files
Merge branch 'hotfix/2.4.1' into 'master'
Hotfix/2.4.1 master See merge request maarch/thirdPartyArchiving!73
parents
d9087523
ae68a243
Changes
4
Hide whitespace changes
Inline
Side-by-side
VERSION.md
View file @
d660964d
2.
4
2.
4
.1
bundle/medona/Controller/ArchiveTransfer.php
View file @
d660964d
...
...
@@ -258,7 +258,7 @@ class ArchiveTransfer extends abstractMessage
protected
function
detectSchema
(
$message
)
{
$mediatype
=
$this
->
finfo
->
file
(
$message
->
path
);
if
(
$mediatype
==
'application/xml'
)
{
if
(
$mediatype
==
'application/xml'
||
$mediatype
===
'text/xml'
)
{
$xml
=
new
\
DOMDocument
();
$xml
->
load
(
$message
->
path
);
$messageNamespace
=
$xml
->
documentElement
->
namespaceURI
;
...
...
bundle/medona/Controller/message.php
View file @
d660964d
...
...
@@ -1025,10 +1025,7 @@ class message
}
$messages
=
$this
->
read
(
$message
[
0
]
->
messageId
);
$nbMessages
=
count
(
$messages
);
if
(
$nbMessages
!=
1
)
{
if
(
!
$messages
)
{
throw
new
\
core\Exception\NotFoundException
(
"The message does not exist"
);
}
...
...
data/conf/vhost.conf.default
View file @
d660964d
...
...
@@ -32,6 +32,7 @@
SetEnv LAABS_EXTENSIONS thirdPartyArchiving
SetEnv LAABS_DEPENDENCIES repository;xml;html;localisation;datasource;sdo;json;fileSystem
SetEnv LAABS_PRESENTATION maarchRM
SetEnv SERVICE_CLIENT_TOKEN service
SetEnv LAABS_CONFIGURATION "../src/ext/thirdPartyArchiving/data/conf/configuration.ini"
SetEnv LAABS_LOG "../data/maarchRM/log.txt"
...
...
@@ -54,60 +55,4 @@
SetEnv LAABS_CRYPT_KEY mySecretKey
SetEnv LAABS_CRYPT_CIPHER MCRYPT_BLOWFISH
SetEnv LAABS_XML_NS "medona:org:afnor:medona:1.0"
</VirtualHost>
<VirtualHost *:80>
# Set document root in Laabs public web directory
DocumentRoot /var/www/laabs/web/
# Set server name
ServerName srv-maarchrmtp
Options -Indexes
Options FollowSymLinks
# DirectoryIndex dynamic.php
# Rewrite URLs to route to frontal scripts
# when target is not an existing public resource
RewriteEngine On
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_FILENAME} -f [OR]
RewriteCond %{REQUEST_URI} ^/public [NC]
RewriteRule .* - [QSA,L]
# Rewrite to dynamic frontal if no file extension
# input: /route?args...
# output : http.php/route?args...
RewriteRule ^(.*)$ /http.php [QSA,L]
# Set environment variables for the application instance
SetEnv LAABS_INSTANCE_NAME maarchRMTP
SetEnv LAABS_APP maarchRMTP
SetEnv LAABS_BUNDLES audit;auth;batchProcessing;contact;digitalResource;filePlan;lifeCycle;medona;organization;recordsManagement
SetEnv LAABS_EXTENSIONS thirdPartyArchiving
SetEnv LAABS_DEPENDENCIES repository;xml;html;localisation;datasource;sdo;json;fileSystem
# SetEnv LAABS_PRESENTATION maarchRM
SetEnv LAABS_CONFIGURATION "../data/maarchRM/conf/configuration.ini"
SetEnv LAABS_LOG "../data/maarchRM/log.txt"
SetEnv LAABS_CONTENT_TYPES "url:application/x-www-form-urlencoded;html:text/html,application/xhtml+xml;xml:application/xml;json:application/json,application/javascript;soap:application/soap+xml;csv:text/csv"
#SetEnv LAABS_CONTENT_LANGUAGES "fr:fr,fr-fr,fr-ca"
SetEnv LAABS_CACHE_CONTROL "public, max-age=3600"
#SetEnv LAABS_EXCEPTION_HANDLER
#SetEnv LAABS_ERROR_HANDLER
SetEnv LAABS_DATE_FORMAT "d-m-Y"
SetEnv LAABS_TIMESTAMP_FORMAT "Y-m-d\TH:i:s,u\Z"
SetEnv LAABS_NUMBER_DECIMALS 2
SetEnv LAABS_DEFAULT_URI recordsManagement/welcome/welcomePage
SetEnv LAABS_ERROR_URI recordsManagement/welcome/error
SetEnv LAABS_CSRF_PROTECTION On
SetEnv LAABS_CRYPT_KEY mySecretKey
SetEnv LAABS_CRYPT_CIPHER MCRYPT_BLOWFISH
SetEnv LAABS_XML_NS "medona:org:afnor:medona:1.0"
</VirtualHost>
</VirtualHost>
\ No newline at end of file
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment