From 64fceb3bca037650e80e6b7bf3dab1d323fc4abb Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Sat, 6 Sep 2008 22:56:04 +0000 Subject: Update: Centralized Central in phpBB3 Also removed subscription.php due to the new subscription specification (#28) Refs #52 and #28 --- .../phpBB3/trunk/root/includes/acp/acp_instadisc.php | 20 ++++++-------------- .../trunk/root/includes/functions_instadisc.php | 8 +++----- 2 files changed, 9 insertions(+), 19 deletions(-) (limited to 'update/plugin/phpBB3/trunk/root/includes') diff --git a/update/plugin/phpBB3/trunk/root/includes/acp/acp_instadisc.php b/update/plugin/phpBB3/trunk/root/includes/acp/acp_instadisc.php index d5bcbd1..b7fc583 100644 --- a/update/plugin/phpBB3/trunk/root/includes/acp/acp_instadisc.php +++ b/update/plugin/phpBB3/trunk/root/includes/acp/acp_instadisc.php @@ -31,29 +31,21 @@ class acp_instadisc { // Add config to the database set_config('id_subscription_title', $_POST['subscription_title']); - set_config('id_central_server', $_POST['central_server']); - set_config('id_username', $_POST['central_server_username']); - set_config('id_password', $_POST['central_server_password']); - set_config('id_activation_key', $_POST['central_server_activation']); + set_config('id_series_url', $_POST['series_url']); + set_config('id_subscription_id', $_POST['subscription_id']); set_config('id_encryption_key', $_POST['encryption_key']); trigger_error($user->lang['ID_CHANGES_SAVED'] . adm_back_link($this->u_action), E_USER_NOTICE); } else { $idst = isset($config['id_subscription_title']) ? $config['id_subscription_title'] : $config['sitename']; - $idcs = isset($config['id_central_server']) ? $config['id_central_server'] : ''; - $idun = isset($config['id_username']) ? $config['id_username'] : ''; - $idps = isset($config['id_password']) ? $config['id_password'] : ''; - $idak = isset($config['id_activation_key']) ? $config['id_activation_key'] : ''; - $idsf = generate_board_url() . '/instadisc.php'; + $idsu = isset($config['id_series_url']) ? $config['id_series_url'] : ''; + $idsi = isset($config['id_subscription_id']) ? $config['id_subscription_id'] : ''; $idec = isset($config['id_encryption_key']) ? $config['id_encryption_key'] : ''; $template->assign_vars(array( 'S_SUBSCRIPTION_TITLE' => $idst, - 'S_CENTRAL_SERVER' => $idcs, - 'S_USERNAME' => $idun, - 'S_PASSWORD' => $idps, - 'S_ACTIVATION' => $idak, - 'S_SUBSCRIPTION_FILE' => $idsf, + 'S_SERIES_URL' => $idsu, + 'S_SUBSCRIPTION_ID' => $idsi, 'S_ENCRYPTION_KEY' => $idec, 'S_SUBMIT' => $this->u_action )); diff --git a/update/plugin/phpBB3/trunk/root/includes/functions_instadisc.php b/update/plugin/phpBB3/trunk/root/includes/functions_instadisc.php index cfbe5d5..f7af802 100644 --- a/update/plugin/phpBB3/trunk/root/includes/functions_instadisc.php +++ b/update/plugin/phpBB3/trunk/root/includes/functions_instadisc.php @@ -65,11 +65,9 @@ function sendItem($title, $userID, $url, $fourm) mcrypt_module_close($td); } - $client = new xmlrpc_client($config['id_central_server']); - $msg = new xmlrpcmsg("InstaDisc.sendFromUpdate", array( new xmlrpcval($config['id_username'], 'string'), - new xmlrpcval(md5($config['id_username'] . ':' . md5($config['id_password']) . ':' . $verID), 'string'), - new xmlrpcval($verID, 'int'), - new xmlrpcval(generate_board_url() . '/', 'string'), + $client = new xmlrpc_client('http://central.fourisland.com/xmlrpc.php'); + $msg = new xmlrpcmsg("InstaDisc.sendFromUpdate", array( new xmlrpcval($config['id_series_url'], 'string'), + new xmlrpcval($config['id_subscription_id'], 'string'), new xmlrpcval($title, 'string'), new xmlrpcval($author, 'string'), new xmlrpcval($url, 'string'), -- cgit 1.4.1