Merge branch 'develop' into rewrites/coding-convention-split2
This commit is contained in:
Roland Häder
GitHub
commit
49527b70d3
93 changed files with 11433 additions and 33261 deletions
107
mod/admin.php
107
mod/admin.php
|
|
@ -629,7 +629,6 @@ function admin_page_site_post(App $a) {
|
|||
$no_multi_reg = ((x($_POST,'no_multi_reg')) ? True : False);
|
||||
$no_openid = !((x($_POST,'no_openid')) ? True : False);
|
||||
$no_regfullname = !((x($_POST,'no_regfullname')) ? True : False);
|
||||
$no_utf = !((x($_POST,'no_utf')) ? True : False);
|
||||
$community_page_style = ((x($_POST,'community_page_style')) ? intval(trim($_POST['community_page_style'])) : 0);
|
||||
$max_author_posts_community_page = ((x($_POST,'max_author_posts_community_page')) ? intval(trim($_POST['max_author_posts_community_page'])) : 0);
|
||||
|
||||
|
|
@ -666,7 +665,6 @@ function admin_page_site_post(App $a) {
|
|||
$proxy_disabled = ((x($_POST,'proxy_disabled')) ? True : False);
|
||||
$only_tag_search = ((x($_POST,'only_tag_search')) ? True : False);
|
||||
$rino = ((x($_POST,'rino')) ? intval($_POST['rino']) : 0);
|
||||
$embedly = ((x($_POST,'embedly')) ? notags(trim($_POST['embedly'])) : '');
|
||||
$worker_queues = ((x($_POST,'worker_queues')) ? intval($_POST['worker_queues']) : 4);
|
||||
$worker_dont_fork = ((x($_POST,'worker_dont_fork')) ? True : False);
|
||||
$worker_fastlane = ((x($_POST,'worker_fastlane')) ? True : False);
|
||||
|
|
@ -763,66 +761,57 @@ function admin_page_site_post(App $a) {
|
|||
} else {
|
||||
set_config('system','singleuser', $singleuser);
|
||||
}
|
||||
set_config('system','maximagesize', $maximagesize);
|
||||
set_config('system','max_image_length', $maximagelength);
|
||||
set_config('system','jpeg_quality', $jpegimagequality);
|
||||
set_config('system', 'maximagesize', $maximagesize);
|
||||
set_config('system', 'max_image_length', $maximagelength);
|
||||
set_config('system', 'jpeg_quality', $jpegimagequality);
|
||||
|
||||
set_config('config','register_policy', $register_policy);
|
||||
set_config('system','max_daily_registrations', $daily_registrations);
|
||||
set_config('system','account_abandon_days', $abandon_days);
|
||||
set_config('config','register_text', $register_text);
|
||||
set_config('system','allowed_sites', $allowed_sites);
|
||||
set_config('system','allowed_email', $allowed_email);
|
||||
set_config('system','block_public', $block_public);
|
||||
set_config('system','publish_all', $force_publish);
|
||||
set_config('system','directory', $global_directory);
|
||||
set_config('system','thread_allow', $thread_allow);
|
||||
set_config('system','newuser_private', $newuser_private);
|
||||
set_config('system','enotify_no_content', $enotify_no_content);
|
||||
set_config('system','disable_embedded', $disable_embedded);
|
||||
set_config('system','allow_users_remote_self', $allow_users_remote_self);
|
||||
set_config('config', 'register_policy', $register_policy);
|
||||
set_config('system', 'max_daily_registrations', $daily_registrations);
|
||||
set_config('system', 'account_abandon_days', $abandon_days);
|
||||
set_config('config', 'register_text', $register_text);
|
||||
set_config('system', 'allowed_sites', $allowed_sites);
|
||||
set_config('system', 'allowed_email', $allowed_email);
|
||||
set_config('system', 'block_public', $block_public);
|
||||
set_config('system', 'publish_all', $force_publish);
|
||||
set_config('system', 'directory', $global_directory);
|
||||
set_config('system', 'thread_allow', $thread_allow);
|
||||
set_config('system', 'newuser_private', $newuser_private);
|
||||
set_config('system', 'enotify_no_content', $enotify_no_content);
|
||||
set_config('system', 'disable_embedded', $disable_embedded);
|
||||
set_config('system', 'allow_users_remote_self', $allow_users_remote_self);
|
||||
|
||||
set_config('system','block_extended_register', $no_multi_reg);
|
||||
set_config('system','no_openid', $no_openid);
|
||||
set_config('system','no_regfullname', $no_regfullname);
|
||||
set_config('system','community_page_style', $community_page_style);
|
||||
set_config('system','max_author_posts_community_page', $max_author_posts_community_page);
|
||||
set_config('system','no_utf', $no_utf);
|
||||
set_config('system','verifyssl', $verifyssl);
|
||||
set_config('system','proxyuser', $proxyuser);
|
||||
set_config('system','proxy', $proxy);
|
||||
set_config('system','curl_timeout', $timeout);
|
||||
set_config('system','dfrn_only', $dfrn_only);
|
||||
set_config('system','ostatus_disabled', $ostatus_disabled);
|
||||
set_config('system','ostatus_poll_interval', $ostatus_poll_interval);
|
||||
set_config('system','ostatus_full_threads', $ostatus_full_threads);
|
||||
set_config('system','diaspora_enabled', $diaspora_enabled);
|
||||
set_config('system', 'block_extended_register', $no_multi_reg);
|
||||
set_config('system', 'no_openid', $no_openid);
|
||||
set_config('system', 'no_regfullname', $no_regfullname);
|
||||
set_config('system', 'community_page_style', $community_page_style);
|
||||
set_config('system', 'max_author_posts_community_page', $max_author_posts_community_page);
|
||||
set_config('system', 'verifyssl', $verifyssl);
|
||||
set_config('system', 'proxyuser', $proxyuser);
|
||||
set_config('system', 'proxy', $proxy);
|
||||
set_config('system', 'curl_timeout', $timeout);
|
||||
set_config('system', 'dfrn_only', $dfrn_only);
|
||||
set_config('system', 'ostatus_disabled', $ostatus_disabled);
|
||||
set_config('system', 'ostatus_poll_interval', $ostatus_poll_interval);
|
||||
set_config('system', 'ostatus_full_threads', $ostatus_full_threads);
|
||||
set_config('system', 'diaspora_enabled', $diaspora_enabled);
|
||||
|
||||
set_config('config','private_addons', $private_addons);
|
||||
|
||||
set_config('system','force_ssl', $force_ssl);
|
||||
set_config('system','hide_help', $hide_help);
|
||||
set_config('system','use_fulltext_engine', $use_fulltext_engine);
|
||||
set_config('system','itemcache', $itemcache);
|
||||
set_config('system','itemcache_duration', $itemcache_duration);
|
||||
set_config('system','max_comments', $max_comments);
|
||||
set_config('system','temppath', $temppath);
|
||||
set_config('system','basepath', $basepath);
|
||||
set_config('system','proxy_disabled', $proxy_disabled);
|
||||
set_config('system','only_tag_search', $only_tag_search);
|
||||
set_config('system','worker_queues', $worker_queues);
|
||||
set_config('system','worker_dont_fork', $worker_dont_fork);
|
||||
set_config('system','worker_fastlane', $worker_fastlane);
|
||||
set_config('system','frontend_worker', $worker_frontend);
|
||||
|
||||
if (($rino == 2) and !function_exists('mcrypt_create_iv')) {
|
||||
notice(t("RINO2 needs mcrypt php extension to work."));
|
||||
} else {
|
||||
set_config('system','rino_encrypt', $rino);
|
||||
}
|
||||
|
||||
set_config('system','embedly', $embedly);
|
||||
set_config('config', 'private_addons', $private_addons);
|
||||
|
||||
set_config('system', 'force_ssl', $force_ssl);
|
||||
set_config('system', 'hide_help', $hide_help);
|
||||
set_config('system', 'use_fulltext_engine', $use_fulltext_engine);
|
||||
set_config('system', 'itemcache', $itemcache);
|
||||
set_config('system', 'itemcache_duration', $itemcache_duration);
|
||||
set_config('system', 'max_comments', $max_comments);
|
||||
set_config('system', 'temppath', $temppath);
|
||||
set_config('system', 'basepath', $basepath);
|
||||
set_config('system', 'proxy_disabled', $proxy_disabled);
|
||||
set_config('system', 'only_tag_search', $only_tag_search);
|
||||
set_config('system', 'worker_queues', $worker_queues);
|
||||
set_config('system', 'worker_dont_fork', $worker_dont_fork);
|
||||
set_config('system', 'worker_fastlane', $worker_fastlane);
|
||||
set_config('system', 'frontend_worker', $worker_frontend);
|
||||
set_config('system', 'rino_encrypt', $rino);
|
||||
|
||||
info(t('Site settings updated.').EOL);
|
||||
goaway('admin/site');
|
||||
|
|
@ -1012,7 +1001,6 @@ function admin_page_site(App $a) {
|
|||
'$no_multi_reg' => array('no_multi_reg', t("Block multiple registrations"), get_config('system','block_extended_register'), t("Disallow users to register additional accounts for use as pages.")),
|
||||
'$no_openid' => array('no_openid', t("OpenID support"), !get_config('system','no_openid'), t("OpenID support for registration and logins.")),
|
||||
'$no_regfullname' => array('no_regfullname', t("Fullname check"), !get_config('system','no_regfullname'), t("Force users to register with a space between firstname and lastname in Full name, as an antispam measure")),
|
||||
'$no_utf' => array('no_utf', t("UTF-8 Regular expressions"), !get_config('system','no_utf'), t("Use PHP UTF8 regular expressions")),
|
||||
'$community_page_style' => array('community_page_style', t("Community Page Style"), get_config('system','community_page_style'), t("Type of community page to show. 'Global community' shows every public posting from an open distributed network that arrived on this server."), $community_page_style_choices),
|
||||
'$max_author_posts_community_page' => array('max_author_posts_community_page', t("Posts per user on community page"), get_config('system','max_author_posts_community_page'), t("The maximum number of posts per user on the community page. (Not valid for 'Global Community')")),
|
||||
'$ostatus_disabled' => array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disabled'), t("Provide built-in OStatus \x28StatusNet, GNU Social etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")),
|
||||
|
|
@ -1053,7 +1041,6 @@ function admin_page_site(App $a) {
|
|||
'$relocate_url' => array('relocate_url', t("New base url"), App::get_baseurl(), t("Change base url for this server. Sends relocate message to all DFRN contacts of all users.")),
|
||||
|
||||
'$rino' => array('rino', t("RINO Encryption"), intval(get_config('system','rino_encrypt')), t("Encryption layer between nodes."), array("Disabled", "RINO1 (deprecated)", "RINO2")),
|
||||
'$embedly' => array('embedly', t("Embedly API key"), get_config('system','embedly'), t("<a href='http://embed.ly'>Embedly</a> is used to fetch additional data for web pages. This is an optional parameter.")),
|
||||
|
||||
'$worker_queues' => array('worker_queues', t("Maximum number of parallel workers"), get_config('system','worker_queues'), t("On shared hosters set this to 2. On larger systems, values of 10 are great. Default value is 4.")),
|
||||
'$worker_dont_fork' => array('worker_dont_fork', t("Don't use 'proc_open' with the worker"), get_config('system','worker_dont_fork'), t("Enable this if your system doesn't allow the use of 'proc_open'. This can happen on shared hosters. If this is enabled you should increase the frequency of poller calls in your crontab.")),
|
||||
|
|
|
|||
|
|
@ -1,78 +1,73 @@
|
|||
<?php
|
||||
|
||||
require_once('include/bbcode.php');
|
||||
require_once('library/markdown.php');
|
||||
require_once('include/bb2diaspora.php');
|
||||
require_once('include/html2bbcode.php');
|
||||
require_once 'include/bbcode.php';
|
||||
require_once 'library/markdown.php';
|
||||
require_once 'include/bb2diaspora.php';
|
||||
require_once 'include/html2bbcode.php';
|
||||
|
||||
function visible_lf($s) {
|
||||
return str_replace("\n",'<br />', $s);
|
||||
return str_replace("\n", '<br />', $s);
|
||||
}
|
||||
|
||||
function babel_content(App $a) {
|
||||
|
||||
$o .= '<h1>Babel Diagnostic</h1>';
|
||||
|
||||
$o .= '<form action="babel" method="post">';
|
||||
$o .= t('Source (bbcode) text:') . EOL . '<textarea name="text" >' . htmlspecialchars($_REQUEST['text']) .'</textarea>' . EOL;
|
||||
$o .= t('Source (bbcode) text:') . EOL;
|
||||
$o .= '<textarea name="text" cols="80" rows="10">' . htmlspecialchars($_REQUEST['text']) .'</textarea>' . EOL;
|
||||
$o .= '<input type="submit" name="submit" value="Submit" /></form>';
|
||||
|
||||
$o .= '<br /><br />';
|
||||
|
||||
$o .= '<form action="babel" method="post">';
|
||||
$o .= t('Source (Diaspora) text to convert to BBcode:') . EOL . '<textarea name="d2bbtext" >' . htmlspecialchars($_REQUEST['d2bbtext']) .'</textarea>' . EOL;
|
||||
$o .= t('Source (Diaspora) text to convert to BBcode:') . EOL;
|
||||
$o .= '<textarea name="d2bbtext" cols="80" rows="10">' . htmlspecialchars($_REQUEST['d2bbtext']) .'</textarea>' . EOL;
|
||||
$o .= '<input type="submit" name="submit" value="Submit" /></form>';
|
||||
|
||||
$o .= '<br /><br />';
|
||||
|
||||
if(x($_REQUEST,'text')) {
|
||||
|
||||
if (x($_REQUEST, 'text')) {
|
||||
$text = trim($_REQUEST['text']);
|
||||
$o .= "<h2>" . t("Source input: ") . "</h2>" . EOL. EOL;
|
||||
$o .= '<h2>' . t('Source input: ') . '</h2>' . EOL. EOL;
|
||||
$o .= visible_lf($text) . EOL. EOL;
|
||||
|
||||
$html = bbcode($text);
|
||||
$o .= "<h2>" . t("bb2html (raw HTML): ") . "</h2>" . EOL. EOL;
|
||||
$o .= '<h2>' . t('bb2html (raw HTML): ') . '</h2>' . EOL. EOL;
|
||||
$o .= htmlspecialchars($html). EOL. EOL;
|
||||
|
||||
//$html = bbcode($text);
|
||||
$o .= "<h2>" . t("bb2html: ") . "</h2>" . EOL. EOL;
|
||||
$o .= '<h2>' . t('bb2html: ') . '</h2>' . EOL. EOL;
|
||||
$o .= $html. EOL. EOL;
|
||||
|
||||
$bbcode = html2bbcode($html);
|
||||
$o .= "<h2>" . t("bb2html2bb: ") . "</h2>" . EOL. EOL;
|
||||
$o .= '<h2>' . t('bb2html2bb: ') . '</h2>' . EOL. EOL;
|
||||
$o .= visible_lf($bbcode) . EOL. EOL;
|
||||
|
||||
$diaspora = bb2diaspora($text);
|
||||
$o .= "<h2>" . t("bb2md: ") . "</h2>" . EOL. EOL;
|
||||
$o .= '<h2>' . t('bb2md: ') . '</h2>' . EOL. EOL;
|
||||
$o .= visible_lf($diaspora) . EOL. EOL;
|
||||
|
||||
$html = Markdown($diaspora);
|
||||
$o .= "<h2>" . t("bb2md2html: ") . "</h2>" . EOL. EOL;
|
||||
$o .= '<h2>' . t('bb2md2html: ') . '</h2>' . EOL. EOL;
|
||||
$o .= $html. EOL. EOL;
|
||||
|
||||
$bbcode = diaspora2bb($diaspora);
|
||||
$o .= "<h2>" . t("bb2dia2bb: ") . "</h2>" . EOL. EOL;
|
||||
$o .= '<h2>' . t('bb2dia2bb: ') . '</h2>' . EOL. EOL;
|
||||
$o .= visible_lf($bbcode) . EOL. EOL;
|
||||
|
||||
$bbcode = html2bbcode($html);
|
||||
$o .= "<h2>" . t("bb2md2html2bb: ") . "</h2>" . EOL. EOL;
|
||||
$o .= '<h2>' . t('bb2md2html2bb: ') . '</h2>' . EOL. EOL;
|
||||
$o .= visible_lf($bbcode) . EOL. EOL;
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
if(x($_REQUEST,'d2bbtext')) {
|
||||
|
||||
if (x($_REQUEST, 'd2bbtext')) {
|
||||
$d2bbtext = trim($_REQUEST['d2bbtext']);
|
||||
$o .= "<h2>" . t("Source input (Diaspora format): ") . "</h2>" . EOL. EOL;
|
||||
$o .= visible_lf($d2bbtext) . EOL. EOL;
|
||||
|
||||
$o .= '<h2>' . t('Source input (Diaspora format): ') . '</h2>' . EOL. EOL;
|
||||
$o .= '<pre>' . $d2bbtext . '</pre>' . EOL. EOL;
|
||||
|
||||
$bb = diaspora2bb($d2bbtext);
|
||||
$o .= "<h2>" . t("diaspora2bb: ") . "</h2>" . EOL. EOL;
|
||||
$o .= visible_lf($bb) . EOL. EOL;
|
||||
$o .= '<h2>' . t('diaspora2bb: ') . '</h2>' . EOL. EOL;
|
||||
$o .= '<pre>' . $bb . '</pre>' . EOL. EOL;
|
||||
}
|
||||
|
||||
return $o;
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
<?php
|
||||
|
||||
use \Friendica\Core\Config;
|
||||
|
||||
function community_init(App $a) {
|
||||
if (! local_user()) {
|
||||
unset($_SESSION['theme']);
|
||||
unset($_SESSION['mobile-theme']);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -14,16 +14,12 @@ function community_content(App $a, $update = 0) {
|
|||
|
||||
$o = '';
|
||||
|
||||
// Currently the community page isn't able to handle update requests
|
||||
if ($update)
|
||||
return;
|
||||
|
||||
if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
|
||||
if ((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
|
||||
notice( t('Public access denied.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
||||
if(get_config('system','community_page_style') == CP_NO_COMMUNITY_PAGE) {
|
||||
if (Config::get('system','community_page_style') == CP_NO_COMMUNITY_PAGE) {
|
||||
notice( t('Not available.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
|
@ -34,15 +30,15 @@ function community_content(App $a, $update = 0) {
|
|||
|
||||
|
||||
$o .= '<h3>' . t('Community') . '</h3>';
|
||||
if(! $update) {
|
||||
if (! $update) {
|
||||
nav_set_selected('community');
|
||||
}
|
||||
|
||||
if(x($a->data,'search'))
|
||||
if (x($a->data,'search')) {
|
||||
$search = notags(trim($a->data['search']));
|
||||
else
|
||||
} else {
|
||||
$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
|
||||
|
||||
}
|
||||
|
||||
// Here is the way permissions work in this module...
|
||||
// Only public posts can be shown
|
||||
|
|
@ -55,7 +51,7 @@ function community_content(App $a, $update = 0) {
|
|||
return $o;
|
||||
}
|
||||
|
||||
$maxpostperauthor = get_config('system','max_author_posts_community_page');
|
||||
$maxpostperauthor = Config::get('system','max_author_posts_community_page');
|
||||
|
||||
if ($maxpostperauthor != 0) {
|
||||
$count = 1;
|
||||
|
|
@ -65,23 +61,24 @@ function community_content(App $a, $update = 0) {
|
|||
|
||||
do {
|
||||
foreach ($r AS $row=>$item) {
|
||||
if ($previousauthor == $item["author-link"])
|
||||
if ($previousauthor == $item["author-link"]) {
|
||||
++$numposts;
|
||||
else
|
||||
} else {
|
||||
$numposts = 0;
|
||||
|
||||
}
|
||||
$previousauthor = $item["author-link"];
|
||||
|
||||
if (($numposts < $maxpostperauthor) AND (sizeof($s) < $a->pager['itemspage']))
|
||||
if (($numposts < $maxpostperauthor) AND (sizeof($s) < $a->pager['itemspage'])) {
|
||||
$s[] = $item;
|
||||
}
|
||||
}
|
||||
if ((sizeof($s) < $a->pager['itemspage']))
|
||||
if ((sizeof($s) < $a->pager['itemspage'])) {
|
||||
$r = community_getitems($a->pager['start'] + ($count * $a->pager['itemspage']), $a->pager['itemspage']);
|
||||
|
||||
}
|
||||
} while ((sizeof($s) < $a->pager['itemspage']) AND (++$count < 50) AND (sizeof($r) > 0));
|
||||
} else
|
||||
} else {
|
||||
$s = $r;
|
||||
|
||||
}
|
||||
// we behave the same in message lists as the search module
|
||||
|
||||
$o .= conversation($a, $s, 'community', $update);
|
||||
|
|
@ -92,9 +89,9 @@ function community_content(App $a, $update = 0) {
|
|||
}
|
||||
|
||||
function community_getitems($start, $itemspage) {
|
||||
if (get_config('system','community_page_style') == CP_GLOBAL_COMMUNITY)
|
||||
if (Config::get('system','community_page_style') == CP_GLOBAL_COMMUNITY) {
|
||||
return(community_getpublicitems($start, $itemspage));
|
||||
|
||||
}
|
||||
$r = qu("SELECT %s
|
||||
FROM `thread`
|
||||
INNER JOIN `user` ON `user`.`uid` = `thread`.`uid` AND NOT `user`.`hidewall`
|
||||
|
|
|
|||
|
|
@ -185,10 +185,10 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
|
|||
*
|
||||
*/
|
||||
|
||||
$src_aes_key = random_string();
|
||||
$src_aes_key = openssl_random_pseudo_bytes(64);
|
||||
|
||||
$result = '';
|
||||
openssl_private_encrypt($dfrn_id,$result,$user[0]['prvkey']);
|
||||
openssl_private_encrypt($dfrn_id, $result, $user[0]['prvkey']);
|
||||
|
||||
$params['dfrn_id'] = bin2hex($result);
|
||||
$params['public_key'] = $public_key;
|
||||
|
|
|
|||
|
|
@ -138,10 +138,6 @@ function dfrn_notify_post(App $a) {
|
|||
|
||||
$rino = get_config('system', 'rino_encrypt');
|
||||
$rino = intval($rino);
|
||||
// use RINO1 if mcrypt isn't installed and RINO2 was selected
|
||||
if ($rino == 2 && !function_exists('mcrypt_create_iv')) {
|
||||
$rino = 1;
|
||||
}
|
||||
|
||||
logger("Local rino version: " . $rino, LOGGER_DEBUG);
|
||||
|
||||
|
|
@ -178,10 +174,10 @@ function dfrn_notify_post(App $a) {
|
|||
case 0:
|
||||
case 1:
|
||||
/*
|
||||
* we got a key. old code send only the key, without RINO version.
|
||||
*we got a key. old code send only the key, without RINO version.
|
||||
* we assume RINO 1 if key and no RINO version
|
||||
*/
|
||||
$data = aes_decrypt(hex2bin($data), $final_key);
|
||||
$data = dfrn::aes_decrypt(hex2bin($data), $final_key);
|
||||
break;
|
||||
case 2:
|
||||
try {
|
||||
|
|
@ -316,10 +312,6 @@ function dfrn_notify_content(App $a) {
|
|||
|
||||
$rino = get_config('system', 'rino_encrypt');
|
||||
$rino = intval($rino);
|
||||
// use RINO1 if mcrypt isn't installed and RINO2 was selected
|
||||
if ($rino == 2 && !function_exists('mcrypt_create_iv')) {
|
||||
$rino = 1;
|
||||
}
|
||||
|
||||
logger("Local rino version: ". $rino, LOGGER_DEBUG);
|
||||
|
||||
|
|
|
|||
|
|
@ -73,9 +73,9 @@ function dirfind_content(App $a, $prefix = "") {
|
|||
$j->results[] = $objresult;
|
||||
|
||||
// Add the contact to the global contacts if it isn't already in our system
|
||||
if (($contact["cid"] == 0) AND ($contact["zid"] == 0) AND ($contact["gid"] == 0))
|
||||
poco_check($user_data["url"], $user_data["name"], $user_data["network"], $user_data["photo"],
|
||||
"", "", "", "", "", datetime_convert(), 0);
|
||||
if (($contact["cid"] == 0) AND ($contact["zid"] == 0) AND ($contact["gid"] == 0)) {
|
||||
update_gcontact($user_data);
|
||||
}
|
||||
} elseif ($local) {
|
||||
|
||||
if ($community)
|
||||
|
|
|
|||
|
|
@ -78,14 +78,7 @@ function install_post(App $a) {
|
|||
$timezone = notags(trim($_POST['timezone']));
|
||||
$language = notags(trim($_POST['language']));
|
||||
$adminmail = notags(trim($_POST['adminmail']));
|
||||
// In step 4 of the installer, we passed the check for mcrypt
|
||||
// already, so we can activate RINO, make RINO2 the default
|
||||
// and only fall back if the mcrypt_create_iv function is
|
||||
// not available on the system.
|
||||
$rino = 2;
|
||||
if (! function_exists('mcrypt_create_iv')) {
|
||||
$rino = 1;
|
||||
}
|
||||
|
||||
// connect to db
|
||||
$db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
|
||||
|
|
@ -422,7 +415,6 @@ function check_funcs(&$checks) {
|
|||
check_add($ck_funcs, t('OpenSSL PHP module'), true, true, "");
|
||||
check_add($ck_funcs, t('mysqli PHP module'), true, true, "");
|
||||
check_add($ck_funcs, t('mb_string PHP module'), true, true, "");
|
||||
check_add($ck_funcs, t('mcrypt PHP module'), true, true, "");
|
||||
check_add($ck_funcs, t('XML PHP module'), true, true, "");
|
||||
check_add($ck_funcs, t('iconv module'), true, true, "");
|
||||
|
||||
|
|
@ -454,10 +446,6 @@ function check_funcs(&$checks) {
|
|||
$ck_funcs[4]['status']= false;
|
||||
$ck_funcs[4]['help']= t('Error: mb_string PHP module required but not installed.');
|
||||
}
|
||||
if (! function_exists('mcrypt_create_iv')){
|
||||
$ck_funcs[5]['status']= false;
|
||||
$ck_funcs[5]['help']= t('Error: mcrypt PHP module required but not installed.');
|
||||
}
|
||||
if (! function_exists('iconv_strlen')){
|
||||
$ck_funcs[7]['status']= false;
|
||||
$ck_funcs[7]['help']= t('Error: iconv PHP module required but not installed.');
|
||||
|
|
@ -465,18 +453,6 @@ function check_funcs(&$checks) {
|
|||
|
||||
$checks = array_merge($checks, $ck_funcs);
|
||||
|
||||
// check for 'mcrypt_create_iv()', needed for RINO2
|
||||
if ($ck_funcs[5]['status']) {
|
||||
if (function_exists('mcrypt_create_iv')) {
|
||||
$__status = true;
|
||||
$__help = t("If you are using php_cli, please make sure that mcrypt module is enabled in its config file");
|
||||
} else {
|
||||
$__status = false;
|
||||
$__help = t('Function mcrypt_create_iv() is not defined. This is needed to enable RINO2 encryption layer.');
|
||||
}
|
||||
check_add($checks, t('mcrypt_create_iv() function'), $__status, false, $__help);
|
||||
}
|
||||
|
||||
// check for XML DOM Documents being able to be generated
|
||||
try {
|
||||
$xml = new DOMDocument();
|
||||
|
|
|
|||
271
mod/nodeinfo.php
271
mod/nodeinfo.php
|
|
@ -5,15 +5,13 @@
|
|||
* Documentation: http://nodeinfo.diaspora.software/schema.html
|
||||
*/
|
||||
|
||||
require_once("include/plugin.php");
|
||||
use \Friendica\Core\Config;
|
||||
|
||||
require_once 'include/plugin.php';
|
||||
|
||||
function nodeinfo_wellknown(App $a) {
|
||||
if (!get_config("system", "nodeinfo")) {
|
||||
http_status_exit(404);
|
||||
killme();
|
||||
}
|
||||
$nodeinfo = array("links" => array(array("rel" => "http://nodeinfo.diaspora.software/ns/schema/1.0",
|
||||
"href" => App::get_baseurl()."/nodeinfo/1.0")));
|
||||
$nodeinfo = array('links' => array(array('rel' => 'http://nodeinfo.diaspora.software/ns/schema/1.0',
|
||||
'href' => App::get_baseurl().'/nodeinfo/1.0')));
|
||||
|
||||
header('Content-type: application/json; charset=utf-8');
|
||||
echo json_encode($nodeinfo, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
|
||||
|
|
@ -21,124 +19,127 @@ function nodeinfo_wellknown(App $a) {
|
|||
}
|
||||
|
||||
function nodeinfo_init(App $a) {
|
||||
if (!get_config("system", "nodeinfo")) {
|
||||
if (!Config::get('system', 'nodeinfo')) {
|
||||
http_status_exit(404);
|
||||
killme();
|
||||
}
|
||||
|
||||
if (($a->argc != 2) OR ($a->argv[1] != "1.0")) {
|
||||
if (($a->argc != 2) OR ($a->argv[1] != '1.0')) {
|
||||
http_status_exit(404);
|
||||
killme();
|
||||
}
|
||||
|
||||
$smtp = (function_exists("imap_open") AND !get_config("system","imap_disabled") AND !get_config("system","dfrn_only"));
|
||||
$smtp = (function_exists('imap_open') AND !Config::get('system', 'imap_disabled') AND !Config::get('system', 'dfrn_only'));
|
||||
|
||||
$nodeinfo = array();
|
||||
$nodeinfo["version"] = "1.0";
|
||||
$nodeinfo["software"] = array("name" => "friendica", "version" => FRIENDICA_VERSION."-".DB_UPDATE_VERSION);
|
||||
$nodeinfo['version'] = '1.0';
|
||||
$nodeinfo['software'] = array('name' => 'friendica', 'version' => FRIENDICA_VERSION.'-'.DB_UPDATE_VERSION);
|
||||
|
||||
$nodeinfo["protocols"] = array();
|
||||
$nodeinfo["protocols"]["inbound"] = array();
|
||||
$nodeinfo["protocols"]["outbound"] = array();
|
||||
$nodeinfo['protocols'] = array();
|
||||
$nodeinfo['protocols']['inbound'] = array();
|
||||
$nodeinfo['protocols']['outbound'] = array();
|
||||
|
||||
if (get_config("system","diaspora_enabled")) {
|
||||
$nodeinfo["protocols"]["inbound"][] = "diaspora";
|
||||
$nodeinfo["protocols"]["outbound"][] = "diaspora";
|
||||
if (Config::get('system', 'diaspora_enabled')) {
|
||||
$nodeinfo['protocols']['inbound'][] = 'diaspora';
|
||||
$nodeinfo['protocols']['outbound'][] = 'diaspora';
|
||||
}
|
||||
|
||||
$nodeinfo["protocols"]["inbound"][] = "friendica";
|
||||
$nodeinfo["protocols"]["outbound"][] = "friendica";
|
||||
$nodeinfo['protocols']['inbound'][] = 'friendica';
|
||||
$nodeinfo['protocols']['outbound'][] = 'friendica';
|
||||
|
||||
if (!get_config("system","ostatus_disabled")) {
|
||||
$nodeinfo["protocols"]["inbound"][] = "gnusocial";
|
||||
$nodeinfo["protocols"]["outbound"][] = "gnusocial";
|
||||
if (!Config::get('system', 'ostatus_disabled')) {
|
||||
$nodeinfo['protocols']['inbound'][] = 'gnusocial';
|
||||
$nodeinfo['protocols']['outbound'][] = 'gnusocial';
|
||||
}
|
||||
|
||||
$nodeinfo["services"] = array();
|
||||
$nodeinfo["services"]["inbound"] = array();
|
||||
$nodeinfo["services"]["outbound"] = array();
|
||||
$nodeinfo['services'] = array();
|
||||
$nodeinfo['services']['inbound'] = array();
|
||||
$nodeinfo['services']['outbound'] = array();
|
||||
|
||||
$nodeinfo["openRegistrations"] = ($a->config['register_policy'] != 0);
|
||||
$nodeinfo['usage'] = array();
|
||||
|
||||
$nodeinfo["usage"] = array();
|
||||
$nodeinfo["usage"]["users"] = array("total" => (int)get_config("nodeinfo","total_users"),
|
||||
"activeHalfyear" => (int)get_config("nodeinfo","active_users_halfyear"),
|
||||
"activeMonth" => (int)get_config("nodeinfo","active_users_monthly"));
|
||||
$nodeinfo["usage"]["localPosts"] = (int)get_config("nodeinfo","local_posts");
|
||||
$nodeinfo["usage"]["localComments"] = (int)get_config("nodeinfo","local_comments");
|
||||
$nodeinfo['openRegistrations'] = ($a->config['register_policy'] != 0);
|
||||
|
||||
$nodeinfo["metadata"] = array("nodeName" => $a->config["sitename"]);
|
||||
$nodeinfo['metadata'] = array('nodeName' => $a->config['sitename']);
|
||||
|
||||
if (plugin_enabled("appnet"))
|
||||
$nodeinfo["services"]["inbound"][] = "appnet";
|
||||
if (Config::get('system', 'nodeinfo')) {
|
||||
|
||||
if (plugin_enabled("appnet") OR plugin_enabled("buffer"))
|
||||
$nodeinfo["services"]["outbound"][] = "appnet";
|
||||
$nodeinfo['usage']['users'] = array('total' => (int)Config::get('nodeinfo', 'total_users'),
|
||||
'activeHalfyear' => (int)Config::get('nodeinfo', 'active_users_halfyear'),
|
||||
'activeMonth' => (int)Config::get('nodeinfo', 'active_users_monthly'));
|
||||
$nodeinfo['usage']['localPosts'] = (int)Config::get('nodeinfo', 'local_posts');
|
||||
$nodeinfo['usage']['localComments'] = (int)Config::get('nodeinfo', 'local_comments');
|
||||
|
||||
if (plugin_enabled("blogger"))
|
||||
$nodeinfo["services"]["outbound"][] = "blogger";
|
||||
if (plugin_enabled('appnet')) {
|
||||
$nodeinfo['services']['inbound'][] = 'appnet';
|
||||
}
|
||||
if (plugin_enabled('appnet') OR plugin_enabled('buffer')) {
|
||||
$nodeinfo['services']['outbound'][] = 'appnet';
|
||||
}
|
||||
if (plugin_enabled('blogger')) {
|
||||
$nodeinfo['services']['outbound'][] = 'blogger';
|
||||
}
|
||||
if (plugin_enabled('dwpost')) {
|
||||
$nodeinfo['services']['outbound'][] = 'dreamwidth';
|
||||
}
|
||||
if (plugin_enabled('fbpost') OR plugin_enabled('buffer')) {
|
||||
$nodeinfo['services']['outbound'][] = 'facebook';
|
||||
}
|
||||
if (plugin_enabled('statusnet')) {
|
||||
$nodeinfo['services']['inbound'][] = 'gnusocial';
|
||||
$nodeinfo['services']['outbound'][] = 'gnusocial';
|
||||
}
|
||||
|
||||
if (plugin_enabled("dwpost"))
|
||||
$nodeinfo["services"]["outbound"][] = "dreamwidth";
|
||||
if (plugin_enabled('gpluspost') OR plugin_enabled('buffer')) {
|
||||
$nodeinfo['services']['outbound'][] = 'google';
|
||||
}
|
||||
if (plugin_enabled('ijpost')) {
|
||||
$nodeinfo['services']['outbound'][] = 'insanejournal';
|
||||
}
|
||||
if (plugin_enabled('libertree')) {
|
||||
$nodeinfo['services']['outbound'][] = 'libertree';
|
||||
}
|
||||
if (plugin_enabled('buffer')) {
|
||||
$nodeinfo['services']['outbound'][] = 'linkedin';
|
||||
}
|
||||
if (plugin_enabled('ljpost')) {
|
||||
$nodeinfo['services']['outbound'][] = 'livejournal';
|
||||
}
|
||||
if (plugin_enabled('buffer')) {
|
||||
$nodeinfo['services']['outbound'][] = 'pinterest';
|
||||
}
|
||||
if (plugin_enabled('posterous')) {
|
||||
$nodeinfo['services']['outbound'][] = 'posterous';
|
||||
}
|
||||
if (plugin_enabled('pumpio')) {
|
||||
$nodeinfo['services']['inbound'][] = 'pumpio';
|
||||
$nodeinfo['services']['outbound'][] = 'pumpio';
|
||||
}
|
||||
|
||||
if (plugin_enabled("fbpost") OR plugin_enabled("buffer"))
|
||||
$nodeinfo["services"]["outbound"][] = "facebook";
|
||||
if ($smtp) {
|
||||
$nodeinfo['services']['outbound'][] = 'smtp';
|
||||
}
|
||||
if (plugin_enabled('tumblr')) {
|
||||
$nodeinfo['services']['outbound'][] = 'tumblr';
|
||||
}
|
||||
if (plugin_enabled('twitter') OR plugin_enabled('buffer')) {
|
||||
$nodeinfo['services']['outbound'][] = 'twitter';
|
||||
}
|
||||
if (plugin_enabled('wppost')) {
|
||||
$nodeinfo['services']['outbound'][] = 'wordpress';
|
||||
}
|
||||
$nodeinfo['metadata']['protocols'] = $nodeinfo['protocols'];
|
||||
$nodeinfo['metadata']['protocols']['outbound'][] = 'atom1.0';
|
||||
$nodeinfo['metadata']['protocols']['inbound'][] = 'atom1.0';
|
||||
$nodeinfo['metadata']['protocols']['inbound'][] = 'rss2.0';
|
||||
|
||||
if (plugin_enabled("statusnet")) {
|
||||
$nodeinfo["services"]["inbound"][] = "gnusocial";
|
||||
$nodeinfo["services"]["outbound"][] = "gnusocial";
|
||||
$nodeinfo['metadata']['services'] = $nodeinfo['services'];
|
||||
|
||||
if (plugin_enabled('twitter')) {
|
||||
$nodeinfo['metadata']['services']['inbound'][] = 'twitter';
|
||||
}
|
||||
}
|
||||
|
||||
if (plugin_enabled("gpluspost") OR plugin_enabled("buffer"))
|
||||
$nodeinfo["services"]["outbound"][] = "google";
|
||||
|
||||
if (plugin_enabled("ijpost"))
|
||||
$nodeinfo["services"]["outbound"][] = "insanejournal";
|
||||
|
||||
if (plugin_enabled("libertree"))
|
||||
$nodeinfo["services"]["outbound"][] = "libertree";
|
||||
|
||||
if (plugin_enabled("buffer"))
|
||||
$nodeinfo["services"]["outbound"][] = "linkedin";
|
||||
|
||||
if (plugin_enabled("ljpost"))
|
||||
$nodeinfo["services"]["outbound"][] = "livejournal";
|
||||
|
||||
if (plugin_enabled("buffer"))
|
||||
$nodeinfo["services"]["outbound"][] = "pinterest";
|
||||
|
||||
if (plugin_enabled("posterous"))
|
||||
$nodeinfo["services"]["outbound"][] = "posterous";
|
||||
|
||||
if (plugin_enabled("pumpio")) {
|
||||
$nodeinfo["services"]["inbound"][] = "pumpio";
|
||||
$nodeinfo["services"]["outbound"][] = "pumpio";
|
||||
}
|
||||
|
||||
// redmatrix
|
||||
|
||||
if ($smtp)
|
||||
$nodeinfo["services"]["outbound"][] = "smtp";
|
||||
|
||||
if (plugin_enabled("tumblr"))
|
||||
$nodeinfo["services"]["outbound"][] = "tumblr";
|
||||
|
||||
if (plugin_enabled("twitter") OR plugin_enabled("buffer"))
|
||||
$nodeinfo["services"]["outbound"][] = "twitter";
|
||||
|
||||
if (plugin_enabled("wppost"))
|
||||
$nodeinfo["services"]["outbound"][] = "wordpress";
|
||||
|
||||
$nodeinfo["metadata"]["protocols"] = $nodeinfo["protocols"];
|
||||
$nodeinfo["metadata"]["protocols"]["outbound"][] = "atom1.0";
|
||||
$nodeinfo["metadata"]["protocols"]["inbound"][] = "atom1.0";
|
||||
$nodeinfo["metadata"]["protocols"]["inbound"][] = "rss2.0";
|
||||
|
||||
$nodeinfo["metadata"]["services"] = $nodeinfo["services"];
|
||||
|
||||
if (plugin_enabled("twitter"))
|
||||
$nodeinfo["metadata"]["services"]["inbound"][] = "twitter";
|
||||
|
||||
header('Content-type: application/json; charset=utf-8');
|
||||
echo json_encode($nodeinfo, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
|
||||
exit;
|
||||
|
|
@ -150,40 +151,40 @@ function nodeinfo_cron() {
|
|||
|
||||
$a = get_app();
|
||||
|
||||
// If the plugin "statistics_json" is enabled then disable it and actrivate nodeinfo.
|
||||
if (plugin_enabled("statistics_json")) {
|
||||
set_config("system", "nodeinfo", true);
|
||||
// If the plugin 'statistics_json' is enabled then disable it and actrivate nodeinfo.
|
||||
if (plugin_enabled('statistics_json')) {
|
||||
Config::set('system', 'nodeinfo', true);
|
||||
|
||||
$plugin = "statistics_json";
|
||||
$plugins = get_config("system","addon");
|
||||
$plugin = 'statistics_json';
|
||||
$plugins = Config::get('system', 'addon');
|
||||
$plugins_arr = array();
|
||||
|
||||
if($plugins) {
|
||||
$plugins_arr = explode(",",str_replace(" ", "",$plugins));
|
||||
if ($plugins) {
|
||||
$plugins_arr = explode(',',str_replace(' ', '',$plugins));
|
||||
|
||||
$idx = array_search($plugin, $plugins_arr);
|
||||
if ($idx !== false){
|
||||
if ($idx !== false) {
|
||||
unset($plugins_arr[$idx]);
|
||||
uninstall_plugin($plugin);
|
||||
set_config("system","addon", implode(", ",$plugins_arr));
|
||||
Config::set('system', 'addon', implode(', ',$plugins_arr));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!get_config("system", "nodeinfo"))
|
||||
if (!Config::get('system', 'nodeinfo')) {
|
||||
return;
|
||||
}
|
||||
$last = Config::get('nodeinfo', 'last_calucation');
|
||||
|
||||
$last = get_config('nodeinfo','last_calucation');
|
||||
|
||||
if($last) {
|
||||
if ($last) {
|
||||
// Calculate every 24 hours
|
||||
$next = $last + (24 * 60 * 60);
|
||||
if($next > time()) {
|
||||
logger("calculation intervall not reached");
|
||||
if ($next > time()) {
|
||||
logger('calculation intervall not reached');
|
||||
return;
|
||||
}
|
||||
}
|
||||
logger("cron_start");
|
||||
logger('cron_start');
|
||||
|
||||
$users = qu("SELECT `user`.`uid`, `user`.`login_date`, `contact`.`last-item`
|
||||
FROM `user`
|
||||
|
|
@ -202,31 +203,31 @@ function nodeinfo_cron() {
|
|||
|
||||
foreach ($users AS $user) {
|
||||
if ((strtotime($user['login_date']) > $halfyear) OR
|
||||
(strtotime($user['last-item']) > $halfyear))
|
||||
(strtotime($user['last-item']) > $halfyear)) {
|
||||
++$active_users_halfyear;
|
||||
|
||||
}
|
||||
if ((strtotime($user['login_date']) > $month) OR
|
||||
(strtotime($user['last-item']) > $month))
|
||||
(strtotime($user['last-item']) > $month)) {
|
||||
++$active_users_monthly;
|
||||
|
||||
}
|
||||
}
|
||||
set_config('nodeinfo','total_users', $total_users);
|
||||
logger("total_users: ".$total_users, LOGGER_DEBUG);
|
||||
Config::set('nodeinfo', 'total_users', $total_users);
|
||||
logger('total_users: '.$total_users, LOGGER_DEBUG);
|
||||
|
||||
set_config('nodeinfo','active_users_halfyear', $active_users_halfyear);
|
||||
set_config('nodeinfo','active_users_monthly', $active_users_monthly);
|
||||
Config::set('nodeinfo', 'active_users_halfyear', $active_users_halfyear);
|
||||
Config::set('nodeinfo', 'active_users_monthly', $active_users_monthly);
|
||||
}
|
||||
|
||||
$posts = qu("SELECT COUNT(*) AS local_posts FROM `thread` WHERE `thread`.`wall` AND `thread`.`uid` != 0");
|
||||
|
||||
if (!is_array($posts))
|
||||
if (!is_array($posts)) {
|
||||
$local_posts = -1;
|
||||
else
|
||||
$local_posts = $posts[0]["local_posts"];
|
||||
} else {
|
||||
$local_posts = $posts[0]['local_posts'];
|
||||
}
|
||||
Config::set('nodeinfo', 'local_posts', $local_posts);
|
||||
|
||||
set_config('nodeinfo','local_posts', $local_posts);
|
||||
|
||||
logger("local_posts: ".$local_posts, LOGGER_DEBUG);
|
||||
logger('local_posts: '.$local_posts, LOGGER_DEBUG);
|
||||
|
||||
$posts = qu("SELECT COUNT(*) FROM `contact`
|
||||
INNER JOIN `item` ON `item`.`contact-id` = `contact`.`id` AND `item`.`uid` = `contact`.`uid` AND
|
||||
|
|
@ -234,21 +235,21 @@ function nodeinfo_cron() {
|
|||
WHERE `contact`.`self`",
|
||||
dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_DFRN));
|
||||
|
||||
if (!is_array($posts))
|
||||
if (!is_array($posts)) {
|
||||
$local_comments = -1;
|
||||
else
|
||||
$local_comments = $posts[0]["local_comments"];
|
||||
|
||||
set_config('nodeinfo','local_comments', $local_comments);
|
||||
} else {
|
||||
$local_comments = $posts[0]['local_comments'];
|
||||
}
|
||||
Config::set('nodeinfo', 'local_comments', $local_comments);
|
||||
|
||||
// Now trying to register
|
||||
$url = "http://the-federation.info/register/".$a->get_hostname();
|
||||
$url = 'http://the-federation.info/register/'.$a->get_hostname();
|
||||
logger('registering url: '.$url, LOGGER_DEBUG);
|
||||
$ret = fetch_url($url);
|
||||
logger('registering answer: '.$ret, LOGGER_DEBUG);
|
||||
|
||||
logger("cron_end");
|
||||
set_config('nodeinfo','last_calucation', time());
|
||||
logger('cron_end');
|
||||
Config::set('nodeinfo', 'last_calucation', time());
|
||||
}
|
||||
|
||||
?>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue