forked from GNUsocial/gnu-social
Added a checkbox for subscribing the admin of a StatusNet instance to
update@status.net. Checked by default. Subscription optional.
This commit is contained in:
parent
311da86762
commit
053aafe5fb
13
install.php
13
install.php
@ -483,6 +483,7 @@ function showForm()
|
|||||||
$dbRadios .= "<input type=\"radio\" name=\"dbtype\" id=\"dbtype-$type\" value=\"$type\" $checked/> $info[name]<br />\n";
|
$dbRadios .= "<input type=\"radio\" name=\"dbtype\" id=\"dbtype-$type\" value=\"$type\" $checked/> $info[name]<br />\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
echo<<<E_O_T
|
echo<<<E_O_T
|
||||||
</ul>
|
</ul>
|
||||||
</dd>
|
</dd>
|
||||||
@ -559,6 +560,11 @@ function showForm()
|
|||||||
<input id="admin_email" name="admin_email" value="{$post->value('admin_email')}" />
|
<input id="admin_email" name="admin_email" value="{$post->value('admin_email')}" />
|
||||||
<p class="form_guide">Optional email address for the initial StatusNet user (administrator)</p>
|
<p class="form_guide">Optional email address for the initial StatusNet user (administrator)</p>
|
||||||
</li>
|
</li>
|
||||||
|
<li>
|
||||||
|
<label for="admin_updates">Subscribe to announcements</label>
|
||||||
|
<input type="checkbox" id="admin_updates" name="admin_updates" value="true" checked="checked" />
|
||||||
|
<p class="form_guide">Release and security feed from <a href="http://update.status.net/">update@status.net</a> (recommended)</p>
|
||||||
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
<input type="submit" name="submit" class="submit" value="Submit" />
|
<input type="submit" name="submit" class="submit" value="Submit" />
|
||||||
@ -587,6 +593,7 @@ function handlePost()
|
|||||||
$adminPass = $_POST['admin_password'];
|
$adminPass = $_POST['admin_password'];
|
||||||
$adminPass2 = $_POST['admin_password2'];
|
$adminPass2 = $_POST['admin_password2'];
|
||||||
$adminEmail = $_POST['admin_email'];
|
$adminEmail = $_POST['admin_email'];
|
||||||
|
$adminUpdates = $_POST['admin_updates'];
|
||||||
|
|
||||||
$server = $_SERVER['HTTP_HOST'];
|
$server = $_SERVER['HTTP_HOST'];
|
||||||
$path = substr(dirname($_SERVER['PHP_SELF']), 1);
|
$path = substr(dirname($_SERVER['PHP_SELF']), 1);
|
||||||
@ -657,7 +664,7 @@ STR;
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Okay, cross fingers and try to register an initial user
|
// Okay, cross fingers and try to register an initial user
|
||||||
if (registerInitialUser($adminNick, $adminPass, $adminEmail)) {
|
if (registerInitialUser($adminNick, $adminPass, $adminEmail, $adminUpdates)) {
|
||||||
updateStatus(
|
updateStatus(
|
||||||
"An initial user with the administrator role has been created."
|
"An initial user with the administrator role has been created."
|
||||||
);
|
);
|
||||||
@ -854,7 +861,7 @@ function runDbScript($filename, $conn, $type = 'mysqli')
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
function registerInitialUser($nickname, $password, $email)
|
function registerInitialUser($nickname, $password, $email, $adminUpdates)
|
||||||
{
|
{
|
||||||
define('STATUSNET', true);
|
define('STATUSNET', true);
|
||||||
define('LACONICA', true); // compatibility
|
define('LACONICA', true); // compatibility
|
||||||
@ -882,7 +889,7 @@ function registerInitialUser($nickname, $password, $email)
|
|||||||
// Attempt to do a remote subscribe to update@status.net
|
// Attempt to do a remote subscribe to update@status.net
|
||||||
// Will fail if instance is on a private network.
|
// Will fail if instance is on a private network.
|
||||||
|
|
||||||
if (class_exists('Ostatus_profile')) {
|
if (class_exists('Ostatus_profile') && $adminUpdates) {
|
||||||
try {
|
try {
|
||||||
$oprofile = Ostatus_profile::ensureProfile('http://update.status.net/');
|
$oprofile = Ostatus_profile::ensureProfile('http://update.status.net/');
|
||||||
Subscription::start($user->getProfile(), $oprofile->localProfile());
|
Subscription::start($user->getProfile(), $oprofile->localProfile());
|
||||||
|
Loading…
Reference in New Issue
Block a user