git://git.onelab.eu / plcapi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 07b9bff)
Introduce __DIR__; some CRLF -> LF; wrappers file has been renamed
authorgggeek <giunta.gaetano@gmail.com>
Wed, 10 Dec 2014 00:48:36 +0000 (00:48 +0000)
committergggeek <giunta.gaetano@gmail.com>
Wed, 10 Dec 2014 00:48:36 +0000 (00:48 +0000)
debugger/action.php patch | blob | history
debugger/controller.php patch | blob | history
demo/client/wrap.php patch | blob | history
demo/server/server.php patch | blob | history
doc/xmlrpc_php.xml patch | blob | history

diff --git a/debugger/action.php b/debugger/action.php
index f79aba0..f56946c 100644 (file)
--- a/debugger/action.php
+++ b/debugger/action.php
@@ -36,7 +36,7 @@ td form {margin: 0;}
 <body>
 <?php
 
-  include(dirname(__FILE__).'/common.php');
+  include(__DIR__.'/common.php');
   if ($action)
   {
 
@@ -149,10 +149,10 @@ td form {margin: 0;}
     switch ($action) {
 
       case 'wrap':
-        @include('xmlrpc_wrappers.inc');
+        @include('xmlrpc_wrappers.php');
         if (!function_exists('build_remote_method_wrapper_code'))
         {
-          die('Error: to enable creation of method stubs the xmlrpc_wrappers.inc file is needed');
+          die('Error: to enable creation of method stubs the xmlrpc_wrappers.php file is needed');
         }
         // fall thru intentionally
       case 'describe':
diff --git a/debugger/controller.php b/debugger/controller.php
index 438f2a4..965b2ef 100644 (file)
--- a/debugger/controller.php
+++ b/debugger/controller.php
@@ -13,7 +13,7 @@
  * @todo add http no-cache headers
  **/
 
-  include(dirname(__FILE__).'/common.php');
+  include(__DIR__.'/common.php');
   if ($action == '')
     $action = 'list';
 
diff --git a/demo/client/wrap.php b/demo/client/wrap.php
index 8ec452c..faae4bf 100644 (file)
--- a/demo/client/wrap.php
+++ b/demo/client/wrap.php
@@ -9,7 +9,7 @@
 </h3>
 <?php
     include("xmlrpc.inc");
-    include("xmlrpc_wrappers.inc");
+    include("xmlrpc_wrappers.php");
 
     $c = new xmlrpc_client("/server.php", "phpxmlrpc.sourceforge.net", 80);
     $c->return_type = 'phpvals'; // let client give us back php values instead of xmlrpcvals
diff --git a/demo/server/server.php b/demo/server/server.php
index 853dc4b..d17f73c 100644 (file)
--- a/demo/server/server.php
+++ b/demo/server/server.php
@@ -19,7 +19,7 @@ if ($_SERVER['REQUEST_METHOD'] != 'POST' && isset($_GET['showSource']))
 
     include("xmlrpc.inc");
     include("xmlrpcs.inc");
-    include("xmlrpc_wrappers.inc");
+    include("xmlrpc_wrappers.php");
 
     /**
     * Used to test usage of object methods in dispatch maps and in wrapper code
diff --git a/doc/xmlrpc_php.xml b/doc/xmlrpc_php.xml
index e6c927f..d9fff5f 100644 (file)
--- a/doc/xmlrpc_php.xml
+++ b/doc/xmlrpc_php.xml
@@ -486,7 +486,7 @@ PHP-XMLRPC User manual
             <para>The <function>wrap_php_function</function> and
             <function>wrap_xmlrpc_method</function> functions have been moved
             out of the base library file <filename>xmlrpc.inc</filename> into
-            a file of their own: <filename>xmlrpc_wrappers.inc</filename>. You
+            a file of their own: <filename>xmlrpc_wrappers.php</filename>. You
             will have to include() / require() it in your scripts if you have
             been using those functions. For increased security, the automatic
             rebuilding of php object instances out of received xmlrpc structs
@@ -913,7 +913,7 @@ PHP-XMLRPC User manual
       </glossentry>
 
       <glossentry>
-        <glossterm>lib/xmlrpc_wrappers.inc</glossterm>
+        <glossterm>lib/xmlrpc_wrappers.php</glossterm>
 
         <glossdef>
           <para>helper functions to "automagically" convert plain php
plcapi