bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into separated-confirm

Browse source
This commit is contained in:
Michael 2019-05-06 05:54:51 +00:00
parent 5da3e17a12 14d8c12130
commit 37f9af2f24
33 changed files with 650 additions and 427 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
images/friendica-404_svg_flexy-o-hare.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
images/friendica-404_svg_hare-bottom-light-inside.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.9 KiB

40
mod/filerm.php
View file

@ -1,40 +0,0 @@
<?php
use Friendica\App;
use Friendica\Core\Logger;
use Friendica\Model\FileTag;
use Friendica\Util\XML;
function filerm_content(App $a)
{
if (! local_user())
{
exit();
}
$term = XML::unescape(trim(defaults($_GET, 'term', '')));
$cat = XML::unescape(trim(defaults($_GET, 'cat', '')));
$category = (($cat) ? true : false);
if ($category)
{
$term = $cat;
}
$item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
Logger::log('filerm: tag ' . $term . ' item ' . $item_id . ' category ' . ($category ? 'true' : 'false'));
if ($item_id && strlen($term)) {
if (FileTag::unsaveFile(local_user(), $item_id, $term, $category)) {
info('Item removed');
}
}
else {
info('Item was not deleted');
}
$a->internalRedirect('/network?f=&file=' . rawurlencode($term));
exit();
}

141
mod/friendica.php
View file

@ -1,141 +0,0 @@
<?php
/**
* @file mod/friendica.php
*/
use Friendica\App;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\Hook;
use Friendica\Core\L10n;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Module\Register;
function friendica_init(App $a)
{
if (!empty($a->argv[1]) && ($a->argv[1] == "json")) {
$register_policies = [
Register::CLOSED => 'REGISTER_CLOSED',
Register::APPROVE => 'REGISTER_APPROVE',
Register::OPEN => 'REGISTER_OPEN'
];
$register_policy_int = intval(Config::get('config', 'register_policy'));
if ($register_policy_int !== Register::CLOSED && Config::get('config', 'invitation_only')) {
$register_policy = 'REGISTER_INVITATION';
} else {
$register_policy = $register_policies[$register_policy_int];
}
$condition = [];
$admin = false;
if (!empty(Config::get('config', 'admin_nickname'))) {
$condition['nickname'] = Config::get('config', 'admin_nickname');
}
if (!empty(Config::get('config', 'admin_email'))) {
$adminlist = explode(",", str_replace(" ", "", Config::get('config', 'admin_email')));
$condition['email'] = $adminlist[0];
$administrator = DBA::selectFirst('user', ['username', 'nickname'], $condition);
if (DBA::isResult($administrator)) {
$admin = [
'name' => $administrator['username'],
'profile'=> System::baseUrl() . '/profile/' . $administrator['nickname'],
];
}
}
$visible_addons = Addon::getVisibleList();
Config::load('feature_lock');
$locked_features = [];
$featureLock = Config::get('config', 'feature_lock');
if (isset($featureLock)) {
foreach ($featureLock as $k => $v) {
if ($k === 'config_loaded') {
continue;
}
$locked_features[$k] = intval($v);
}
}
$data = [
'version' => FRIENDICA_VERSION,
'url' => System::baseUrl(),
'addons' => $visible_addons,
'locked_features' => $locked_features,
'explicit_content' => (int)Config::get('system', 'explicit_content', false),
'language' => Config::get('system','language'),
'register_policy' => $register_policy,
'admin' => $admin,
'site_name' => Config::get('config', 'sitename'),
'platform' => FRIENDICA_PLATFORM,
'info' => Config::get('config', 'info'),
'no_scrape_url' => System::baseUrl().'/noscrape'
];
header('Content-type: application/json; charset=utf-8');
echo json_encode($data);
exit();
}
}
function friendica_content(App $a)
{
$o = '<h1>Friendica</h1>' . PHP_EOL;
$o .= '<p>';
$o .= L10n::t('This is Friendica, version %s that is running at the web location %s. The database version is %s, the post update version is %s.',
'<strong>' . FRIENDICA_VERSION . '</strong>', System::baseUrl(), '<strong>' . DB_UPDATE_VERSION . '</strong>',
'<strong>' . Config::get("system", "post_update_version") . '</strong>');
$o .= '</p>' . PHP_EOL;
$o .= '<p>';
$o .= L10n::t('Please visit <a href="https://friendi.ca">Friendi.ca</a> to learn more about the Friendica project.') . PHP_EOL;
$o .= '</p>' . PHP_EOL;
$o .= '<p>';
$o .= L10n::t('Bug reports and issues: please visit') . ' ' . '<a href="https://github.com/friendica/friendica/issues?state=open">'.L10n::t('the bugtracker at github').'</a>';
$o .= '</p>' . PHP_EOL;
$o .= '<p>';
$o .= L10n::t('Suggestions, praise, etc. - please email "info" at "friendi - dot - ca');
$o .= '</p>' . PHP_EOL;
$visible_addons = Addon::getVisibleList();
if (count($visible_addons)) {
$o .= '<p>' . L10n::t('Installed addons/apps:') . '</p>' . PHP_EOL;
$sorted = $visible_addons;
$s = '';
sort($sorted);
foreach ($sorted as $p) {
if (strlen($p)) {
if (strlen($s)) {
$s .= ', ';
}
$s .= $p;
}
}
$o .= '<div style="margin-left: 25px; margin-right: 25px; margin-bottom: 25px;">' . $s . '</div>' . PHP_EOL;
} else {
$o .= '<p>' . L10n::t('No installed addons/apps') . '</p>' . PHP_EOL;
}
if (Config::get('system', 'tosdisplay'))
{
$o .= '<p>'.L10n::t('Read about the <a href="%1$s/tos">Terms of Service</a> of this node.', System::baseurl()).'</p>';
}
$blocklist = Config::get('system', 'blocklist', []);
if (!empty($blocklist)) {
$o .= '<div id="about_blocklist"><p>' . L10n::t('On this server the following remote servers are blocked.') . '</p>' . PHP_EOL;
$o .= '<table class="table"><thead><tr><th>' . L10n::t('Blocked domain') . '</th><th>' . L10n::t('Reason for the block') . '</th></thead><tbody>' . PHP_EOL;
foreach ($blocklist as $b) {
$o .= '<tr><td>' . $b['domain'] .'</td><td>' . $b['reason'] . '</td></tr>' . PHP_EOL;
}
$o .= '</tbody></table></div>' . PHP_EOL;
}
Hook::callAll('about_hook', $o);
return $o;
}

29
mod/maintenance.php
View file

@ -1,29 +0,0 @@
<?php
/**
* @file mod/maintenance.php
*/
use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Util\Strings;
function maintenance_content(App $a)
{
$reason = Config::get('system', 'maintenance_reason');
if (substr(Strings::normaliseLink($reason), 0, 7) == 'http://') {
header("HTTP/1.1 307 Temporary Redirect");
header("Location:".$reason);
return;
}
header('HTTP/1.1 503 Service Temporarily Unavailable');
header('Status: 503 Service Temporarily Unavailable');
header('Retry-After: 600');
return Renderer::replaceMacros(Renderer::getMarkupTemplate('maintenance.tpl'), [
'$sysdown' => L10n::t('System down for maintenance'),
'$reason' => $reason
]);
}

36
mod/modexp.php
View file

@ -1,36 +0,0 @@
<?php
use Friendica\App;
use Friendica\Database\DBA;
function modexp_init(App $a) {
if($a->argc != 2)
exit();
$nick = $a->argv[1];
$r = q("SELECT `spubkey` FROM `user` WHERE `nickname` = '%s' LIMIT 1",
DBA::escape($nick)
);
if (! DBA::isResult($r)) {
exit();
}
$lines = explode("\n",$r[0]['spubkey']);
unset($lines[0]);
unset($lines[count($lines)]);
$x = base64_decode(implode('',$lines));
$r = ASN_BASE::parseASNString($x);
$m = $r[0]->asnData[1]->asnData[0]->asnData[0]->asnData;
$e = $r[0]->asnData[1]->asnData[0]->asnData[1]->asnData;
header("Content-type: application/magic-public-key");
echo 'RSA' . '.' . $m . '.' . $e;
exit();
}

25
mod/pretheme.php
View file

@ -1,25 +0,0 @@
<?php
use Friendica\App;
use Friendica\Core\Theme;
function pretheme_init(App $a) {
if ($_REQUEST['theme']) {
$theme = $_REQUEST['theme'];
$info = Theme::getInfo($theme);
if ($info) {
// unfortunately there will be no translation for this string
$desc = $info['description'];
$version = $info['version'];
$credits = $info['credits'];
} else {
$desc = '';
$version = '';
$credits = '';
}
echo json_encode(['img' => Theme::getScreenshot($theme), 'desc' => $desc, 'version' => $version, 'credits' => $credits]);
}
exit();
}

30
mod/robots_txt.php
View file

@ -1,30 +0,0 @@
<?php
/**
* @file mod/robots_text.php
* @brief Module which returns the default robots.txt
* @version 0.1.2
*/
use Friendica\App;
/**
* @brief Return default robots.txt when init
* @param App $a
* @return void
*/
function robots_txt_init(App $a)
{
$allDisalloweds = [
'/settings/',
'/admin/',
'/message/',
];
header('Content-Type: text/plain');
echo 'User-agent: *' . PHP_EOL;
foreach ($allDisalloweds as $disallowed) {
echo 'Disallow: ' . $disallowed . PHP_EOL;
}
exit();
}

35
mod/viewsrc.php
View file

@ -1,35 +0,0 @@
<?php
/**
* @file mod/viewsrc.php
*/
use Friendica\App;
use Friendica\Core\L10n;
use Friendica\Database\DBA;
use Friendica\Model\Item;
function viewsrc_content(App $a)
{
if (!local_user()) {
notice(L10n::t('Access denied.') . EOL);
return;
}
$o = '';
$item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
if (!$item_id) {
throw new \Friendica\Network\HTTPException\NotFoundException(L10n::t('Item not found.'));
}
$item = Item::selectFirst(['body'], ['uid' => local_user(), 'id' => $item_id]);
if (DBA::isResult($item)) {
if ($a->isAjax()) {
echo str_replace("\n", '<br />', $item['body']);
exit();
} else {
$o .= str_replace("\n", '<br />', $item['body']);
}
}
return $o;
}

10
src/App.php
View file

@ -988,7 +988,7 @@ class App
header('Refresh: 120; url=' . $this->getBaseURL() . "/" . $this->query_string);
Module\Special\HTTPException::rawContent(
new HTTPException\ServiceUnavaiableException('The node is currently overloaded. Please try again later.')
new HTTPException\ServiceUnavailableException('The node is currently overloaded. Please try again later.')
);
}
@ -1077,10 +1077,10 @@ class App
// in install mode, any url loads install module
// but we need "view" module for stylesheet
if ($this->getMode()->isInstall() && $this->module != 'view') {
$this->module = 'install';
} elseif (!$this->getMode()->has(App\Mode::MAINTENANCEDISABLED) && $this->module != 'view') {
$this->module = 'maintenance';
if ($this->getMode()->isInstall() && $this->module !== 'install') {
$this->internalRedirect('install');
} elseif (!$this->getMode()->has(App\Mode::MAINTENANCEDISABLED) && $this->module !== 'maintenance') {
$this->internalRedirect('maintenance');
} else {
$this->checkURL();
Core\Update::check($this->getBasePath(), false, $this->getMode());

13
src/App/Router.php
View file

@ -89,12 +89,13 @@ class Router
$this->routeCollector->addRoute(['GET'], '/apps', Module\Apps::class);
$this->routeCollector->addRoute(['GET'], '/attach/{item:\d+}', Module\Attach::class);
$this->routeCollector->addRoute(['GET'], '/babel', Module\Babel::class);
$this->routeCollector->addRoute(['GET'], '/bookmarklet', Module\BookMarklet::class);
$this->routeCollector->addRoute(['GET'], '/bookmarklet', Module\Bookmarklet::class);
$this->routeCollector->addGroup('/contact', function (RouteCollector $collector) {
$collector->addRoute(['GET'], '[/]', Module\Contact::class);
$collector->addRoute(['GET'], '/{id:\d+}[/posts|conversations]', Module\Contact::class);
});
$this->routeCollector->addRoute(['GET'], '/credits', Module\Credits::class);
$this->routeCollector->addRoute(['GET'], '/directory', Module\Directory::class);
$this->routeCollector->addGroup('/feed', function (RouteCollector $collector) {
$collector->addRoute(['GET'], '/{nickname}', Module\Feed::class);
$collector->addRoute(['GET'], '/{nickname}/posts', Module\Feed::class);
@ -102,17 +103,18 @@ class Router
$collector->addRoute(['GET'], '/{nickname}/replies', Module\Feed::class);
$collector->addRoute(['GET'], '/{nickname}/activity', Module\Feed::class);
});
$this->routeCollector->addRoute(['GET'], '/directory', Module\Directory::class);
$this->routeCollector->addRoute(['GET'], '/feedtest', Module\Feedtest::class);
$this->routeCollector->addGroup('/fetch', function (RouteCollector $collector) {
$collector->addRoute(['GET'], '/{guid}/post', Module\Diaspora\Fetch::class);
$collector->addRoute(['GET'], '/{guid}/status_message', Module\Diaspora\Fetch::class);
$collector->addRoute(['GET'], '/{guid}/reshare', Module\Diaspora\Fetch::class);
});
$this->routeCollector->addRoute(['GET'], '/filer[/{id:\d+}]', Module\Filer::class);
$this->routeCollector->addRoute(['GET'], '/filer[/{id:\d+}]', Module\Filer\SaveTag::class);
$this->routeCollector->addRoute(['GET'], '/filerm/{id:\d+}', Module\Filer\RemoveTag::class);
$this->routeCollector->addRoute(['GET', 'POST'], '/follow_confirm', Module\FollowConfirm::class);
$this->routeCollector->addRoute(['GET'], '/followers/{owner}', Module\Followers::class);
$this->routeCollector->addRoute(['GET'], '/following/{owner}', Module\Following::class);
$this->routeCollector->addRoute(['GET'], '/friendica[/json]', Module\Friendica::class);
$this->routeCollector->addGroup('/group', function (RouteCollector $collector) {
$collector->addRoute(['GET', 'POST'], '[/]', Module\Group::class);
$collector->addRoute(['GET', 'POST'], '/{group:\d+}', Module\Group::class);
@ -139,7 +141,9 @@ class Router
$this->routeCollector->addRoute(['GET', 'POST'], '/login', Module\Login::class);
$this->routeCollector->addRoute(['GET', 'POST'], '/logout', Module\Logout::class);
$this->routeCollector->addRoute(['GET'], '/magic', Module\Magic::class);
$this->routeCollector->addRoute(['GET'], '/maintenance', Module\Maintenance::class);
$this->routeCollector->addRoute(['GET'], '/manifest', Module\Manifest::class);
$this->routeCollector->addRoute(['GET'], '/modexp/{nick}', Module\PublicRSAKey::class);
$this->routeCollector->addRoute(['GET'], '/nodeinfo/1.0', Module\NodeInfo::class);
$this->routeCollector->addRoute(['GET'], '/nogroup', Module\Group::class);
$this->routeCollector->addRoute(['GET'], '/objects/{guid}', Module\Objects::class);
@ -154,6 +158,7 @@ class Router
$collector->addRoute(['GET'], '/{type}/{name}', Module\Photo::class);
$collector->addRoute(['GET'], '/{type}/{customize}/{name}', Module\Photo::class);
});
$this->routeCollector->addRoute(['GET'], '/pretheme', Module\ThemeDetails::class);
$this->routeCollector->addGroup('/profile', function (RouteCollector $collector) {
$collector->addRoute(['GET'], '/{nickname}', Module\Profile::class);
$collector->addRoute(['GET'], '/{profile:\d+}/view', Module\Profile::class);
@ -165,9 +170,11 @@ class Router
$collector->addRoute(['GET'], '/{sub1}/{sub2}/{url}' , Module\Proxy::class);
});
$this->routeCollector->addRoute(['GET', 'POST'], '/register', Module\Register::class);
$this->routeCollector->addRoute(['GET'], '/robots.txt', Module\RobotsTxt::class);
$this->routeCollector->addRoute(['GET'], '/rsd.xml', Module\ReallySimpleDiscovery::class);
$this->routeCollector->addRoute(['GET'], '/statistics.json', Module\Statistics::class);
$this->routeCollector->addRoute(['GET'], '/tos', Module\Tos::class);
$this->routeCollector->addRoute(['GET'], '/viewsrc/{item:\d+}', Module\ItemBody::class);
$this->routeCollector->addRoute(['GET'], '/webfinger', Module\WebFinger::class);
$this->routeCollector->addRoute(['GET'], '/xrd', Module\Xrd::class);
}

3
src/Core/System.php
View file

@ -242,6 +242,9 @@ class System extends BaseObject
case 301:
header('HTTP/1.1 301 Moved Permanently');
break;
case 307:
header('HTTP/1.1 307 Temporary Redirect');
break;
}
header("Location: $url");

2
src/Model/Contact.php
View file

@ -1174,7 +1174,7 @@ class Contact extends BaseObject
// The link could be provided as http although we stored it as https
$ssl_url = str_replace('http://', 'https://', $url);
$fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick',
$fields = ['id', 'uid', 'url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick',
'photo', 'keywords', 'location', 'about', 'network',
'priority', 'batch', 'request', 'confirm', 'poco'];

100
src/Model/Profile.php
View file

@ -1249,56 +1249,96 @@ class Profile
*/
public static function searchProfiles($start = 0, $count = 100, $search = null)
{
if ($search) {
$search = DBA::escape($search);
$sql_extra = " AND ((`profile`.`name` LIKE '%$search%') OR
(`user`.`nickname` LIKE '%$search%') OR
(`profile`.`pdesc` LIKE '%$search%') OR
(`profile`.`locality` LIKE '%$search%') OR
(`profile`.`region` LIKE '%$search%') OR
(`profile`.`country-name` LIKE '%$search%') OR
(`profile`.`gender` LIKE '%$search%') OR
(`profile`.`marital` LIKE '%$search%') OR
(`profile`.`sexual` LIKE '%$search%') OR
(`profile`.`about` LIKE '%$search%') OR
(`profile`.`romance` LIKE '%$search%') OR
(`profile`.`work` LIKE '%$search%') OR
(`profile`.`education` LIKE '%$search%') OR
(`profile`.`pub_keywords` LIKE '%$search%') OR
(`profile`.`prv_keywords` LIKE '%$search%'))";
} else {
$sql_extra = '';
}
$publish = (Config::get('system', 'publish_all') ? '' : " AND `publish` = 1 ");
$total = 0;
$cnt = DBA::fetchFirst("SELECT COUNT(*) AS `total`
if (!empty($search)) {
$searchTerm = '%' . $search . '%';
$cnt = DBA::fetchFirst("SELECT COUNT(*) AS `total`
FROM `profile`
LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
WHERE `is-default` $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` $sql_extra");
WHERE `is-default` $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed`
AND ((`profile`.`name` LIKE ?) OR
(`user`.`nickname` LIKE ?) OR
(`profile`.`pdesc` LIKE ?) OR
(`profile`.`locality` LIKE ?) OR
(`profile`.`region` LIKE ?) OR
(`profile`.`country-name` LIKE ?) OR
(`profile`.`gender` LIKE ?) OR
(`profile`.`marital` LIKE ?) OR
(`profile`.`sexual` LIKE ?) OR
(`profile`.`about` LIKE ?) OR
(`profile`.`romance` LIKE ?) OR
(`profile`.`work` LIKE ?) OR
(`profile`.`education` LIKE ?) OR
(`profile`.`pub_keywords` LIKE ?) OR
(`profile`.`prv_keywords` LIKE ?))",
$searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm,
$searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm);
} else {
$cnt = DBA::fetchFirst("SELECT COUNT(*) AS `total`
FROM `profile`
LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
WHERE `is-default` $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed`");
}
if (DBA::isResult($cnt)) {
$total = $cnt['total'];
}
$order = " ORDER BY `name` ASC ";
$limit = $start . ',' . $count;
$profiles = [];
$profiles = DBA::p("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags`,
// If nothing found, don't try to select details
if ($total > 0) {
if (!empty($search)) {
$searchTerm = '%' . $search . '%';
$profiles = DBA::p("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags`,
`contact`.`addr`, `contact`.`url` AS `profile_url`
FROM `profile`
LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
LEFT JOIN `contact` ON `contact`.`uid` = `user`.`uid`
WHERE `is-default` $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `contact`.`self`
$sql_extra $order LIMIT $limit"
);
AND ((`profile`.`name` LIKE ?) OR
(`user`.`nickname` LIKE ?) OR
(`profile`.`pdesc` LIKE ?) OR
(`profile`.`locality` LIKE ?) OR
(`profile`.`region` LIKE ?) OR
(`profile`.`country-name` LIKE ?) OR
(`profile`.`gender` LIKE ?) OR
(`profile`.`marital` LIKE ?) OR
(`profile`.`sexual` LIKE ?) OR
(`profile`.`about` LIKE ?) OR
(`profile`.`romance` LIKE ?) OR
(`profile`.`work` LIKE ?) OR
(`profile`.`education` LIKE ?) OR
(`profile`.`pub_keywords` LIKE ?) OR
(`profile`.`prv_keywords` LIKE ?))
$order LIMIT ?,?",
$searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm,
$searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm,
$start, $count
);
} else {
$profiles = DBA::p("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags`,
`contact`.`addr`, `contact`.`url` AS `profile_url`
FROM `profile`
LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
LEFT JOIN `contact` ON `contact`.`uid` = `user`.`uid`
WHERE `is-default` $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `contact`.`self`
$order LIMIT ?,?",
$start, $count
);
}
}
if (DBA::isResult($profiles)) {
if (DBA::isResult($profiles) && $total > 0) {
return [
'total' => $total,
'entries' => DBA::toArray($profiles),
];
} else {
return [
'total' => $total,

15
src/Model/User.php
View file

@ -129,6 +129,21 @@ class User
}
}
/**
* Get a user based on its email
*
* @param string $email
* @param array $fields
*
* @return array|boolean User record if it exists, false otherwise
*
* @throws Exception
*/
public static function getByEmail($email, array $fields = [])
{
return DBA::selectFirst('user', $fields, ['email' => $email]);
}
/**
* @brief Get owner data by user id
*

2
src/Module/BookMarklet.php → src/Module/Bookmarklet.php
View file

@ -12,7 +12,7 @@ use Friendica\Util\Strings;
* Creates a bookmarklet
* Shows either a editor browser or adds the given bookmarklet to the current user
*/
class BookMarklet extends BaseModule
class Bookmarklet extends BaseModule
{
public static function content()
{

51
src/Module/Filer/RemoveTag.php Normal file
View file

@ -0,0 +1,51 @@
<?php
namespace Friendica\Module\Filer;
use Friendica\BaseModule;
use Friendica\Model\FileTag;
use Friendica\Network\HTTPException;
use Friendica\Util\XML;
/**
* Remove a tag from a file
*/
class RemoveTag extends BaseModule
{
public static function content()
{
if (!local_user()) {
throw new HTTPException\ForbiddenException();
}
$app = self::getApp();
$logger = $app->getLogger();
$item_id = (($app->argc > 1) ? intval($app->argv[1]) : 0);
$term = XML::unescape(trim(defaults($_GET, 'term', '')));
$cat = XML::unescape(trim(defaults($_GET, 'cat', '')));
$category = (($cat) ? true : false);
if ($category) {
$term = $cat;
}
$logger->info('Filer - Remove Tag', [
'term' => $term,
'item' => $item_id,
'category' => ($category ? 'true' : 'false')
]);
if ($item_id && strlen($term)) {
if (FileTag::unsaveFile(local_user(), $item_id, $term, $category)) {
info('Item removed');
}
} else {
info('Item was not deleted');
}
$app->internalRedirect('/network?f=&file=' . rawurlencode($term));
}
}

4
src/Module/Filer.php → src/Module/Filer/SaveTag.php
View file

@ -1,6 +1,6 @@
<?php
namespace Friendica\Module;
namespace Friendica\Module\Filer;
use Friendica\BaseModule;
use Friendica\Core\L10n;
@ -12,7 +12,7 @@ use Friendica\Util\XML;
/**
* Shows a dialog for adding tags to a file
*/
class Filer extends BaseModule
class SaveTag extends BaseModule
{
public static function init()
{

166
src/Module/Friendica.php Normal file
View file

@ -0,0 +1,166 @@
<?php
namespace Friendica\Module;
use Friendica\BaseModule;
use Friendica\Core\Addon;
use Friendica\Core\Hook;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Model\User;
/**
* Prints information about the current node
* Either in human readable form or in JSON
*/
class Friendica extends BaseModule
{
public static function content()
{
$app = self::getApp();
$config = $app->getConfig();
$visibleAddonList = Addon::getVisibleList();
if (!empty($visibleAddonList)) {
$sorted = $visibleAddonList;
sort($sorted);
$sortedAddonList = '';
foreach ($sorted as $addon) {
if (strlen($addon)) {
if (strlen($sortedAddonList)) {
$sortedAddonList .= ', ';
}
$sortedAddonList .= $addon;
}
}
$addon = [
'title' => L10n::t('Installed addons/apps:'),
'list' => $sortedAddonList,
];
} else {
$addon = [
'title' => L10n::t('No installed addons/apps'),
];
}
$tos = ($config->get('system', 'tosdisplay')) ?
L10n::t('Read about the <a href="%1$s/tos">Terms of Service</a> of this node.', $app->getBaseURL()) :
'';
$blockList = $config->get('system', 'blocklist');
if (!empty($blockList)) {
$blocked = [
'title' => L10n::t('On this server the following remote servers are blocked.'),
'header' => [
L10n::t('Blocked domain'),
L10n::t('Reason for the block'),
],
'list' => $blockList,
];
} else {
$blocked = null;
}
$hooked = '';
Hook::callAll('about_hook', $hooked);
$tpl = Renderer::getMarkupTemplate('friendica.tpl');
return Renderer::replaceMacros($tpl, [
'about' => L10n::t('This is Friendica, version %s that is running at the web location %s. The database version is %s, the post update version is %s.',
'<strong>' . FRIENDICA_VERSION . '</strong>',
$app->getBaseURL(),
'<strong>' . DB_UPDATE_VERSION . '</strong>',
'<strong>' . $config->get('system', 'post_update_version') . '</strong>'),
'friendica' => L10n::t('Please visit <a href="https://friendi.ca">Friendi.ca</a> to learn more about the Friendica project.'),
'bugs' => L10n::t('Bug reports and issues: please visit') . ' ' . '<a href="https://github.com/friendica/friendica/issues?state=open">' . L10n::t('the bugtracker at github') . '</a>',
'info' => L10n::t('Suggestions, praise, etc. - please email "info" at "friendi - dot - ca'),
'visible_addons' => $addon,
'tos' => $tos,
'block_list' => $blocked,
'hooked' => $hooked,
]);
}
public static function rawContent()
{
$app = self::getApp();
// @TODO: Replace with parameter from router
if ($app->argc <= 1 || ($app->argv[1] !== 'json')) {
return;
}
$config = $app->getConfig();
$register_policies = [
Register::CLOSED => 'REGISTER_CLOSED',
Register::APPROVE => 'REGISTER_APPROVE',
Register::OPEN => 'REGISTER_OPEN'
];
$register_policy_int = intval($config->get('config', 'register_policy'));
if ($register_policy_int !== Register::CLOSED && $config->get('config', 'invitation_only')) {
$register_policy = 'REGISTER_INVITATION';
} else {
$register_policy = $register_policies[$register_policy_int];
}
$condition = [];
$admin = false;
if (!empty($config->get('config', 'admin_nickname'))) {
$condition['nickname'] = $config->get('config', 'admin_nickname');
}
if (!empty($config->get('config', 'admin_email'))) {
$adminList = explode(',', str_replace(' ', '', $config->get('config', 'admin_email')));
$condition['email'] = $adminList[0];
$administrator = User::getByEmail($adminList[0], ['username', 'nickname']);
if (!empty($administrator)) {
$admin = [
'name' => $administrator['username'],
'profile' => $app->getBaseURL() . '/profile/' . $administrator['nickname'],
];
}
}
$visible_addons = Addon::getVisibleList();
$config->load('feature_lock');
$locked_features = [];
$featureLocks = $config->get('config', 'feature_lock');
if (isset($featureLocks)) {
foreach ($featureLocks as $feature => $lock) {
if ($feature === 'config_loaded') {
continue;
}
$locked_features[$feature] = intval($lock);
}
}
$data = [
'version' => FRIENDICA_VERSION,
'url' => $app->getBaseURL(),
'addons' => $visible_addons,
'locked_features' => $locked_features,
'explicit_content' => intval($config->get('system', 'explicit_content', 0)),
'language' => $config->get('system', 'language'),
'register_policy' => $register_policy,
'admin' => $admin,
'site_name' => $config->get('config', 'sitename'),
'platform' => FRIENDICA_PLATFORM,
'info' => $config->get('config', 'info'),
'no_scrape_url' => $app->getBaseURL() . '/noscrape',
];
header('Content-type: application/json; charset=utf-8');
echo json_encode($data);
exit();
}
}

43
src/Module/ItemBody.php Normal file
View file

@ -0,0 +1,43 @@
<?php
namespace Friendica\Module;
use Friendica\BaseModule;
use Friendica\Core\L10n;
use Friendica\Model\Item;
use Friendica\Network\HTTPException;
/**
* Print the body of an Item
*/
class ItemBody extends BaseModule
{
public static function content()
{
if (!local_user()) {
throw new HTTPException\UnauthorizedException(L10n::t('Access denied.'));
}
$app = self::getApp();
// @TODO: Replace with parameter from router
$itemId = (($app->argc > 1) ? intval($app->argv[1]) : 0);
if (!$itemId) {
throw new HTTPException\NotFoundException(L10n::t('Item not found.'));
}
$item = Item::selectFirst(['body'], ['uid' => local_user(), 'id' => $itemId]);
if (!empty($item)) {
if ($app->isAjax()) {
echo str_replace("\n", '<br />', $item['body']);
exit();
} else {
return str_replace("\n", '<br />', $item['body']);
}
} else {
throw new HTTPException\NotFoundException(L10n::t('Item not found.'));
}
}
}

32
src/Module/Maintenance.php Normal file
View file

@ -0,0 +1,32 @@
<?php
namespace Friendica\Module;
use Friendica\BaseModule;
use Friendica\Core\L10n;
use Friendica\Core\System;
use Friendica\Network\HTTPException;
use Friendica\Util\Strings;
/**
* Shows the maintenance reason
* or redirects to the alternate location
*/
class Maintenance extends BaseModule
{
public static function content()
{
$config = self::getApp()->getConfig();
$reason = $config->get('system', 'maintenance_reason');
if ((substr(Strings::normaliseLink($reason), 0, 7) === 'http://') ||
(substr(Strings::normaliseLink($reason), 0, 8) === 'https://')) {
System::externalRedirect($reason, 307);
}
$exception = new HTTPException\ServiceUnavailableException($reason);
$exception->httpdesc = L10n::t('System down for maintenance');
throw $exception;
}
}

47
src/Module/PublicRSAKey.php Normal file
View file

@ -0,0 +1,47 @@
<?php
namespace Friendica\Module;
use ASN_BASE;
use Friendica\BaseModule;
use Friendica\Model\User;
use Friendica\Network\HTTPException\BadRequestException;
/**
* prints the public RSA key of a user
*/
class PublicRSAKey extends BaseModule
{
public static function rawContent()
{
$app = self::getApp();
// @TODO: Replace with parameter from router
if ($app->argc !== 2) {
throw new BadRequestException();
}
// @TODO: Replace with parameter from router
$nick = $app->argv[1];
$user = User::getByNickname($nick, ['spubkey']);
if (empty($user) || empty($user['spubkey'])) {
throw new BadRequestException();
}
$lines = explode("\n", $user['spubkey']);
unset($lines[0]);
unset($lines[count($lines)]);
$asnString = base64_decode(implode('', $lines));
$asnBase = ASN_BASE::parseASNString($asnString);
$m = $asnBase[0]->asnData[1]->asnData[0]->asnData[0]->asnData;
$e = $asnBase[0]->asnData[1]->asnData[0]->asnData[1]->asnData;
header('Content-type: application/magic-public-key');
echo 'RSA' . '.' . $m . '.' . $e;
exit();
}
}

42
src/Module/ReallySimpleDiscovery.php
View file

@ -3,7 +3,7 @@
namespace Friendica\Module;
use Friendica\BaseModule;
use Friendica\Core\Renderer;
use Friendica\Util\XML;
/**
* Prints the rsd.xml
@ -13,9 +13,43 @@ class ReallySimpleDiscovery extends BaseModule
{
public static function rawContent()
{
header ('Content-Type: text/xml');
$tpl = Renderer::getMarkupTemplate('rsd.tpl');
echo Renderer::replaceMacros($tpl);
header('Content-Type: text/xml');
$app = self::getApp();
$xml = null;
echo XML::fromArray([
'rsd' => [
'@attributes' => [
'version' => '1.0',
'xmlns' => 'http://archipelago.phrasewise.com/rsd',
],
'service' => [
'engineName' => 'Friendica',
'engineLink' => 'http://friendica.com',
'apis' => [
'api' => [
'@attributes' => [
'name' => 'Twitter',
'preferred' => 'true',
'apiLink' => $app->getBaseURL(),
'blogID' => '',
],
'settings' => [
'docs' => [
'http://status.net/wiki/TwitterCompatibleAPI',
],
'setting' => [
'@attributes' => [
'name' => 'OAuth',
],
'false',
],
],
]
],
],
],
], $xml);
exit();
}
}

27
src/Module/RobotsTxt.php Normal file
View file

@ -0,0 +1,27 @@
<?php
namespace Friendica\Module;
use Friendica\BaseModule;
/**
* Return the default robots.txt
*/
class RobotsTxt extends BaseModule
{
public static function rawContent()
{
$allDisalloweds = [
'/settings/',
'/admin/',
'/message/',
];
header('Content-Type: text/plain');
echo 'User-agent: *' . PHP_EOL;
foreach ($allDisalloweds as $disallowed) {
echo 'Disallow: ' . $disallowed . PHP_EOL;
}
exit();
}
}

6
src/Module/Special/HTTPException.php
View file

@ -52,14 +52,14 @@ class HTTPException
$message = defaults($explanation, $e->getCode(), '');
}
return ['$title' => $title, '$description' => $message];
return ['$title' => $title, '$message' => $message, '$back' => L10n::t('Go back')];
}
/**
* Displays a bare message page with no theming at all.
*
* @param \Friendica\Network\HTTPException $e
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \Exception
*/
public static function rawContent(\Friendica\Network\HTTPException $e)
{
@ -78,7 +78,7 @@ class HTTPException
*
* @param \Friendica\Network\HTTPException $e
* @return string
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \Exception
*/
public static function content(\Friendica\Network\HTTPException $e)
{

33
src/Module/ThemeDetails.php Normal file
View file

@ -0,0 +1,33 @@
<?php
namespace Friendica\Module;
use Friendica\BaseModule;
use Friendica\Core\Theme;
/**
* Prints theme specific details as a JSON string
*/
class ThemeDetails extends BaseModule
{
public static function rawContent()
{
if (!empty($_REQUEST['theme'])) {
$theme = $_REQUEST['theme'];
$info = Theme::getInfo($theme);
// Unfortunately there will be no translation for this string
$description = defaults($info, 'description', '');
$version = defaults($info, 'version' , '');
$credits = defaults($info, 'credits' , '');
echo json_encode([
'img' => Theme::getScreenshot($theme),
'desc' => $description,
'version' => $version,
'credits' => $credits,
]);
}
exit();
}
}

2
src/Network/HTTPException/ServiceUnavaiableException.php → src/Network/HTTPException/ServiceUnavailableException.php
View file

@ -4,7 +4,7 @@ namespace Friendica\Network\HTTPException;
use Friendica\Network\HTTPException;
class ServiceUnavaiableException extends HTTPException
class ServiceUnavailableException extends HTTPException
{
protected $code = 503;
}

22
view/global.css
View file

@ -5,7 +5,7 @@ details > summary {
cursor: pointer;
}
/* General designing elements */
/* General design elements */
.btn {
outline: none;
-moz-box-shadow: inset 0px 1px 0px 0px #ffffff;
@ -87,7 +87,6 @@ span.connector {
.wall-item-container .wall-item-content .type-link img.attachment-image,
.type-link img.attachment-image, .type-video img.attachment-image {
/* max-width: 640px; */
max-width: 100%;
max-height: initial;
float: initial;
@ -621,3 +620,22 @@ span.emoji.mastodon img {
height: 1.2em;
vertical-align: middle;
}
/* Exception page */
#exception {
overflow: hidden;
background-image: url('../images/friendica-404_svg_hare-bottom-light-inside.png');
background-position: 50px bottom;
background-repeat: no-repeat;
}
#exception .hare {
float: right;
}
@media screen and (max-width: 600px) {
#exception .hare {
display: none;
}
}

2
view/templates/exception.tpl
View file

@ -1,4 +1,6 @@
<div id="exception" class="generic-page-wrapper">
<img class="hare" src="images/friendica-404_svg_flexy-o-hare.png"/>
<h1>{{$title}}</h1>
<p>{{$message}}</p>
<p><button type="button" onclick="window.history.back()" class="btn btn-primary">{{$back}}</button></p>
</div>

50
view/templates/feedtest.tpl
View file

@ -1,30 +1,32 @@
<h2>Feed Test</h2>
<form action="feedtest" method="get" class="panel panel-default">
<div class="panel-body">
<div class="form-group">
{{include file="field_input.tpl" field=$url}}
<div id="feedtest" class="generic-page-wrapper">
<h2>Feed Test</h2>
<form action="feedtest" method="get" class="panel panel-default">
<div class="panel-body">
<div class="form-group">
{{include file="field_input.tpl" field=$url}}
</div>
<p><button type="submit" class="btn btn-primary">Submit</button></p>
</div>
<p><button type="submit" class="btn btn-primary">Submit</button></p>
</div>
</form>
</form>
{{if $result}}
<div class="feedtest-result">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Output Items</h3>
{{if $result}}
<div class="feedtest-result">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Output Items</h3>
</div>
<div class="panel-body">
<pre>{{$result.output}}</pre>
</div>
</div>
<div class="panel-body">
<pre>{{$result.output}}</pre>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Input Feed XML</h3>
</div>
<div class="panel-body">
{{$result.input}}
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Input Feed XML</h3>
</div>
<div class="panel-body">
{{$result.input}}
</div>
</div>
</div>
{{/if}}
</div>
{{/if}}

47
view/templates/friendica.tpl Normal file
View file

@ -0,0 +1,47 @@
<div id="friendica" class="generic-page-wrapper">
<h1>Friendica</h1>
<br>
<p>{{$about nofilter}}</p>
<br>
<p>{{$friendica nofilter}}</p>
<br>
<p>{{$bugs nofilter}}</p>
<br>
<p>{{$info nofilter}}</p>
<br>
<p>{{$visible_addons.title nofilter}}</p>
{{if $visible_addons.list}}
<div style="margin-left: 25px; margin-right: 25px; margin-bottom: 25px;">{{$visible_addons.list nofilter}}</div>
{{/if}}
{{if $tos}}
<p>{{$tos nofilter}}</p>
{{/if}}
{{if $block_list}}
<div id="about_blocklist">
<p>{{$block_list.title nofilter}}</p>
<br>
<table class="table">
<thead>
<tr>
<th>{{$block_list.header[0] nofilter}}</th>
<th>{{$block_list.header[1] nofilter}}</th>
</tr>
</thead>
<tbody>
{{foreach $block_list.list as $blocked}}
<tr>
<td>{{$blocked.domain nofilter}}</td>
<td>{{$blocked.reason nofilter}}</td>
</tr>
{{/foreach}}
</tbody>
</table>
</div>
{{/if}}
{{$hooked nofilter}}
</div>

15
view/templates/rsd.tpl
View file

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd">
<service>
<engineName>Friendica</engineName>
<engineLink>http://friendica.com/</engineLink>
<apis>
<api name="Twitter" preferred="true" apiLink="{{$baseurl}}/api/" blogID="">
<settings>
<docs>http://status.net/wiki/TwitterCompatibleAPI</docs>
<setting name="OAuth">false</setting>
</settings>
</api>
</apis>
</service>
</rsd>

7
view/theme/frio/css/style.css
View file

@ -105,6 +105,9 @@ blockquote {
* mobile aside
*/
@media screen and (max-width: 990px) {
body {
padding-top: 105px;
}
aside{
position: fixed!important;
top: 0!important;
@ -616,6 +619,10 @@ nav.navbar a, nav.navbar .btn-link {
display: flex;
}
#friendica-logo-mask {
display: block;
}
/* Notification Menu */
#topbar-first #nav-notifications-menu {