eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Revert "Ask users if they wish to send statistics to SNI, default is off."

Browse Source 
This reverts commit 7efea1115f.

Conflicts:

	install.php
This commit is contained in:
Evan Prodromou 2009-11-14 17:38:10 +01:00
parent 959d278c34
commit fe18063bd2
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
install.php
View File

@ -1,3 +1,4 @@
<?php <?php
/** /**
* StatusNet - the distributed open-source microblogging tool * StatusNet - the distributed open-source microblogging tool
@ -25,7 +26,7 @@
* @author Brion Vibber <brion@pobox.com> * @author Brion Vibber <brion@pobox.com>
* @author CiaranG <ciaran@ciarang.com> * @author CiaranG <ciaran@ciarang.com>
* @author Craig Andrews <candrews@integralblue.com> * @author Craig Andrews <candrews@integralblue.com>
* @author Eric Helgeson <erichelgeson@gmail.com> * @author Eric Helgeson <helfire@Erics-MBP.local>
* @author Evan Prodromou <evan@status.net> * @author Evan Prodromou <evan@status.net>
* @author Robin Millette <millette@controlyourself.ca> * @author Robin Millette <millette@controlyourself.ca>
* @author Sarven Capadisli <csarven@status.net> * @author Sarven Capadisli <csarven@status.net>
@ -499,11 +500,6 @@ function showForm()
<input type="password" id="password" name="password" /> <input type="password" id="password" name="password" />
<p class="form_guide">Database password (optional)</p> <p class="form_guide">Database password (optional)</p>
</li> </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>
</li>
</ul> </ul>
<input type="submit" name="submit" class="submit" value="Submit" /> <input type="submit" name="submit" class="submit" value="Submit" />
</fieldset> </fieldset>
@ -525,7 +521,6 @@ function handlePost()
$username = $_POST['username']; $username = $_POST['username'];
$password = $_POST['password']; $password = $_POST['password'];
$sitename = $_POST['sitename']; $sitename = $_POST['sitename'];
$snapshot = $_POST['snapshot'];
$fancy = !empty($_POST['fancy']); $fancy = !empty($_POST['fancy']);
$server = $_SERVER['HTTP_HOST']; $server = $_SERVER['HTTP_HOST'];
$path = substr(dirname($_SERVER['PHP_SELF']), 1); $path = substr(dirname($_SERVER['PHP_SELF']), 1);
@ -572,7 +567,7 @@ STR;
} }
updateStatus("Writing config file..."); updateStatus("Writing config file...");
$res = writeConf($sitename, $server, $path, $fancy, $db, $snapshot); $res = writeConf($sitename, $server, $path, $fancy, $db);
if (!$res) { if (!$res) {
updateStatus("Can't write config file.", true); updateStatus("Can't write config file.", true);
@ -693,7 +688,7 @@ function Mysql_Db_installer($host, $database, $username, $password)
return $db; return $db;
} }
function writeConf($sitename, $server, $path, $fancy, $db, $snapshot) function writeConf($sitename, $server, $path, $fancy, $db)
{ {
// assemble configuration file in a string // assemble configuration file in a string
$cfg = "<?php\n". $cfg = "<?php\n".
@ -709,9 +704,6 @@ function writeConf($sitename, $server, $path, $fancy, $db, $snapshot)
// checks if fancy URLs are enabled // checks if fancy URLs are enabled
($fancy ? "\$config['site']['fancy'] = true;\n\n":''). ($fancy ? "\$config['site']['fancy'] = true;\n\n":'').
// send site stats to SNI
($snapshot ? "\$config['snapshot']['run'] = 'web';\n\n":'').
// database // database
"\$config['db']['database'] = '{$db['database']}';\n\n". "\$config['db']['database'] = '{$db['database']}';\n\n".
($db['type'] == 'pgsql' ? "\$config['db']['quote_identifiers'] = true;\n\n":''). ($db['type'] == 'pgsql' ? "\$config['db']['quote_identifiers'] = true;\n\n":'').

2
lib/default.php
View File

@ -159,7 +159,7 @@ $default =
array('default' => null, array('default' => null,
'welcome' => null), 'welcome' => null),
'snapshot' => 'snapshot' =>
array('run' => 'never', array('run' => 'web',
'frequency' => 10000, 'frequency' => 10000,
'reporturl' => 'http://status.net/stats/report'), 'reporturl' => 'http://status.net/stats/report'),
'attachments' => 'attachments' =>