From fe18063bd2bb00ac67d4afc038850cd3a7a63189 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 14 Nov 2009 17:38:10 +0100 Subject: Revert "Ask users if they wish to send statistics to SNI, default is off." This reverts commit 7efea1115f45b8880fe3161cc32b09510ddd2264. Conflicts: install.php --- install.php | 16 ++++------------ lib/default.php | 2 +- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/install.php b/install.php index 8e76f6198..e7f7cf318 100644 --- a/install.php +++ b/install.php @@ -1,3 +1,4 @@ + * @author CiaranG * @author Craig Andrews - * @author Eric Helgeson + * @author Eric Helgeson * @author Evan Prodromou * @author Robin Millette * @author Sarven Capadisli @@ -499,11 +500,6 @@ function showForm()

Database password (optional)

-
  • - - -

    Periodically send information about your site to StatusNet Inc

    -
  • @@ -525,7 +521,6 @@ function handlePost() $username = $_POST['username']; $password = $_POST['password']; $sitename = $_POST['sitename']; - $snapshot = $_POST['snapshot']; $fancy = !empty($_POST['fancy']); $server = $_SERVER['HTTP_HOST']; $path = substr(dirname($_SERVER['PHP_SELF']), 1); @@ -572,7 +567,7 @@ STR; } updateStatus("Writing config file..."); - $res = writeConf($sitename, $server, $path, $fancy, $db, $snapshot); + $res = writeConf($sitename, $server, $path, $fancy, $db); if (!$res) { updateStatus("Can't write config file.", true); @@ -693,7 +688,7 @@ function Mysql_Db_installer($host, $database, $username, $password) return $db; } -function writeConf($sitename, $server, $path, $fancy, $db, $snapshot) +function writeConf($sitename, $server, $path, $fancy, $db) { // assemble configuration file in a string $cfg = " null, 'welcome' => null), 'snapshot' => - array('run' => 'never', + array('run' => 'web', 'frequency' => 10000, 'reporturl' => 'http://status.net/stats/report'), 'attachments' => -- cgit v1.2.3-54-g00ecf