Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MaarchCourrier
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Redmine
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Harbor Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maarch
MaarchCourrier
Commits
5418196a
Commit
5418196a
authored
8 years ago
by
Giovannoni Laurent
Browse files
Options
Downloads
Patches
Plain Diff
FEAT #4542 PEAR SOAP FOR PHP7
parent
1aad963e
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
core/trunk/core/class/web_service/Maarch_SOAP_DISCO_Server.php
+20
-5
20 additions, 5 deletions
...trunk/core/class/web_service/Maarch_SOAP_DISCO_Server.php
core/trunk/core/class/web_service/class_soap_server.php
+5
-4
5 additions, 4 deletions
core/trunk/core/class/web_service/class_soap_server.php
with
25 additions
and
9 deletions
core/trunk/core/class/web_service/Maarch_SOAP_DISCO_Server.php
+
20
−
5
View file @
5418196a
<?php
<?php
require_once
(
'SOAP/Disco.php'
);
if
(
version_compare
(
PHP_VERSION
,
'7.0.0'
)
>=
0
)
{
require_once
(
'apps/maarch_entreprise/tools/PEAR/SOAP/Disco.php'
);
}
else
{
require_once
(
'SOAP/Disco.php'
);
}
require_once
(
'core/class/Url.php'
);
require_once
(
'core/class/Url.php'
);
class
Maarch_SOAP_DISCO_Server
extends
SOAP_DISCO_Server
class
Maarch_SOAP_DISCO_Server
extends
SOAP_DISCO_Server
{
{
public
function
__construct
()
public
function
__construct
(
$server
,
$service_name
=
'MaarchSoapServer'
)
{
{
$funcGetArgs
=
func_get_args
();
if
(
version_compare
(
PHP_VERSION
,
'7.0.0'
)
>=
0
)
{
call_user_func_array
(
array
(
parent
,
'SOAP_DISCO_Server'
),
$SOAP_DISCO_Server
=
new
SOAP_DISCO_Server
(
$server
,
$service_name
);
$funcGetArgs
);
$this
->
soap_server
=
$SOAP_DISCO_Server
->
soap_server
;
$this
->
soap_server
->
_namespaces
=
$SOAP_DISCO_Server
->
namespaces
;
$this
->
_service_name
=
$service_name
;
$this
->
_service_ns
=
"urn:
$service_name
"
;
}
else
{
$funcGetArgs
=
func_get_args
();
call_user_func_array
(
array
(
parent
,
'SOAP_DISCO_Server'
),
$funcGetArgs
);
}
$this
->
host
=
array_key_exists
(
'HTTP_X_FORWARDED_HOST'
,
$_SERVER
)
$this
->
host
=
array_key_exists
(
'HTTP_X_FORWARDED_HOST'
,
$_SERVER
)
?
$_SERVER
[
'HTTP_X_FORWARDED_HOST'
]
?
$_SERVER
[
'HTTP_X_FORWARDED_HOST'
]
:
$_SERVER
[
'HTTP_HOST'
];
:
$_SERVER
[
'HTTP_HOST'
];
...
...
This diff is collapsed.
Click to expand it.
core/trunk/core/class/web_service/class_soap_server.php
+
5
−
4
View file @
5418196a
...
@@ -92,10 +92,11 @@ class MaarchSoapServer extends webService {
...
@@ -92,10 +92,11 @@ class MaarchSoapServer extends webService {
* import of the SOAP library
* import of the SOAP library
*/
*/
function
importSOAPLibs
()
{
function
importSOAPLibs
()
{
require
(
'SOAP/Server.php'
);
if
(
version_compare
(
PHP_VERSION
,
'7.0.0'
)
>=
0
)
{
/*
require
(
'apps/maarch_entreprise/tools/PEAR/SOAP/Server.php'
);
require ('SOAP/Disco.php');
}
else
{
*/
require
(
'SOAP/Server.php'
);
}
}
}
/**
/**
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment