diff options
| author | Eric Helgeson <erichelgeson@gmail.com> | 2009-11-11 18:45:21 -0500 |
|---|---|---|
| committer | Eric Helgeson <erichelgeson@gmail.com> | 2009-11-11 18:45:21 -0500 |
| commit | 7efea1115f45b8880fe3161cc32b09510ddd2264 (patch) | |
| tree | 8bde9e297d63995bea3d67fe072c3a334fa823cb | |
| parent | 59e8896212a8d5e5ceed37162b8d38abc0de0e4b (diff) | |
Ask users if they wish to send statistics to SNI, default is off.
Users may not know about this setting and are unaware they are sending stats.
This allows them to make that decision.
| -rw-r--r-- | install.php | 15 | ||||
| -rw-r--r-- | lib/default.php | 2 |
2 files changed, 12 insertions, 5 deletions
diff --git a/install.php b/install.php index e7f7cf318..964d743f9 100644 --- a/install.php +++ b/install.php @@ -1,4 +1,3 @@ - <?php /** * StatusNet - the distributed open-source microblogging tool @@ -26,7 +25,7 @@ * @author Brion Vibber <brion@pobox.com> * @author CiaranG <ciaran@ciarang.com> * @author Craig Andrews <candrews@integralblue.com> - * @author Eric Helgeson <helfire@Erics-MBP.local> + * @author Eric Helgeson <erichelgeson@gmail.com> * @author Evan Prodromou <evan@status.net> * @author Robin Millette <millette@controlyourself.ca> * @author Sarven Capadisli <csarven@status.net> @@ -500,6 +499,10 @@ function showForm() <input type="password" id="password" name="password" /> <p class="form_guide">Database password (optional)</p> </li> + <li> + <label for="snapshot">Send stats to StatusNet Inc?</label> + <input type="checkbox" id="snapshot" name="snapshot" checked /> + <p class="form_guide">Periodically send information about your site to StatusNet Inc</p> </ul> <input type="submit" name="submit" class="submit" value="Submit" /> </fieldset> @@ -521,6 +524,7 @@ 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); @@ -567,7 +571,7 @@ STR; } updateStatus("Writing config file..."); - $res = writeConf($sitename, $server, $path, $fancy, $db); + $res = writeConf($sitename, $server, $path, $fancy, $db, $snapshot); if (!$res) { updateStatus("Can't write config file.", true); @@ -688,7 +692,7 @@ function Mysql_Db_installer($host, $database, $username, $password) return $db; } -function writeConf($sitename, $server, $path, $fancy, $db) +function writeConf($sitename, $server, $path, $fancy, $db, $snapshot) { // assemble configuration file in a string $cfg = "<?php\n". @@ -704,6 +708,9 @@ function writeConf($sitename, $server, $path, $fancy, $db) // checks if fancy URLs are enabled ($fancy ? "\$config['site']['fancy'] = true;\n\n":''). + // send site stats to SNI + ($snapshot ? "\$config['snapshot']['run'] = 'web';\n\n":''). + // database "\$config['db']['database'] = '{$db['database']}';\n\n". ($db['type'] == 'pgsql' ? "\$config['db']['quote_identifiers'] = true;\n\n":''). diff --git a/lib/default.php b/lib/default.php index 95366e0b3..82b6910ab 100644 --- a/lib/default.php +++ b/lib/default.php @@ -159,7 +159,7 @@ $default = array('default' => null, 'welcome' => null), 'snapshot' => - array('run' => 'web', + array('run' => 'never', 'frequency' => 10000, 'reporturl' => 'http://status.net/stats/report'), 'attachments' => |