Fixes #1492: Removed usage info collecting from installation.

git-svn-id: http://code.elgg.org/elgg/trunk@3913 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/actions/systemsettings/install.php b/actions/systemsettings/install.php
index 98d958a6712eb1da63886412264c4010d7bd7d09..08cbef99d56e94bfbd873d5270cc6529741c39b3 100644 (file)
--- a/actions/systemsettings/install.php
+++ b/actions/systemsettings/install.php
@@ -68,17 +68,6 @@ if (get_input('settings') == 'go') {
                        unset_config('debug', $site->getGUID());
                }
 
-               $usage = get_input('usage');
-               if (is_array($usage)) {
-                       $usage = $usage[0];
-               }
-
-               if ($usage) {
-                       unset_config('ping_home', $site->getGUID());
-               } else {
-                       set_config('ping_home', 'disabled', $site->getGUID());
-               }
-
                $api = get_input('api');
                if ($api) {
                        unset_config('disable_api', $site->getGUID());
@@ -120,11 +109,6 @@ if (get_input('settings') == 'go') {
                $cache = new ElggFileCache($dataroot);
                $cache->delete('view_paths');
 
-               // Now ping home
-               if ($usage) {
-                       ping_home($site);
-               }
-
                system_message(elgg_echo("installation:configuration:success"));
 
                header("Location: ../../account/register.php");

diff --git a/engine/lib/ping.php b/engine/lib/ping.php
deleted file mode 100644 (file)
index b318806..0000000
--- a/engine/lib/ping.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * This module pings us on the first install.
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltdsend_api_get_call
- * @link http://elgg.org/
- */
-
-/**
- * The api for the pinger.
- * TODO: Have this configurable and/or updatable
- */
-$NOTIFICATION_SERVER = "http://ping.elgg.org/pg/api/rest/php/";
-
-
-/**
- * Run once and only once.
- *
- * @param ElggSite $site The site who's information to use
- */
-function ping_home(ElggSite $site) {
-       global $NOTIFICATION_SERVER, $CONFIG;
-
-       // Get version information
-       $version = get_version();
-       $release = get_version(true);
-
-       // Get export
-       $export = export($site->guid);
-
-       return send_api_post_call($NOTIFICATION_SERVER,
-               array(
-                       'method' => 'elgg.system.ping',
-
-                       'url'     => $site->url,
-                       'version' => $version,
-                       'release' => $release,
-               ),
-               array(),
-               $export,
-               'text/xml'
-       );
-}
\ No newline at end of file

diff --git a/languages/en.php b/languages/en.php
index 63c3e33fcd093c8ada0ccabf33f545011e713491..7310c8ac271acfb1f91c286ba14f4a483f4d565e 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -742,8 +742,6 @@ Alternatively, you can enter your database settings below and we will try and do
        'installation:debug:notice' => 'Log all errors, warnings and notices',
        'installation:httpslogin' => "Enable this to have user logins performed over HTTPS. You will need to have https enabled on your server for this to work.",
        'installation:httpslogin:label' => "Enable HTTPS logins",
-       'installation:usage' => "This option lets Elgg send anonymous usage statistics back to Curverider.",
-       'installation:usage:label' => "Send anonymous usage statistics",
        'installation:view' => "Enter the view which will be used as the default for your site or leave this blank for the default view (if in doubt, leave as default):",
 
        'installation:siteemail' => "Site email address (used when sending system emails)",

diff --git a/views/failsafe/settings/system.php b/views/failsafe/settings/system.php
index dfc7ecc41e2f6f270f196b5d9512adda0cdd8250..9c4a40aa5feb1b640a8fdda5ca8e2eff77c4353f 100644 (file)
--- a/views/failsafe/settings/system.php
+++ b/views/failsafe/settings/system.php
@@ -54,15 +54,6 @@ if ((isset($CONFIG->disable_api)) && ($CONFIG->disable_api == true)) {
 $form_body .= elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:disableapi:label')), 'internalname' => 'api', 'value' => $on ));
 $form_body .= "</p>";
 
-$form_body .= "<p class=\"admin_usage\">" . elgg_echo('installation:usage') . "<br />";
-$on = elgg_echo('installation:usage:label');
-
-if (isset($CONFIG->ping_home)) {
-       $on = ($vars['config']->ping_home!='disabled' ? elgg_echo('installation:usage:label') : "");
-}
-$form_body .= elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:usage:label')), 'internalname' => 'usage', 'value' => $on ));
-$form_body .= "</p>";
-
 $form_body .= elgg_view('input/hidden', array('internalname' => 'settings', 'value' => 'go'));
 
 $form_body .= elgg_view('input/submit', array('value' => elgg_echo("save")));