Commit 222460eb authored by jonnybradley's avatar jonnybradley

[FIX] intertiki: Remove redundant includes for XML/ pear files as this is now...

[FIX] intertiki: Remove redundant includes for XML/ pear files as this is now done in the composer autoload classmap (also add the main pref to the intertiki admin panel)
parent 595eb39a
......@@ -444,7 +444,6 @@ class RegistrationLib extends TikiLib
{
global $prefs;
include_once('XML/RPC.php');
$remote = $prefs['interlist'][$prefs['feature_intertiki_mymaster']];
$client = new XML_RPC_Client($remote['path'], $remote['host'], $remote['port']);
$client->setDebug(0);
......@@ -678,7 +677,6 @@ class RegistrationLib extends TikiLib
}
if ($prefs['feature_intertiki'] == 'y' && !empty($prefs['feature_intertiki_mymaster'])) {
include_once('XML/RPC.php');
$remote = $prefs['interlist'][$prefs['feature_intertiki_mymaster']];
$client = new XML_RPC_Client($remote['path'], $remote['host'], $remote['port']);
$client->setDebug(0);
......
......@@ -248,7 +248,6 @@ class UsersLib extends TikiLib
}
if ($remote && $prefs['feature_intertiki'] == 'y' and $prefs['feature_intertiki_sharedcookie'] == 'y' and !empty($prefs['feature_intertiki_mymaster'])) {
include_once('XML/RPC.php');
$remote = $prefs['interlist'][$prefs['feature_intertiki_mymaster']];
$remote['path'] = preg_replace('/^\/?/', '/', $remote['path']);
$client = new XML_RPC_Client($remote['path'], $remote['host'], $remote['port']);
......@@ -7214,7 +7213,6 @@ class UsersLib extends TikiLib
function intervalidate($remote, $user, $pass, $get_info = false)
{
global $prefs;
include_once('XML/RPC.php');
$hashkey = $this->get_cookie_check() . '.'. ($this->now + $prefs['remembertime']);
$remote['path'] = preg_replace('/^\/?/', '/', $remote['path']);
$client = new XML_RPC_Client($remote['path'], $remote['host'], $remote['port']);
......@@ -7239,7 +7237,6 @@ class UsersLib extends TikiLib
function interGetUserInfo($remote, $user, $email)
{
global $prefs;
include_once('XML/RPC.php');
$remote['path'] = preg_replace('/^\/?/', '/', $remote['path']);
$client = new XML_RPC_Client($remote['path'], $remote['host'], $remote['port']);
$client->setDebug(0);
......@@ -7275,7 +7272,6 @@ class UsersLib extends TikiLib
{
global $prefs;
$userlib = TikiLib::lib('user');
include_once('XML/RPC.php');
$remote['path'] = preg_replace('/^\/?/', '/', $remote['path']);
$client = new XML_RPC_Client($remote['path'], $remote['host'], $remote['port']);
$client->setDebug(0);
......@@ -7334,7 +7330,6 @@ class UsersLib extends TikiLib
function get_remote_user_by_cookie($hash)
{
global $prefs;
include_once('XML/RPC.php');
$prefs['interlist'] = unserialize($prefs['interlist']);
$remote = $prefs['interlist'][$prefs['feature_intertiki_mymaster']];
......
......@@ -11,7 +11,6 @@
$version = '0.2';
include 'tiki-setup.php';
require_once('XML/Server.php');
if ($prefs['feature_intertiki'] != 'y' || $prefs['feature_intertiki_server'] != 'y' || $prefs['feature_intertiki_mymaster']) {
......
......@@ -5,6 +5,10 @@
<form action="tiki-admin.php?page=intertiki" method="post" name="intertiki">
<input type="hidden" name="ticket" value="{$ticket|escape}">
<table class="formcolor">
<tr>
<td>{tr}Feature{/tr}</td>
<td>{preference name=feature_intertiki}</td>
</tr>
<tr>
<td>{tr}Tiki Unique key{/tr}</td>
<td><input type="text" name="tiki_key" value="{$prefs.tiki_key}" size="32" /></td>
......
......@@ -9,7 +9,6 @@
// $Id$
include_once('tiki-setup.php');
require_once("XML/Server.php");
$access->check_feature('feature_freetags', 'freetags_feature_3d');
......
......@@ -13,7 +13,6 @@ if ($prefs['feature_xmlrpc'] != 'y' || $prefs['wiki_feature_3d'] != 'y') {
die;
}
require_once("XML/Server.php");
$wikilib = TikiLib::lib('wiki');
$map = array ("getSubGraph" => array( "function" => "getSubGraph" ) );
......
......@@ -6,7 +6,6 @@
// $Id$
include_once('tiki-setup.php');
require_once('XML/Server.php');
$bloglib = TikiLib::lib('blog');
if ($prefs['feature_xmlrpc'] != 'y') {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment