Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

- Fix Bug #11454: basedir config is not respected in index.php

- Replace & -> & to get valid html


git-svn-id: http://svn.php.net/repository/pear/packages/SOAP_Interop/trunk@238691 c90b9560-bf6c-de11-be94-00142212c4b1
  • Loading branch information...
commit bb1b166c176e6b787d9f8550890501a62562cf69 1 parent 69fb19e
@cweiske cweiske authored
Showing with 20 additions and 19 deletions.
  1. +1 −1  config.php.dist
  2. +19 −18 index.php
View
2  config.php.dist
@@ -1,4 +1,4 @@
<?php
// configuration items
$interopConfig['DSN'] = 'mysql://user@localhost/soapinterop';
-$interopConfig['basedir'] = '/soap_interop';
+$interopConfig['basedir'] = '/soap_interop/';
View
37 index.php
@@ -5,6 +5,7 @@
<title>PEAR SOAP Interop</title>
</head>
<?php
+require_once 'config.php';
require_once 'registrationAndNotification.php';
$tests = array('Round 2 Base',
@@ -21,7 +22,7 @@
);
// get our endpoint
-$baseurl = 'http://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].'/soap_interop/';
+$baseurl = 'http://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].$interopConfig['basedir'];
?>
<body>
@@ -71,26 +72,26 @@ class to define what the type of the value is. The second method is more intero
</p>
<ul>
-<li><a href="interop_client_results.php?test=Round+2+Base&type=php&wsdl=0">Base results using PHP native types</a></li>
-<li><a href="interop_client_results.php?test=Round+2+Base&type=soapval&wsdl=0">Base results using SOAP types</a></li>
-<li><a href="interop_client_results.php?test=Round+2+Base&type=php&wsdl=1">Base results using PHP native types with WSDL</a></li>
+<li><a href="interop_client_results.php?test=Round+2+Base&amp;type=php&amp;wsdl=0">Base results using PHP native types</a></li>
+<li><a href="interop_client_results.php?test=Round+2+Base&amp;type=soapval&amp;wsdl=0">Base results using SOAP types</a></li>
+<li><a href="interop_client_results.php?test=Round+2+Base&amp;type=php&amp;wsdl=1">Base results using PHP native types with WSDL</a></li>
-<li><a href="interop_client_results.php?test=Round+2+Group+B&type=php&wsdl=0">Group B results using PHP native types</a></li>
-<li><a href="interop_client_results.php?test=Round+2+Group+B&type=soapval&wsdl=0">Group B results using SOAP types</a></li>
-<li><a href="interop_client_results.php?test=Round+2+Group+B&type=php&wsdl=1">Group B results using PHP native types with WSDL</a></li>
+<li><a href="interop_client_results.php?test=Round+2+Group+B&amp;type=php&amp;wsdl=0">Group B results using PHP native types</a></li>
+<li><a href="interop_client_results.php?test=Round+2+Group+B&amp;type=soapval&amp;wsdl=0">Group B results using SOAP types</a></li>
+<li><a href="interop_client_results.php?test=Round+2+Group+B&amp;type=php&amp;wsdl=1">Group B results using PHP native types with WSDL</a></li>
-<li><a href="interop_client_results.php?test=Round+2+Group+C&type=php&wsdl=0">Group C results using PHP native types</a></li>
-<li><a href="interop_client_results.php?test=Round+2+Group+C&type=soapval&wsdl=0">Group C results using SOAP types</a></li>
-<li><a href="interop_client_results.php?test=Round+2+Group+C&type=php&wsdl=1">Group C results using PHP native types with WSDL</a></li>
+<li><a href="interop_client_results.php?test=Round+2+Group+C&amp;type=php&amp;wsdl=0">Group C results using PHP native types</a></li>
+<li><a href="interop_client_results.php?test=Round+2+Group+C&amp;type=soapval&amp;wsdl=0">Group C results using SOAP types</a></li>
+<li><a href="interop_client_results.php?test=Round+2+Group+C&amp;type=php&amp;wsdl=1">Group C results using PHP native types with WSDL</a></li>
-<li><a href="interop_client_results.php?test=Round+3+Group+D+Compound+1&type=php&wsdl=1">Group D Compound 1 results using PHP native types with WSDL</a></li>
-<li><a href="interop_client_results.php?test=Round+3+Group+D+Compound+2&type=php&wsdl=1">Group D Compound 2 results using PHP native types with WSDL</a></li>
-<li><a href="interop_client_results.php?test=Round+3+Group+D+DocLit&type=php&wsdl=1">Group D DocLit results using PHP native types with WSDL</a></li>
-<li><a href="interop_client_results.php?test=Round+3+Group+D+DocLitParams&type=php&wsdl=1">Group D DocLitParams results using PHP native types with WSDL</a></li>
-<li><a href="interop_client_results.php?test=Round+3+Group+D+Import+1&type=php&wsdl=1">Group D Import 1 results using PHP native types with WSDL</a></li>
-<li><a href="interop_client_results.php?test=Round+3+Group+D+Import+2&type=php&wsdl=1">Group D Import 2 results using PHP native types with WSDL</a></li>
-<li><a href="interop_client_results.php?test=Round+3+Group+D+Import+3&type=php&wsdl=1">Group D Import 3 results using PHP native types with WSDL</a></li>
-<li><a href="interop_client_results.php?test=Round+3+Group+D+RpcEnc&type=php&wsdl=1">Group D RpcEnc results using PHP native types with WSDL</a></li>
+<li><a href="interop_client_results.php?test=Round+3+Group+D+Compound+1&amp;type=php&amp;wsdl=1">Group D Compound 1 results using PHP native types with WSDL</a></li>
+<li><a href="interop_client_results.php?test=Round+3+Group+D+Compound+2&amp;type=php&amp;wsdl=1">Group D Compound 2 results using PHP native types with WSDL</a></li>
+<li><a href="interop_client_results.php?test=Round+3+Group+D+DocLit&amp;type=php&amp;wsdl=1">Group D DocLit results using PHP native types with WSDL</a></li>
+<li><a href="interop_client_results.php?test=Round+3+Group+D+DocLitParams&amp;type=php&amp;wsdl=1">Group D DocLitParams results using PHP native types with WSDL</a></li>
+<li><a href="interop_client_results.php?test=Round+3+Group+D+Import+1&amp;type=php&amp;wsdl=1">Group D Import 1 results using PHP native types with WSDL</a></li>
+<li><a href="interop_client_results.php?test=Round+3+Group+D+Import+2&amp;type=php&amp;wsdl=1">Group D Import 2 results using PHP native types with WSDL</a></li>
+<li><a href="interop_client_results.php?test=Round+3+Group+D+Import+3&amp;type=php&amp;wsdl=1">Group D Import 3 results using PHP native types with WSDL</a></li>
+<li><a href="interop_client_results.php?test=Round+3+Group+D+RpcEnc&amp;type=php&amp;wsdl=1">Group D RpcEnc results using PHP native types with WSDL</a></li>
<li><a href="interop_client_results.php">Show All Results</a></li>
</ul>
Please sign in to comment.
Something went wrong with that request. Please try again.