From 03a5279f6c5b82ac6a14b2d9cb995f0be4e2557c Mon Sep 17 00:00:00 2001 From: x2000habouzit Date: Wed, 26 Oct 2005 07:02:00 +0000 Subject: [PATCH] rename include git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@143 839d8a87-29fc-0310-9880-83ba4fa771e5 --- htdocs.net/groupe/listes-create.php | 2 +- htdocs/admin/lists.php | 2 +- htdocs/groupex/export-econfiance.php | 2 +- include/lists.inc.php | 2 +- .../xmlrpc-client.inc.php} | 24 +++++++++++----------- .../{xml-rpc.inc.php => xmlrpc-server.inc.php} | 0 include/validations/listes.inc.php | 2 +- include/webservices/manageurs.client.inc.php | 3 +-- 8 files changed, 18 insertions(+), 19 deletions(-) rename include/{xml-rpc-client.inc.php => platal/xmlrpc-client.inc.php} (79%) rename include/platal/{xml-rpc.inc.php => xmlrpc-server.inc.php} (100%) diff --git a/htdocs.net/groupe/listes-create.php b/htdocs.net/groupe/listes-create.php index a49805c..7bb3af8 100644 --- a/htdocs.net/groupe/listes-create.php +++ b/htdocs.net/groupe/listes-create.php @@ -26,7 +26,7 @@ if (Post::has('submit')) { $page->trig_run('le sujet est vide'); } - require('xml-rpc-client.inc.php'); + require_once('platal/xmlrpc-client.inc.php'); require_once('lists.inc.php'); $client =& lists_xmlrpc(Session::getInt('uid'), Session::get('password'), $globals->asso('mail_domain')); $ret = $client->create_list($liste, Post::get('desc'), Post::get('advertise'), Post::get('modlevel'), Post::get('inslevel'), array(Session::get('forlife')), array()); diff --git a/htdocs/admin/lists.php b/htdocs/admin/lists.php index 4610096..2783a18 100644 --- a/htdocs/admin/lists.php +++ b/htdocs/admin/lists.php @@ -22,7 +22,7 @@ require_once("xorg.inc.php"); new_admin_page('admin/lists.tpl'); $page->assign('xorg_title','Polytechnique.org - Administration - Mailing lists'); -require_once('xml-rpc-client.inc.php'); +require_once('platal/xmlrpc-client.inc.php'); require_once('lists.inc.php'); $client =& lists_xmlrpc(Session::getInt('uid'), Session::get('password')); diff --git a/htdocs/groupex/export-econfiance.php b/htdocs/groupex/export-econfiance.php index 2861e28..8b0c547 100644 --- a/htdocs/groupex/export-econfiance.php +++ b/htdocs/groupex/export-econfiance.php @@ -23,7 +23,7 @@ /* Script permettant l'export de la liste des membres de la mailing list eConfiance, pour intégration par J-P Figer dans la liste des membres de X-Informatique */ require_once('xorg.inc.php'); -require_once('xml-rpc-client.inc.php'); +require_once('platal/xmlrpc-client.inc.php'); require_once('lists.inc.php'); $cle = $globals->core->econfiance; diff --git a/include/lists.inc.php b/include/lists.inc.php index 55fca23..9338cb7 100644 --- a/include/lists.inc.php +++ b/include/lists.inc.php @@ -21,7 +21,7 @@ // {{{ import class definitions -require_once("xml-rpc-client.inc.php"); +require_once 'platal/xmlrpc-client.inc.php'; // }}} // {{{ function lists_xmlrpc diff --git a/include/xml-rpc-client.inc.php b/include/platal/xmlrpc-client.inc.php similarity index 79% rename from include/xml-rpc-client.inc.php rename to include/platal/xmlrpc-client.inc.php index 891646d..a8adb92 100644 --- a/include/xml-rpc-client.inc.php +++ b/include/platal/xmlrpc-client.inc.php @@ -19,7 +19,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************/ -require_once('platal/xml-rpc.inc.php'); +require_once 'platal/xmlrpc-server.inc.php'; /* taken from : http://fr2.php.net/xml-rpc * Author mboeren@php.net @@ -39,25 +39,25 @@ class xmlrpc_client { $this->url = $url; $this->urlparts = parse_url($this->url); - foreach(array('scheme', 'host', 'user', 'pass', 'path', 'query', 'fragment') as $part) { + foreach (array('scheme', 'host', 'user', 'pass', 'path', 'query', 'fragment') as $part) { if (!isset($this->urlparts[$part])) { - $this->urlparts[$part] = NULL; + $this->urlparts[$part] = null; } } } function __call($function, $arguments, &$return) { - $requestprms['host'] = $this->urlparts['host']; - $requestprms['port'] = $this->urlparts['port']; - $requestprms['uri'] = $this->urlparts['path']; - $requestprms['method'] = $function; - $requestprms['args'] = $arguments; - $requestprms['debug'] = 0; + $requestprms['host'] = $this->urlparts['host']; + $requestprms['port'] = $this->urlparts['port']; + $requestprms['uri'] = $this->urlparts['path']; + $requestprms['method'] = $function; + $requestprms['args'] = $arguments; + $requestprms['debug'] = 0; $requestprms['timeout'] = 0; - $requestprms['user'] = $this->urlparts['user']; - $requestprms['pass'] = $this->urlparts['pass']; - $requestprms['secure'] = 0; + $requestprms['user'] = $this->urlparts['user']; + $requestprms['pass'] = $this->urlparts['pass']; + $requestprms['secure'] = 0; $result = xu_rpc_http_concise($requestprms); if (is_array($result) && isset($result['faultCode'])) { diff --git a/include/platal/xml-rpc.inc.php b/include/platal/xmlrpc-server.inc.php similarity index 100% rename from include/platal/xml-rpc.inc.php rename to include/platal/xmlrpc-server.inc.php diff --git a/include/validations/listes.inc.php b/include/validations/listes.inc.php index e36fb2c..e292199 100644 --- a/include/validations/listes.inc.php +++ b/include/validations/listes.inc.php @@ -86,7 +86,7 @@ class ListeReq extends Validate function commit() { global $globals; - require_once('xml-rpc-client.inc.php'); + require_once('platal/xmlrpc-client.inc.php'); require_once('lists.inc.php'); $client =& lists_xmlrpc(Session::getInt('uid'), Session::get('password')); diff --git a/include/webservices/manageurs.client.inc.php b/include/webservices/manageurs.client.inc.php index 559699a..a5f47b8 100644 --- a/include/webservices/manageurs.client.inc.php +++ b/include/webservices/manageurs.client.inc.php @@ -1,8 +1,7 @@