diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2008-09-06 22:56:04 +0000 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2008-09-06 22:56:04 +0000 |
| commit | 64fceb3bca037650e80e6b7bf3dab1d323fc4abb (patch) | |
| tree | 28a725d6114a715a7690b1402e3555e466048f0a /update/plugin/phpBB3/trunk/root/includes | |
| parent | 9c8c1d163cc74e51a46d17e5359723e71a23d1ee (diff) | |
| download | instadisc-64fceb3bca037650e80e6b7bf3dab1d323fc4abb.tar.gz instadisc-64fceb3bca037650e80e6b7bf3dab1d323fc4abb.tar.bz2 instadisc-64fceb3bca037650e80e6b7bf3dab1d323fc4abb.zip | |
Update: Centralized Central in phpBB3
Also removed subscription.php due to the new subscription specification (#28) Refs #52 and #28
Diffstat (limited to 'update/plugin/phpBB3/trunk/root/includes')
| -rw-r--r-- | update/plugin/phpBB3/trunk/root/includes/acp/acp_instadisc.php | 20 | ||||
| -rw-r--r-- | update/plugin/phpBB3/trunk/root/includes/functions_instadisc.php | 8 |
2 files changed, 9 insertions, 19 deletions
| 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 | |||
| 31 | { | 31 | { |
| 32 | // Add config to the database | 32 | // Add config to the database |
| 33 | set_config('id_subscription_title', $_POST['subscription_title']); | 33 | set_config('id_subscription_title', $_POST['subscription_title']); |
| 34 | set_config('id_central_server', $_POST['central_server']); | 34 | set_config('id_series_url', $_POST['series_url']); |
| 35 | set_config('id_username', $_POST['central_server_username']); | 35 | set_config('id_subscription_id', $_POST['subscription_id']); |
| 36 | set_config('id_password', $_POST['central_server_password']); | ||
| 37 | set_config('id_activation_key', $_POST['central_server_activation']); | ||
| 38 | set_config('id_encryption_key', $_POST['encryption_key']); | 36 | set_config('id_encryption_key', $_POST['encryption_key']); |
| 39 | 37 | ||
| 40 | trigger_error($user->lang['ID_CHANGES_SAVED'] . adm_back_link($this->u_action), E_USER_NOTICE); | 38 | trigger_error($user->lang['ID_CHANGES_SAVED'] . adm_back_link($this->u_action), E_USER_NOTICE); |
| 41 | } else { | 39 | } else { |
| 42 | $idst = isset($config['id_subscription_title']) ? $config['id_subscription_title'] : $config['sitename']; | 40 | $idst = isset($config['id_subscription_title']) ? $config['id_subscription_title'] : $config['sitename']; |
| 43 | $idcs = isset($config['id_central_server']) ? $config['id_central_server'] : ''; | 41 | $idsu = isset($config['id_series_url']) ? $config['id_series_url'] : ''; |
| 44 | $idun = isset($config['id_username']) ? $config['id_username'] : ''; | 42 | $idsi = isset($config['id_subscription_id']) ? $config['id_subscription_id'] : ''; |
| 45 | $idps = isset($config['id_password']) ? $config['id_password'] : ''; | ||
| 46 | $idak = isset($config['id_activation_key']) ? $config['id_activation_key'] : ''; | ||
| 47 | $idsf = generate_board_url() . '/instadisc.php'; | ||
| 48 | $idec = isset($config['id_encryption_key']) ? $config['id_encryption_key'] : ''; | 43 | $idec = isset($config['id_encryption_key']) ? $config['id_encryption_key'] : ''; |
| 49 | 44 | ||
| 50 | $template->assign_vars(array( | 45 | $template->assign_vars(array( |
| 51 | 'S_SUBSCRIPTION_TITLE' => $idst, | 46 | 'S_SUBSCRIPTION_TITLE' => $idst, |
| 52 | 'S_CENTRAL_SERVER' => $idcs, | 47 | 'S_SERIES_URL' => $idsu, |
| 53 | 'S_USERNAME' => $idun, | 48 | 'S_SUBSCRIPTION_ID' => $idsi, |
| 54 | 'S_PASSWORD' => $idps, | ||
| 55 | 'S_ACTIVATION' => $idak, | ||
| 56 | 'S_SUBSCRIPTION_FILE' => $idsf, | ||
| 57 | 'S_ENCRYPTION_KEY' => $idec, | 49 | 'S_ENCRYPTION_KEY' => $idec, |
| 58 | 'S_SUBMIT' => $this->u_action | 50 | 'S_SUBMIT' => $this->u_action |
| 59 | )); | 51 | )); |
| 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) | |||
| 65 | mcrypt_module_close($td); | 65 | mcrypt_module_close($td); |
| 66 | } | 66 | } |
| 67 | 67 | ||
| 68 | $client = new xmlrpc_client($config['id_central_server']); | 68 | $client = new xmlrpc_client('http://central.fourisland.com/xmlrpc.php'); |
| 69 | $msg = new xmlrpcmsg("InstaDisc.sendFromUpdate", array( new xmlrpcval($config['id_username'], 'string'), | 69 | $msg = new xmlrpcmsg("InstaDisc.sendFromUpdate", array( new xmlrpcval($config['id_series_url'], 'string'), |
| 70 | new xmlrpcval(md5($config['id_username'] . ':' . md5($config['id_password']) . ':' . $verID), 'string'), | 70 | new xmlrpcval($config['id_subscription_id'], 'string'), |
| 71 | new xmlrpcval($verID, 'int'), | ||
| 72 | new xmlrpcval(generate_board_url() . '/', 'string'), | ||
| 73 | new xmlrpcval($title, 'string'), | 71 | new xmlrpcval($title, 'string'), |
| 74 | new xmlrpcval($author, 'string'), | 72 | new xmlrpcval($author, 'string'), |
| 75 | new xmlrpcval($url, 'string'), | 73 | new xmlrpcval($url, 'string'), |