git.gnu.io has moved to IP address 209.51.188.249 -- please double check where you are logging in.

Commit 827d6018 authored by mmn's avatar mmn

Less StatusNet, more GNU social

We've still got stuff like the update-subscription thing to set up.
parent 099b65eb
......@@ -34,7 +34,7 @@
* @author Tom Adams <tom@holizz.com>
* @author Zach Copley <zach@status.net>
* @copyright 2009-2010 StatusNet, Inc http://status.net
* @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @copyright 2009-2014 Free Software Foundation, Inc http://www.fsf.org
* @license GNU Affero General Public License http://www.gnu.org/licenses/
* @version 1.0.x
* @link http://status.net
......@@ -227,7 +227,7 @@ abstract class Installer
$fail = false;
if (empty($this->adminNick)) {
$this->updateStatus("No initial StatusNet user nickname specified.", true);
$this->updateStatus("No initial user nickname specified.", true);
$fail = true;
}
if ($this->adminNick && !preg_match('/^[0-9a-z]{1,64}$/', $this->adminNick)) {
......@@ -245,7 +245,7 @@ abstract class Installer
}
if (empty($this->adminPass)) {
$this->updateStatus("No initial StatusNet user password specified.", true);
$this->updateStatus("No initial user password specified.", true);
$fail = true;
}
......@@ -301,7 +301,7 @@ abstract class Installer
} else if ($this->dbtype == 'pgsql') {
$record = $conn->getRow('SHOW server_encoding');
if ($record->server_encoding != 'UTF8') {
$this->updateStatus("StatusNet requires UTF8 character encoding. Your database is ". htmlentities($record->server_encoding));
$this->updateStatus("GNU social requires UTF8 character encoding. Your database is ". htmlentities($record->server_encoding));
return false;
}
}
......@@ -508,7 +508,7 @@ abstract class Installer
/**
* Create the initial admin user account.
* Side effect: may load portions of StatusNet framework.
* Side effect: may load portions of GNU social framework.
* Side effect: outputs program info
*/
function registerInitialUser()
......@@ -612,7 +612,7 @@ abstract class Installer
);
} else {
$this->updateStatus(
"Could not create initial GNU social user.",
"Could not create initial user account.",
true
);
return false;
......@@ -637,9 +637,9 @@ abstract class Installer
$scheme = $this->ssl === 'always' ? 'https' : 'http';
$link = "{$scheme}://{$this->server}/{$this->path}";
$this->updateStatus("StatusNet has been installed at $link");
$this->updateStatus("GNU social has been installed at $link");
$this->updateStatus(
"<strong>DONE!</strong> You can visit your <a href='$link'>new StatusNet site</a> (login as '$this->adminNick'). If this is your first StatusNet install, you may want to poke around our <a href='http://status.net/wiki/Getting_started'>Getting Started guide</a>."
'<strong>DONE!</strong> You can visit your <a href="'.htmlspecialchars($link).'">new GNU social site</a> (log in as "'.htmlspecialchars($this->adminNick).'"). If this is your first GNU social install, make your experience the best possible by visiting our resource site to join the mailing list and <a href="http://gnu.io/resources/">good documentation</a>.'
);
return true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment