Browse Source

Merge remote-tracking branch 'upstream/develop' into 1601-gcontact-total

pull/2244/head
Michael Vogel 5 years ago
parent
commit
01c2eacd46
4 changed files with 23 additions and 9 deletions
  1. +1
    -1
      htconfig.php
  2. +4
    -3
      include/Scrape.php
  3. +18
    -0
      include/cron.php
  4. +0
    -5
      mod/newmember.php

+ 1
- 1
htconfig.php View File

@ -57,7 +57,7 @@ $a->config['system']['huburl'] = '[internal]';
// allowed themes (change this from admin panel after installation)
$a->config['system']['allowed_themes'] = 'dispy,quattro,vier,darkzero,duepuntozero,greenzero,purplezero,slackr,diabook';
$a->config['system']['allowed_themes'] = 'quattro,vier,duepuntozero';
// default system theme


+ 4
- 3
include/Scrape.php View File

@ -559,10 +559,11 @@ function probe_url($url, $mode = PROBE_NORMAL, $level = 1) {
$pubkey = $hcard_key;
}
}
if($diaspora && $diaspora_base && $diaspora_guid) {
if($mode == PROBE_DIASPORA || ! $notify) {
$notify = $diaspora_base . 'receive/users/' . $diaspora_guid;
$diaspora_notify = $diaspora_base.'receive/users/'.$diaspora_guid;
if($mode == PROBE_DIASPORA || ! $notify || ($notify == $diaspora_notify)) {
$notify = $diaspora_notify;
$batch = $diaspora_base . 'receive/public' ;
}
if(strpos($url,'@'))


+ 18
- 0
include/cron.php View File

@ -228,6 +228,24 @@ function cron_run(&$argv, &$argc){
set_config('system','cache_last_cleared', time());
}
// Repair missing Diaspora settings
$r = q("SELECT `id`, `url` FROM `contact`
WHERE `uid` > 0 AND `network` = '%s' AND (`batch` = '' OR `notify` = '' OR `poll` = '' OR pubkey = '')
ORDER BY RAND() LIMIT 50", dbesc(NETWORK_DIASPORA));
if ($r) {
foreach ($r AS $contact) {
if (poco_reachable($contact["url"])) {
$data = probe_url($contact["url"]);
if ($data["network"] == NETWORK_DIASPORA) {
logger("Repair contact ".$contact["id"]." ".$contact["url"], LOGGER_DEBUG);
q("UPDATE `contact` SET `batch` = '%s', `notify` = '%s', `poll` = '%s', pubkey = '%s' WHERE `id` = %d",
dbesc($data["batch"]), dbesc($data["notify"]), dbesc($data["poll"]), dbesc($data["pubkey"]),
intval($contact["id"]));
}
}
}
}
$manual_id = 0;
$generation = 0;
$force = false;


+ 0
- 5
mod/newmember.php View File

@ -45,11 +45,6 @@ function newmember_content(&$a) {
$o .= '<ul>';
if(in_array('facebook', $a->plugins))
$o .= '<li>' . '<a target="newmember" href="facebook">' . t('Facebook') . '</a><br />' . t("Authorise the Facebook Connector if you currently have a Facebook account and we will \x28optionally\x29 import all your Facebook friends and conversations.") . '</li>' . EOL;
else
$o .= '<li>' . '<a target="newmember" href="help/Installing-Connectors">' . t('Facebook') . '</a><br />' . t("<em>If</em> this is your own personal server, installing the Facebook addon may ease your transition to the free social web.") . '</li>' . EOL;
$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
if(! $mail_disabled)


Loading…
Cancel
Save