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
be7d7055
Commit
be7d7055
authored
13 years ago
by
Giovannoni Laurent
Browse files
Options
Downloads
Patches
Plain Diff
fix : pb with url in ws
parent
70d5fc41
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
core/trunk/core/class/web_service/Maarch_SOAP_DISCO_Server.php
+3
-9
3 additions, 9 deletions
...trunk/core/class/web_service/Maarch_SOAP_DISCO_Server.php
with
3 additions
and
9 deletions
core/trunk/core/class/web_service/Maarch_SOAP_DISCO_Server.php
+
3
−
9
View file @
be7d7055
<?php
<?php
require_once
(
'SOAP/Disco.php'
);
require_once
(
'SOAP/Disco.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
{
{
...
@@ -18,19 +19,12 @@ class Maarch_SOAP_DISCO_Server extends SOAP_DISCO_Server
...
@@ -18,19 +19,12 @@ class Maarch_SOAP_DISCO_Server extends SOAP_DISCO_Server
$rootUri
=
self
::
_getRootUri
();
$rootUri
=
self
::
_getRootUri
();
$protocol
=
(
array_key_exists
(
'HTTPS'
,
$_SERVER
)
&&
$_SERVER
[
'HTTPS'
]
==
'on'
)
$protocol
=
(
array_key_exists
(
'HTTPS'
,
$_SERVER
)
&&
$_SERVER
[
'HTTPS'
]
==
'on'
)
?
'https://'
:
'http://'
;
?
'https://'
:
'http://'
;
$selfFilename
=
basename
(
__file__
);
return
$protocol
.
$this
->
host
.
$rootUri
.
'/'
.
basename
(
Url
::
scriptName
());
return
$protocol
.
$this
->
host
.
$rootUri
;
}
}
private
static
function
_getRootUri
()
private
static
function
_getRootUri
()
{
{
$rootUri
=
array_key_exists
(
'HTTP_X_BASE_URL'
,
$_SERVER
)
return
Url
::
baseUri
();
?
str_replace
(
$_SERVER
[
'HTTP_X_BASE_URL'
],
''
,
$_SERVER
[
'SCRIPT_NAME'
])
:
$_SERVER
[
'SCRIPT_NAME'
];
$endPos
=
strlen
(
$rootUri
)
-
strrpos
(
$rootUri
,
'/'
);
$rootUri
=
substr
(
$rootUri
,
0
,
$endPos
);
return
$rootUri
.
'.php'
;
}
}
public
function
_generate_WSDL
()
public
function
_generate_WSDL
()
...
...
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