nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'develop' of https://github.com/friendica/friendica into develop

Browse source
This commit is contained in:
Ralf Thees 2018-10-22 23:20:00 +02:00
parent 9cb189049e ebc97ba8fe
commit ff203c277d
102 changed files with 3003 additions and 2737 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
bin/worker.php
View file

@ -4,12 +4,9 @@
* @file bin/worker.php
* @brief Starts the background processing
*/
use Friendica\App;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\Worker;
use Friendica\Core\L10n;
// Get options
$shortopts = 'sn';
@ -20,10 +17,10 @@ $options = getopt($shortopts, $longopts);
if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
$directory = dirname($_SERVER["argv"][0]);
if (substr($directory, 0, 1) != "/") {
$directory = $_SERVER["PWD"]."/".$directory;
if (substr($directory, 0, 1) != '/') {
$directory = $_SERVER["PWD"] . '/' . $directory;
}
$directory = realpath($directory."/..");
$directory = realpath($directory . '/..');
chdir($directory);
}
@ -32,23 +29,16 @@ require_once "boot.php";
$a = new App(dirname(__DIR__));
Config::load();
$lang = L10n::getBrowserLanguage();
L10n::loadTranslationTable($lang);
// Check the database structure and possibly fixes it
check_db(true);
// Quit when in maintenance
if (Config::get('system', 'maintenance', false, true)) {
if (!$a->getMode()->has(App\Mode::MAINTENANCEDISABLED)) {
return;
}
$a->setBaseURL(Config::get('system', 'url'));
Addon::loadHooks();
$spawn = array_key_exists('s', $options) || array_key_exists('spawn', $options);
if ($spawn) {
@ -63,5 +53,3 @@ Worker::processQueue($run_cron);
Worker::unclaimProcess();
Worker::endProcess();
killme();

21
boot.php
View file

@ -41,7 +41,6 @@ define('FRIENDICA_PLATFORM', 'Friendica');
define('FRIENDICA_CODENAME', 'The Tazmans Flax-lily');
define('FRIENDICA_VERSION', '2018.12-dev');
define('DFRN_PROTOCOL_VERSION', '2.23');
define('DB_UPDATE_VERSION', 1289);
define('NEW_UPDATE_ROUTINE_VERSION', 1170);
/**
@ -345,11 +344,6 @@ define('SR_SCOPE_ALL', 'all');
define('SR_SCOPE_TAGS', 'tags');
/* @}*/
/**
* Lowest possible date time value
*/
define('NULL_DATE', '0001-01-01 00:00:00');
// Normally this constant is defined - but not if "pcntl" isn't installed
if (!defined("SIGTERM")) {
define("SIGTERM", 15);
@ -598,21 +592,6 @@ function killme()
exit();
}
/**
* @brief Redirect to another URL and terminate this process.
*/
function goaway($path = '')
{
if (strstr(normalise_link($path), 'http://')) {
$url = $path;
} else {
$url = System::baseUrl() . '/' . ltrim($path, '/');
}
header("Location: $url");
killme();
}
/**
* @brief Returns the user id of locally logged in user or false.
*

12
config/config.ini.php
View file

@ -369,6 +369,18 @@ throttle_limit_month = 0
; For instance if your URL is 'http://example.com/directory/subdirectory', set urlpath to 'directory/subdirectory'.
urlpath =
; username_min_length (Integer)
; The minimum character length a username can be.
; This length is check once the username has been trimmed and multiple spaces have been collapsed into one.
; Minimum for this config value is 1. Maximum is 64 as the resulting profile URL mustn't be longer than 255 chars.
username_min_length = 3
; username_max_length (Integer)
; The maximum character length a username can be.
; This length is check once the username has been trimmed and multiple spaces have been collapsed into one.
; Minimum for this config value is 1. Maximum is 64 as the resulting profile URL mustn't be longer than 255 chars.
username_max_length = 48
; worker_cooldown (Integer)
; Cooldown period in seconds after each worker function call.
worker_cooldown = 0

1326
config/dbstructure.json
View file

File diff suppressed because it is too large Load diff

1374
config/dbstructure.php Normal file
View file

File diff suppressed because it is too large Load diff

19
include/api.php
View file

@ -1335,9 +1335,9 @@ function api_status_show($type, $item_id = 0)
}
if ($status_info["source"] == 'web') {
$status_info["source"] = ContactSelector::networkToName($lastwall['network'], $user_info['url']);
} elseif (ContactSelector::networkToName($lastwall['network'], $user_info['url']) != $status_info["source"]) {
$status_info["source"] = trim($status_info["source"].' ('.ContactSelector::networkToName($lastwall['network'], $user_info['url']).')');
$status_info["source"] = ContactSelector::networkToName($lastwall['network'], $lastwall['author-link']);
} elseif (ContactSelector::networkToName($lastwall['network'], $lastwall['author-link']) != $status_info["source"]) {
$status_info["source"] = trim($status_info["source"].' ('.ContactSelector::networkToName($lastwall['network'], $lastwall['author-link']).')');
}
// "uid" and "self" are only needed for some internal stuff, so remove it from here
@ -1410,11 +1410,11 @@ function api_users_show($type)
}
if ($user_info["status"]["source"] == 'web') {
$user_info["status"]["source"] = ContactSelector::networkToName($lastwall['network'], $user_info['url']);
$user_info["status"]["source"] = ContactSelector::networkToName($lastwall['network'], $lastwall['author-link']);
}
if (ContactSelector::networkToName($lastwall['network'], $user_info['url']) != $user_info["status"]["source"]) {
$user_info["status"]["source"] = trim($user_info["status"]["source"] . ' (' . ContactSelector::networkToName($lastwall['network'], $user_info['url']) . ')');
$user_info["status"]["source"] = trim($user_info["status"]["source"] . ' (' . ContactSelector::networkToName($lastwall['network'], $lastwall['author-link']) . ')');
}
}
@ -2912,9 +2912,9 @@ function api_format_items($r, $user_info, $filter_user = false, $type = "json")
}
if ($status["source"] == 'web') {
$status["source"] = ContactSelector::networkToName($item['network'], $user_info['url']);
} elseif (ContactSelector::networkToName($item['network'], $user_info['url']) != $status["source"]) {
$status["source"] = trim($status["source"].' ('.ContactSelector::networkToName($item['network'], $user_info['url']).')');
$status["source"] = ContactSelector::networkToName($item['network'], $item['author-link']);
} elseif (ContactSelector::networkToName($item['network'], $item['author-link']) != $status["source"]) {
$status["source"] = trim($status["source"].' ('.ContactSelector::networkToName($item['network'], $item['author-link']).')');
}
if ($item["id"] == $item["parent"]) {
@ -4809,7 +4809,8 @@ function api_friendica_remoteauth()
logger($contact['name'] . ' ' . $sec, LOGGER_DEBUG);
$dest = ($url ? '&destination_url=' . $url : '');
goaway(
System::externalRedirect(
$contact['poll'] . '?dfrn_id=' . $dfrn_id
. '&dfrn_version=' . DFRN_PROTOCOL_VERSION
. '&type=profile&sec=' . $sec . $dest

5
include/conversation.php
View file

@ -353,7 +353,8 @@ function localize_item(&$item)
$author = ['uid' => 0, 'id' => $item['author-id'],
'network' => $item['author-network'], 'url' => $item['author-link']];
if (!empty($item['plink'])) {
// Only create a redirection to a magic link when logged in
if (!empty($item['plink']) && (local_user() || remote_user())) {
$item['plink'] = Contact::magicLinkbyContact($author, $item['plink']);
}
}
@ -533,7 +534,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
$page_dropping = ((local_user() && local_user() == $profile_owner) ? true : false);
if (!$update) {
$_SESSION['return_url'] = $a->query_string;
$_SESSION['return_path'] = $a->query_string;
}
$cb = ['items' => $items, 'mode' => $mode, 'update' => $update, 'preview' => $preview];

8
include/items.php
View file

@ -354,7 +354,7 @@ function drop_item($id)
if (!DBA::isResult($item)) {
notice(L10n::t('Item not found.') . EOL);
goaway('/network');
$a->internalRedirect('network');
}
if ($item['deleted']) {
@ -401,17 +401,17 @@ function drop_item($id)
}
// Now check how the user responded to the confirmation query
if (!empty($_REQUEST['canceled'])) {
goaway('/display/' . $item['guid']);
$a->internalRedirect('display/' . $item['guid']);
}
// delete the item
Item::deleteForUser(['id' => $item['id']], local_user());
goaway('/network');
$a->internalRedirect('network');
//NOTREACHED
} else {
notice(L10n::t('Permission denied.') . EOL);
goaway('/display/' . $item['guid']);
$a->internalRedirect('display/' . $item['guid']);
//NOTREACHED
}
}

474
index.php
View file

@ -4,482 +4,12 @@
* Friendica
*/
/**
* Bootstrap the application
*/
use Friendica\App;
use Friendica\Content\Nav;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Session;
use Friendica\Core\System;
use Friendica\Core\Theme;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\Model\Profile;
use Friendica\Module\Login;
require_once 'boot.php';
// We assume that the index.php is called by a frontend process
// The value is set to "true" by default in boot.php
// The value is set to "true" by default in App
$a = new App(__DIR__, false);
/**
* Try to open the database;
*/
require_once "include/dba.php";
// Missing DB connection: ERROR
if ($a->getMode()->has(App\Mode::LOCALCONFIGPRESENT) && !$a->getMode()->has(App\Mode::DBAVAILABLE)) {
System::httpExit(500, ['title' => 'Error 500 - Internal Server Error', 'description' => 'Apologies but the website is unavailable at the moment.']);
}
// Max Load Average reached: ERROR
if ($a->isMaxProcessesReached() || $a->isMaxLoadReached()) {
header('Retry-After: 120');
header('Refresh: 120; url=' . System::baseUrl() . "/" . $a->query_string);
System::httpExit(503, ['title' => 'Error 503 - Service Temporarily Unavailable', 'description' => 'System is currently overloaded. Please try again later.']);
}
if (strstr($a->query_string, '.well-known/host-meta') && ($a->query_string != '.well-known/host-meta')) {
System::httpExit(404);
}
if (!$a->getMode()->isInstall()) {
if (Config::get('system', 'force_ssl') && ($a->getScheme() == "http")
&& (intval(Config::get('system', 'ssl_policy')) == SSL_POLICY_FULL)
&& (substr(System::baseUrl(), 0, 8) == "https://")
&& ($_SERVER['REQUEST_METHOD'] == 'GET')) {
header("HTTP/1.1 302 Moved Temporarily");
header("Location: " . System::baseUrl() . "/" . $a->query_string);
exit();
}
Config::init();
Session::init();
Addon::loadHooks();
Addon::callHooks('init_1');
}
$lang = L10n::getBrowserLanguage();
L10n::loadTranslationTable($lang);
/**
* Important stuff we always need to do.
*
* The order of these may be important so use caution if you think they're all
* intertwingled with no logical order and decide to sort it out. Some of the
* dependencies have changed, but at least at one time in the recent past - the
* order was critical to everything working properly
*/
// Exclude the backend processes from the session management
if (!$a->isBackend()) {
$stamp1 = microtime(true);
session_start();
$a->saveTimestamp($stamp1, "parser");
} else {
$_SESSION = [];
Worker::executeIfIdle();
}
/**
* Language was set earlier, but we can over-ride it in the session.
* We have to do it here because the session was just now opened.
*/
if (!empty($_SESSION['authenticated']) && empty($_SESSION['language'])) {
$_SESSION['language'] = $lang;
// we haven't loaded user data yet, but we need user language
if (!empty($_SESSION['uid'])) {
$user = DBA::selectFirst('user', ['language'], ['uid' => $_SESSION['uid']]);
if (DBA::isResult($user)) {
$_SESSION['language'] = $user['language'];
}
}
}
if (!empty($_SESSION['language']) && $_SESSION['language'] !== $lang) {
$lang = $_SESSION['language'];
L10n::loadTranslationTable($lang);
}
if (!empty($_GET['zrl']) && $a->getMode()->isNormal()) {
$a->query_string = Profile::stripZrls($a->query_string);
if (!local_user()) {
// Only continue when the given profile link seems valid
// Valid profile links contain a path with "/profile/" and no query parameters
if ((parse_url($_GET['zrl'], PHP_URL_QUERY) == "") &&
strstr(parse_url($_GET['zrl'], PHP_URL_PATH), "/profile/")) {
if (defaults($_SESSION, "visitor_home", "") != $_GET["zrl"]) {
$_SESSION['my_url'] = $_GET['zrl'];
$_SESSION['authenticated'] = 0;
}
Profile::zrlInit($a);
} else {
// Someone came with an invalid parameter, maybe as a DDoS attempt
// We simply stop processing here
logger("Invalid ZRL parameter " . $_GET['zrl'], LOGGER_DEBUG);
header('HTTP/1.1 403 Forbidden');
echo "<h1>403 Forbidden</h1>";
exit();
}
}
}
if (!empty($_GET['owt']) && $a->getMode()->isNormal()) {
$token = $_GET['owt'];
$a->query_string = Profile::stripQueryParam($a->query_string, 'owt');
Profile::openWebAuthInit($token);
}
/**
* For Mozilla auth manager - still needs sorting, and this might conflict with LRDD header.
* Apache/PHP lumps the Link: headers into one - and other services might not be able to parse it
* this way. There's a PHP flag to link the headers because by default this will over-write any other
* link header.
*
* What we really need to do is output the raw headers ourselves so we can keep them separate.
*/
// header('Link: <' . System::baseUrl() . '/amcd>; rel="acct-mgmt";');
Login::sessionAuth();
if (empty($_SESSION['authenticated'])) {
header('X-Account-Management-Status: none');
}
$_SESSION['sysmsg'] = defaults($_SESSION, 'sysmsg' , []);
$_SESSION['sysmsg_info'] = defaults($_SESSION, 'sysmsg_info' , []);
$_SESSION['last_updated'] = defaults($_SESSION, 'last_updated', []);
/*
* check_config() is responsible for running update scripts. These automatically
* update the DB schema whenever we push a new one out. It also checks to see if
* any addons have been added or removed and reacts accordingly.
*/
// in install mode, any url loads install module
// but we need "view" module for stylesheet
if ($a->getMode()->isInstall() && $a->module != 'view') {
$a->module = 'install';
} elseif (!$a->getMode()->has(App\Mode::MAINTENANCEDISABLED) && $a->module != 'view') {
$a->module = 'maintenance';
} else {
$a->checkURL();
check_db(false);
Addon::check();
}
Nav::setSelected('nothing');
//Don't populate apps_menu if apps are private
$privateapps = Config::get('config', 'private_addons');
if ((local_user()) || (! $privateapps === "1")) {
$arr = ['app_menu' => $a->apps];
Addon::callHooks('app_menu', $arr);
$a->apps = $arr['app_menu'];
}
/**
* We have already parsed the server path into $a->argc and $a->argv
*
* $a->argv[0] is our module name. We will load the file mod/{$a->argv[0]}.php
* and use it for handling our URL request.
* The module file contains a few functions that we call in various circumstances
* and in the following order:
*
* "module"_init
* "module"_post (only called if there are $_POST variables)
* "module"_afterpost
* "module"_content - the string return of this function contains our page body
*
* Modules which emit other serialisations besides HTML (XML,JSON, etc.) should do
* so within the module init and/or post functions and then invoke killme() to terminate
* further processing.
*/
if (strlen($a->module)) {
/**
* We will always have a module name.
* First see if we have an addon which is masquerading as a module.
*/
// Compatibility with the Android Diaspora client
if ($a->module == 'stream') {
goaway('network?f=&order=post');
}
if ($a->module == 'conversations') {
goaway('message');
}
if ($a->module == 'commented') {
goaway('network?f=&order=comment');
}
if ($a->module == 'liked') {
goaway('network?f=&order=comment');
}
if ($a->module == 'activity') {
goaway('network/?f=&conv=1');
}
if (($a->module == 'status_messages') && ($a->cmd == 'status_messages/new')) {
goaway('bookmarklet');
}
if (($a->module == 'user') && ($a->cmd == 'user/edit')) {
goaway('settings');
}
if (($a->module == 'tag_followings') && ($a->cmd == 'tag_followings/manage')) {
goaway('search');
}
// Compatibility with the Firefox App
if (($a->module == "users") && ($a->cmd == "users/sign_in")) {
$a->module = "login";
}
$privateapps = Config::get('config', 'private_addons');
if (is_array($a->addons) && in_array($a->module, $a->addons) && file_exists("addon/{$a->module}/{$a->module}.php")) {
//Check if module is an app and if public access to apps is allowed or not
if ((!local_user()) && Addon::isApp($a->module) && $privateapps === "1") {
info(L10n::t("You must be logged in to use addons. "));
} else {
include_once "addon/{$a->module}/{$a->module}.php";
if (function_exists($a->module . '_module')) {
Friendica\LegacyModule::setModuleFile("addon/{$a->module}/{$a->module}.php");
$a->module_class = 'Friendica\\LegacyModule';
$a->module_loaded = true;
}
}
}
// Controller class routing
if (! $a->module_loaded && class_exists('Friendica\\Module\\' . ucfirst($a->module))) {
$a->module_class = 'Friendica\\Module\\' . ucfirst($a->module);
$a->module_loaded = true;
}
/**
* If not, next look for a 'standard' program module in the 'mod' directory
* We emulate a Module class through the LegacyModule class
*/
if (! $a->module_loaded && file_exists("mod/{$a->module}.php")) {
Friendica\LegacyModule::setModuleFile("mod/{$a->module}.php");
$a->module_class = 'Friendica\\LegacyModule';
$a->module_loaded = true;
}
/**
* The URL provided does not resolve to a valid module.
*
* On Dreamhost sites, quite often things go wrong for no apparent reason and they send us to '/internal_error.html'.
* We don't like doing this, but as it occasionally accounts for 10-20% or more of all site traffic -
* we are going to trap this and redirect back to the requested page. As long as you don't have a critical error on your page
* this will often succeed and eventually do the right thing.
*
* Otherwise we are going to emit a 404 not found.
*/
if (! $a->module_loaded) {
// Stupid browser tried to pre-fetch our Javascript img template. Don't log the event or return anything - just quietly exit.
if (!empty($_SERVER['QUERY_STRING']) && preg_match('/{[0-9]}/', $_SERVER['QUERY_STRING']) !== 0) {
killme();
}
if (!empty($_SERVER['QUERY_STRING']) && ($_SERVER['QUERY_STRING'] === 'q=internal_error.html') && isset($dreamhost_error_hack)) {
logger('index.php: dreamhost_error_hack invoked. Original URI =' . $_SERVER['REQUEST_URI']);
goaway(System::baseUrl() . $_SERVER['REQUEST_URI']);
}
logger('index.php: page not found: ' . $_SERVER['REQUEST_URI'] . ' ADDRESS: ' . $_SERVER['REMOTE_ADDR'] . ' QUERY: ' . $_SERVER['QUERY_STRING'], LOGGER_DEBUG);
header($_SERVER["SERVER_PROTOCOL"] . ' 404 ' . L10n::t('Not Found'));
$tpl = get_markup_template("404.tpl");
$a->page['content'] = replace_macros($tpl, [
'$message' => L10n::t('Page not found.')
]);
}
}
/**
* Load current theme info
*/
$theme_info_file = 'view/theme/' . $a->getCurrentTheme() . '/theme.php';
if (file_exists($theme_info_file)) {
require_once $theme_info_file;
}
/* initialise content region */
if ($a->getMode()->isNormal()) {
Addon::callHooks('page_content_top', $a->page['content']);
}
/**
* Call module functions
*/
if ($a->module_loaded) {
$a->page['page_title'] = $a->module;
$placeholder = '';
Addon::callHooks($a->module . '_mod_init', $placeholder);
call_user_func([$a->module_class, 'init']);
// "rawContent" is especially meant for technical endpoints.
// This endpoint doesn't need any theme initialization or other comparable stuff.
if (!$a->error) {
call_user_func([$a->module_class, 'rawContent']);
}
if (function_exists(str_replace('-', '_', $a->getCurrentTheme()) . '_init')) {
$func = str_replace('-', '_', $a->getCurrentTheme()) . '_init';
$func($a);
}
if (! $a->error && $_SERVER['REQUEST_METHOD'] === 'POST') {
Addon::callHooks($a->module . '_mod_post', $_POST);
call_user_func([$a->module_class, 'post']);
}
if (! $a->error) {
Addon::callHooks($a->module . '_mod_afterpost', $placeholder);
call_user_func([$a->module_class, 'afterpost']);
}
if (! $a->error) {
$arr = ['content' => $a->page['content']];
Addon::callHooks($a->module . '_mod_content', $arr);
$a->page['content'] = $arr['content'];
$arr = ['content' => call_user_func([$a->module_class, 'content'])];
Addon::callHooks($a->module . '_mod_aftercontent', $arr);
$a->page['content'] .= $arr['content'];
}
if (function_exists(str_replace('-', '_', $a->getCurrentTheme()) . '_content_loaded')) {
$func = str_replace('-', '_', $a->getCurrentTheme()) . '_content_loaded';
$func($a);
}
}
/*
* Create the page head after setting the language
* and getting any auth credentials.
*
* Moved init_pagehead() and init_page_end() to after
* all the module functions have executed so that all
* theme choices made by the modules can take effect.
*/
$a->initHead();
/*
* Build the page ending -- this is stuff that goes right before
* the closing </body> tag
*/
$a->initFooter();
/*
* now that we've been through the module content, see if the page reported
* a permission problem and if so, a 403 response would seem to be in order.
*/
if (stristr(implode("", $_SESSION['sysmsg']), L10n::t('Permission denied'))) {
header($_SERVER["SERVER_PROTOCOL"] . ' 403 ' . L10n::t('Permission denied.'));
}
/*
* Report anything which needs to be communicated in the notification area (before the main body)
*/
Addon::callHooks('page_end', $a->page['content']);
/*
* Add the navigation (menu) template
*/
if ($a->module != 'install' && $a->module != 'maintenance') {
Nav::build($a);
}
/**
* Build the page - now that we have all the components
*/
if (isset($_GET["mode"]) && (($_GET["mode"] == "raw") || ($_GET["mode"] == "minimal"))) {
$doc = new DOMDocument();
$target = new DOMDocument();
$target->loadXML("<root></root>");
$content = mb_convert_encoding($a->page["content"], 'HTML-ENTITIES', "UTF-8");
/// @TODO one day, kill those error-surpressing @ stuff, or PHP should ban it
@$doc->loadHTML($content);
$xpath = new DOMXPath($doc);
$list = $xpath->query("//*[contains(@id,'tread-wrapper-')]"); /* */
foreach ($list as $item) {
$item = $target->importNode($item, true);
// And then append it to the target
$target->documentElement->appendChild($item);
}
}
if (isset($_GET["mode"]) && ($_GET["mode"] == "raw")) {
header("Content-type: text/html; charset=utf-8");
echo substr($target->saveHTML(), 6, -8);
exit();
}
$page = $a->page;
$profile = $a->profile;
header("X-Friendica-Version: " . FRIENDICA_VERSION);
header("Content-type: text/html; charset=utf-8");
if (Config::get('system', 'hsts') && (Config::get('system', 'ssl_policy') == SSL_POLICY_FULL)) {
header("Strict-Transport-Security: max-age=31536000");
}
// Some security stuff
header('X-Content-Type-Options: nosniff');
header('X-XSS-Protection: 1; mode=block');
header('X-Permitted-Cross-Domain-Policies: none');
header('X-Frame-Options: sameorigin');
// Things like embedded OSM maps don't work, when this is enabled
// header("Content-Security-Policy: default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; connect-src 'self'; style-src 'self' 'unsafe-inline'; font-src 'self'; img-src 'self' https: data:; media-src 'self' https:; child-src 'self' https:; object-src 'none'");
/*
* We use $_GET["mode"] for special page templates. So we will check if we have
* to load another page template than the default one.
* The page templates are located in /view/php/ or in the theme directory.
*/
if (isset($_GET["mode"])) {
$template = Theme::getPathForFile($_GET["mode"] . '.php');
}
// If there is no page template use the default page template
if (empty($template)) {
$template = Theme::getPathForFile("default.php");
}
/// @TODO Looks unsafe (remote-inclusion), is maybe not but Theme::getPathForFile() uses file_exists() but does not escape anything
require_once $template;
$a->runFrontend();

92
mod/admin.php
View file

@ -82,7 +82,7 @@ function admin_post(App $a)
if ($a->isAjax()) {
return;
}
goaway('admin/');
$a->internalRedirect('admin/');
return;
}
@ -135,7 +135,7 @@ function admin_post(App $a)
}
}
goaway($return_path);
$a->internalRedirect($return_path);
return; // NOTREACHED
}
@ -214,11 +214,12 @@ function admin_content(App $a)
$r = q("SELECT `name` FROM `addon` WHERE `plugin_admin` = 1 ORDER BY `name`");
$aside_tools['addons_admin'] = [];
$addons_admin = [];
foreach ($r as $h) {
$addon = $h['name'];
$aside_tools['addons_admin'][] = ["admin/addons/" . $addon, $addon, "addon"];
// temp addons with admin
$a->addons_admin[] = $addon;
$addons_admin[] = $addon;
}
$t = get_markup_template('admin/aside.tpl');
@ -243,7 +244,7 @@ function admin_content(App $a)
$o = admin_page_users($a);
break;
case 'addons':
$o = admin_page_addons($a);
$o = admin_page_addons($a, $addons_admin);
break;
case 'themes':
$o = admin_page_themes($a);
@ -340,7 +341,7 @@ function admin_page_tos_post(App $a)
Config::set('system', 'tosprivstatement', $displayprivstatement);
Config::set('system', 'tostext', $tostext);
goaway('admin/tos');
$a->internalRedirect('admin/tos');
return; // NOTREACHED
}
@ -429,7 +430,7 @@ function admin_page_blocklist_post(App $a)
Config::set('system', 'blocklist', $blocklist);
info(L10n::t('Site blocklist updated.') . EOL);
}
goaway('admin/blocklist');
$a->internalRedirect('admin/blocklist');
return; // NOTREACHED
}
@ -461,7 +462,7 @@ function admin_page_contactblock_post(App $a)
}
notice(L10n::tt("%s contact unblocked", "%s contacts unblocked", count($contacts)));
}
goaway('admin/contactblock');
$a->internalRedirect('admin/contactblock');
return; // NOTREACHED
}
@ -569,7 +570,7 @@ function admin_page_deleteitem_post(App $a)
}
info(L10n::t('Item marked for deletion.') . EOL);
goaway('admin/deleteitem');
$a->internalRedirect('admin/deleteitem');
return; // NOTREACHED
}
@ -932,7 +933,7 @@ function admin_page_summary(App $a)
'$platform' => FRIENDICA_PLATFORM,
'$codename' => FRIENDICA_CODENAME,
'$build' => Config::get('system', 'build'),
'$addons' => [L10n::t('Active addons'), $a->addons],
'$addons' => [L10n::t('Active addons'), Addon::getEnabledList()],
'$serversettings' => $server_settings,
'$showwarning' => $showwarning,
'$warningtext' => $warningtext
@ -965,7 +966,7 @@ function admin_page_site_post(App $a)
$parsed = @parse_url($new_url);
if (!is_array($parsed) || !x($parsed, 'host') || !x($parsed, 'scheme')) {
notice(L10n::t("Can not parse base url. Must have at least <scheme>://<domain>"));
goaway('admin/site');
$a->internalRedirect('admin/site');
}
/* steps:
@ -973,13 +974,13 @@ function admin_page_site_post(App $a)
* send relocate for every local user
* */
$old_url = System::baseUrl(true);
$old_url = $a->getBaseURL(true);
// Generate host names for relocation the addresses in the format user@address.tld
$new_host = str_replace("http://", "@", normalise_link($new_url));
$old_host = str_replace("http://", "@", normalise_link($old_url));
function update_table($table_name, $fields, $old_url, $new_url)
function update_table(App $a, $table_name, $fields, $old_url, $new_url)
{
$dbold = DBA::escape($old_url);
$dbnew = DBA::escape($new_url);
@ -995,20 +996,20 @@ function admin_page_site_post(App $a)
if (!DBA::isResult($r)) {
notice("Failed updating '$table_name': " . DBA::errorMessage());
goaway('admin/site');
$a->internalRedirect('admin/site');
}
}
// update tables
// update profile links in the format "http://server.tld"
update_table("profile", ['photo', 'thumb'], $old_url, $new_url);
update_table("term", ['url'], $old_url, $new_url);
update_table("contact", ['photo', 'thumb', 'micro', 'url', 'nurl', 'alias', 'request', 'notify', 'poll', 'confirm', 'poco', 'avatar'], $old_url, $new_url);
update_table("gcontact", ['url', 'nurl', 'photo', 'server_url', 'notify', 'alias'], $old_url, $new_url);
update_table("item", ['owner-link', 'author-link', 'body', 'plink', 'tag'], $old_url, $new_url);
update_table($a, "profile", ['photo', 'thumb'], $old_url, $new_url);
update_table($a, "term", ['url'], $old_url, $new_url);
update_table($a, "contact", ['photo', 'thumb', 'micro', 'url', 'nurl', 'alias', 'request', 'notify', 'poll', 'confirm', 'poco', 'avatar'], $old_url, $new_url);
update_table($a, "gcontact", ['url', 'nurl', 'photo', 'server_url', 'notify', 'alias'], $old_url, $new_url);
update_table($a, "item", ['owner-link', 'author-link', 'body', 'plink', 'tag'], $old_url, $new_url);
// update profile addresses in the format "user@server.tld"
update_table("contact", ['addr'], $old_host, $new_host);
update_table("gcontact", ['connect', 'addr'], $old_host, $new_host);
update_table($a, "contact", ['addr'], $old_host, $new_host);
update_table($a, "gcontact", ['connect', 'addr'], $old_host, $new_host);
// update config
Config::set('system', 'hostname', parse_url($new_url, PHP_URL_HOST));
@ -1024,7 +1025,7 @@ function admin_page_site_post(App $a)
info("Relocation started. Could take a while to complete.");
goaway('admin/site');
$a->internalRedirect('admin/site');
}
// end relocate
@ -1298,7 +1299,7 @@ function admin_page_site_post(App $a)
Config::set('system', 'rino_encrypt', $rino);
info(L10n::t('Site settings updated.') . EOL);
goaway('admin/site');
$a->internalRedirect('admin/site');
return; // NOTREACHED
}
@ -1570,7 +1571,7 @@ function admin_page_dbsync(App $a)
Config::set('system', 'build', intval($curr) + 1);
}
info(L10n::t('Update has been marked successful') . EOL);
goaway('admin/dbsync');
$a->internalRedirect('admin/dbsync');
}
if (($a->argc > 2) && (intval($a->argv[2]) || ($a->argv[2] === 'check'))) {
@ -1745,7 +1746,7 @@ function admin_page_users_post(App $a)
user_deny($hash);
}
}
goaway('admin/users');
$a->internalRedirect('admin/users');
return; // NOTREACHED
}
@ -1768,7 +1769,7 @@ function admin_page_users(App $a)
$user = DBA::selectFirst('user', ['username', 'blocked'], ['uid' => $uid]);
if (!DBA::isResult($user)) {
notice('User not found' . EOL);
goaway('admin/users');
$a->internalRedirect('admin/users');
return ''; // NOTREACHED
}
switch ($a->argv[2]) {
@ -1788,7 +1789,7 @@ function admin_page_users(App $a)
notice(sprintf(($user['blocked'] ? L10n::t("User '%s' unblocked") : L10n::t("User '%s' blocked")), $user['username']) . EOL);
break;
}
goaway('admin/users');
$a->internalRedirect('admin/users');
return ''; // NOTREACHED
}
@ -1956,10 +1957,11 @@ function admin_page_users(App $a)
*
* The returned string returned hulds the HTML code of the page.
*
* @param App $a
* @param App $a
* @param array $addons_admin A list of admin addon names
* @return string
*/
function admin_page_addons(App $a)
function admin_page_addons(App $a, array $addons_admin)
{
/*
* Single addon
@ -1971,27 +1973,25 @@ function admin_page_addons(App $a)
return '';
}
if (x($_GET, "a") && $_GET['a'] == "t") {
if (defaults($_GET, 'a', '') == "t") {
BaseModule::checkFormSecurityTokenRedirectOnError('/admin/addons', 'admin_themes', 't');
// Toggle addon status
$idx = array_search($addon, $a->addons);
if ($idx !== false) {
unset($a->addons[$idx]);
if (Addon::isEnabled($addon)) {
Addon::uninstall($addon);
info(L10n::t("Addon %s disabled.", $addon));
} else {
$a->addons[] = $addon;
Addon::install($addon);
info(L10n::t("Addon %s enabled.", $addon));
}
Config::set("system", "addon", implode(", ", $a->addons));
goaway('admin/addons');
Addon::saveEnabledList();
$a->internalRedirect('admin/addons');
return ''; // NOTREACHED
}
// display addon details
if (in_array($addon, $a->addons)) {
if (Addon::isEnabled($addon)) {
$status = "on";
$action = L10n::t("Disable");
} else {
@ -2007,7 +2007,7 @@ function admin_page_addons(App $a)
}
$admin_form = "";
if (in_array($addon, $a->addons_admin)) {
if (in_array($addon, $addons_admin)) {
require_once "addon/$addon/$addon.php";
$func = $addon . '_addon_admin';
$func($a, $admin_form);
@ -2020,7 +2020,7 @@ function admin_page_addons(App $a)
'$page' => L10n::t('Addons'),
'$toggle' => L10n::t('Toggle'),
'$settings' => L10n::t('Settings'),
'$baseurl' => System::baseUrl(true),
'$baseurl' => $a->getBaseURL(true),
'$addon' => $addon,
'$status' => $status,
@ -2042,10 +2042,10 @@ function admin_page_addons(App $a)
* List addons
*/
if (x($_GET, "a") && $_GET['a'] == "r") {
BaseModule::checkFormSecurityTokenRedirectOnError(System::baseUrl() . '/admin/addons', 'admin_themes', 't');
BaseModule::checkFormSecurityTokenRedirectOnError($a->getBaseURL() . '/admin/addons', 'admin_themes', 't');
Addon::reload();
info("Addons reloaded");
goaway(System::baseUrl() . '/admin/addons');
$a->internalRedirect('admin/addons');
}
$addons = [];
@ -2058,7 +2058,7 @@ function admin_page_addons(App $a)
$show_addon = true;
// If the addon is unsupported, then only show it, when it is enabled
if ((strtolower($info["status"]) == "unsupported") && !in_array($id, $a->addons)) {
if ((strtolower($info["status"]) == "unsupported") && !Addon::isEnabled($id)) {
$show_addon = false;
}
@ -2068,7 +2068,7 @@ function admin_page_addons(App $a)
}
if ($show_addon) {
$addons[] = [$id, (in_array($id, $a->addons) ? "on" : "off"), $info];
$addons[] = [$id, (Addon::isEnabled($id) ? "on" : "off"), $info];
}
}
}
@ -2235,7 +2235,7 @@ function admin_page_themes(App $a)
}
Config::set('system', 'allowed_themes', $s);
goaway('admin/themes');
$a->internalRedirect('admin/themes');
return ''; // NOTREACHED
}
@ -2316,7 +2316,7 @@ function admin_page_themes(App $a)
}
}
info("Themes reloaded");
goaway(System::baseUrl() . '/admin/themes');
$a->internalRedirect('admin/themes');
}
/*
@ -2365,7 +2365,7 @@ function admin_page_logs_post(App $a)
}
info(L10n::t("Log settings updated."));
goaway('admin/logs');
$a->internalRedirect('admin/logs');
return; // NOTREACHED
}
@ -2513,7 +2513,7 @@ function admin_page_features_post(App $a)
}
}
goaway('admin/features');
$a->internalRedirect('admin/features');
return; // NOTREACHED
}

3
mod/api.php
View file

@ -5,6 +5,7 @@
use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Module\Login;
@ -76,7 +77,7 @@ function api_content(App $a)
if (strstr($consumer->callback_url, $glue)) {
$glue = "?";
}
goaway($consumer->callback_url . $glue . "oauth_token=" . OAuthUtil::urlencode_rfc3986($params['oauth_token']) . "&oauth_verifier=" . OAuthUtil::urlencode_rfc3986($verifier));
$a->internalRedirect($consumer->callback_url . $glue . 'oauth_token=' . OAuthUtil::urlencode_rfc3986($params['oauth_token']) . '&oauth_verifier=' . OAuthUtil::urlencode_rfc3986($verifier));
killme();
}

10
mod/apps.php
View file

@ -2,11 +2,11 @@
/**
* @file mod/apps.php
*/
use Friendica\App;
use Friendica\Content\Nav;
use Friendica\Core\Config;
use Friendica\Core\L10n;
function apps_content(App $a)
function apps_content()
{
$privateaddons = Config::get('config', 'private_addons');
if ($privateaddons === "1") {
@ -18,13 +18,15 @@ function apps_content(App $a)
$title = L10n::t('Applications');
if (count($a->apps) == 0) {
$apps = Nav::getAppMenu();
if (count($apps) == 0) {
notice(L10n::t('No installed applications.') . EOL);
}
$tpl = get_markup_template('apps.tpl');
return replace_macros($tpl, [
'$title' => $title,
'$apps' => $a->apps,
'$apps' => $apps,
]);
}

4
mod/cal.php
View file

@ -301,7 +301,7 @@ function cal_content(App $a)
// Respect the export feature setting for all other /cal pages if it's not the own profile
if ((local_user() !== intval($owner_uid)) && !Feature::isEnabled($owner_uid, "export_calendar")) {
notice(L10n::t('Permission denied.') . EOL);
goaway('cal/' . $nick);
$a->internalRedirect('cal/' . $nick);
}
// Get the export data by uid
@ -322,7 +322,7 @@ function cal_content(App $a)
$return_path = "cal/" . $nick;
}
goaway($return_path);
$a->internalRedirect($return_path);
}
// If nothing went wrong we can echo the export content

8
mod/delegate.php
View file

@ -62,7 +62,7 @@ function delegate_content(App $a)
if ($a->argc > 2 && $a->argv[1] === 'add' && intval($a->argv[2])) {
// delegated admins can view but not change delegation permissions
if (x($_SESSION, 'submanage')) {
goaway(System::baseUrl() . '/delegate');
$a->internalRedirect('delegate');
}
$user_id = $a->argv[2];
@ -77,17 +77,17 @@ function delegate_content(App $a)
DBA::insert('manage', ['uid' => $user_id, 'mid' => local_user()]);
}
}
goaway(System::baseUrl() . '/delegate');
$a->internalRedirect('delegate');
}
if ($a->argc > 2 && $a->argv[1] === 'remove' && intval($a->argv[2])) {
// delegated admins can view but not change delegation permissions
if (x($_SESSION, 'submanage')) {
goaway(System::baseUrl() . '/delegate');
$a->internalRedirect('delegate');
}
DBA::delete('manage', ['uid' => $a->argv[2], 'mid' => local_user()]);
goaway(System::baseUrl() . '/delegate');
$a->internalRedirect('delegate');
}
// find everybody that currently has delegated management to this account/page

4
mod/dfrn_confirm.php
View file

@ -400,7 +400,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
// Let's send our user to the contact editor in case they want to
// do anything special with this new friend.
if ($handsfree === null) {
goaway(System::baseUrl() . '/contact/' . intval($contact_id));
$a->internalRedirect('contact/' . intval($contact_id));
} else {
return;
}
@ -620,6 +620,6 @@ function dfrn_confirm_post(App $a, $handsfree = null)
}
// somebody arrived here by mistake or they are fishing. Send them to the homepage.
goaway(System::baseUrl());
$a->internalRedirect();
// NOTREACHED
}

60
mod/dfrn_poll.php
View file

@ -90,7 +90,7 @@ function dfrn_poll_init(App $a)
$my_id = '0:' . $dfrn_id;
break;
default:
goaway(System::baseUrl());
$a->internalRedirect();
break; // NOTREACHED
}
@ -109,7 +109,7 @@ function dfrn_poll_init(App $a)
if (strlen($s)) {
$xml = XML::parseString($s);
if ((int) $xml->status === 1) {
if ((int)$xml->status === 1) {
$_SESSION['authenticated'] = 1;
if (!x($_SESSION, 'remote')) {
$_SESSION['remote'] = [];
@ -135,10 +135,15 @@ function dfrn_poll_init(App $a)
);
}
}
$profile = $r[0]['nickname'];
goaway((strlen($destination_url)) ? $destination_url : System::baseUrl() . '/profile/' . $profile);
$profile = (count($r) > 0 && isset($r[0]['nickname']) ? $r[0]['nickname'] : '');
if (!empty($destination_url)) {
System::externalRedirect($destination_url);
} else {
$a->internalRedirect('profile/' . $profile);
}
}
goaway(System::baseUrl());
$a->internalRedirect();
}
if ($type === 'profile-check' && $dfrn_version < 2.2) {
@ -325,7 +330,7 @@ function dfrn_poll_post(App $a)
$my_id = '0:' . $dfrn_id;
break;
default:
goaway(System::baseUrl());
$a->internalRedirect();
break; // NOTREACHED
}
@ -446,7 +451,7 @@ function dfrn_poll_content(App $a)
$my_id = '0:' . $dfrn_id;
break;
default:
goaway(System::baseUrl());
$a->internalRedirect();
break; // NOTREACHED
}
@ -505,25 +510,6 @@ function dfrn_poll_content(App $a)
])->getBody();
}
$profile = ((DBA::isResult($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname);
switch ($destination_url) {
case 'profile':
$dest = System::baseUrl() . '/profile/' . $profile . '?f=&tab=profile';
break;
case 'photos':
$dest = System::baseUrl() . '/photos/' . $profile;
break;
case 'status':
case '':
$dest = System::baseUrl() . '/profile/' . $profile;
break;
default:
$appendix = (strstr($destination_url, '?') ? '&f=&redir=1' : '?f=&redir=1');
$dest = $destination_url . $appendix;
break;
}
logger("dfrn_poll: sec profile: " . $s, LOGGER_DATA);
if (strlen($s) && strstr($s, '<?xml')) {
@ -557,10 +543,26 @@ function dfrn_poll_content(App $a)
DBA::escape($session_id)
);
}
goaway($dest);
}
goaway($dest);
$profile = ((DBA::isResult($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname);
switch ($destination_url) {
case 'profile':
$a->internalRedirect('profile/' . $profile . '?f=&tab=profile';
break;
case 'photos':
$a->internalRedirect('photos/' . $profile;
break;
case 'status':
case '':
$a->internalRedirect('profile/' . $profile;
break;
default:
$appendix = (strstr($destination_url, '?') ? '&f=&redir=1' : '?f=&redir=1');
System::externalRedirect($destination_url . $appendix);
break;
}
// NOTREACHED
} else {
// XML reply

26
mod/dfrn_request.php
View file

@ -62,7 +62,7 @@ function dfrn_request_post(App $a)
}
if (x($_POST, 'cancel')) {
goaway(System::baseUrl());
$a->internalRedirect();
}
/*
@ -173,9 +173,9 @@ function dfrn_request_post(App $a)
Contact::updateAvatar($photo, local_user(), $r[0]["id"], true);
}
$forwardurl = System::baseUrl() . "/contact/" . $r[0]['id'];
$forward_path = "contact/" . $r[0]['id'];
} else {
$forwardurl = System::baseUrl() . "/contact";
$forward_path = "contact";
}
// Allow the blocked remote notification to complete
@ -188,14 +188,14 @@ function dfrn_request_post(App $a)
}
// (ignore reply, nothing we can do it failed)
goaway($forwardurl);
$a->internalRedirect($forward_path);
return; // NOTREACHED
}
}
// invalid/bogus request
notice(L10n::t('Unrecoverable protocol error.') . EOL);
goaway(System::baseUrl());
$a->internalRedirect();
return; // NOTREACHED
}
@ -331,19 +331,19 @@ function dfrn_request_post(App $a)
$url = Network::isUrlValid($url);
if (!$url) {
notice(L10n::t('Invalid profile URL.') . EOL);
goaway(System::baseUrl() . '/' . $a->cmd);
$a->internalRedirect($a->cmd);
return; // NOTREACHED
}
if (!Network::isUrlAllowed($url)) {
notice(L10n::t('Disallowed profile URL.') . EOL);
goaway(System::baseUrl() . '/' . $a->cmd);
$a->internalRedirect($a->cmd);
return; // NOTREACHED
}
if (Network::isUrlBlocked($url)) {
notice(L10n::t('Blocked domain') . EOL);
goaway(System::baseUrl() . '/' . $a->cmd);
$a->internalRedirect($a->cmd);
return; // NOTREACHED
}
@ -351,7 +351,7 @@ function dfrn_request_post(App $a)
if (!count($parms)) {
notice(L10n::t('Profile location is not valid or does not contain profile information.') . EOL);
goaway(System::baseUrl() . '/' . $a->cmd);
$a->internalRedirect($a->cmd);
} else {
if (!x($parms, 'fn')) {
notice(L10n::t('Warning: profile location has no identifiable owner name.') . EOL);
@ -433,10 +433,10 @@ function dfrn_request_post(App $a)
}
// "Homecoming" - send the requestor back to their site to record the introduction.
$dfrn_url = bin2hex(System::baseUrl() . '/profile/' . $nickname);
$dfrn_url = bin2hex($a->getBaseURL() . '/profile/' . $nickname);
$aes_allow = ((function_exists('openssl_encrypt')) ? 1 : 0);
goaway($parms['dfrn-request'] . "?dfrn_url=$dfrn_url"
System::externalRedirect($parms['dfrn-request'] . "?dfrn_url=$dfrn_url"
. '&dfrn_version=' . DFRN_PROTOCOL_VERSION
. '&confirm_key=' . $hash
. (($aes_allow) ? "&aes_allow=1" : "")
@ -459,11 +459,11 @@ function dfrn_request_post(App $a)
$uri = urlencode($uri);
} else {
$uri = System::baseUrl() . '/profile/' . $nickname;
$uri = 'profile/' . $nickname;
}
$url = str_replace('{uri}', $uri, $url);
goaway($url);
System::externalRedirect($url);
// NOTREACHED
// END $network != Protocol::PHANTOM
} else {

2
mod/display.php
View file

@ -79,7 +79,7 @@ function display_init(App $a)
}
if (ActivityPub::isRequest()) {
goaway(str_replace('display/', 'objects/', $a->query_string));
$a->internalRedirect(str_replace('display/', 'objects/', $a->query_string));
}
if ($item["id"] != $item["parent"]) {

20
mod/events.php
View file

@ -15,9 +15,9 @@ use Friendica\Database\DBA;
use Friendica\Model\Event;
use Friendica\Model\Item;
use Friendica\Model\Profile;
use Friendica\Module\Login;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Temporal;
use Friendica\Module\Login;
require_once 'include/items.php';
@ -66,8 +66,8 @@ function events_post(App $a)
// The default setting for the `private` field in event_store() is false, so mirror that
$private_event = false;
$start = NULL_DATE;
$finish = NULL_DATE;
$start = DBA::NULL_DATETIME;
$finish = DBA::NULL_DATETIME;
if ($start_text) {
$start = $start_text;
@ -100,7 +100,7 @@ function events_post(App $a)
$type = 'event';
$action = ($event_id == '') ? 'new' : "event/" . $event_id;
$onerror_url = System::baseUrl() . "/events/" . $action . "?summary=$summary&description=$desc&location=$location&start=$start_text&finish=$finish_text&adjust=$adjust&nofinish=$nofinish";
$onerror_path = "events/" . $action . "?summary=$summary&description=$desc&location=$location&start=$start_text&finish=$finish_text&adjust=$adjust&nofinish=$nofinish";
if (strcmp($finish, $start) < 0 && !$nofinish) {
notice(L10n::t('Event can not end before it has started.') . EOL);
@ -108,16 +108,16 @@ function events_post(App $a)
echo L10n::t('Event can not end before it has started.');
killme();
}
goaway($onerror_url);
$a->internalRedirect($onerror_path);
}
if (!$summary || ($start === NULL_DATE)) {
if (!$summary || ($start === DBA::NULL_DATETIME)) {
notice(L10n::t('Event title and start time are required.') . EOL);
if (intval($_REQUEST['preview'])) {
echo L10n::t('Event title and start time are required.');
killme();
}
goaway($onerror_url);
$a->internalRedirect($onerror_path);
}
$share = intval(defaults($_POST, 'share', 0));
@ -187,7 +187,7 @@ function events_post(App $a)
Worker::add(PRIORITY_HIGH, "Notifier", "event", $item_id);
}
goaway('/events');
$a->internalRedirect('events');
}
function events_content(App $a)
@ -198,7 +198,7 @@ function events_content(App $a)
}
if ($a->argc == 1) {
$_SESSION['return_url'] = System::baseUrl() . '/' . $a->cmd;
$_SESSION['return_path'] = $a->cmd;
}
if (($a->argc > 2) && ($a->argv[1] === 'ignore') && intval($a->argv[2])) {
@ -577,6 +577,6 @@ function events_content(App $a)
info(L10n::t('Event removed') . EOL);
}
goaway(System::baseUrl() . '/events');
$a->internalRedirect('events');
}
}

2
mod/filerm.php
View file

@ -25,7 +25,7 @@ function filerm_content(App $a) {
file_tag_unsave_file(local_user(),$item_id,$term, $category);
}
//goaway('/network');
//$a->internalRedirect('network');
killme();
}

24
mod/follow.php
View file

@ -20,12 +20,12 @@ function follow_post(App $a)
}
if (isset($_REQUEST['cancel'])) {
goaway('contacts');
$a->internalRedirect('contacts');
}
$uid = local_user();
$url = notags(trim($_REQUEST['url']));
$return_url = 'contacts';
$return_path = 'contacts';
// Makes the connection request for friendica contacts easier
// This is just a precaution if maybe this page is called somewhere directly via POST
@ -37,24 +37,24 @@ function follow_post(App $a)
if ($result['message']) {
notice($result['message']);
}
goaway($return_url);
$a->internalRedirect($return_path);
} elseif ($result['cid']) {
goaway('contact/' . $result['cid']);
$a->internalRedirect('contact/' . $result['cid']);
}
info(L10n::t('The contact could not be added.'));
goaway($return_url);
$a->internalRedirect($return_path);
// NOTREACHED
}
function follow_content(App $a)
{
$return_url = 'contacts';
$return_path = 'contacts';
if (!local_user()) {
notice(L10n::t('Permission denied.'));
goaway($return_url);
$a->internalRedirect($return_path);
// NOTREACHED
}
@ -74,7 +74,7 @@ function follow_content(App $a)
if ($r[0]['pending']) {
notice(L10n::t('You already added this contact.'));
$submit = '';
//goaway($_SESSION['return_url']);
//$a->internalRedirect($_SESSION['return_path']);
// NOTREACHED
}
}
@ -84,21 +84,21 @@ function follow_content(App $a)
if (($ret['network'] == Protocol::DIASPORA) && !Config::get('system', 'diaspora_enabled')) {
notice(L10n::t("Diaspora support isn't enabled. Contact can't be added."));
$submit = '';
//goaway($_SESSION['return_url']);
//$a->internalRedirect($_SESSION['return_path']);
// NOTREACHED
}
if (($ret['network'] == Protocol::OSTATUS) && Config::get('system', 'ostatus_disabled')) {
notice(L10n::t("OStatus support is disabled. Contact can't be added."));
$submit = '';
//goaway($_SESSION['return_url']);
//$a->internalRedirect($_SESSION['return_path']);
// NOTREACHED
}
if ($ret['network'] == Protocol::PHANTOM) {
notice(L10n::t("The network type couldn't be detected. Contact can't be added."));
$submit = '';
//goaway($_SESSION['return_url']);
//$a->internalRedirect($_SESSION['return_path']);
// NOTREACHED
}
@ -118,7 +118,7 @@ function follow_content(App $a)
if (!$r) {
notice(L10n::t('Permission denied.'));
goaway($return_url);
$a->internalRedirect($return_path);
// NOTREACHED
}

21
mod/friendica.php
View file

@ -31,15 +31,7 @@ function friendica_init(App $a)
$admin = false;
}
$visible_addons = [];
if (is_array($a->addons) && count($a->addons)) {
$r = q("SELECT * FROM `addon` WHERE `hidden` = 0");
if (DBA::isResult($r)) {
foreach ($r as $rr) {
$visible_addons[] = $rr['name'];
}
}
}
$visible_addons = Addon::getVisibleList();
Config::load('feature_lock');
$locked_features = [];
@ -91,16 +83,7 @@ function friendica_content(App $a)
$o .= L10n::t('Suggestions, praise, etc. - please email "info" at "friendi - dot - ca');
$o .= '</p>' . PHP_EOL;
$visible_addons = [];
if (is_array($a->addons) && count($a->addons)) {
$r = q("SELECT * FROM `addon` WHERE `hidden` = 0");
if (DBA::isResult($r)) {
foreach ($r as $rr) {
$visible_addons[] = $rr['name'];
}
}
}
$visible_addons = Addon::getVisibleList();
if (count($visible_addons)) {
$o .= '<p>' . L10n::t('Installed addons/apps:') . '</p>' . PHP_EOL;
$sorted = $visible_addons;

12
mod/group.php
View file

@ -38,12 +38,12 @@ function group_post(App $a) {
info(L10n::t('Group created.') . EOL);
$r = Model\Group::getIdByName(local_user(), $name);
if ($r) {
goaway(System::baseUrl() . '/group/' . $r);
$a->internalRedirect('group/' . $r);
}
} else {
notice(L10n::t('Could not create group.') . EOL);
}
goaway(System::baseUrl() . '/group');
$a->internalRedirect('group');
return; // NOTREACHED
}
@ -56,7 +56,7 @@ function group_post(App $a) {
);
if (!DBA::isResult($r)) {
notice(L10n::t('Group not found.') . EOL);
goaway(System::baseUrl() . '/contact');
$a->internalRedirect('contact');
return; // NOTREACHED
}
$group = $r[0];
@ -88,7 +88,7 @@ function group_content(App $a) {
// With no group number provided we jump to the unassigned contacts as a starting point
if ($a->argc == 1) {
goaway('group/none');
$a->internalRedirect('group/none');
}
// Switch to text mode interface if we have more than 'n' contacts or group members
@ -159,7 +159,7 @@ function group_content(App $a) {
notice(L10n::t('Unable to remove group.') . EOL);
}
}
goaway(System::baseUrl() . '/group');
$a->internalRedirect('group');
// NOTREACHED
}
@ -183,7 +183,7 @@ function group_content(App $a) {
if (!DBA::isResult($r)) {
notice(L10n::t('Group not found.') . EOL);
goaway(System::baseUrl() . '/contact');
$a->internalRedirect('contact');
}
$group = $r[0];

4
mod/home.php
View file

@ -16,11 +16,11 @@ function home_init(App $a) {
Addon::callHooks('home_init',$ret);
if (local_user() && ($a->user['nickname'])) {
goaway(System::baseUrl()."/network");
$a->internalRedirect('network');
}
if (strlen(Config::get('system','singleuser'))) {
goaway(System::baseUrl()."/profile/" . Config::get('system','singleuser'));
$a->internalRedirect('profile/' . Config::get('system','singleuser'));
}
}}

2
mod/ignored.php
View file

@ -43,7 +43,7 @@ function ignored_init(App $a)
$rand = "?$rand";
}
goaway(System::baseUrl() . "/" . $return_path . $rand);
$a->internalRedirect($return_path . $rand);
}
// the json doesn't really matter, it will either be 0 or 1

17
mod/item.php
View file

@ -115,7 +115,7 @@ function item_post(App $a) {
if (!DBA::isResult($parent_item)) {
notice(L10n::t('Unable to locate original post.') . EOL);
if (!empty($_REQUEST['return'])) {
goaway($return_path);
$a->internalRedirect($return_path);
}
killme();
}
@ -165,7 +165,7 @@ function item_post(App $a) {
notice(L10n::t('Permission denied.') . EOL) ;
if (!empty($_REQUEST['return'])) {
goaway($return_path);
$a->internalRedirect($return_path);
}
killme();
@ -283,7 +283,7 @@ function item_post(App $a) {
}
info(L10n::t('Empty post discarded.') . EOL);
if (!empty($_REQUEST['return'])) {
goaway($return_path);
$a->internalRedirect($return_path);
}
killme();
}
@ -678,7 +678,7 @@ function item_post(App $a) {
if (!empty($datarray['cancel'])) {
logger('mod_item: post cancelled by addon.');
if ($return_path) {
goaway($return_path);
$a->internalRedirect($return_path);
}
$json = ['cancel' => 1];
@ -714,7 +714,7 @@ function item_post(App $a) {
if (!empty($_REQUEST['return']) && strlen($return_path)) {
logger('return: ' . $return_path);
goaway($return_path);
$a->internalRedirect($return_path);
}
killme();
} else {
@ -729,14 +729,14 @@ function item_post(App $a) {
if (!$post_id) {
logger("Item wasn't stored.");
goaway($return_path);
$a->internalRedirect($return_path);
}
$datarray = Item::selectFirst(Item::ITEM_FIELDLIST, ['id' => $post_id]);
if (!DBA::isResult($datarray)) {
logger("Item with id ".$post_id." couldn't be fetched.");
goaway($return_path);
$a->internalRedirect($return_path);
}
// update filetags in pconfig
@ -844,13 +844,14 @@ function item_post(App $a) {
function item_post_return($baseurl, $api_source, $return_path)
{
// figure out how to return, depending on from whence we came
$a = get_app();
if ($api_source) {
return;
}
if ($return_path) {
goaway($return_path);
$a->internalRedirect($return_path);
}
$json = ['success' => 1];

6
mod/like.php
View file

@ -28,7 +28,7 @@ function like_content(App $a) {
// See if we've been passed a return path to redirect to
$return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : '');
like_content_return(System::baseUrl(), $return_path);
like_content_return($a, $return_path);
killme(); // NOTREACHED
}
@ -36,7 +36,7 @@ function like_content(App $a) {
// Decide how to return. If we were called with a 'return' argument,
// then redirect back to the calling page. If not, just quietly end
function like_content_return($baseurl, $return_path) {
function like_content_return(App $a, $return_path) {
if ($return_path) {
$rand = '_=' . time();
if (strpos($return_path, '?')) {
@ -45,7 +45,7 @@ function like_content_return($baseurl, $return_path) {
$rand = "?$rand";
}
goaway($baseurl . "/" . $return_path . $rand);
$a->internalRedirect($return_path . $rand);
}
killme();

6
mod/lostpass.php
View file

@ -19,14 +19,14 @@ function lostpass_post(App $a)
{
$loginame = notags(trim($_POST['login-name']));
if (!$loginame) {
goaway(System::baseUrl());
$a->internalRedirect();
}
$condition = ['(`email` = ? OR `nickname` = ?) AND `verified` = 1 AND `blocked` = 0', $loginame, $loginame];
$user = DBA::selectFirst('user', ['uid', 'username', 'email', 'language'], $condition);
if (!DBA::isResult($user)) {
notice(L10n::t('No valid account found.') . EOL);
goaway(System::baseUrl());
$a->internalRedirect();
}
$pwdreset_token = autoname(12) . mt_rand(1000, 9999);
@ -78,7 +78,7 @@ function lostpass_post(App $a)
'body' => $body
]);
goaway(System::baseUrl());
$a->internalRedirect();
}
function lostpass_content(App $a)

4
mod/manage.php
View file

@ -99,7 +99,7 @@ function manage_post(App $a) {
unset($_SESSION['theme']);
unset($_SESSION['mobile-theme']);
unset($_SESSION['page_flags']);
unset($_SESSION['return_url']);
unset($_SESSION['return_path']);
if (x($_SESSION, 'submanage')) {
unset($_SESSION['submanage']);
}
@ -119,7 +119,7 @@ function manage_post(App $a) {
$ret = [];
Addon::callHooks('home_init',$ret);
goaway( System::baseUrl() . "/profile/" . $a->user['nickname'] );
$a->internalRedirect('profile/' . $a->user['nickname'] );
// NOTREACHED
}

2
mod/match.php
View file

@ -35,7 +35,7 @@ function match_content(App $a)
$a->page['aside'] .= Widget::findPeople();
$a->page['aside'] .= Widget::follow();
$_SESSION['return_url'] = System::baseUrl() . '/' . $a->cmd;
$_SESSION['return_path'] = $a->cmd;
$r = q(
"SELECT `pub_keywords`, `prv_keywords` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",

14
mod/message.php
View file

@ -87,7 +87,7 @@ function message_post(App $a)
$a->argc = 2;
$a->argv[1] = 'new';
} else {
goaway($a->cmd . '/' . $ret);
$a->internalRedirect($a->cmd . '/' . $ret);
}
}
@ -155,7 +155,7 @@ function message_content(App $a)
// Now check how the user responded to the confirmation query
if (!empty($_REQUEST['canceled'])) {
goaway('/message');
$a->internalRedirect('message');
}
$cmd = $a->argv[1];
@ -163,7 +163,7 @@ function message_content(App $a)
$message = DBA::selectFirst('mail', ['convid'], ['id' => $a->argv[2], 'uid' => local_user()]);
if(!DBA::isResult($message)){
info(L10n::t('Conversation not found.') . EOL);
goaway('/message');
$a->internalRedirect('message');
}
if (DBA::delete('mail', ['id' => $a->argv[2], 'uid' => local_user()])) {
@ -173,10 +173,10 @@ function message_content(App $a)
$conversation = DBA::selectFirst('mail', ['id'], ['convid' => $message['convid'], 'uid' => local_user()]);
if(!DBA::isResult($conversation)){
info(L10n::t('Conversation removed.') . EOL);
goaway('/message');
$a->internalRedirect('message');
}
goaway('/message/' . $conversation['id'] );
$a->internalRedirect('message/' . $conversation['id'] );
} else {
$r = q("SELECT `parent-uri`,`convid` FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($a->argv[2]),
@ -190,7 +190,7 @@ function message_content(App $a)
info(L10n::t('Conversation removed.') . EOL);
}
}
goaway('/message' );
$a->internalRedirect('message');
}
}
@ -265,7 +265,7 @@ function message_content(App $a)
}
$_SESSION['return_url'] = $a->query_string;
$_SESSION['return_path'] = $a->query_string;
if ($a->argc == 1) {

8
mod/network.php
View file

@ -38,7 +38,7 @@ function network_init(App $a)
$search = (x($_GET, 'search') ? escape_tags($_GET['search']) : '');
if (($search != '') && !empty($_GET['submit'])) {
goaway('search?search=' . urlencode($search));
$a->internalRedirect('search?search=' . urlencode($search));
}
if (x($_GET, 'save')) {
@ -140,7 +140,7 @@ function network_init(App $a)
$redir_url = ($net_queries ? $net_baseurl . '?' . $net_queries : $net_baseurl);
goaway(System::baseUrl() . $redir_url);
$a->internalRedirect($redir_url);
}
}
@ -618,7 +618,7 @@ function networkThreadedView(App $a, $update, $parent)
killme();
}
notice(L10n::t('No such group') . EOL);
goaway('network/0');
$a->internalRedirect('network/0');
// NOTREACHED
}
@ -672,7 +672,7 @@ function networkThreadedView(App $a, $update, $parent)
}
} else {
notice(L10n::t('Invalid contact.') . EOL);
goaway('network');
$a->internalRedirect('network');
// NOTREACHED
}
}

2
mod/nogroup.php
View file

@ -24,5 +24,5 @@ function nogroup_content(App $a)
return '';
}
goaway(System::baseUrl() . '/group/none');
$a->internalRedirect('group/none');
}

3
mod/notice.php
View file

@ -15,8 +15,7 @@ function notice_init(App $a)
$r = q("SELECT `user`.`nickname` FROM `user` LEFT JOIN `item` ON `item`.`uid` = `user`.`uid` WHERE `item`.`id` = %d", intval($id));
if (DBA::isResult($r)) {
$nick = $r[0]['nickname'];
$url = System::baseUrl() . "/display/$nick/$id";
goaway($url);
$a->internalRedirect('display/' . $nick . '/' . $id);
} else {
$a->error = 404;
notice(L10n::t('Item not found.') . EOL);

6
mod/notifications.php
View file

@ -17,7 +17,7 @@ use Friendica\Module\Login;
function notifications_post(App $a)
{
if (!local_user()) {
goaway(System::baseUrl());
$a->internalRedirect();
}
$request_id = (($a->argc > 1) ? $a->argv[1] : 0);
@ -52,12 +52,12 @@ function notifications_post(App $a)
'self' => false, 'blocked' => true, 'pending' => true];
DBA::delete('contact', $condition);
}
goaway('notifications/intros');
$a->internalRedirect('notifications/intros');
}
if ($_POST['submit'] == L10n::t('Ignore')) {
DBA::update('intro', ['ignore' => true], ['id' => $intro_id]);
goaway('notifications/intros');
$a->internalRedirect('notifications/intros');
}
}
}

4
mod/notify.php
View file

@ -37,10 +37,10 @@ function notify_init(App $a)
}
}
goaway($note['link']);
System::externalRedirect($note['link']);
}
goaway(System::baseUrl(true));
$a->internalRedirect();
}
if ($a->argc > 2 && $a->argv[1] === 'mark' && $a->argv[2] === 'all') {

12
mod/openid.php
View file

@ -14,7 +14,7 @@ function openid_content(App $a) {
$noid = Config::get('system','no_openid');
if($noid)
goaway(System::baseUrl());
$a->internalRedirect();
logger('mod_openid ' . print_r($_REQUEST,true), LOGGER_DATA);
@ -28,7 +28,7 @@ function openid_content(App $a) {
if(! strlen($authid)) {
logger(L10n::t('OpenID protocol error. No ID returned.') . EOL);
goaway(System::baseUrl());
$a->internalRedirect();
}
// NOTE: we search both for normalised and non-normalised form of $authid
@ -56,7 +56,7 @@ function openid_content(App $a) {
// just in case there was no return url set
// and we fell through
goaway(System::baseUrl());
$a->internalRedirect();
}
// Successful OpenID login - but we can't match it to an existing account.
@ -64,7 +64,7 @@ function openid_content(App $a) {
if (intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED) {
notice(L10n::t('Account not found and OpenID registration is not permitted on this site.') . EOL);
goaway(System::baseUrl());
$a->internalRedirect();
}
unset($_SESSION['register']);
@ -108,12 +108,12 @@ function openid_content(App $a) {
$args .= '&openid_url=' . urlencode(notags(trim($authid)));
goaway(System::baseUrl() . '/register?' . $args);
$a->internalRedirect('register?' . $args);
// NOTREACHED
}
}
notice(L10n::t('Login failed.') . EOL);
goaway(System::baseUrl());
$a->internalRedirect();
// NOTREACHED
}

2
mod/ostatus_subscribe.php
View file

@ -15,7 +15,7 @@ function ostatus_subscribe_content(App $a) {
if (! local_user()) {
notice(L10n::t('Permission denied.') . EOL);
goaway('/ostatus_subscribe');
$a->internalRedirect('ostatus_subscribe');
// NOTREACHED
}

29
mod/photos.php
View file

@ -196,7 +196,7 @@ function photos_post(App $a)
$album = hex2bin($a->argv[3]);
if ($album === L10n::t('Profile Photos') || $album === 'Contact Photos' || $album === L10n::t('Contact Photos')) {
goaway($_SESSION['photo_return']);
$a->internalRedirect($_SESSION['photo_return']);
return; // NOTREACHED
}
@ -207,13 +207,13 @@ function photos_post(App $a)
if (!DBA::isResult($r)) {
notice(L10n::t('Album not found.') . EOL);
goaway($_SESSION['photo_return']);
$a->internalRedirect($_SESSION['photo_return']);
return; // NOTREACHED
}
// Check if the user has responded to a delete confirmation query
if (!empty($_REQUEST['canceled'])) {
goaway($_SESSION['photo_return']);
$a->internalRedirect($_SESSION['photo_return']);
}
// RENAME photo album
@ -227,8 +227,7 @@ function photos_post(App $a)
// Update the photo albums cache
Photo::clearAlbumCache($page_owner_uid);
$newurl = System::baseUrl() . '/photos/' . $a->user['nickname'] . '/album/' . bin2hex($newalbum);
goaway($newurl);
$a->internalRedirect('photos/' . $a->user['nickname'] . '/album/' . bin2hex($newalbum));
return; // NOTREACHED
}
@ -281,7 +280,7 @@ function photos_post(App $a)
$res[] = "'" . DBA::escape($rr['rid']) . "'" ;
}
} else {
goaway($_SESSION['photo_return']);
$a->internalRedirect($_SESSION['photo_return']);
return; // NOTREACHED
}
@ -299,14 +298,14 @@ function photos_post(App $a)
Photo::clearAlbumCache($page_owner_uid);
}
goaway('photos/' . $a->data['user']['nickname']);
$a->internalRedirect('photos/' . $a->data['user']['nickname']);
return; // NOTREACHED
}
// Check if the user has responded to a delete confirmation query for a single photo
if ($a->argc > 2 && !empty($_REQUEST['canceled'])) {
goaway($_SESSION['photo_return']);
$a->internalRedirect($_SESSION['photo_return']);
}
if ($a->argc > 2 && defaults($_POST, 'delete', '') === L10n::t('Delete Photo')) {
@ -356,7 +355,7 @@ function photos_post(App $a)
Photo::clearAlbumCache($page_owner_uid);
}
goaway('photos/' . $a->data['user']['nickname']);
$a->internalRedirect('photos/' . $a->data['user']['nickname']);
return; // NOTREACHED
}
@ -697,7 +696,7 @@ function photos_post(App $a)
}
}
}
goaway($_SESSION['photo_return']);
$a->internalRedirect($_SESSION['photo_return']);
return; // NOTREACHED
}
@ -928,7 +927,7 @@ function photos_post(App $a)
// addon uploaders should call "killme()" [e.g. exit] within the photo_post_end hook
// if they do not wish to be redirected
goaway($_SESSION['photo_return']);
$a->internalRedirect($_SESSION['photo_return']);
// NOTREACHED
}
@ -1470,7 +1469,7 @@ function photos_content(App $a)
if (count($linked_items)) {
$cmnt_tpl = get_markup_template('comment_item.tpl');
$tpl = get_markup_template('photo_item.tpl');
$return_url = $a->cmd;
$return_path = $a->cmd;
if ($can_post || Security::canWriteToUserWall($owner_uid)) {
$like_tpl = get_markup_template('like_noshare.tpl');
@ -1487,7 +1486,7 @@ function photos_content(App $a)
if (($can_post || Security::canWriteToUserWall($owner_uid))) {
$comments .= replace_macros($cmnt_tpl, [
'$return_path' => '',
'$jsreload' => $return_url,
'$jsreload' => $return_path,
'$id' => $link_item['id'],
'$parent' => $link_item['id'],
'$profile_uid' => $owner_uid,
@ -1526,7 +1525,7 @@ function photos_content(App $a)
if (($can_post || Security::canWriteToUserWall($owner_uid))) {
$comments .= replace_macros($cmnt_tpl,[
'$return_path' => '',
'$jsreload' => $return_url,
'$jsreload' => $return_path,
'$id' => $link_item['id'],
'$parent' => $link_item['id'],
'$profile_uid' => $owner_uid,
@ -1586,7 +1585,7 @@ function photos_content(App $a)
if (($can_post || Security::canWriteToUserWall($owner_uid))) {
$comments .= replace_macros($cmnt_tpl, [
'$return_path' => '',
'$jsreload' => $return_url,
'$jsreload' => $return_path,
'$id' => $item['item_id'],
'$parent' => $item['parent'],
'$profile_uid' => $owner_uid,

2
mod/profile.php
View file

@ -34,7 +34,7 @@ function profile_init(App $a)
} else {
$r = q("SELECT `nickname` FROM `user` WHERE `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 ORDER BY RAND() LIMIT 1");
if (DBA::isResult($r)) {
goaway(System::baseUrl() . '/profile/' . $r[0]['nickname']);
$a->internalRedirect('profile/' . $r[0]['nickname']);
} else {
logger('profile error: mod_profile ' . $a->query_string, LOGGER_DEBUG);
notice(L10n::t('Requested profile is not available.') . EOL);

12
mod/profile_photo.php
View file

@ -74,7 +74,7 @@ function profile_photo_post(App $a)
$r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = %d LIMIT 1", DBA::escape($image_id),
DBA::escape(local_user()), intval($scale));
$url = System::baseUrl() . '/profile/' . $a->user['nickname'];
$path = 'profile/' . $a->user['nickname'];
if (DBA::isResult($r)) {
$base_image = $r[0];
@ -125,8 +125,8 @@ function profile_photo_post(App $a)
info(L10n::t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL);
// Update global directory in background
if ($url && strlen(Config::get('system', 'directory'))) {
Worker::add(PRIORITY_LOW, "Directory", $url);
if ($path && strlen(Config::get('system', 'directory'))) {
Worker::add(PRIORITY_LOW, "Directory", $a->getBaseURL() . '/' . $path);
}
Worker::add(PRIORITY_LOW, 'ProfileUpdate', local_user());
@ -135,7 +135,7 @@ function profile_photo_post(App $a)
}
}
goaway($url);
$a->internalRedirect($path);
return; // NOTREACHED
}
@ -168,7 +168,7 @@ function profile_photo_post(App $a)
@unlink($src);
$imagecrop = profile_photo_crop_ui_head($a, $ph);
goaway(System::baseUrl() . '/profile_photo/use/' . $imagecrop['hash']);
$a->internalRedirect('profile_photo/use/' . $imagecrop['hash']);
}
function profile_photo_content(App $a)
@ -225,7 +225,7 @@ function profile_photo_content(App $a)
Worker::add(PRIORITY_LOW, "Directory", $url);
}
goaway(System::baseUrl() . '/profile/' . $a->user['nickname']);
$a->internalRedirect('profile/' . $a->user['nickname']);
return; // NOTREACHED
}
$ph = new Image($r[0]['data'], $r[0]['type']);

20
mod/profiles.php
View file

@ -18,10 +18,10 @@ use Friendica\Database\DBA;
use Friendica\Model\Contact;
use Friendica\Model\GContact;
use Friendica\Model\Profile;
use Friendica\Module\Login;
use Friendica\Network\Probe;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Temporal;
use Friendica\Module\Login;
function profiles_init(App $a) {
@ -38,7 +38,7 @@ function profiles_init(App $a) {
);
if (! DBA::isResult($r)) {
notice(L10n::t('Profile not found.') . EOL);
goaway('profiles');
$a->internalRedirect('profiles');
return; // NOTREACHED
}
@ -59,7 +59,7 @@ function profiles_init(App $a) {
info(L10n::t('Profile deleted.').EOL);
}
goaway('profiles');
$a->internalRedirect('profiles');
return; // NOTREACHED
}
@ -93,10 +93,10 @@ function profiles_init(App $a) {
info(L10n::t('New profile created.') . EOL);
if (DBA::isResult($r3) && count($r3) == 1) {
goaway('profiles/' . $r3[0]['id']);
$a->internalRedirect('profiles/' . $r3[0]['id']);
}
goaway('profiles');
$a->internalRedirect('profiles');
}
if (($a->argc > 2) && ($a->argv[1] === 'clone')) {
@ -132,10 +132,10 @@ function profiles_init(App $a) {
);
info(L10n::t('New profile created.') . EOL);
if ((DBA::isResult($r3)) && (count($r3) == 1)) {
goaway('profiles/'.$r3[0]['id']);
$a->internalRedirect('profiles/'.$r3[0]['id']);
}
goaway('profiles');
$a->internalRedirect('profiles');
return; // NOTREACHED
}
@ -252,7 +252,7 @@ function profiles_post(App $a) {
$with = ((x($_POST,'with')) ? notags(trim($_POST['with'])) : '');
if (! strlen($howlong)) {
$howlong = NULL_DATE;
$howlong = DBA::NULL_DATETIME;
} else {
$howlong = DateTimeFormat::convert($howlong, 'UTC', date_default_timezone_get());
}
@ -619,7 +619,7 @@ function profiles_content(App $a) {
'$gender' => ContactSelector::gender($r[0]['gender']),
'$marital' => ['selector' => ContactSelector::maritalStatus($r[0]['marital']), 'value' => $r[0]['marital']],
'$with' => ['with', L10n::t("Who: \x28if applicable\x29"), strip_tags($r[0]['with']), L10n::t('Examples: cathy123, Cathy Williams, cathy@example.com')],
'$howlong' => ['howlong', L10n::t('Since [date]:'), ($r[0]['howlong'] <= NULL_DATE ? '' : DateTimeFormat::local($r[0]['howlong']))],
'$howlong' => ['howlong', L10n::t('Since [date]:'), ($r[0]['howlong'] <= DBA::NULL_DATETIME ? '' : DateTimeFormat::local($r[0]['howlong']))],
'$sexual' => ['selector' => ContactSelector::sexualPreference($r[0]['sexual']), 'value' => $r[0]['sexual']],
'$about' => ['about', L10n::t('Tell us about yourself...'), $r[0]['about']],
'$xmpp' => ['xmpp', L10n::t("XMPP \x28Jabber\x29 address:"), $r[0]['xmpp'], L10n::t("The XMPP address will be propagated to your contacts so that they can follow you.")],
@ -654,7 +654,7 @@ function profiles_content(App $a) {
);
if (DBA::isResult($r)) {
//Go to the default profile.
goaway('profiles/' . $r[0]['id']);
$a->internalRedirect('profiles/' . $r[0]['id']);
}
}

10
mod/randprof.php
View file

@ -13,8 +13,14 @@ function randprof_init(App $a)
$x = GContact::getRandomUrl();
if ($x) {
goaway(Contact::magicLink($x));
$link = Contact::magicLink($x);
// @TODO making the return of magicLink save to use either externalRedirect or internalRedirect
if (filter_var($link, FILTER_VALIDATE_URL)) {
System::externalRedirect($link);
} else {
$a->internalRedirect($link);
}
}
goaway(System::baseUrl() . '/profile');
$a->internalRedirect('profile');
}

22
mod/redir.php
View file

@ -27,7 +27,7 @@ function redir_init(App $a) {
$contact = DBA::selectFirst('contact', $fields, ['id' => $cid, 'uid' => [0, local_user()]]);
if (!DBA::isResult($contact)) {
notice(L10n::t('Contact not found.'));
goaway(System::baseUrl());
$a->internalRedirect();
}
$contact_url = $contact['url'];
@ -36,7 +36,7 @@ function redir_init(App $a) {
|| (!local_user() && !remote_user()) // Visitors (not logged in or not remotes) can't authenticate.
|| (!empty($a->contact['id']) && $a->contact['id'] == $cid)) // Local user is already authenticated.
{
goaway($url != '' ? $url : $contact_url);
System::externalRedirect(defaults($url, $contact_url));
}
if ($contact['uid'] == 0 && local_user()) {
@ -50,14 +50,14 @@ function redir_init(App $a) {
if (!empty($a->contact['id']) && $a->contact['id'] == $cid) {
// Local user is already authenticated.
$target_url = $url != '' ? $url : $contact_url;
$target_url = defaults($url, $contact_url);
logger($contact['name'] . " is already authenticated. Redirecting to " . $target_url, LOGGER_DEBUG);
goaway($target_url);
System::externalRedirect($target_url);
}
}
if (remote_user()) {
$host = substr(System::baseUrl() . ($a->getURLPath() ? '/' . $a->getURLPath() : ''), strpos(System::baseUrl(), '://') + 3);
$host = substr($a->getBaseURL() . ($a->getURLPath() ? '/' . $a->getURLPath() : ''), strpos($a->getBaseURL(), '://') + 3);
$remotehost = substr($contact['addr'], strpos($contact['addr'], '@') + 1);
// On a local instance we have to check if the local user has already authenticated
@ -71,9 +71,9 @@ function redir_init(App $a) {
foreach ($_SESSION['remote'] as $v) {
if ($v['uid'] == $_SESSION['visitor_visiting'] && $v['cid'] == $_SESSION['visitor_id']) {
// Remote user is already authenticated.
$target_url = $url != '' ? $url : $contact_url;
$target_url = defaults($url, $contact_url);
logger($contact['name'] . " is already authenticated. Redirecting to " . $target_url, LOGGER_DEBUG);
goaway($target_url);
System::externalRedirect($target_url);
}
}
}
@ -102,11 +102,11 @@ function redir_init(App $a) {
$dest = (!empty($url) ? '&destination_url=' . $url : '');
goaway($contact['poll'] . '?dfrn_id=' . $dfrn_id
System::externalRedirect($contact['poll'] . '?dfrn_id=' . $dfrn_id
. '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest . $quiet);
}
$url = $url != '' ? $url : $contact_url;
$url = defaults($url, $contact_url);
}
// If we don't have a connected contact, redirect with
@ -121,9 +121,9 @@ function redir_init(App $a) {
}
logger('redirecting to ' . $url, LOGGER_DEBUG);
goaway($url);
System::externalRedirect($url);
}
notice(L10n::t('Contact not found.'));
goaway(System::baseUrl());
$a->internalRedirect();
}

10
mod/register.php
View file

@ -63,7 +63,7 @@ function register_post(App $a)
$arr['blocked'] = $blocked;
$arr['verified'] = $verified;
$arr['language'] = L10n::getBrowserLanguage();
$arr['language'] = L10n::detectLanguage();
try {
$result = Model\User::create($arr);
@ -100,7 +100,7 @@ function register_post(App $a)
if ($res) {
info(L10n::t('Registration successful. Please check your email for further instructions.') . EOL);
goaway();
$a->internalRedirect();
} else {
notice(
L10n::t('Failed to send email message. Here your accout details:<br> login: %s<br> password: %s<br><br>You can change your password after login.',
@ -111,12 +111,12 @@ function register_post(App $a)
}
} else {
info(L10n::t('Registration successful.') . EOL);
goaway();
$a->internalRedirect();
}
} elseif (intval(Config::get('config', 'register_policy')) === REGISTER_APPROVE) {
if (!strlen(Config::get('config', 'admin_email'))) {
notice(L10n::t('Your registration can not be processed.') . EOL);
goaway();
$a->internalRedirect();
}
Model\Register::createForApproval($user['uid'], Config::get('system', 'language'), $_POST['permonlybox']);
@ -159,7 +159,7 @@ function register_post(App $a)
);
info(L10n::t('Your registration is pending approval by the site owner.') . EOL);
goaway();
$a->internalRedirect();
}
return;

4
mod/regmod.php
View file

@ -101,11 +101,11 @@ function regmod_content(App $a)
if ($cmd === 'deny') {
user_deny($hash);
goaway('admin/users/');
$a->internalRedirect('admin/users/');
}
if ($cmd === 'allow') {
user_allow($hash);
goaway('admin/users/');
$a->internalRedirect('admin/users/');
}
}

4
mod/removeme.php
View file

@ -64,7 +64,7 @@ function removeme_post(App $a)
function removeme_content(App $a)
{
if (!local_user()) {
goaway(System::baseUrl());
$a->internalRedirect();
}
$hash = random_string();
@ -76,7 +76,7 @@ function removeme_content(App $a)
$tpl = get_markup_template('removeme.tpl');
$o = replace_macros($tpl, [
'$basedir' => System::baseUrl(),
'$basedir' => $a->getBaseURL(),
'$hash' => $hash,
'$title' => L10n::t('Remove My Account'),
'$desc' => L10n::t('This will completely remove your account. Once this has been done it is not recoverable.'),

2
mod/repair_ostatus.php
View file

@ -14,7 +14,7 @@ function repair_ostatus_content(App $a) {
if (! local_user()) {
notice(L10n::t('Permission denied.') . EOL);
goaway('/ostatus_repair');
$a->internalRedirect('ostatus_repair');
// NOTREACHED
}

21
mod/settings.php
View file

@ -20,11 +20,10 @@ use Friendica\Model\Contact;
use Friendica\Model\GContact;
use Friendica\Model\Group;
use Friendica\Model\User;
use Friendica\Module\Login;
use Friendica\Protocol\Email;
use Friendica\Util\Network;
use Friendica\Util\Temporal;
use Friendica\Util\Security;
use Friendica\Module\Login;
function get_theme_config_file($theme)
{
@ -160,7 +159,7 @@ function settings_post(App $a)
$key = $_POST['remove'];
DBA::delete('tokens', ['id' => $key, 'uid' => local_user()]);
goaway(System::baseUrl(true)."/settings/oauth/");
$a->internalRedirect('settings/oauth/', true);
return;
}
@ -206,7 +205,7 @@ function settings_post(App $a)
);
}
}
goaway(System::baseUrl(true)."/settings/oauth/");
$a->internalRedirect('settings/oauth/', true);
return;
}
@ -371,7 +370,7 @@ function settings_post(App $a)
);
Addon::callHooks('display_settings_post', $_POST);
goaway('settings/display');
$a->internalRedirect('settings/display');
return; // NOTREACHED
}
@ -380,7 +379,7 @@ function settings_post(App $a)
if (x($_POST,'resend_relocate')) {
Worker::add(PRIORITY_HIGH, 'Notifier', 'relocate', local_user());
info(L10n::t("Relocate message has been send to your contacts"));
goaway('settings');
$a->internalRedirect('settings');
}
Addon::callHooks('settings_post', $_POST);
@ -649,7 +648,7 @@ function settings_post(App $a)
// Update the global contact for the user
GContact::updateForUser(local_user());
goaway('settings');
$a->internalRedirect('settings');
return; // NOTREACHED
}
@ -716,7 +715,7 @@ function settings_content(App $a)
BaseModule::checkFormSecurityTokenRedirectOnError('/settings/oauth', 'settings_oauth', 't');
DBA::delete('clients', ['client_id' => $a->argv[3], 'uid' => local_user()]);
goaway(System::baseUrl(true)."/settings/oauth/");
$a->internalRedirect('settings/oauth/', true);
return;
}
@ -732,7 +731,7 @@ function settings_content(App $a)
$tpl = get_markup_template('settings/oauth.tpl');
$o .= replace_macros($tpl, [
'$form_security_token' => BaseModule::getFormSecurityToken("settings_oauth"),
'$baseurl' => System::baseUrl(true),
'$baseurl' => $a->getBaseURL(true),
'$title' => L10n::t('Connected Apps'),
'$add' => L10n::t('Add application'),
'$edit' => L10n::t('Edit'),
@ -795,7 +794,7 @@ function settings_content(App $a)
$legacy_contact = PConfig::get(local_user(), 'ostatus', 'legacy_contact');
if (x($legacy_contact)) {
/// @todo Isn't it supposed to be a goaway() call?
/// @todo Isn't it supposed to be a $a->internalRedirect() call?
$a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL=' . System::baseUrl().'/ostatus_subscribe?url=' . urlencode($legacy_contact) . '">';
}
@ -830,7 +829,7 @@ function settings_content(App $a)
$mail_pubmail = ((DBA::isResult($r)) ? $r[0]['pubmail'] : 0);
$mail_action = ((DBA::isResult($r)) ? $r[0]['action'] : 0);
$mail_movetofolder = ((DBA::isResult($r)) ? $r[0]['movetofolder'] : '');
$mail_chk = ((DBA::isResult($r)) ? $r[0]['last_check'] : NULL_DATE);
$mail_chk = ((DBA::isResult($r)) ? $r[0]['last_check'] : DBA::NULL_DATETIME);
$tpl = get_markup_template('settings/connectors.tpl');

2
mod/starred.php
View file

@ -42,7 +42,7 @@ function starred_init(App $a) {
$rand = "?$rand";
}
goaway(System::baseUrl() . "/" . $return_path . $rand);
$a->internalRedirect($return_path . $rand);
}
// the json doesn't really matter, it will either be 0 or 1

2
mod/suggest.php
View file

@ -62,7 +62,7 @@ function suggest_content(App $a)
return;
}
$_SESSION['return_url'] = System::baseUrl() . '/' . $a->cmd;
$_SESSION['return_path'] = $a->cmd;
$a->page['aside'] .= Widget::findPeople();
$a->page['aside'] .= Widget::follow();

16
mod/tagrm.php
View file

@ -13,11 +13,11 @@ use Friendica\Model\Item;
function tagrm_post(App $a)
{
if (!local_user()) {
goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
$a->internalRedirect($_SESSION['photo_return']);
}
if (x($_POST,'submit') && ($_POST['submit'] === L10n::t('Cancel'))) {
goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
$a->internalRedirect($_SESSION['photo_return']);
}
$tag = (x($_POST,'tag') ? hex2bin(notags(trim($_POST['tag']))) : '');
@ -25,7 +25,7 @@ function tagrm_post(App $a)
$item = Item::selectFirst(['tag'], ['id' => $item_id, 'uid' => local_user()]);
if (!DBA::isResult($item)) {
goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
$a->internalRedirect($_SESSION['photo_return']);
}
$arr = explode(',', $item['tag']);
@ -41,7 +41,7 @@ function tagrm_post(App $a)
Item::update(['tag' => $tag_str], ['id' => $item_id]);
info(L10n::t('Tag removed') . EOL );
goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
$a->internalRedirect($_SESSION['photo_return']);
// NOTREACHED
}
@ -53,25 +53,25 @@ function tagrm_content(App $a)
$o = '';
if (!local_user()) {
goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
$a->internalRedirect($_SESSION['photo_return']);
// NOTREACHED
}
$item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
if (!$item_id) {
goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
$a->internalRedirect($_SESSION['photo_return']);
// NOTREACHED
}
$item = Item::selectFirst(['tag'], ['id' => $item_id, 'uid' => local_user()]);
if (!DBA::isResult($item)) {
goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
$a->internalRedirect($_SESSION['photo_return']);
}
$arr = explode(',', $item['tag']);
if (!count($arr)) {
goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
$a->internalRedirect($_SESSION['photo_return']);
}
$o .= '<h3>' . L10n::t('Remove Item Tag') . '</h3>';

4
mod/toggle_mobile.php
View file

@ -14,8 +14,8 @@ function toggle_mobile_init(App $a) {
if (isset($_GET['address'])) {
$address = $_GET['address'];
} else {
$address = System::baseUrl();
$address = '';
}
goaway($address);
$a->internalRedirect($address);
}

24
mod/unfollow.php
View file

@ -12,13 +12,13 @@ use Friendica\Model\Contact;
use Friendica\Model\Profile;
use Friendica\Model\User;
function unfollow_post()
function unfollow_post(App $a)
{
$return_url = 'contacts';
$return_path = 'contacts';
if (!local_user()) {
notice(L10n::t('Permission denied.'));
goaway('/login');
$a->internalRedirect('login');
// NOTREACHED
}
@ -32,17 +32,17 @@ function unfollow_post()
if (!DBA::isResult($contact)) {
notice(L10n::t("You aren't following this contact."));
goaway($return_url);
$a->internalRedirect($return_path);
// NOTREACHED
}
if (!empty($_REQUEST['cancel'])) {
goaway($return_url . '/' . $contact['id']);
$a->internalRedirect($return_path . '/' . $contact['id']);
}
if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
notice(L10n::t('Unfollowing is currently not supported by your network.'));
goaway($return_url . '/' . $contact['id']);
$a->internalRedirect($return_path . '/' . $contact['id']);
// NOTREACHED
}
@ -63,17 +63,17 @@ function unfollow_post()
}
info(L10n::t('Contact unfollowed'));
goaway($return_path);
$a->internalRedirect($return_path);
// NOTREACHED
}
function unfollow_content(App $a)
{
$return_url = 'contacts';
$return_path = 'contacts';
if (!local_user()) {
notice(L10n::t('Permission denied.'));
goaway('/login');
$a->internalRedirect('login');
// NOTREACHED
}
@ -88,13 +88,13 @@ function unfollow_content(App $a)
if (!DBA::isResult($contact)) {
notice(L10n::t("You aren't following this contact."));
goaway($return_url);
$a->internalRedirect($return_path);
// NOTREACHED
}
if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
notice(L10n::t('Unfollowing is currently not supported by your network.'));
goaway('contact/' . $contact['id']);
$a->internalRedirect('contact/' . $contact['id']);
// NOTREACHED
}
@ -105,7 +105,7 @@ function unfollow_content(App $a)
if (!DBA::isResult($self)) {
notice(L10n::t('Permission denied.'));
goaway($return_url);
$a->internalRedirect($return_path);
// NOTREACHED
}

8
mod/videos.php
View file

@ -115,14 +115,14 @@ function videos_post(App $a)
$owner_uid = $a->data['user']['uid'];
if (local_user() != $owner_uid) {
goaway(System::baseUrl() . '/videos/' . $a->data['user']['nickname']);
$a->internalRedirect('videos/' . $a->data['user']['nickname']);
}
if (($a->argc == 2) && !empty($_POST['delete']) && !empty($_POST['id'])) {
// Check if we should do HTML-based delete confirmation
if (empty($_REQUEST['confirm'])) {
if (!empty($_REQUEST['canceled'])) {
goaway(System::baseUrl() . '/videos/' . $a->data['user']['nickname']);
$a->internalRedirect('videos/' . $a->data['user']['nickname']);
}
$drop_url = $a->query_string;
@ -169,11 +169,11 @@ function videos_post(App $a)
}
}
goaway(System::baseUrl() . '/videos/' . $a->data['user']['nickname']);
$a->internalRedirect('videos/' . $a->data['user']['nickname']);
return; // NOTREACHED
}
goaway(System::baseUrl() . '/videos/' . $a->data['user']['nickname']);
$a->internalRedirect('videos/' . $a->data['user']['nickname']);
}
function videos_content(App $a)

2
mod/wallmessage.php
View file

@ -69,7 +69,7 @@ function wallmessage_post(App $a) {
info(L10n::t('Message sent.') . EOL);
}
goaway('profile/'.$user['nickname']);
$a->internalRedirect('profile/'.$user['nickname']);
}

551
src/App.php
View file

@ -5,16 +5,13 @@
namespace Friendica;
use Detection\MobileDetect;
use DOMDocument;
use DOMXPath;
use Exception;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Network\HTTPException\InternalServerErrorException;
require_once 'boot.php';
require_once 'include/dba.php';
require_once 'include/text.php';
/**
@ -53,20 +50,14 @@ class App
public $argv;
public $argc;
public $module;
public $strings;
public $hooks = [];
public $timezone;
public $interactive = true;
public $addons;
public $addons_admin = [];
public $apps = [];
public $identities;
public $is_mobile = false;
public $is_tablet = false;
public $performance = [];
public $callstack = [];
public $theme_info = [];
public $nav_sel;
public $category;
// Allow themes to control internal parameters
// by changing App values in theme.php
@ -120,7 +111,7 @@ class App
* Inclusion is done in App->initHead().
* The path can be absolute or relative to the Friendica installation base folder.
*
* @see App->initHead()
* @see initHead()
*
* @param string $path
*/
@ -136,7 +127,7 @@ class App
* Inclusion is done in App->initFooter().
* The path can be absolute or relative to the Friendica installation base folder.
*
* @see App->initFooter()
* @see initFooter()
*
* @param string $path
*/
@ -187,12 +178,12 @@ class App
/**
* @brief App constructor.
*
* @param string $basePath Path to the app base folder
* @param bool $backend true, if the call is from backend, otherwise set to true (Default true)
* @param string $basePath Path to the app base folder
* @param bool $isBackend Whether it is used for backend or frontend (Default true=backend)
*
* @throws Exception if the Basepath is not usable
*/
public function __construct($basePath, $backend = true)
public function __construct($basePath, $isBackend = true)
{
if (!static::isDirectoryUsable($basePath, false)) {
throw new Exception('Basepath ' . $basePath . ' isn\'t usable.');
@ -201,7 +192,7 @@ class App
BaseObject::setApp($this);
$this->basePath = rtrim($basePath, DIRECTORY_SEPARATOR);
$this->checkBackend($backend);
$this->checkBackend($isBackend);
$this->checkFriendicaApp();
$this->performance['start'] = microtime(true);
@ -236,20 +227,20 @@ class App
$this->scheme = 'http';
if ((x($_SERVER, 'HTTPS') && $_SERVER['HTTPS']) ||
(x($_SERVER, 'HTTP_FORWARDED') && preg_match('/proto=https/', $_SERVER['HTTP_FORWARDED'])) ||
(x($_SERVER, 'HTTP_X_FORWARDED_PROTO') && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') ||
(x($_SERVER, 'HTTP_X_FORWARDED_SSL') && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') ||
(x($_SERVER, 'FRONT_END_HTTPS') && $_SERVER['FRONT_END_HTTPS'] == 'on') ||
(x($_SERVER, 'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443)) // XXX: reasonable assumption, but isn't this hardcoding too much?
if (!empty($_SERVER['HTTPS']) ||
!empty($_SERVER['HTTP_FORWARDED']) && preg_match('/proto=https/', $_SERVER['HTTP_FORWARDED']) ||
!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' ||
!empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on' ||
!empty($_SERVER['FRONT_END_HTTPS']) && $_SERVER['FRONT_END_HTTPS'] == 'on' ||
!empty($_SERVER['SERVER_PORT']) && (intval($_SERVER['SERVER_PORT']) == 443) // XXX: reasonable assumption, but isn't this hardcoding too much?
) {
$this->scheme = 'https';
}
if (x($_SERVER, 'SERVER_NAME')) {
if (!empty($_SERVER['SERVER_NAME'])) {
$this->hostname = $_SERVER['SERVER_NAME'];
if (x($_SERVER, 'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443) {
if (!empty($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443) {
$this->hostname .= ':' . $_SERVER['SERVER_PORT'];
}
}
@ -260,9 +251,9 @@ class App
. $this->getBasePath(). DIRECTORY_SEPARATOR . 'library' . PATH_SEPARATOR
. $this->getBasePath());
if ((x($_SERVER, 'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'], 0, 9) === 'pagename=') {
if (!empty($_SERVER['QUERY_STRING']) && strpos($_SERVER['QUERY_STRING'], 'pagename=') === 0) {
$this->query_string = substr($_SERVER['QUERY_STRING'], 9);
} elseif ((x($_SERVER, 'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'], 0, 2) === 'q=') {
} elseif (!empty($_SERVER['QUERY_STRING']) && strpos($_SERVER['QUERY_STRING'], 'q=') === 0) {
$this->query_string = substr($_SERVER['QUERY_STRING'], 2);
}
@ -313,7 +304,7 @@ class App
}
// See if there is any page number information, and initialise pagination
$this->pager['page'] = ((x($_GET, 'page') && intval($_GET['page']) > 0) ? intval($_GET['page']) : 1);
$this->pager['page'] = !empty($_GET['page']) && intval($_GET['page']) > 0 ? intval($_GET['page']) : 1;
$this->pager['itemspage'] = 50;
$this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
@ -363,30 +354,19 @@ class App
$this->determineURLPath();
Config::load();
Core\Config::load();
if ($this->getMode()->has(App\Mode::DBAVAILABLE)) {
Core\Addon::loadHooks();
Core\Hook::loadHooks();
$this->loadAddonConfig();
}
$this->loadDefaultTimezone();
$this->page = [
'aside' => '',
'bottom' => '',
'content' => '',
'footer' => '',
'htmlhead' => '',
'nav' => '',
'page_title' => '',
'right_aside' => '',
'template' => '',
'title' => ''
];
Core\L10n::init();
$this->process_id = System::processID('log');
$this->process_id = Core\System::processID('log');
}
/**
@ -593,7 +573,11 @@ class App
$stamp1 = microtime(true);
DBA::connect($db_host, $db_user, $db_pass, $db_data, $charset);
if (DBA::connect($db_host, $db_user, $db_pass, $db_data, $charset)) {
// Loads DB_UPDATE_VERSION constant
Database\DBStructure::definition(false);
}
unset($db_host, $db_user, $db_pass, $db_data, $charset);
$this->saveTimestamp($stamp1, 'network');
@ -612,14 +596,14 @@ class App
$basepath = $this->basePath;
if (!$basepath) {
$basepath = Config::get('system', 'basepath');
$basepath = Core\Config::get('system', 'basepath');
}
if (!$basepath && x($_SERVER, 'DOCUMENT_ROOT')) {
if (!$basepath && !empty($_SERVER['DOCUMENT_ROOT'])) {
$basepath = $_SERVER['DOCUMENT_ROOT'];
}
if (!$basepath && x($_SERVER, 'PWD')) {
if (!$basepath && !empty($_SERVER['PWD'])) {
$basepath = $_SERVER['PWD'];
}
@ -670,14 +654,14 @@ class App
{
$scheme = $this->scheme;
if (Config::get('system', 'ssl_policy') == SSL_POLICY_FULL) {
if (Core\Config::get('system', 'ssl_policy') == SSL_POLICY_FULL) {
$scheme = 'https';
}
// Basically, we have $ssl = true on any links which can only be seen by a logged in user
// (and also the login link). Anything seen by an outsider will have it turned off.
if (Config::get('system', 'ssl_policy') == SSL_POLICY_SELFSIGN) {
if (Core\Config::get('system', 'ssl_policy') == SSL_POLICY_SELFSIGN) {
if ($ssl) {
$scheme = 'https';
} else {
@ -685,8 +669,8 @@ class App
}
}
if (Config::get('config', 'hostname') != '') {
$this->hostname = Config::get('config', 'hostname');
if (Core\Config::get('config', 'hostname') != '') {
$this->hostname = Core\Config::get('config', 'hostname');
}
return $scheme . '://' . $this->hostname . (!empty($this->getURLPath()) ? '/' . $this->getURLPath() : '' );
@ -704,7 +688,7 @@ class App
$parsed = @parse_url($url);
$hostname = '';
if (x($parsed)) {
if (!empty($parsed)) {
if (!empty($parsed['scheme'])) {
$this->scheme = $parsed['scheme'];
}
@ -713,10 +697,10 @@ class App
$hostname = $parsed['host'];
}
if (x($parsed, 'port')) {
if (!empty($parsed['port'])) {
$hostname .= ':' . $parsed['port'];
}
if (x($parsed, 'path')) {
if (!empty($parsed['path'])) {
$this->urlPath = trim($parsed['path'], '\\/');
}
@ -724,8 +708,8 @@ class App
include $this->getBasePath() . DIRECTORY_SEPARATOR . '.htpreconfig.php';
}
if (Config::get('config', 'hostname') != '') {
$this->hostname = Config::get('config', 'hostname');
if (Core\Config::get('config', 'hostname') != '') {
$this->hostname = Core\Config::get('config', 'hostname');
}
if (!isset($this->hostname) || ($this->hostname == '')) {
@ -736,8 +720,8 @@ class App
public function getHostName()
{
if (Config::get('config', 'hostname') != '') {
$this->hostname = Config::get('config', 'hostname');
if (Core\Config::get('config', 'hostname') != '') {
$this->hostname = Core\Config::get('config', 'hostname');
}
return $this->hostname;
@ -777,7 +761,7 @@ class App
*/
public function initHead()
{
$interval = ((local_user()) ? PConfig::get(local_user(), 'system', 'update_interval') : 40000);
$interval = ((local_user()) ? Core\PConfig::get(local_user(), 'system', 'update_interval') : 40000);
// If the update is 'deactivated' set it to the highest integer number (~24 days)
if ($interval < 0) {
@ -804,12 +788,12 @@ class App
$this->registerStylesheet($stylesheet);
$shortcut_icon = Config::get('system', 'shortcut_icon');
$shortcut_icon = Core\Config::get('system', 'shortcut_icon');
if ($shortcut_icon == '') {
$shortcut_icon = 'images/friendica-32.png';
}
$touch_icon = Config::get('system', 'touch_icon');
$touch_icon = Core\Config::get('system', 'touch_icon');
if ($touch_icon == '') {
$touch_icon = 'images/friendica-128.png';
}
@ -828,14 +812,14 @@ class App
'$baseurl' => $this->getBaseURL(),
'$local_user' => local_user(),
'$generator' => 'Friendica' . ' ' . FRIENDICA_VERSION,
'$delitem' => L10n::t('Delete this item?'),
'$showmore' => L10n::t('show more'),
'$showfewer' => L10n::t('show fewer'),
'$delitem' => Core\L10n::t('Delete this item?'),
'$showmore' => Core\L10n::t('show more'),
'$showfewer' => Core\L10n::t('show fewer'),
'$update_interval' => $interval,
'$shortcut_icon' => $shortcut_icon,
'$touch_icon' => $touch_icon,
'$infinite_scroll' => $infinite_scroll,
'$block_public' => intval(Config::get('system', 'block_public')),
'$block_public' => intval(Core\Config::get('system', 'block_public')),
'$stylesheets' => $this->stylesheets,
]) . $this->page['htmlhead'];
}
@ -916,7 +900,7 @@ class App
private function registerTemplateEngine($class)
{
$v = get_class_vars($class);
if (x($v, 'name')) {
if (!empty($v['name'])) {
$name = $v['name'];
$this->template_engines[$name] = $class;
} else {
@ -935,10 +919,7 @@ class App
*/
public function getTemplateEngine()
{
$template_engine = 'smarty3';
if (x($this->theme, 'template_engine')) {
$template_engine = $this->theme['template_engine'];
}
$template_engine = defaults($this->theme, 'template_engine', 'smarty3');
if (isset($this->template_engines[$template_engine])) {
if (isset($this->template_engine_instance[$template_engine])) {
@ -952,7 +933,7 @@ class App
}
echo "template engine <tt>$template_engine</tt> is not registered!\n";
killme();
exit();
}
/**
@ -1030,7 +1011,7 @@ class App
$this->performance[$value] += (float) $duration;
$this->performance['marktime'] += (float) $duration;
$callstack = System::callstack();
$callstack = Core\System::callstack();
if (!isset($this->callstack[$value][$callstack])) {
// Prevent ugly E_NOTICE
@ -1138,13 +1119,13 @@ class App
*
if ($this->is_backend()) {
$process = 'backend';
$max_processes = Config::get('system', 'max_processes_backend');
$max_processes = Core\Config::get('system', 'max_processes_backend');
if (intval($max_processes) == 0) {
$max_processes = 5;
}
} else {
$process = 'frontend';
$max_processes = Config::get('system', 'max_processes_frontend');
$max_processes = Core\Config::get('system', 'max_processes_frontend');
if (intval($max_processes) == 0) {
$max_processes = 20;
}
@ -1170,7 +1151,7 @@ class App
*/
public function isMinMemoryReached()
{
$min_memory = Config::get('system', 'min_memory', 0);
$min_memory = Core\Config::get('system', 'min_memory', 0);
if ($min_memory == 0) {
return false;
}
@ -1216,19 +1197,19 @@ class App
{
if ($this->isBackend()) {
$process = 'backend';
$maxsysload = intval(Config::get('system', 'maxloadavg'));
$maxsysload = intval(Core\Config::get('system', 'maxloadavg'));
if ($maxsysload < 1) {
$maxsysload = 50;
}
} else {
$process = 'frontend';
$maxsysload = intval(Config::get('system', 'maxloadavg_frontend'));
$maxsysload = intval(Core\Config::get('system', 'maxloadavg_frontend'));
if ($maxsysload < 1) {
$maxsysload = 50;
}
}
$load = System::currentLoad();
$load = Core\System::currentLoad();
if ($load) {
if (intval($load) > $maxsysload) {
logger('system: load ' . $load . ' for ' . $process . ' tasks (' . $maxsysload . ') too high.');
@ -1480,7 +1461,7 @@ class App
*/
public function getSenderEmailAddress()
{
$sender_email = Config::get('config', 'sender_email');
$sender_email = Core\Config::get('config', 'sender_email');
if (empty($sender_email)) {
$hostname = $this->getHostName();
if (strpos($hostname, ':')) {
@ -1519,15 +1500,15 @@ class App
*/
private function computeCurrentTheme()
{
$system_theme = Config::get('system', 'theme');
$system_theme = Core\Config::get('system', 'theme');
if (!$system_theme) {
throw new Exception(L10n::t('No system theme config value set.'));
throw new Exception(Core\L10n::t('No system theme config value set.'));
}
// Sane default
$this->currentTheme = $system_theme;
$allowed_themes = explode(',', Config::get('system', 'allowed_themes', $system_theme));
$allowed_themes = explode(',', Core\Config::get('system', 'allowed_themes', $system_theme));
$page_theme = null;
// Find the theme that belongs to the user whose stuff we are looking at
@ -1535,7 +1516,7 @@ class App
// Allow folks to override user themes and always use their own on their own site.
// This works only if the user is on the same server
$user = DBA::selectFirst('user', ['theme'], ['uid' => $this->profile_uid]);
if (DBA::isResult($user) && !PConfig::get(local_user(), 'system', 'always_my_theme')) {
if (DBA::isResult($user) && !Core\PConfig::get(local_user(), 'system', 'always_my_theme')) {
$page_theme = $user['theme'];
}
}
@ -1544,7 +1525,7 @@ class App
// Specific mobile theme override
if (($this->is_mobile || $this->is_tablet) && Core\Session::get('show-mobile', true)) {
$system_mobile_theme = Config::get('system', 'mobile-theme');
$system_mobile_theme = Core\Config::get('system', 'mobile-theme');
$user_mobile_theme = Core\Session::get('mobile-theme', $system_mobile_theme);
// --- means same mobile theme as desktop
@ -1614,7 +1595,7 @@ class App
*/
public function checkURL()
{
$url = Config::get('system', 'url');
$url = Core\Config::get('system', 'url');
// if the url isn't set or the stored url is radically different
// than the currently visited url, store the current value accordingly.
@ -1623,7 +1604,405 @@ class App
// We will only change the url to an ip address if there is no existing setting
if (empty($url) || (!link_compare($url, $this->getBaseURL())) && (!preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/", $this->getHostName()))) {
Config::set('system', 'url', $this->getBaseURL());
Core\Config::set('system', 'url', $this->getBaseURL());
}
}
/**
* Frontend App script
*
* The App object behaves like a container and a dispatcher at the same time, including a representation of the
* request and a representation of the response.
*
* This probably should change to limit the size of this monster method.
*/
public function runFrontend()
{
// Missing DB connection: ERROR
if ($this->getMode()->has(App\Mode::LOCALCONFIGPRESENT) && !$this->getMode()->has(App\Mode::DBAVAILABLE)) {
Core\System::httpExit(500, ['title' => 'Error 500 - Internal Server Error', 'description' => 'Apologies but the website is unavailable at the moment.']);
}
// Max Load Average reached: ERROR
if ($this->isMaxProcessesReached() || $this->isMaxLoadReached()) {
header('Retry-After: 120');
header('Refresh: 120; url=' . $this->getBaseURL() . "/" . $this->query_string);
Core\System::httpExit(503, ['title' => 'Error 503 - Service Temporarily Unavailable', 'description' => 'Core\System is currently overloaded. Please try again later.']);
}
if (strstr($this->query_string, '.well-known/host-meta') && ($this->query_string != '.well-known/host-meta')) {
Core\System::httpExit(404);
}
if (!$this->getMode()->isInstall()) {
// Force SSL redirection
if (Core\Config::get('system', 'force_ssl') && ($this->getScheme() == "http")
&& intval(Core\Config::get('system', 'ssl_policy')) == SSL_POLICY_FULL
&& strpos($this->getBaseURL(), 'https://') === 0
&& $_SERVER['REQUEST_METHOD'] == 'GET') {
header('HTTP/1.1 302 Moved Temporarily');
header('Location: ' . $this->getBaseURL() . '/' . $this->query_string);
exit();
}
Core\Session::init();
Core\Addon::callHooks('init_1');
}
// Exclude the backend processes from the session management
if (!$this->isBackend()) {
$stamp1 = microtime(true);
session_start();
$this->saveTimestamp($stamp1, 'parser');
Core\L10n::setSessionVariable();
Core\L10n::setLangFromSession();
} else {
$_SESSION = [];
Core\Worker::executeIfIdle();
}
// ZRL
if (!empty($_GET['zrl']) && $this->getMode()->isNormal()) {
$this->query_string = Model\Profile::stripZrls($this->query_string);
if (!local_user()) {
// Only continue when the given profile link seems valid
// Valid profile links contain a path with "/profile/" and no query parameters
if ((parse_url($_GET['zrl'], PHP_URL_QUERY) == "") &&
strstr(parse_url($_GET['zrl'], PHP_URL_PATH), "/profile/")) {
if (defaults($_SESSION, "visitor_home", "") != $_GET["zrl"]) {
$_SESSION['my_url'] = $_GET['zrl'];
$_SESSION['authenticated'] = 0;
}
Model\Profile::zrlInit($this);
} else {
// Someone came with an invalid parameter, maybe as a DDoS attempt
// We simply stop processing here
logger("Invalid ZRL parameter " . $_GET['zrl'], LOGGER_DEBUG);
Core\System::httpExit(403, ['title' => '403 Forbidden']);
}
}
}
if (!empty($_GET['owt']) && $this->getMode()->isNormal()) {
$token = $_GET['owt'];
$this->query_string = Model\Profile::stripQueryParam($this->query_string, 'owt');
Model\Profile::openWebAuthInit($token);
}
Module\Login::sessionAuth();
if (empty($_SESSION['authenticated'])) {
header('X-Account-Management-Status: none');
}
$_SESSION['sysmsg'] = defaults($_SESSION, 'sysmsg' , []);
$_SESSION['sysmsg_info'] = defaults($_SESSION, 'sysmsg_info' , []);
$_SESSION['last_updated'] = defaults($_SESSION, 'last_updated', []);
/*
* check_config() is responsible for running update scripts. These automatically
* update the DB schema whenever we push a new one out. It also checks to see if
* any addons have been added or removed and reacts accordingly.
*/
// 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';
} else {
$this->checkURL();
check_db(false);
Core\Addon::check();
}
$this->page = [
'aside' => '',
'bottom' => '',
'content' => '',
'footer' => '',
'htmlhead' => '',
'nav' => '',
'page_title' => '',
'right_aside' => '',
'template' => '',
'title' => ''
];
if (strlen($this->module)) {
// Compatibility with the Android Diaspora client
if ($this->module == 'stream') {
$this->internalRedirect('network?f=&order=post');
}
if ($this->module == 'conversations') {
$this->internalRedirect('message');
}
if ($this->module == 'commented') {
$this->internalRedirect('network?f=&order=comment');
}
if ($this->module == 'liked') {
$this->internalRedirect('network?f=&order=comment');
}
if ($this->module == 'activity') {
$this->internalRedirect('network/?f=&conv=1');
}
if (($this->module == 'status_messages') && ($this->cmd == 'status_messages/new')) {
$this->internalRedirect('bookmarklet');
}
if (($this->module == 'user') && ($this->cmd == 'user/edit')) {
$this->internalRedirect('settings');
}
if (($this->module == 'tag_followings') && ($this->cmd == 'tag_followings/manage')) {
$this->internalRedirect('search');
}
// Compatibility with the Firefox App
if (($this->module == "users") && ($this->cmd == "users/sign_in")) {
$this->module = "login";
}
$privateapps = Core\Config::get('config', 'private_addons', false);
if (is_array($this->addons) && in_array($this->module, $this->addons) && file_exists("addon/{$this->module}/{$this->module}.php")) {
//Check if module is an app and if public access to apps is allowed or not
if ((!local_user()) && Core\Addon::isApp($this->module) && $privateapps) {
info(Core\L10n::t("You must be logged in to use addons. "));
} else {
include_once "addon/{$this->module}/{$this->module}.php";
if (function_exists($this->module . '_module')) {
LegacyModule::setModuleFile("addon/{$this->module}/{$this->module}.php");
$this->module_class = 'Friendica\\LegacyModule';
$this->module_loaded = true;
}
}
}
// Controller class routing
if (! $this->module_loaded && class_exists('Friendica\\Module\\' . ucfirst($this->module))) {
$this->module_class = 'Friendica\\Module\\' . ucfirst($this->module);
$this->module_loaded = true;
}
/* If not, next look for a 'standard' program module in the 'mod' directory
* We emulate a Module class through the LegacyModule class
*/
if (! $this->module_loaded && file_exists("mod/{$this->module}.php")) {
LegacyModule::setModuleFile("mod/{$this->module}.php");
$this->module_class = 'Friendica\\LegacyModule';
$this->module_loaded = true;
}
/* The URL provided does not resolve to a valid module.
*
* On Dreamhost sites, quite often things go wrong for no apparent reason and they send us to '/internal_error.html'.
* We don't like doing this, but as it occasionally accounts for 10-20% or more of all site traffic -
* we are going to trap this and redirect back to the requested page. As long as you don't have a critical error on your page
* this will often succeed and eventually do the right thing.
*
* Otherwise we are going to emit a 404 not found.
*/
if (! $this->module_loaded) {
// Stupid browser tried to pre-fetch our Javascript img template. Don't log the event or return anything - just quietly exit.
if (!empty($_SERVER['QUERY_STRING']) && preg_match('/{[0-9]}/', $_SERVER['QUERY_STRING']) !== 0) {
exit();
}
if (!empty($_SERVER['QUERY_STRING']) && ($_SERVER['QUERY_STRING'] === 'q=internal_error.html') && isset($dreamhost_error_hack)) {
logger('index.php: dreamhost_error_hack invoked. Original URI =' . $_SERVER['REQUEST_URI']);
$this->internalRedirect($_SERVER['REQUEST_URI']);
}
logger('index.php: page not found: ' . $_SERVER['REQUEST_URI'] . ' ADDRESS: ' . $_SERVER['REMOTE_ADDR'] . ' QUERY: ' . $_SERVER['QUERY_STRING'], LOGGER_DEBUG);
header($_SERVER["SERVER_PROTOCOL"] . ' 404 ' . Core\L10n::t('Not Found'));
$tpl = get_markup_template("404.tpl");
$this->page['content'] = replace_macros($tpl, [
'$message' => Core\L10n::t('Page not found.')
]);
}
}
// Load current theme info
$theme_info_file = 'view/theme/' . $this->getCurrentTheme() . '/theme.php';
if (file_exists($theme_info_file)) {
require_once $theme_info_file;
}
// initialise content region
if ($this->getMode()->isNormal()) {
Core\Addon::callHooks('page_content_top', $this->page['content']);
}
// Call module functions
if ($this->module_loaded) {
$this->page['page_title'] = $this->module;
$placeholder = '';
Core\Addon::callHooks($this->module . '_mod_init', $placeholder);
call_user_func([$this->module_class, 'init']);
// "rawContent" is especially meant for technical endpoints.
// This endpoint doesn't need any theme initialization or other comparable stuff.
if (!$this->error) {
call_user_func([$this->module_class, 'rawContent']);
}
if (function_exists(str_replace('-', '_', $this->getCurrentTheme()) . '_init')) {
$func = str_replace('-', '_', $this->getCurrentTheme()) . '_init';
$func($this);
}
if (! $this->error && $_SERVER['REQUEST_METHOD'] === 'POST') {
Core\Addon::callHooks($this->module . '_mod_post', $_POST);
call_user_func([$this->module_class, 'post']);
}
if (! $this->error) {
Core\Addon::callHooks($this->module . '_mod_afterpost', $placeholder);
call_user_func([$this->module_class, 'afterpost']);
}
if (! $this->error) {
$arr = ['content' => $this->page['content']];
Core\Addon::callHooks($this->module . '_mod_content', $arr);
$this->page['content'] = $arr['content'];
$arr = ['content' => call_user_func([$this->module_class, 'content'])];
Core\Addon::callHooks($this->module . '_mod_aftercontent', $arr);
$this->page['content'] .= $arr['content'];
}
if (function_exists(str_replace('-', '_', $this->getCurrentTheme()) . '_content_loaded')) {
$func = str_replace('-', '_', $this->getCurrentTheme()) . '_content_loaded';
$func($this);
}
}
/* Create the page head after setting the language
* and getting any auth credentials.
*
* Moved initHead() and initFooter() to after
* all the module functions have executed so that all
* theme choices made by the modules can take effect.
*/
$this->initHead();
/* Build the page ending -- this is stuff that goes right before
* the closing </body> tag
*/
$this->initFooter();
/* now that we've been through the module content, see if the page reported
* a permission problem and if so, a 403 response would seem to be in order.
*/
if (stristr(implode("", $_SESSION['sysmsg']), Core\L10n::t('Permission denied'))) {
header($_SERVER["SERVER_PROTOCOL"] . ' 403 ' . Core\L10n::t('Permission denied.'));
}
// Report anything which needs to be communicated in the notification area (before the main body)
Core\Addon::callHooks('page_end', $this->page['content']);
// Add the navigation (menu) template
if ($this->module != 'install' && $this->module != 'maintenance') {
$this->page['htmlhead'] .= replace_macros(get_markup_template('nav_head.tpl'), []);
$this->page['nav'] = Content\Nav::build($this);
}
// Build the page - now that we have all the components
if (isset($_GET["mode"]) && (($_GET["mode"] == "raw") || ($_GET["mode"] == "minimal"))) {
$doc = new DOMDocument();
$target = new DOMDocument();
$target->loadXML("<root></root>");
$content = mb_convert_encoding($this->page["content"], 'HTML-ENTITIES', "UTF-8");
/// @TODO one day, kill those error-surpressing @ stuff, or PHP should ban it
@$doc->loadHTML($content);
$xpath = new DOMXPath($doc);
$list = $xpath->query("//*[contains(@id,'tread-wrapper-')]"); /* */
foreach ($list as $item) {
$item = $target->importNode($item, true);
// And then append it to the target
$target->documentElement->appendChild($item);
}
}
if (isset($_GET["mode"]) && ($_GET["mode"] == "raw")) {
header("Content-type: text/html; charset=utf-8");
echo substr($target->saveHTML(), 6, -8);
exit();
}
$page = $this->page;
$profile = $this->profile;
header("X-Friendica-Version: " . FRIENDICA_VERSION);
header("Content-type: text/html; charset=utf-8");
if (Core\Config::get('system', 'hsts') && (Core\Config::get('system', 'ssl_policy') == SSL_POLICY_FULL)) {
header("Strict-Transport-Security: max-age=31536000");
}
// Some security stuff
header('X-Content-Type-Options: nosniff');
header('X-XSS-Protection: 1; mode=block');
header('X-Permitted-Cross-Domain-Policies: none');
header('X-Frame-Options: sameorigin');
// Things like embedded OSM maps don't work, when this is enabled
// header("Content-Security-Policy: default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; connect-src 'self'; style-src 'self' 'unsafe-inline'; font-src 'self'; img-src 'self' https: data:; media-src 'self' https:; child-src 'self' https:; object-src 'none'");
/* We use $_GET["mode"] for special page templates. So we will check if we have
* to load another page template than the default one.
* The page templates are located in /view/php/ or in the theme directory.
*/
if (isset($_GET["mode"])) {
$template = Core\Theme::getPathForFile($_GET["mode"] . '.php');
}
// If there is no page template use the default page template
if (empty($template)) {
$template = Core\Theme::getPathForFile("default.php");
}
// Theme templates expect $a as an App instance
$a = $this;
/// @TODO Looks unsafe (remote-inclusion), is maybe not but Core\Theme::getPathForFile() uses file_exists() but does not escape anything
require_once $template;
}
/**
* Redirects to another module relative to the current Friendica base.
* If you want to redirect to a external URL, use System::externalRedirectTo()
*
* @param string $toUrl The destination URL (Default is empty, which is the default page of the Friendica node)
* @param bool $ssl if true, base URL will try to get called with https:// (works just for relative paths)
*
* @throws InternalServerErrorException In Case the given URL is not relative to the Friendica node
*/
public function internalRedirect($toUrl = '', $ssl = false)
{
if (filter_var($toUrl, FILTER_VALIDATE_URL)) {
throw new InternalServerErrorException('URL is not a relative path, please use System::externalRedirectTo');
}
$redirectTo = $this->getBaseURL($ssl) . '/' . ltrim($toUrl, '/');
System::externalRedirect($redirectTo);
}
}

5
src/BaseModule.php
View file

@ -60,7 +60,8 @@ abstract class BaseModule extends BaseObject
*/
public static function post()
{
// goaway('module');
// $a = self::getApp();
// $a->internalRedirect('module');
}
/**
@ -138,7 +139,7 @@ abstract class BaseModule extends BaseObject
logger('checkFormSecurityToken failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
logger('checkFormSecurityToken failed: _REQUEST data: ' . print_r($_REQUEST, true), LOGGER_DATA);
notice(self::getFormSecurityStandardErrorMessage());
goaway(System::baseUrl() . $err_redirect);
$a->internalRedirect($err_redirect);
}
}

129
src/Content/Nav.php
View file

@ -15,50 +15,102 @@ use Friendica\Model\Contact;
use Friendica\Model\Profile;
require_once 'boot.php';
require_once 'dba.php';
require_once 'include/text.php';
class Nav
{
private static $selected = [
'global' => null,
'community' => null,
'network' => null,
'home' => null,
'profiles' => null,
'introductions' => null,
'notifications' => null,
'messages' => null,
'directory' => null,
'settings' => null,
'contacts' => null,
'manage' => null,
'events' => null,
'register' => null
];
/**
* An array of HTML links provided by addons providing a module via the app_menu hook
*
* @var array
*/
private static $app_menu = null;
/**
* Set a menu item in navbar as selected
*/
public static function setSelected($item)
{
self::$selected[$item] = 'selected';
}
/**
* Build page header and site navigation bars
*/
public static function build(App $a)
{
if (!(x($a->page, 'nav'))) {
$a->page['nav'] = '';
}
$a->page['htmlhead'] .= replace_macros(get_markup_template('nav_head.tpl'), []);
/*
* Placeholder div for popup panel
*/
$a->page['nav'] .= '<div id="panel" style="display: none;"></div>' ;
// Placeholder div for popup panel
$nav = '<div id="panel" style="display: none;"></div>' ;
$nav_info = self::getInfo($a);
/*
* Build the page
*/
$tpl = get_markup_template('nav.tpl');
$a->page['nav'] .= replace_macros($tpl, [
'$baseurl' => System::baseUrl(),
$nav .= replace_macros($tpl, [
'$baseurl' => System::baseUrl(),
'$sitelocation' => $nav_info['sitelocation'],
'$nav' => $nav_info['nav'],
'$banner' => $nav_info['banner'],
'$nav' => $nav_info['nav'],
'$banner' => $nav_info['banner'],
'$emptynotifications' => L10n::t('Nothing new here'),
'$userinfo' => $nav_info['userinfo'],
'$sel' => $a->nav_sel,
'$apps' => $a->apps,
'$userinfo' => $nav_info['userinfo'],
'$sel' => self::$selected,
'$apps' => self::getAppMenu(),
'$clear_notifs' => L10n::t('Clear notifications'),
'$search_hint' => L10n::t('@name, !forum, #tags, content')
'$search_hint' => L10n::t('@name, !forum, #tags, content')
]);
Addon::callHooks('page_header', $a->page['nav']);
Addon::callHooks('page_header', $nav);
return $nav;
}
/**
* Returns the addon app menu
*
* @return array
*/
public static function getAppMenu()
{
if (is_null(self::$app_menu)) {
self::populateAppMenu();
}
return self::$app_menu;
}
/**
* Fills the apps static variable with apps that require a menu
*/
private static function populateAppMenu()
{
self::$app_menu = [];
//Don't populate apps_menu if apps are private
$privateapps = Config::get('config', 'private_addons', false);
if (local_user() || !$privateapps) {
$arr = ['app_menu' => self::$app_menu];
Addon::callHooks('app_menu', $arr);
self::$app_menu = $arr['app_menu'];
}
}
/**
@ -134,7 +186,7 @@ class Nav
$nav['help'] = [$help_url, L10n::t('Help'), '', L10n::t('Help and documentation')];
}
if (count($a->apps) > 0) {
if (count(self::getAppMenu()) > 0) {
$nav['apps'] = ['apps', L10n::t('Apps'), '', L10n::t('Addon applications, utilities, games')];
}
@ -235,29 +287,4 @@ class Nav
'userinfo' => $userinfo,
];
}
/**
* Set a menu item in navbar as selected
*/
public static function setSelected($item)
{
$a = get_app();
$a->nav_sel = [
'global' => null,
'community' => null,
'network' => null,
'home' => null,
'profiles' => null,
'introductions' => null,
'notifications' => null,
'messages' => null,
'directory' => null,
'settings' => null,
'contacts' => null,
'manage' => null,
'events' => null,
'register' => null
];
$a->nav_sel[$item] = 'selected';
}
}

307
src/Core/Addon.php
View file

@ -8,15 +8,20 @@ use Friendica\App;
use Friendica\BaseObject;
use Friendica\Database\DBA;
require_once 'include/dba.php';
/**
* Some functions to handle addons
*/
class Addon extends BaseObject
{
/**
* @brief Synchronise addons:
* List of the names of enabled addons
*
* @var array
*/
private static $addons = [];
/**
* @brief Synchronize addons:
*
* system.addon contains a comma-separated list of names
* of addons which are used on this system.
@ -27,15 +32,13 @@ class Addon extends BaseObject
* call the install procedure and add it to the database.
*
*/
public static function check()
public static function loadAddons()
{
$a = self::getApp();
$installed_addons = [];
$r = DBA::select('addon', [], ['installed' => 1]);
if (DBA::isResult($r)) {
$installed = DBA::toArray($r);
} else {
$installed = [];
$installed_addons = DBA::toArray($r);
}
$addons = Config::get('system', 'addon');
@ -45,31 +48,23 @@ class Addon extends BaseObject
$addons_arr = explode(',', str_replace(' ', '', $addons));
}
$a->addons = $addons_arr;
self::$addons = $addons_arr;
$installed_arr = [];
if (count($installed)) {
foreach ($installed as $i) {
if (!in_array($i['name'], $addons_arr)) {
self::uninstall($i['name']);
} else {
$installed_arr[] = $i['name'];
}
foreach ($installed_addons as $addon) {
if (!self::isEnabled($addon['name'])) {
self::uninstall($addon['name']);
} else {
$installed_arr[] = $addon['name'];
}
}
if (count($addons_arr)) {
foreach ($addons_arr as $p) {
if (!in_array($p, $installed_arr)) {
self::install($p);
}
foreach (self::$addons as $p) {
if (!in_array($p, $installed_arr)) {
self::install($p);
}
}
self::loadHooks();
return;
}
/**
@ -88,6 +83,8 @@ class Addon extends BaseObject
$func = $addon . '_uninstall';
$func();
}
unset(self::$addons[$idx]);
}
/**
@ -110,10 +107,10 @@ class Addon extends BaseObject
$func = $addon . '_install';
$func();
$addon_admin = (function_exists($addon."_addon_admin") ? 1 : 0);
$addon_admin = (function_exists($addon . "_addon_admin") ? 1 : 0);
DBA::insert('addon', ['name' => $addon, 'installed' => true,
'timestamp' => $t, 'plugin_admin' => $addon_admin]);
'timestamp' => $t, 'plugin_admin' => $addon_admin]);
// we can add the following with the previous SQL
// once most site tables have been updated.
@ -122,6 +119,10 @@ class Addon extends BaseObject
if (file_exists('addon/' . $addon . '/.hidden')) {
DBA::update('addon', ['hidden' => true], ['name' => $addon]);
}
if (!self::isEnabled($addon)) {
self::$addons[] = $addon;
}
return true;
} else {
logger("Addons: FAILED installing " . $addon);
@ -174,165 +175,6 @@ class Addon extends BaseObject
}
}
/**
* @brief check if addon is enabled
*
* @param string $addon
* @return boolean
*/
public static function isEnabled($addon)
{
return DBA::exists('addon', ['installed' => true, 'name' => $addon]);
}
/**
* @brief registers a hook.
*
* @param string $hook the name of the hook
* @param string $file the name of the file that hooks into
* @param string $function the name of the function that the hook will call
* @param int $priority A priority (defaults to 0)
* @return mixed|bool
*/
public static function registerHook($hook, $file, $function, $priority = 0)
{
$file = str_replace(self::getApp()->getBasePath() . DIRECTORY_SEPARATOR, '', $file);
$condition = ['hook' => $hook, 'file' => $file, 'function' => $function];
$exists = DBA::exists('hook', $condition);
if ($exists) {
return true;
}
$r = DBA::insert('hook', ['hook' => $hook, 'file' => $file, 'function' => $function, 'priority' => $priority]);
return $r;
}
/**
* @brief unregisters a hook.
*
* @param string $hook the name of the hook
* @param string $file the name of the file that hooks into
* @param string $function the name of the function that the hook called
* @return array
*/
public static function unregisterHook($hook, $file, $function)
{
$relative_file = str_replace(self::getApp()->getBasePath() . DIRECTORY_SEPARATOR, '', $file);
// This here is only needed for fixing a problem that existed on the develop branch
$condition = ['hook' => $hook, 'file' => $file, 'function' => $function];
DBA::delete('hook', $condition);
$condition = ['hook' => $hook, 'file' => $relative_file, 'function' => $function];
$r = DBA::delete('hook', $condition);
return $r;
}
/**
* Load hooks
*/
public static function loadHooks()
{
$a = self::getApp();
$a->hooks = [];
$r = DBA::select('hook', ['hook', 'file', 'function'], [], ['order' => ['priority' => 'desc', 'file']]);
while ($rr = DBA::fetch($r)) {
if (! array_key_exists($rr['hook'], $a->hooks)) {
$a->hooks[$rr['hook']] = [];
}
$a->hooks[$rr['hook']][] = [$rr['file'],$rr['function']];
}
DBA::close($r);
}
/**
* @brief Forks a hook.
*
* Use this function when you want to fork a hook via the worker.
*
* @param string $name of the hook to call
* @param string|array $data to transmit to the callback handler
*/
public static function forkHooks($priority, $name, $data = null)
{
$a = self::getApp();
if (is_array($a->hooks) && array_key_exists($name, $a->hooks)) {
foreach ($a->hooks[$name] as $hook) {
Worker::add($priority, 'ForkHook', $name, $hook, $data);
}
}
}
/**
* @brief Calls a hook.
*
* Use this function when you want to be able to allow a hook to manipulate
* the provided data.
*
* @param string $name of the hook to call
* @param string|array &$data to transmit to the callback handler
*/
public static function callHooks($name, &$data = null)
{
$a = self::getApp();
if (is_array($a->hooks) && array_key_exists($name, $a->hooks)) {
foreach ($a->hooks[$name] as $hook) {
self::callSingleHook($a, $name, $hook, $data);
}
}
}
/**
* @brief Calls a single hook.
*
* @param App $a
* @param string $name of the hook to call
* @param array $hook Hook data
* @param string|array &$data to transmit to the callback handler
*/
public static function callSingleHook(App $a, $name, $hook, &$data = null)
{
// Don't run a theme's hook if the user isn't using the theme
if (strpos($hook[0], 'view/theme/') !== false && strpos($hook[0], 'view/theme/' . $a->getCurrentTheme()) === false) {
return;
}
@include_once($hook[0]);
if (function_exists($hook[1])) {
$func = $hook[1];
$func($a, $data);
} else {
// remove orphan hooks
$condition = ['hook' => $name, 'file' => $hook[0], 'function' => $hook[1]];
DBA::delete('hook', $condition, ['cascade' => false]);
}
}
/**
* check if an app_menu hook exist for addon $name.
* Return true if the addon is an app
*/
public static function isApp($name)
{
$a = self::getApp();
if (is_array($a->hooks) && (array_key_exists('app_menu', $a->hooks))) {
foreach ($a->hooks['app_menu'] as $hook) {
if ($hook[0] == 'addon/'.$name.'/'.$name.'.php') {
return true;
}
}
}
return false;
}
/**
* @brief Parse addon comment in search of addon infos.
*
@ -401,4 +243,97 @@ class Addon extends BaseObject
}
return $info;
}
/**
* Checks if the provided addon is enabled
*
* @param string $addon
* @return boolean
*/
public static function isEnabled($addon)
{
return in_array($addon, self::$addons);
}
/**
* Returns a list of the enabled addon names
*
* @return array
*/
public static function getEnabledList()
{
return self::$addons;
}
/**
* Saves the current enabled addon list in the system.addon config key
*
* @return boolean
*/
public static function saveEnabledList()
{
return Config::set("system", "addon", implode(", ", self::$addons));
}
/**
* Returns the list of non-hidden enabled addon names
*
* @return array
*/
public static function getVisibleList()
{
$visible_addons = [];
$stmt = DBA::select('addon', ['name'], ['hidden' => false, 'installed' => true]);
if (DBA::isResult($stmt)) {
foreach (DBA::toArray($stmt) as $addon) {
$visible_addons[] = $addon['name'];
}
}
return $visible_addons;
}
/**
* Shim of Hook::register left for backward compatibility purpose.
*
* @see Hook::register
* @deprecated since version 2018.12
* @param string $hook the name of the hook
* @param string $file the name of the file that hooks into
* @param string $function the name of the function that the hook will call
* @param int $priority A priority (defaults to 0)
* @return mixed|bool
*/
public static function registerHook($hook, $file, $function, $priority = 0)
{
return Hook::register($hook, $file, $function, $priority);
}
/**
* Shim of Hook::unregister left for backward compatibility purpose.
*
* @see Hook::unregister
* @deprecated since version 2018.12
* @param string $hook the name of the hook
* @param string $file the name of the file that hooks into
* @param string $function the name of the function that the hook called
* @return boolean
*/
public static function unregisterHook($hook, $file, $function)
{
return Hook::unregister($hook, $file, $function);
}
/**
* Shim of Hook::callAll left for backward-compatibility purpose.
*
* @see Hook::callAll
* @deprecated since version 2018.12
* @param string $name of the hook to call
* @param string|array &$data to transmit to the callback handler
*/
public static function callHooks($name, &$data = null)
{
Hook::callAll($name, $data);
}
}

16
src/Core/Authentication.php
View file

@ -5,17 +5,17 @@
namespace Friendica\Core;
use Friendica\Core\Addon;
use Friendica\BaseObject;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Util\DateTimeFormat;
use Friendica\Database\DBA;
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
use Friendica\Database\DBA;
use Friendica\Util\DateTimeFormat;
/**
* Handle Authentification, Session and Cookies
*/
*/
class Authentication extends BaseObject
{
/**
@ -81,8 +81,8 @@ class Authentication extends BaseObject
$a->user = $user_record;
if ($interactive) {
if ($a->user['login_date'] <= NULL_DATE) {
$_SESSION['return_url'] = 'profile_photo/new';
if ($a->user['login_date'] <= DBA::NULL_DATETIME) {
$_SESSION['return_path'] = 'profile_photo/new';
$a->module = 'profile_photo';
info(L10n::t("Welcome ") . $a->user['username'] . EOL);
info(L10n::t('Please upload a profile photo.') . EOL);
@ -193,8 +193,8 @@ class Authentication extends BaseObject
if ($login_initial) {
Addon::callHooks('logged_in', $a->user);
if (($a->module !== 'home') && isset($_SESSION['return_url'])) {
goaway($a->getbaseUrl() . '/' . $_SESSION['return_url']);
if (($a->module !== 'home') && isset($_SESSION['return_path'])) {
$a->internalRedirect($_SESSION['return_path']);
}
}
}

5
src/Core/Console/Maintenance.php
View file

@ -68,11 +68,6 @@ HELP;
throw new \RuntimeException('Database isn\'t ready or populated yet');
}
Core\Config::load();
$lang = Core\L10n::getBrowserLanguage();
Core\L10n::loadTranslationTable($lang);
$enabled = intval($this->getArgument(0));
Core\Config::set('system', 'maintenance', $enabled);

191
src/Core/Hook.php Normal file
View file

@ -0,0 +1,191 @@
<?php
/**
* @file src/Core/Hook.php
*/
namespace Friendica\Core;
use Friendica\App;
use Friendica\BaseObject;
use Friendica\Database\DBA;
/**
* Some functions to handle hooks
*/
class Hook extends BaseObject
{
/**
* Array of registered hooks
*
* Format:
* [
* ["<hook name>"] => [
* 0 => "<hook file>",
* 1 => "<hook function name>"
* ],
* ...
* ]
*
* @var array
*/
private static $hooks = [];
/**
* Load hooks
*/
public static function loadHooks()
{
self::$hooks = [];
$stmt = DBA::select('hook', ['hook', 'file', 'function'], [], ['order' => ['priority' => 'desc', 'file']]);
while ($hook = DBA::fetch($stmt)) {
if (!array_key_exists($hook['hook'], self::$hooks)) {
self::$hooks[$hook['hook']] = [];
}
self::$hooks[$hook['hook']][] = [$hook['file'], $hook['function']];
}
DBA::close($stmt);
}
/**
* Registers a hook.
*
* @param string $hook the name of the hook
* @param string $file the name of the file that hooks into
* @param string $function the name of the function that the hook will call
* @param int $priority A priority (defaults to 0)
* @return mixed|bool
*/
public static function register($hook, $file, $function, $priority = 0)
{
$file = str_replace(self::getApp()->getBasePath() . DIRECTORY_SEPARATOR, '', $file);
$condition = ['hook' => $hook, 'file' => $file, 'function' => $function];
if (DBA::exists('hook', $condition)) {
return true;
}
$result = DBA::insert('hook', ['hook' => $hook, 'file' => $file, 'function' => $function, 'priority' => $priority]);
return $result;
}
/**
* Unregisters a hook.
*
* @param string $hook the name of the hook
* @param string $file the name of the file that hooks into
* @param string $function the name of the function that the hook called
* @return boolean
*/
public static function unregister($hook, $file, $function)
{
$relative_file = str_replace(self::getApp()->getBasePath() . DIRECTORY_SEPARATOR, '', $file);
// This here is only needed for fixing a problem that existed on the develop branch
$condition = ['hook' => $hook, 'file' => $file, 'function' => $function];
DBA::delete('hook', $condition);
$condition = ['hook' => $hook, 'file' => $relative_file, 'function' => $function];
$result = DBA::delete('hook', $condition);
return $result;
}
/**
* Returns the list of callbacks for a single hook
*
* @param string $name Name of the hook
* @return array
*/
public static function getByName($name)
{
$return = [];
if (isset(self::$hooks[$name])) {
$return = self::$hooks[$name];
}
return $return;
}
/**
* @brief Forks a hook.
*
* Use this function when you want to fork a hook via the worker.
*
* @param integer $priority of the hook
* @param string $name of the hook to call
* @param mixed $data to transmit to the callback handler
*/
public static function fork($priority, $name, $data = null)
{
if (array_key_exists($name, self::$hooks)) {
foreach (self::$hooks[$name] as $hook) {
Worker::add($priority, 'ForkHook', $name, $hook, $data);
}
}
}
/**
* @brief Calls a hook.
*
* Use this function when you want to be able to allow a hook to manipulate
* the provided data.
*
* @param string $name of the hook to call
* @param string|array &$data to transmit to the callback handler
*/
public static function callAll($name, &$data = null)
{
if (array_key_exists($name, self::$hooks)) {
foreach (self::$hooks[$name] as $hook) {
self::callSingle(self::getApp(), $name, $hook, $data);
}
}
}
/**
* @brief Calls a single hook.
*
* @param App $a
* @param string $name of the hook to call
* @param array $hook Hook data
* @param string|array &$data to transmit to the callback handler
*/
public static function callSingle(App $a, $name, $hook, &$data = null)
{
// Don't run a theme's hook if the user isn't using the theme
if (strpos($hook[0], 'view/theme/') !== false && strpos($hook[0], 'view/theme/' . $a->getCurrentTheme()) === false) {
return;
}
@include_once($hook[0]);
if (function_exists($hook[1])) {
$func = $hook[1];
$func($a, $data);
} else {
// remove orphan hooks
$condition = ['hook' => $name, 'file' => $hook[0], 'function' => $hook[1]];
DBA::delete('hook', $condition, ['cascade' => false]);
}
}
/**
* Checks if an app_menu hook exist for the provided addon name.
* Return true if the addon is an app
*
* @param string $name Name of the addon
* @return boolean
*/
public static function isAddonApp($name)
{
if (array_key_exists('app_menu', self::$hooks)) {
foreach (self::$hooks['app_menu'] as $hook) {
if ($hook[0] == 'addon/' . $name . '/' . $name . '.php') {
return true;
}
}
}
return false;
}
}

171
src/Core/L10n.php
View file

@ -12,19 +12,90 @@ require_once 'boot.php';
require_once 'include/dba.php';
/**
* Provide Languange, Translation, and Localisation functions to the application
* Localisation can be referred to by the numeronym L10N (as in: "L", followed by ten more letters, and then "N").
* Provide Language, Translation, and Localization functions to the application
* Localization can be referred to by the numeronym L10N (as in: "L", followed by ten more letters, and then "N").
*/
class L10n extends BaseObject
{
/**
* @brief get the prefered language from the HTTP_ACCEPT_LANGUAGE header
* A string indicating the current language used for translation:
* - Two-letter ISO 639-1 code.
* - Two-letter ISO 639-1 code + dash + Two-letter ISO 3166-1 alpha-2 country code.
* @var string
*/
public static function getBrowserLanguage()
private static $lang = '';
/**
* A language code saved for later after pushLang() has been called.
*
* @var string
*/
private static $langSave = '';
/**
* An array of translation strings whose key is the neutral english message.
*
* @var array
*/
private static $strings = [];
/**
* An array of translation strings saved for later after pushLang() has been called.
*
* @var array
*/
private static $stringsSave = [];
/**
* Detects the language and sets the translation table
*/
public static function init()
{
$lang = self::detectLanguage();
self::loadTranslationTable($lang);
}
/**
* Returns the current language code
*
* @return string Language code
*/
public static function getCurrentLang()
{
return self::$lang;
}
/**
* Sets the language session variable
*/
public static function setSessionVariable()
{
if (!empty($_SESSION['authenticated']) && empty($_SESSION['language'])) {
$_SESSION['language'] = self::$lang;
// we haven't loaded user data yet, but we need user language
if (!empty($_SESSION['uid'])) {
$user = DBA::selectFirst('user', ['language'], ['uid' => $_SESSION['uid']]);
if (DBA::isResult($user)) {
$_SESSION['language'] = $user['language'];
}
}
}
}
public static function setLangFromSession()
{
if (!empty($_SESSION['language']) && $_SESSION['language'] !== self::$lang) {
self::loadTranslationTable($_SESSION['language']);
}
}
/**
* @brief Returns the preferred language from the HTTP_ACCEPT_LANGUAGE header
* @return string The two-letter language code
*/
public static function detectLanguage()
{
$lang_list = [];
if (x($_SERVER, 'HTTP_ACCEPT_LANGUAGE')) {
if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
// break up string into pieces (languages and q factors)
preg_match_all('/([a-z]{1,8}(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $lang_parse);
@ -59,58 +130,69 @@ class L10n extends BaseObject
}
/**
* @param string $language language
* This function should be called before formatting messages in a specific target language
* different from the current user/system language.
*
* It saves the current translation strings in a separate variable and loads new translations strings.
*
* If called repeatedly, it won't save the translation strings again, just load the new ones.
*
* @see popLang()
* @brief Stores the current language strings and load a different language.
* @param string $lang Language code
*/
public static function pushLang($language)
public static function pushLang($lang)
{
$a = self::getApp();
if (!self::$lang) {
self::init();
}
$a->langsave = Config::get('system', 'language');
if ($language === $a->langsave) {
if ($lang === self::$lang) {
return;
}
if (isset($a->strings) && count($a->strings)) {
$a->stringsave = $a->strings;
if (!self::$langSave) {
self::$langSave = self::$lang;
self::$stringsSave = self::$strings;
}
$a->strings = [];
self::loadTranslationTable($language);
Config::set('system', 'language', $language);
self::loadTranslationTable($lang);
}
/**
* Pop language off the top of the stack
* Restores the original user/system language after having used pushLang()
*/
public static function popLang()
{
$a = self::getApp();
if (Config::get('system', 'language') === $a->langsave) {
if (!self::$langSave) {
return;
}
if (isset($a->stringsave)) {
$a->strings = $a->stringsave;
} else {
$a->strings = [];
}
self::$strings = self::$stringsSave;
self::$lang = self::$langSave;
Config::set('system', 'language', $a->langsave);
self::$stringsSave = [];
self::$langSave = '';
}
/**
* load string translation table for alternate language
* Loads string translation table
*
* first addon strings are loaded, then globals
* First addon strings are loaded, then globals
*
* Uses an App object shim since all the strings files refer to $a->strings
*
* @param string $lang language code to load
*/
public static function loadTranslationTable($lang)
private static function loadTranslationTable($lang)
{
$a = self::getApp();
if ($lang === self::$lang) {
return;
}
$a = new \stdClass();
$a->strings = [];
// load enabled addons strings
$addons = DBA::select('addon', ['name'], ['installed' => true]);
while ($p = DBA::fetch($addons)) {
@ -123,6 +205,11 @@ class L10n extends BaseObject
if (file_exists("view/lang/$lang/strings.php")) {
include "view/lang/$lang/strings.php";
}
self::$lang = $lang;
self::$strings = $a->strings;
unset($a);
}
/**
@ -143,14 +230,16 @@ class L10n extends BaseObject
*/
public static function t($s, ...$vars)
{
$a = self::getApp();
if (empty($s)) {
return '';
}
if (x($a->strings, $s)) {
$t = $a->strings[$s];
if (!self::$lang) {
self::init();
}
if (!empty(self::$strings[$s])) {
$t = self::$strings[$s];
$s = is_array($t) ? $t[0] : $t;
}
@ -181,18 +270,18 @@ class L10n extends BaseObject
*/
public static function tt($singular, $plural, $count)
{
$a = self::getApp();
if (!is_numeric($count)) {
logger('Non numeric count called by ' . System::callstack(20));
}
$lang = Config::get('system', 'language');
if (!self::$lang) {
self::init();
}
if (!empty($a->strings[$singular])) {
$t = $a->strings[$singular];
if (!empty(self::$strings[$singular])) {
$t = self::$strings[$singular];
if (is_array($t)) {
$plural_function = 'string_plural_select_' . str_replace('-', '_', $lang);
$plural_function = 'string_plural_select_' . str_replace('-', '_', self::$lang);
if (function_exists($plural_function)) {
$i = $plural_function($count);
} else {
@ -227,8 +316,6 @@ class L10n extends BaseObject
return $n != 1;
}
/**
* @brief Return installed languages codes as associative array
*

21
src/Core/System.php
View file

@ -5,6 +5,7 @@
namespace Friendica\Core;
use Friendica\BaseObject;
use Friendica\Network\HTTPException\InternalServerErrorException;
use Friendica\Util\XML;
/**
@ -142,7 +143,7 @@ class System extends BaseObject
'$description' => defaults($description, 'description', '')]);
}
killme();
exit();
}
/**
@ -236,10 +237,26 @@ class System extends BaseObject
return max($load_arr[0], $load_arr[1]);
}
/**
* Redirects to an external URL (fully qualified URL)
* If you want to route relative to the current Friendica base, use App->internalRedirect()
*
* @param string $url The new Location to redirect
* @throws InternalServerErrorException If the URL is not fully qualified
*/
public static function externalRedirect($url)
{
if (!filter_var($url, FILTER_VALIDATE_URL)) {
throw new InternalServerErrorException('URL is not a fully qualified URL, please use App->internalRedirect() instead');
}
header("Location: $url");
exit();
}
/// @todo Move the following functions from boot.php
/*
function killme()
function goaway($s)
function local_user()
function public_contact()
function remote_user()

4
src/Core/UserImport.php
View file

@ -180,7 +180,7 @@ class UserImport
}
if ($contact['uid'] == $olduid && $contact['self'] == '0') {
// set contacts 'avatar-date' to NULL_DATE to let worker to update urls
$contact["avatar-date"] = NULL_DATE;
$contact["avatar-date"] = DBA::NULL_DATETIME;
switch ($contact['network']) {
case Protocol::DFRN:
@ -272,6 +272,6 @@ class UserImport
Worker::add(PRIORITY_HIGH, 'Notifier', 'relocate', $newuid);
info(L10n::t("Done. You can now login with your username and password"));
goaway(System::baseUrl() . "/login");
$a->internalRedirect('login');
}
}

24
src/Core/Worker.php
View file

@ -4,11 +4,11 @@
*/
namespace Friendica\Core;
use Friendica\BaseObject;
use Friendica\Database\DBA;
use Friendica\Model\Process;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
use Friendica\BaseObject;
require_once 'include/dba.php';
@ -154,7 +154,7 @@ class Worker
private static function totalEntries()
{
return DBA::count('workerqueue', ["`executed` <= ? AND NOT `done` AND `next_try` < ?",
NULL_DATE, DateTimeFormat::utcNow()]);
DBA::NULL_DATETIME, DateTimeFormat::utcNow()]);
}
/**
@ -164,7 +164,7 @@ class Worker
*/
private static function highestPriority()
{
$condition = ["`executed` <= ? AND NOT `done` AND `next_try` < ?", NULL_DATE, DateTimeFormat::utcNow()];
$condition = ["`executed` <= ? AND NOT `done` AND `next_try` < ?", DBA::NULL_DATETIME, DateTimeFormat::utcNow()];
$workerqueue = DBA::selectFirst('workerqueue', ['priority'], $condition, ['order' => ['priority']]);
if (DBA::isResult($workerqueue)) {
return $workerqueue["priority"];
@ -183,7 +183,7 @@ class Worker
private static function processWithPriorityActive($priority)
{
$condition = ["`priority` <= ? AND `executed` > ? AND NOT `done` AND `next_try` < ?",
$priority, NULL_DATE, DateTimeFormat::utcNow()];
$priority, DBA::NULL_DATETIME, DateTimeFormat::utcNow()];
return DBA::exists('workerqueue', $condition);
}
@ -553,7 +553,7 @@ class Worker
$entries = DBA::select(
'workerqueue',
['id', 'pid', 'executed', 'priority', 'parameter'],
['`executed` > ? AND NOT `done` AND `pid` != 0', NULL_DATE],
['`executed` > ? AND NOT `done` AND `pid` != 0', DBA::NULL_DATETIME],
['order' => ['priority', 'created']]
);
@ -561,7 +561,7 @@ class Worker
if (!posix_kill($entry["pid"], 0)) {
DBA::update(
'workerqueue',
['executed' => NULL_DATE, 'pid' => 0],
['executed' => DBA::NULL_DATETIME, 'pid' => 0],
['id' => $entry["id"]]
);
} else {
@ -597,7 +597,7 @@ class Worker
}
DBA::update(
'workerqueue',
['executed' => NULL_DATE, 'created' => DateTimeFormat::utcNow(), 'priority' => $new_priority, 'pid' => 0],
['executed' => DBA::NULL_DATETIME, 'created' => DateTimeFormat::utcNow(), 'priority' => $new_priority, 'pid' => 0],
['id' => $entry["id"]]
);
} else {
@ -809,7 +809,7 @@ class Worker
'workerqueue',
['id'],
["`executed` <= ? AND `priority` < ? AND NOT `done` AND `next_try` < ?",
NULL_DATE, $highest_priority, DateTimeFormat::utcNow()],
DBA::NULL_DATETIME, $highest_priority, DateTimeFormat::utcNow()],
['limit' => $limit, 'order' => ['priority', 'created']]
);
@ -826,7 +826,7 @@ class Worker
'workerqueue',
['id'],
["`executed` <= ? AND `priority` > ? AND NOT `done` AND `next_try` < ?",
NULL_DATE, $highest_priority, DateTimeFormat::utcNow()],
DBA::NULL_DATETIME, $highest_priority, DateTimeFormat::utcNow()],
['limit' => $limit, 'order' => ['priority', 'created']]
);
@ -846,7 +846,7 @@ class Worker
'workerqueue',
['id'],
["`executed` <= ? AND NOT `done` AND `next_try` < ?",
NULL_DATE, DateTimeFormat::utcNow()],
DBA::NULL_DATETIME, DateTimeFormat::utcNow()],
['limit' => $limit, 'order' => ['priority', 'created']]
);
@ -912,7 +912,7 @@ class Worker
{
$mypid = getmypid();
DBA::update('workerqueue', ['executed' => NULL_DATE, 'pid' => 0], ['pid' => $mypid, 'done' => false]);
DBA::update('workerqueue', ['executed' => DBA::NULL_DATETIME, 'pid' => 0], ['pid' => $mypid, 'done' => false]);
}
/**
@ -1147,7 +1147,7 @@ class Worker
logger('Defer execution ' . $retrial . ' of id ' . $id . ' to ' . $next, LOGGER_DEBUG);
$fields = ['retrial' => $retrial + 1, 'next_try' => $next, 'executed' => NULL_DATE, 'pid' => 0];
$fields = ['retrial' => $retrial + 1, 'next_try' => $next, 'executed' => DBA::NULL_DATETIME, 'pid' => 0];
DBA::update('workerqueue', $fields, ['id' => $id]);
}

9
src/Database/DBA.php
View file

@ -24,6 +24,15 @@ require_once 'include/dba.php';
*/
class DBA
{
/**
* Lowest possible date value
*/
const NULL_DATE = '0001-01-01';
/**
* Lowest possible datetime value
*/
const NULL_DATETIME = '0001-01-01 00:00:00';
public static $connected = false;
private static $server_info = '';

64
src/Database/DBStructure.php
View file

@ -5,8 +5,8 @@
namespace Friendica\Database;
use Exception;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\Hook;
use Friendica\Core\L10n;
use Friendica\Util\DateTimeFormat;
@ -22,6 +22,13 @@ require_once 'include/text.php';
*/
class DBStructure
{
/**
* Database structure definition loaded from config/dbstructure.php
*
* @var array
*/
private static $definition = [];
/*
* Converts all tables from MyISAM to InnoDB
*/
@ -166,7 +173,7 @@ class DBStructure
}
public static function printStructure() {
$database = self::definition();
$database = self::definition(false);
echo "-- ------------------------------------------\n";
echo "-- ".FRIENDICA_PLATFORM." ".FRIENDICA_VERSION." (".FRIENDICA_CODENAME,")\n";
@ -822,43 +829,40 @@ class DBStructure
}
/**
* Loads the database structure definition from the /config/dbstructure.json file
*
* Expected format:
* "table_name": {
* "comment": "meaningful table comment",
* "fields": {
* "field_name1": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "meaningful field comment"},
* "field_name2": {"type": "varchar(50)", "not null": "1", "default": "", "comment": "meaningful field comment"},
* },
* "indexes": {
* "PRIMARY": ["field_name1"],
* "name": ["UNIQUE", "field_name2"]
* }
* }
* Loads the database structure definition from the config/dbstructure.php file.
* On first pass, defines DB_UPDATE_VERSION constant.
*
* @see config/dbstructure.php
* @param boolean $with_addons_structure Whether to tack on addons additional tables
* @return array
* @throws Exception
*/
public static function definition() {
$a = \Friendica\BaseObject::getApp();
public static function definition($with_addons_structure = true)
{
if (!self::$definition) {
$a = \Friendica\BaseObject::getApp();
$filename = $a->getBasePath() . '/config/dbstructure.json';
$filename = $a->getBasePath() . '/config/dbstructure.php';
if (!is_readable($filename)) {
throw new Exception('Missing database structure config file config/dbstructure.json');
if (!is_readable($filename)) {
throw new Exception('Missing database structure config file config/dbstructure.php');
}
$definition = require $filename;
if (!$definition) {
throw new Exception('Corrupted database structure config file config/dbstructure.php');
}
self::$definition = $definition;
} else {
$definition = self::$definition;
}
$json = file_get_contents($filename);
$database = json_decode($json, true);
if (!$database) {
throw new Exception('Corrupted database structure config file config/dbstructure.json');
if ($with_addons_structure) {
Hook::callAll('dbstructure_definition', $definition);
}
Addon::callHooks('dbstructure_definition', $database);
return $database;
return $definition;
}
}

55
src/Model/APContact.php
View file

@ -99,32 +99,55 @@ class APContact extends BaseObject
}
$data = ActivityPub::fetchContent($url);
if (empty($data) || empty($data['id']) || empty($data['inbox'])) {
if (empty($data)) {
return false;
}
$compacted = JsonLD::compact($data);
$apcontact = [];
$apcontact['url'] = $data['id'];
$apcontact['uuid'] = defaults($data, 'diaspora:guid', null);
$apcontact['type'] = defaults($data, 'type', null);
$apcontact['following'] = defaults($data, 'following', null);
$apcontact['followers'] = defaults($data, 'followers', null);
$apcontact['inbox'] = defaults($data, 'inbox', null);
$apcontact['outbox'] = defaults($data, 'outbox', null);
$apcontact['sharedinbox'] = JsonLD::fetchElement($data, 'endpoints', 'sharedInbox');
$apcontact['nick'] = defaults($data, 'preferredUsername', null);
$apcontact['name'] = defaults($data, 'name', $apcontact['nick']);
$apcontact['about'] = HTML::toBBCode(defaults($data, 'summary', ''));
$apcontact['photo'] = JsonLD::fetchElement($data, 'icon', 'url');
$apcontact['alias'] = JsonLD::fetchElement($data, 'url', 'href');
$apcontact['url'] = $compacted['@id'];
$apcontact['uuid'] = JsonLD::fetchElement($compacted, 'diaspora:guid');
$apcontact['type'] = str_replace('as:', '', JsonLD::fetchElement($compacted, '@type'));
$apcontact['following'] = JsonLD::fetchElement($compacted, 'as:following', '@id');
$apcontact['followers'] = JsonLD::fetchElement($compacted, 'as:followers', '@id');
$apcontact['inbox'] = JsonLD::fetchElement($compacted, 'ldp:inbox', '@id');
$apcontact['outbox'] = JsonLD::fetchElement($compacted, 'as:outbox', '@id');
$apcontact['sharedinbox'] = '';
if (!empty($compacted['as:endpoints'])) {
$apcontact['sharedinbox'] = JsonLD::fetchElement($compacted['as:endpoints'], 'as:sharedInbox', '@id');
}
$apcontact['nick'] = JsonLD::fetchElement($compacted, 'as:preferredUsername');
$apcontact['name'] = JsonLD::fetchElement($compacted, 'as:name');
if (empty($apcontact['name'])) {
$apcontact['name'] = $apcontact['nick'];
}
$apcontact['about'] = HTML::toBBCode(JsonLD::fetchElement($compacted, 'as:summary'));
$apcontact['photo'] = JsonLD::fetchElement($compacted, 'as:icon', '@id');
if (is_array($apcontact['photo'])) {
$apcontact['photo'] = JsonLD::fetchElement($compacted['as:icon'], 'as:url', '@id');
}
$apcontact['alias'] = JsonLD::fetchElement($compacted, 'as:url', '@id');
if (is_array($apcontact['alias'])) {
$apcontact['alias'] = JsonLD::fetchElement($compacted['as:url'], 'as:href', '@id');
}
if (empty($apcontact['url']) || empty($apcontact['inbox'])) {
return false;
}
$parts = parse_url($apcontact['url']);
unset($parts['scheme']);
unset($parts['path']);
$apcontact['addr'] = $apcontact['nick'] . '@' . str_replace('//', '', Network::unparseURL($parts));
$apcontact['pubkey'] = trim(JsonLD::fetchElement($data, 'publicKey', 'publicKeyPem'));
$apcontact['pubkey'] = trim(JsonLD::fetchElement($compacted, 'w3id:publicKey', 'w3id:publicKeyPem'));
// To-Do
// manuallyApprovesFollowers

19
src/Model/Contact.php
View file

@ -8,7 +8,6 @@ use Friendica\BaseObject;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Core\Worker;
@ -17,8 +16,8 @@ use Friendica\Model\Profile;
use Friendica\Network\Probe;
use Friendica\Object\Image;
use Friendica\Protocol\ActivityPub;
use Friendica\Protocol\Diaspora;
use Friendica\Protocol\DFRN;
use Friendica\Protocol\Diaspora;
use Friendica\Protocol\OStatus;
use Friendica\Protocol\PortableContact;
use Friendica\Protocol\Salmon;
@ -594,9 +593,9 @@ class Contact extends BaseObject
return;
}
if ($contact['term-date'] <= NULL_DATE) {
if ($contact['term-date'] <= DBA::NULL_DATETIME) {
DBA::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
DBA::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['`nurl` = ? AND `term-date` <= ? AND NOT `self`', normalise_link($contact['url']), NULL_DATE]);
DBA::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['`nurl` = ? AND `term-date` <= ? AND NOT `self`', normalise_link($contact['url']), DBA::NULL_DATETIME]);
} else {
/* @todo
* We really should send a notification to the owner after 2-3 weeks
@ -629,7 +628,7 @@ class Contact extends BaseObject
*/
public static function unmarkForArchival(array $contact)
{
$condition = ['`id` = ? AND (`term-date` > ? OR `archive`)', $contact['id'], NULL_DATE];
$condition = ['`id` = ? AND (`term-date` > ? OR `archive`)', $contact['id'], DBA::NULL_DATETIME];
$exists = DBA::exists('contact', $condition);
// We don't need to update, we never marked this contact for archival
@ -646,7 +645,7 @@ class Contact extends BaseObject
}
// It's a miracle. Our dead contact has inexplicably come back to life.
$fields = ['term-date' => NULL_DATE, 'archive' => false];
$fields = ['term-date' => DBA::NULL_DATETIME, 'archive' => false];
DBA::update('contact', $fields, ['id' => $contact['id']]);
DBA::update('contact', $fields, ['nurl' => normalise_link($contact['url'])]);
@ -1639,7 +1638,7 @@ class Contact extends BaseObject
$myaddr = bin2hex($a->user['nickname'] . '@' . $a->getHostName());
}
goaway($ret['request'] . "&addr=$myaddr");
$a->internalRedirect($ret['request'] . "&addr=$myaddr");
// NOTREACHED
}
@ -2024,8 +2023,10 @@ class Contact extends BaseObject
/**
* @brief Returns a magic link to authenticate remote visitors
*
* @todo check if the return is either a fully qualified URL or a relative path to Friendica basedir
*
* @param string $contact_url The address of the target contact profile
* @param integer $url An url that we will be redirected to after the authentication
* @param string $url An url that we will be redirected to after the authentication
*
* @return string with "redir" link
*/
@ -2058,7 +2059,7 @@ class Contact extends BaseObject
* @brief Returns a magic link to authenticate remote visitors
*
* @param array $contact The contact array with "uid", "network" and "url"
* @param integer $url An url that we will be redirected to after the authentication
* @param string $url An url that we will be redirected to after the authentication
*
* @return string with "redir" link
*/

8
src/Model/Event.php
View file

@ -257,10 +257,10 @@ class Event extends BaseObject
$event['created'] = DateTimeFormat::utc(defaults($arr, 'created' , 'now'));
$event['edited'] = DateTimeFormat::utc(defaults($arr, 'edited' , 'now'));
$event['start'] = DateTimeFormat::utc(defaults($arr, 'start' , NULL_DATE));
$event['finish'] = DateTimeFormat::utc(defaults($arr, 'finish' , NULL_DATE));
if ($event['finish'] < NULL_DATE) {
$event['finish'] = NULL_DATE;
$event['start'] = DateTimeFormat::utc(defaults($arr, 'start' , DBA::NULL_DATETIME));
$event['finish'] = DateTimeFormat::utc(defaults($arr, 'finish' , DBA::NULL_DATETIME));
if ($event['finish'] < DBA::NULL_DATETIME) {
$event['finish'] = DBA::NULL_DATETIME;
}
$private = intval(defaults($arr, 'private', 0));

6
src/Model/GContact.php
View file

@ -176,7 +176,7 @@ class GContact
if (!isset($gcontact['network']) && ($gcnt["network"] != Protocol::STATUSNET)) {
$gcontact['network'] = $gcnt["network"];
}
if ($gcontact['updated'] <= NULL_DATE) {
if ($gcontact['updated'] <= DBA::NULL_DATETIME) {
$gcontact['updated'] = $gcnt["updated"];
}
if (!isset($gcontact['server_url']) && (normalise_link($gcnt["server_url"]) != normalise_link($gcnt["url"]))) {
@ -457,7 +457,7 @@ class GContact
intval($uid),
intval($uid),
intval($uid),
DBA::escape(NULL_DATE),
DBA::NULL_DATETIME,
$sql_network,
intval($start),
intval($limit)
@ -486,7 +486,7 @@ class GContact
intval($uid),
intval($uid),
intval($uid),
DBA::escape(NULL_DATE),
DBA::NULL_DATETIME,
$sql_network,
intval($start),
intval($limit)

8
src/Model/Profile.php
View file

@ -774,7 +774,7 @@ class Profile
$profile['marital']['with'] = $a->profile['with'];
}
if (strlen($a->profile['howlong']) && $a->profile['howlong'] >= NULL_DATE) {
if (strlen($a->profile['howlong']) && $a->profile['howlong'] >= DBA::NULL_DATETIME) {
$profile['howlong'] = Temporal::getRelativeDate($a->profile['howlong'], L10n::t('for %1$d %2$s'));
}
@ -1047,7 +1047,7 @@ class Profile
// Try to avoid recursion - but send them home to do a proper magic auth.
$query = str_replace(array('?zrl=', '&zid='), array('?rzrl=', '&rzrl='), $a->query_string);
// The other instance needs to know where to redirect.
$dest = urlencode(System::baseUrl() . '/' . $query);
$dest = urlencode($a->getBaseURL() . '/' . $query);
// We need to extract the basebath from the profile url
// to redirect the visitors '/magic' module.
@ -1055,14 +1055,14 @@ class Profile
$urlarr = explode('/profile/', $contact['url']);
$basepath = $urlarr[0];
if ($basepath != System::baseUrl() && !strstr($dest, '/magic') && !strstr($dest, '/rmagic')) {
if ($basepath != $a->getBaseURL() && !strstr($dest, '/magic') && !strstr($dest, '/rmagic')) {
$magic_path = $basepath . '/magic' . '?f=&owa=1&dest=' . $dest;
// We have to check if the remote server does understand /magic without invoking something
$serverret = Network::curl($basepath . '/magic');
if ($serverret->isSuccess()) {
logger('Doing magic auth for visitor ' . $my_url . ' to ' . $magic_path, LOGGER_DEBUG);
goaway($magic_path);
System::externalRedirect($magic_path);
}
}
}

8
src/Model/PushSubscriber.php
View file

@ -21,7 +21,7 @@ class PushSubscriber
public static function publishFeed($uid, $default_priority = PRIORITY_HIGH)
{
$condition = ['push' => 0, 'uid' => $uid];
DBA::update('push_subscriber', ['push' => 1, 'next_try' => NULL_DATE], $condition);
DBA::update('push_subscriber', ['push' => 1, 'next_try' => DBA::NULL_DATETIME], $condition);
self::requeue($default_priority);
}
@ -114,10 +114,10 @@ class PushSubscriber
$days = round((time() - strtotime($subscriber['renewed'])) / (60 * 60 * 24));
if ($days > 60) {
DBA::update('push_subscriber', ['push' => -1, 'next_try' => NULL_DATE], ['id' => $id]);
DBA::update('push_subscriber', ['push' => -1, 'next_try' => DBA::NULL_DATETIME], ['id' => $id]);
logger('Delivery error: Subscription ' . $subscriber['callback_url'] . ' for ' . $subscriber['nickname'] . ' is marked as ended.', LOGGER_DEBUG);
} else {
DBA::update('push_subscriber', ['push' => 0, 'next_try' => NULL_DATE], ['id' => $id]);
DBA::update('push_subscriber', ['push' => 0, 'next_try' => DBA::NULL_DATETIME], ['id' => $id]);
logger('Delivery error: Giving up ' . $subscriber['callback_url'] . ' for ' . $subscriber['nickname'] . ' for now.', LOGGER_DEBUG);
}
} else {
@ -146,7 +146,7 @@ class PushSubscriber
}
// set last_update to the 'created' date of the last item, and reset push=0
$fields = ['push' => 0, 'next_try' => NULL_DATE, 'last_update' => $last_update];
$fields = ['push' => 0, 'next_try' => DBA::NULL_DATETIME, 'last_update' => $last_update];
DBA::update('push_subscriber', $fields, ['id' => $id]);
logger('Subscriber ' . $subscriber['callback_url'] . ' for ' . $subscriber['nickname'] . ' is marked as vital', LOGGER_DEBUG);
}

29
src/Model/User.php
View file

@ -450,7 +450,7 @@ class User
} catch (Exception $e) {
throw new Exception(L10n::t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.') . EOL . EOL . L10n::t('The error message was:') . $e->getMessage(), 0, $e);
}
goaway($authurl);
System::externalRedirect($authurl);
// NOTREACHED
}
@ -466,19 +466,30 @@ class User
// collapse multiple spaces in name
$username = preg_replace('/ +/', ' ', $username);
if (mb_strlen($username) > 48) {
throw new Exception(L10n::t('Please use a shorter name.'));
$username_min_length = max(1, min(64, intval(Config::get('system', 'username_min_length', 3))));
$username_max_length = max(1, min(64, intval(Config::get('system', 'username_max_length', 48))));
if ($username_min_length > $username_max_length) {
logger(L10n::t('system.username_min_length (%s) and system.username_max_length (%s) are excluding each other, swapping values.', $username_min_length, $username_max_length), LOGGER_WARNING);
$tmp = $username_min_length;
$username_min_length = $username_max_length;
$username_max_length = $tmp;
}
if (mb_strlen($username) < 3) {
throw new Exception(L10n::t('Name too short.'));
if (mb_strlen($username) < $username_min_length) {
throw new Exception(L10n::tt('Username should be at least %s character.', 'Username should be at least %s characters.', $username_min_length));
}
if (mb_strlen($username) > $username_max_length) {
throw new Exception(L10n::tt('Username should be at most %s character.', 'Username should be at most %s characters.', $username_max_length));
}
// So now we are just looking for a space in the full name.
$loose_reg = Config::get('system', 'no_regfullname');
if (!$loose_reg) {
$username = mb_convert_case($username, MB_CASE_TITLE, 'UTF-8');
if (!strpos($username, ' ')) {
throw new Exception(L10n::t("That doesn't appear to be your full \x28First Last\x29 name."));
if (strpos($username, ' ') === false) {
throw new Exception(L10n::t("That doesn't appear to be your full (First Last) name."));
}
}
@ -772,6 +783,8 @@ class User
return;
}
$a = get_app();
logger('Removing user: ' . $uid);
$user = DBA::selectFirst('user', [], ['uid' => $uid]);
@ -796,7 +809,7 @@ class User
if ($uid == local_user()) {
unset($_SESSION['authenticated']);
unset($_SESSION['uid']);
goaway();;
$a->internalRedirect();
}
}
}

3
src/Module/Acctlink.php
View file

@ -4,6 +4,7 @@ namespace Friendica\Module;
use Friendica\BaseModule;
use Friendica\Network\Probe;
use Friendica\Core\System;
/**
* Redirects to another URL based on the parameter 'addr'
@ -18,7 +19,7 @@ class Acctlink extends BaseModule
$url = defaults(Probe::uri(trim($addr)), 'url', false);
if ($url) {
goaway($url);
System::externalRedirect($url);
exit();
}
}

36
src/Module/Contact.php
View file

@ -8,6 +8,7 @@ use Friendica\Content\ContactSelector;
use Friendica\Content\Nav;
use Friendica\Content\Text\BBCode;
use Friendica\Content\Widget;
use Friendica\Core\ACL;
use Friendica\Core\Addon;
use Friendica\Core\L10n;
use Friendica\Core\Protocol;
@ -15,11 +16,10 @@ use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\Model;
use Friendica\Module\Login;
use Friendica\Network\Probe;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Core\ACL;
use Friendica\Module\Login;
/**
* Manages and show Contacts and their content
@ -66,9 +66,9 @@ class Contact extends BaseModule
if (DBA::isResult($contact)) {
if ($contact['self']) {
if (($a->argc == 3) && intval($a->argv[1]) && in_array($a->argv[2], ['posts', 'conversations'])) {
goaway('profile/' . $contact['nick']);
$a->internalRedirect('profile/' . $contact['nick']);
} else {
goaway('profile/' . $contact['nick'] . '?tab=profile');
$a->internalRedirect('profile/' . $contact['nick'] . '?tab=profile');
}
}
@ -168,7 +168,7 @@ class Contact extends BaseModule
info(L10n::tt('%d contact edited.', '%d contacts edited.', $count_actions));
}
goaway('contact');
$a->internalRedirect('contact');
}
public static function post()
@ -191,7 +191,7 @@ class Contact extends BaseModule
if (!DBA::exists('contact', ['id' => $contact_id, 'uid' => local_user()])) {
notice(L10n::t('Could not access contact record.') . EOL);
goaway('contact');
$a->internalRedirect('contact');
return; // NOTREACHED
}
@ -374,19 +374,19 @@ class Contact extends BaseModule
$orig_record = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => [0, local_user()], 'self' => false]);
if (!DBA::isResult($orig_record)) {
notice(L10n::t('Could not access contact record.') . EOL);
goaway('contact');
$a->internalRedirect('contact');
return; // NOTREACHED
}
if ($cmd === 'update' && ($orig_record['uid'] != 0)) {
self::updateContactFromPoll($contact_id);
goaway('contact/' . $contact_id);
$a->internalRedirect('contact/' . $contact_id);
// NOTREACHED
}
if ($cmd === 'updateprofile' && ($orig_record['uid'] != 0)) {
self::updateContactFromProbe($contact_id);
goaway('crepair/' . $contact_id);
$a->internalRedirect('crepair/' . $contact_id);
// NOTREACHED
}
@ -396,7 +396,7 @@ class Contact extends BaseModule
$blocked = Model\Contact::isBlockedByUser($contact_id, local_user());
info(($blocked ? L10n::t('Contact has been blocked') : L10n::t('Contact has been unblocked')) . EOL);
goaway('contact/' . $contact_id);
$a->internalRedirect('contact/' . $contact_id);
return; // NOTREACHED
}
@ -406,7 +406,7 @@ class Contact extends BaseModule
$ignored = Model\Contact::isIgnoredByUser($contact_id, local_user());
info(($ignored ? L10n::t('Contact has been ignored') : L10n::t('Contact has been unignored')) . EOL);
goaway('contact/' . $contact_id);
$a->internalRedirect('contact/' . $contact_id);
return; // NOTREACHED
}
@ -417,7 +417,7 @@ class Contact extends BaseModule
info((($archived) ? L10n::t('Contact has been archived') : L10n::t('Contact has been unarchived')) . EOL);
}
goaway('contact/' . $contact_id);
$a->internalRedirect('contact/' . $contact_id);
return; // NOTREACHED
}
@ -451,13 +451,13 @@ class Contact extends BaseModule
}
// Now check how the user responded to the confirmation query
if (!empty($_REQUEST['canceled'])) {
goaway('contact');
$a->internalRedirect('contact');
}
self::dropContact($orig_record);
info(L10n::t('Contact has been removed.') . EOL);
goaway('contact');
$a->internalRedirect('contact');
return; // NOTREACHED
}
if ($cmd === 'posts') {
@ -468,7 +468,7 @@ class Contact extends BaseModule
}
}
$_SESSION['return_url'] = $a->query_string;
$_SESSION['return_path'] = $a->query_string;
if (!empty($a->data['contact']) && is_array($a->data['contact'])) {
$contact_id = $a->data['contact']['id'];
@ -522,9 +522,9 @@ class Contact extends BaseModule
$insecure = L10n::t('Private communications are not available for this contact.');
$last_update = (($contact['last-update'] <= NULL_DATE) ? L10n::t('Never') : DateTimeFormat::local($contact['last-update'], 'D, j M Y, g:i A'));
$last_update = (($contact['last-update'] <= DBA::NULL_DATETIME) ? L10n::t('Never') : DateTimeFormat::local($contact['last-update'], 'D, j M Y, g:i A'));
if ($contact['last-update'] > NULL_DATE) {
if ($contact['last-update'] > DBA::NULL_DATETIME) {
$last_update .= ' ' . (($contact['last-update'] <= $contact['success_update']) ? L10n::t('(Update was successful)') : L10n::t('(Update was not successful)'));
}
$lblsuggest = (($contact['network'] === Protocol::DFRN) ? L10n::t('Suggest friends') : '');
@ -536,7 +536,7 @@ class Contact extends BaseModule
// tabs
$tab_str = self::getTabsHTML($a, $contact, 3);
$lost_contact = (($contact['archive'] && $contact['term-date'] > NULL_DATE && $contact['term-date'] < DateTimeFormat::utcNow()) ? L10n::t('Communications lost with this contact!') : '');
$lost_contact = (($contact['archive'] && $contact['term-date'] > DBA::NULL_DATETIME && $contact['term-date'] < DateTimeFormat::utcNow()) ? L10n::t('Communications lost with this contact!') : '');
$fetch_further_information = null;
if ($contact['network'] == Protocol::FEED) {

50
src/Module/Login.php
View file

@ -10,6 +10,7 @@ use Friendica\Core\Addon;
use Friendica\Core\Authentication;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Model\User;
use Friendica\Util\DateTimeFormat;
@ -39,17 +40,17 @@ class Login extends BaseModule
}
if (local_user()) {
goaway(self::getApp()->getBaseURL());
$a->internalRedirect();
}
return self::form($_SESSION['return_url'], intval(Config::get('config', 'register_policy')) !== REGISTER_CLOSED);
return self::form($_SESSION['return_path'], intval(Config::get('config', 'register_policy')) !== REGISTER_CLOSED);
}
public static function post()
{
$return_url = $_SESSION['return_url'];
$return_path = $_SESSION['return_path'];
session_unset();
$_SESSION['return_url'] = $return_url;
$_SESSION['return_path'] = $return_path;
// OpenId Login
if (
@ -83,22 +84,23 @@ class Login extends BaseModule
{
$noid = Config::get('system', 'no_openid');
$a = self::getApp();
// if it's an email address or doesn't resolve to a URL, fail.
if ($noid || strpos($openid_url, '@') || !Network::isUrlValid($openid_url)) {
notice(L10n::t('Login failed.') . EOL);
goaway(self::getApp()->getBaseURL());
$a->internalRedirect();
// NOTREACHED
}
// Otherwise it's probably an openid.
try {
$a = get_app();
$openid = new LightOpenID($a->getHostName());
$openid->identity = $openid_url;
$_SESSION['openid'] = $openid_url;
$_SESSION['remember'] = $remember;
$openid->returnUrl = self::getApp()->getBaseURL(true) . '/openid';
goaway($openid->authUrl());
$openid->returnUrl = $a->getBaseURL(true) . '/openid';
System::externalRedirect($openid->authUrl());
} catch (Exception $e) {
notice(L10n::t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.') . '<br /><br >' . L10n::t('The error message was:') . ' ' . $e->getMessage());
}
@ -122,6 +124,8 @@ class Login extends BaseModule
'user_record' => null
];
$a = self::getApp();
/*
* An addon indicates successful login by setting 'authenticated' to non-zero value and returning a user record
* Addons should never set 'authenticated' except to indicate success - as hooks may be chained
@ -144,7 +148,7 @@ class Login extends BaseModule
} catch (Exception $e) {
logger('authenticate: failed login attempt: ' . notags($username) . ' from IP ' . $_SERVER['REMOTE_ADDR']);
info('Login failed. Please check your credentials.' . EOL);
goaway('/');
$a->internalRedirect();
}
if (!$remember) {
@ -156,14 +160,14 @@ class Login extends BaseModule
$_SESSION['last_login_date'] = DateTimeFormat::utcNow();
Authentication::setAuthenticatedSessionForUser($record, true, true);
if (x($_SESSION, 'return_url')) {
$return_url = $_SESSION['return_url'];
unset($_SESSION['return_url']);
if (x($_SESSION, 'return_path')) {
$return_path = $_SESSION['return_path'];
unset($_SESSION['return_path']);
} else {
$return_url = '';
$return_path = '';
}
goaway($return_url);
$a->internalRedirect($return_path);
}
/**
@ -173,6 +177,8 @@ class Login extends BaseModule
*/
public static function sessionAuth()
{
$a = self::getApp();
// When the "Friendica" cookie is set, take the value to authenticate and renew the cookie.
if (isset($_COOKIE["Friendica"])) {
$data = json_decode($_COOKIE["Friendica"]);
@ -191,7 +197,7 @@ class Login extends BaseModule
if ($data->hash != Authentication::getCookieHashForUser($user)) {
logger("Hash for user " . $data->uid . " doesn't fit.");
Authentication::deleteSession();
goaway(self::getApp()->getBaseURL());
$a->internalRedirect();
}
// Renew the cookie
@ -228,7 +234,7 @@ class Login extends BaseModule
logger('Session address changed. Paranoid setting in effect, blocking session. ' .
$_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']);
Authentication::deleteSession();
goaway(self::getApp()->getBaseURL());
$a->internalRedirect();
}
$user = DBA::selectFirst('user', [],
@ -242,7 +248,7 @@ class Login extends BaseModule
);
if (!DBA::isResult($user)) {
Authentication::deleteSession();
goaway(self::getApp()->getBaseURL());
$a->internalRedirect();
}
// Make sure to refresh the last login time for the user if the user
@ -263,7 +269,7 @@ class Login extends BaseModule
/**
* @brief Wrapper for adding a login box.
*
* @param string $return_url The url relative to the base the user should be sent
* @param string $return_path The path relative to the base the user should be sent
* back to after login completes
* @param bool $register If $register == true provide a registration link.
* This will most always depend on the value of config.register_policy.
@ -273,7 +279,7 @@ class Login extends BaseModule
*
* @hooks 'login_hook' string $o
*/
public static function form($return_url = null, $register = false, $hiddens = [])
public static function form($return_path = null, $register = false, $hiddens = [])
{
$a = self::getApp();
$o = '';
@ -287,8 +293,8 @@ class Login extends BaseModule
$noid = Config::get('system', 'no_openid');
if (is_null($return_url)) {
$return_url = $a->query_string;
if (is_null($return_path)) {
$return_path = $a->query_string;
}
if (local_user()) {
@ -302,7 +308,7 @@ class Login extends BaseModule
);
$tpl = get_markup_template('login.tpl');
$_SESSION['return_url'] = $return_url;
$_SESSION['return_path'] = $return_path;
}
$o .= replace_macros(

3
src/Module/Logout.php
View file

@ -8,6 +8,7 @@ use Friendica\BaseModule;
use Friendica\Core\Addon;
use Friendica\Core\Authentication;
use Friendica\Core\L10n;
use Friendica\Core\System;
require_once 'boot.php';
@ -26,6 +27,6 @@ class Logout extends BaseModule
Addon::callHooks("logging_out");
Authentication::deleteSession();
info(L10n::t('Logged out.') . EOL);
goaway(self::getApp()->getBaseURL());
self::getApp()->internalRedirect();
}
}

22
src/Module/Magic.php
View file

@ -7,6 +7,7 @@ namespace Friendica\Module;
use Friendica\BaseModule;
use Friendica\Database\DBA;
use Friendica\Model\Contact;
use Friendica\Core\System;
use Friendica\Util\HTTPSignature;
use Friendica\Util\Network;
@ -41,9 +42,13 @@ class Magic extends BaseModule
if (!$cid) {
logger('No contact record found: ' . print_r($_REQUEST, true), LOGGER_DEBUG);
goaway($dest);
// @TODO Finding a more elegant possibility to redirect to either internal or external URL
if (filter_var($dest, FILTER_VALIDATE_URL)) {
System::externalRedirect($dest);
} else {
$a->internalRedirect($dest);
}
}
$contact = DBA::selectFirst('contact', ['id', 'nurl', 'url'], ['id' => $cid]);
// Redirect if the contact is already authenticated on this site.
@ -55,7 +60,7 @@ class Magic extends BaseModule
}
logger('Contact is already authenticated', LOGGER_DEBUG);
goaway($dest);
System::externalRedirect($dest);
}
if (local_user()) {
@ -99,10 +104,10 @@ class Magic extends BaseModule
$x = strpbrk($dest, '?&');
$args = (($x) ? '&owt=' . $token : '?f=&owt=' . $token);
goaway($dest . $args);
System::externalRedirect($dest . $args);
}
}
goaway($dest);
System::externalRedirect($dest);
}
}
@ -111,6 +116,11 @@ class Magic extends BaseModule
return $ret;
}
goaway($dest);
// @TODO Finding a more elegant possibility to redirect to either internal or external URL
if (filter_var($dest, FILTER_VALIDATE_URL)) {
System::externalRedirect($dest);
} else {
$a->internalRedirect($dest);
}
}
}

2
src/Module/Objects.php
View file

@ -24,7 +24,7 @@ class Objects extends BaseModule
}
if (!ActivityPub::isRequest()) {
goaway(str_replace('objects/', 'display/', $a->query_string));
$a->internalRedirect(str_replace('objects/', 'display/', $a->query_string));
}
$item = Item::selectFirst(['id'], ['guid' => $a->argv[1], 'wall' => true, 'private' => false]);

2
src/Module/Tos.php
View file

@ -49,7 +49,7 @@ class Tos extends BaseModule
public static function init()
{
if (strlen(Config::get('system','singleuser'))) {
goaway(System::baseUrl()."/profile/" . Config::get('system','singleuser'));
self::getApp()->internalRedirect('profile/' . Config::get('system','singleuser'));
}
}
/**

10
src/Object/Post.php
View file

@ -209,7 +209,13 @@ class Post extends BaseObject
$author = ['uid' => 0, 'id' => $item['author-id'],
'network' => $item['author-network'], 'url' => $item['author-link']];
$profile_link = Contact::magicLinkbyContact($author);
if (local_user() || remote_user()) {
$profile_link = Contact::magicLinkbyContact($author);
} else {
$profile_link = $item['author-link'];
}
if (strpos($profile_link, 'redir/') === 0) {
$sparkle = ' sparkle';
}
@ -765,7 +771,7 @@ class Post extends BaseObject
* Hmmm, code depending on the presence of a particular addon?
* This should be better if done by a hook
*/
if (in_array('qcomment', $a->addons)) {
if (Addon::isEnabled('qcomment')) {
$qc = ((local_user()) ? PConfig::get(local_user(), 'qcomment', 'words') : null);
$qcomment = (($qc) ? explode("\n", $qc) : null);
}

2
src/Protocol/ActivityPub/Transmitter.php
View file

@ -289,7 +289,7 @@ class Transmitter
foreach ($activity[$element] as $receiver) {
if ($receiver == $profile['followers'] && !empty($item_profile['followers'])) {
$receiver = $item_profile['followers'];
$permissions[$element][] = $item_profile['followers'];
}
if (!in_array($receiver, $exclude)) {
$permissions[$element][] = $receiver;

2
src/Protocol/DFRN.php
View file

@ -3037,7 +3037,7 @@ class DFRN
logger('auto_redir: ' . $r[0]['name'] . ' ' . $sec, LOGGER_DEBUG);
$dest = (($url) ? '&destination_url=' . $url : '');
goaway($r[0]['poll'] . '?dfrn_id=' . $dfrn_id
System::externalRedirect($r[0]['poll'] . '?dfrn_id=' . $dfrn_id
. '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest);
}

22
src/Protocol/PortableContact.php
View file

@ -113,7 +113,7 @@ class PortableContact
$connect_url = '';
$name = '';
$network = '';
$updated = NULL_DATE;
$updated = DBA::NULL_DATETIME;
$location = '';
$about = '';
$keywords = '';
@ -317,7 +317,7 @@ class PortableContact
$contact = ["url" => $profile];
if ($gcontacts[0]["created"] <= NULL_DATE) {
if ($gcontacts[0]["created"] <= DBA::NULL_DATETIME) {
$contact['created'] = DateTimeFormat::utcNow();
}
@ -522,7 +522,7 @@ class PortableContact
// Maybe there aren't any entries. Then check if it is a valid feed
if ($last_updated == "") {
if ($xpath->query('/atom:feed')->length > 0) {
$last_updated = NULL_DATE;
$last_updated = DBA::NULL_DATETIME;
}
}
@ -931,7 +931,7 @@ class PortableContact
$gserver = DBA::selectFirst('gserver', [], ['nurl' => normalise_link($server_url)]);
if (DBA::isResult($gserver)) {
if ($gserver["created"] <= NULL_DATE) {
if ($gserver["created"] <= DBA::NULL_DATETIME) {
$fields = ['created' => DateTimeFormat::utcNow()];
$condition = ['nurl' => normalise_link($server_url)];
DBA::update('gserver', $fields, $condition);
@ -954,12 +954,12 @@ class PortableContact
// See discussion under https://forum.friendi.ca/display/0b6b25a8135aabc37a5a0f5684081633
// It can happen that a zero date is in the database, but storing it again is forbidden.
if ($last_contact < NULL_DATE) {
$last_contact = NULL_DATE;
if ($last_contact < DBA::NULL_DATETIME) {
$last_contact = DBA::NULL_DATETIME;
}
if ($last_failure < NULL_DATE) {
$last_failure = NULL_DATE;
if ($last_failure < DBA::NULL_DATETIME) {
$last_failure = DBA::NULL_DATETIME;
}
if (!$force && !self::updateNeeded($gserver["created"], "", $last_failure, $last_contact)) {
@ -976,8 +976,8 @@ class PortableContact
$register_policy = -1;
$registered_users = 0;
$last_contact = NULL_DATE;
$last_failure = NULL_DATE;
$last_contact = DBA::NULL_DATETIME;
$last_failure = DBA::NULL_DATETIME;
}
logger("Server ".$server_url." is outdated or unknown. Start discovery. Force: ".$force." Created: ".$gserver["created"]." Failure: ".$last_failure." Contact: ".$last_contact, LOGGER_DEBUG);
@ -1794,7 +1794,7 @@ class PortableContact
$connect_url = '';
$name = '';
$network = '';
$updated = NULL_DATE;
$updated = DBA::NULL_DATETIME;
$location = '';
$about = '';
$keywords = '';

2
src/Util/JsonLD.php
View file

@ -88,7 +88,7 @@ class JsonLD
'ostatus' => (object)['@id' => 'http://ostatus.org#', '@type' => '@id'],
'diaspora' => (object)['@id' => 'https://diasporafoundation.org/ns/', '@type' => '@id'],
'dc' => (object)['@id' => 'http://purl.org/dc/terms/', '@type' => '@id'],
'uuid' => (object)['@id' => 'http://schema.org/identifier', '@type' => '@id']];
'ldp' => (object)['@id' => 'http://www.w3.org/ns/ldp#', '@type' => '@id']];
$jsonobj = json_decode(json_encode($json, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));

7
src/Util/Temporal.php
View file

@ -11,6 +11,7 @@ use DateTimeZone;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
use Friendica\Database\DBA;
require_once 'boot.php';
require_once 'include/text.php';
@ -217,13 +218,13 @@ class Temporal
// First day of the week (0 = Sunday)
$firstDay = PConfig::get(local_user(), 'system', 'first_day_of_week', 0);
$lang = substr(L10n::getBrowserLanguage(), 0, 2);
$lang = substr(L10n::getCurrentLang(), 0, 2);
// Check if the detected language is supported by the picker
if (!in_array($lang,
["ar", "ro", "id", "bg", "fa", "ru", "uk", "en", "el", "de", "nl", "tr", "fr", "es", "th", "pl", "pt", "ch", "se", "kr",
"it", "da", "no", "ja", "vi", "sl", "cs", "hu"])) {
$lang = Config::get('system', 'language', 'en');
$lang = 'en';
}
$o = '';
@ -290,7 +291,7 @@ class Temporal
$abs = strtotime($localtime);
if (is_null($posted_date) || $posted_date <= NULL_DATE || $abs === false) {
if (is_null($posted_date) || $posted_date <= DBA::NULL_DATETIME || $abs === false) {
return L10n::t('never');
}

5
src/Worker/Cron.php
View file

@ -7,6 +7,7 @@ namespace Friendica\Worker;
use Friendica\BaseObject;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\Hook;
use Friendica\Core\Protocol;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
@ -45,7 +46,7 @@ class Cron
logger('cron: start');
// Fork the cron jobs in separate parts to avoid problems when one of them is crashing
Addon::forkHooks($a->queue['priority'], "cron");
Hook::fork($a->queue['priority'], "cron");
// run queue delivery process in the background
Worker::add(PRIORITY_NEGLIGIBLE, "Queue");
@ -203,7 +204,7 @@ class Cron
foreach ($contacts as $contact) {
if ($manual_id) {
$contact['last-update'] = NULL_DATE;
$contact['last-update'] = DBA::NULL_DATETIME;
}
// Friendica and OStatus are checked once a day

2
src/Worker/CronJobs.php
View file

@ -108,7 +108,7 @@ class CronJobs
private static function expireAndRemoveUsers()
{
// expire any expired regular accounts. Don't expire forums.
$condition = ["NOT `account_expired` AND `account_expires_on` > ? AND `account_expires_on` < UTC_TIMESTAMP() AND `page-flags` = 0", NULL_DATE];
$condition = ["NOT `account_expired` AND `account_expires_on` > ? AND `account_expires_on` < UTC_TIMESTAMP() AND `page-flags` = 0", DBA::NULL_DATETIME];
DBA::update('user', ['account_expired' => true], $condition);
// Remove any freshly expired account

25
src/Worker/Expire.php
View file

@ -7,8 +7,8 @@
namespace Friendica\Worker;
use Friendica\BaseObject;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\Hook;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\Model\Item;
@ -17,13 +17,13 @@ require_once 'include/dba.php';
class Expire
{
public static function execute($param = '', $hook_name = '')
public static function execute($param = '', $hook_function = '')
{
$a = BaseObject::getApp();
require_once 'include/items.php';
Addon::loadHooks();
Hook::loadHooks();
if ($param == 'delete') {
logger('Delete expired items', LOGGER_DEBUG);
@ -62,11 +62,11 @@ class Expire
logger('Expire items for user '.$user['uid'].' ('.$user['username'].') - done ', LOGGER_DEBUG);
}
return;
} elseif (!empty($hook_name) && ($param == 'hook') && is_array($a->hooks) && array_key_exists("expire", $a->hooks)) {
foreach ($a->hooks["expire"] as $hook) {
if ($hook[1] == $hook_name) {
} elseif ($param == 'hook' && !empty($hook_function)) {
foreach (Hook::getByName('expire') as $hook) {
if ($hook[1] == $hook_function) {
logger("Calling expire hook '" . $hook[1] . "'", LOGGER_DEBUG);
Addon::callSingleHook($a, $hook_name, $hook, $data);
Hook::callSingle($a, 'expire', $hook, $data);
}
}
return;
@ -86,13 +86,10 @@ class Expire
DBA::close($r);
logger('expire: calling hooks');
if (is_array($a->hooks) && array_key_exists('expire', $a->hooks)) {
foreach ($a->hooks['expire'] as $hook) {
logger("Calling expire hook for '" . $hook[1] . "'", LOGGER_DEBUG);
Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true],
'Expire', 'hook', $hook[1]);
}
foreach (Hook::getByName('expire') as $hook) {
logger("Calling expire hook for '" . $hook[1] . "'", LOGGER_DEBUG);
Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true],
'Expire', 'hook', $hook[1]);
}
logger('expire: end');

4
src/Worker/ForkHook.php
View file

@ -5,7 +5,7 @@
namespace Friendica\Worker;
use Friendica\Core\Addon;
use Friendica\Core\Hook;
Class ForkHook
{
@ -13,6 +13,6 @@ Class ForkHook
{
$a = \Friendica\BaseObject::getApp();
Addon::callSingleHook($a, $name, $hook, $data);
Hook::callSingle($a, $name, $hook, $data);
}
}

5
src/Worker/Notifier.php
View file

@ -7,10 +7,12 @@ namespace Friendica\Worker;
use Friendica\BaseObject;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\Hook;
use Friendica\Core\Protocol;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\Model\Contact;
use Friendica\Model\Conversation;
use Friendica\Model\Group;
use Friendica\Model\Item;
use Friendica\Model\PushSubscriber;
@ -20,7 +22,6 @@ use Friendica\Protocol\ActivityPub;
use Friendica\Protocol\Diaspora;
use Friendica\Protocol\OStatus;
use Friendica\Protocol\Salmon;
use Friendica\Model\Conversation;
require_once 'include/dba.php';
require_once 'include/items.php';
@ -501,7 +502,7 @@ class Notifier
logger('notifier: calling hooks for ' . $cmd . ' ' . $item_id, LOGGER_DEBUG);
if ($normal_mode) {
Addon::forkHooks($a->queue['priority'], 'notifier_normal', $target_item);
Hook::fork($a->queue['priority'], 'notifier_normal', $target_item);
}
Addon::callHooks('notifier_end',$target_item);

6
src/Worker/OnePoll.php
View file

@ -12,8 +12,8 @@ use Friendica\Core\Protocol;
use Friendica\Database\DBA;
use Friendica\Model\Contact;
use Friendica\Model\Item;
use Friendica\Protocol\Email;
use Friendica\Protocol\ActivityPub;
use Friendica\Protocol\Email;
use Friendica\Protocol\PortableContact;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
@ -121,7 +121,7 @@ class OnePoll
$hub_update = false;
}
$last_update = (($contact['last-update'] <= NULL_DATE)
$last_update = (($contact['last-update'] <= DBA::NULL_DATETIME)
? DateTimeFormat::utc('now - 7 days', DateTimeFormat::ATOM)
: DateTimeFormat::utc($contact['last-update'], DateTimeFormat::ATOM)
);
@ -252,7 +252,7 @@ class OnePoll
self::updateContact($contact, $fields);
Contact::markForArchival($contact);
} elseif ($contact['term-date'] > NULL_DATE) {
} elseif ($contact['term-date'] > DBA::NULL_DATETIME) {
logger("$url back from the dead - removing mark for death");
Contact::unmarkForArchival($contact);
}

11
tests/ApiTest.php
View file

@ -12,6 +12,8 @@ use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Network\HTTPException;
require_once __DIR__ . '/../include/api.php';
/**
* Tests for the API functions.
*
@ -20,7 +22,6 @@ use Friendica\Network\HTTPException;
*/
class ApiTest extends DatabaseTest
{
/**
* Create variables used by tests.
*/
@ -28,7 +29,7 @@ class ApiTest extends DatabaseTest
{
parent::setUp();
require_once __DIR__.'/../include/api.php';
$this->app = BaseObject::getApp();
// User data that the test database is populated with
$this->selfUser = [
@ -60,6 +61,10 @@ class ApiTest extends DatabaseTest
'uid' => $this->selfUser['id']
];
Config::set('system', 'url', 'http://localhost');
Config::set('system', 'hostname', 'localhost');
Config::set('system', 'worker_dont_fork', true);
// Default config
Config::set('config', 'hostname', 'localhost');
Config::set('system', 'throttle_limit_day', 100);
@ -3374,7 +3379,7 @@ class ApiTest extends DatabaseTest
*/
public function testApiFriendicaRemoteauthWithCorrectUrl()
{
$this->markTestIncomplete("We can't use an assertion here because of goaway().");
$this->markTestIncomplete("We can't use an assertion here because of App->redirect().");
$_GET['url'] = 'url';
$_GET['c_url'] = $this->selfUser['nurl'];
api_friendica_remoteauth();

22
tests/DatabaseTest.php
View file

@ -14,6 +14,8 @@ use PHPUnit\DbUnit\TestCaseTrait;
use PHPUnit\Framework\TestCase;
use PHPUnit_Extensions_Database_DB_IDatabaseConnection;
require_once __DIR__ . '/../boot.php';
/**
* Abstract class used by tests that need a database.
*/
@ -21,21 +23,6 @@ abstract class DatabaseTest extends TestCase
{
use TestCaseTrait;
/**
* @var App The Friendica App
*/
protected $app;
protected function setUp()
{
// Reusable App object
$this->app = BaseObject::getApp();
Config::set('system', 'url', 'http://localhost');
Config::set('system', 'hostname', 'localhost');
Config::set('system', 'worker_dont_fork', true);
}
/**
* Get database connection.
*
@ -53,6 +40,11 @@ abstract class DatabaseTest extends TestCase
$this->markTestSkipped('Please set the MYSQL_* environment variables to your test database credentials.');
}
DBA::connect(getenv('MYSQL_HOST'),
getenv('MYSQL_USERNAME'),
getenv('MYSQL_PASSWORD'),
getenv('MYSQL_DATABASE'));
if (!DBA::connected()) {
$this->markTestSkipped('Could not connect to the database.');
}

2
tests/Util/VFSTrait.php
View file

@ -26,7 +26,7 @@ trait VFSTrait
$this->setConfigFile('config.ini.php');
$this->setConfigFile('settings.ini.php');
$this->setConfigFile('local.ini.php');
$this->setConfigFile('dbstructure.json');
$this->setConfigFile('dbstructure.php');
}
protected function setConfigFile($filename)

4
tests/src/Core/Console/AutomaticInstallationConsoleTest.php
View file

@ -270,9 +270,13 @@ CONF;
/**
* @runTestsInSeparateProcesses
* @preserveGlobalState disabled
*/
public function testNoDatabaseConnection()
{
// TODO DBA mocking for whole console tests make this test work again
$this->markTestSkipped('DBA is already loaded, we have to mock the whole App to make it work');
$dbaMock = \Mockery::mock('alias:Friendica\Database\DBA');
$dbaMock
->shouldReceive('connected')

11
tests/src/Core/InstallTest.php
View file

@ -6,6 +6,10 @@ namespace Friendica\Core;
use Friendica\Test\Util\VFSTrait;
use PHPUnit\Framework\TestCase;
/**
* @runTestsInSeparateProcesses
* @preserveGlobalState disabled
*/
class InstallTest extends TestCase
{
use VFSTrait;
@ -48,7 +52,6 @@ class InstallTest extends TestCase
/**
* @small
* @runInSeparateProcess
*/
public function testCheckKeys()
{
@ -63,7 +66,6 @@ class InstallTest extends TestCase
/**
* @small
* @runInSeparateProcess
*/
public function testCheckFunctions()
{
@ -141,7 +143,6 @@ class InstallTest extends TestCase
/**
* @small
* @runInSeparateProcess
*/
public function testCheckLocalIni()
{
@ -160,7 +161,6 @@ class InstallTest extends TestCase
/**
* @small
* @runInSeparateProcess
*/
public function testCheckHtAccessFail()
{
@ -201,7 +201,6 @@ class InstallTest extends TestCase
/**
* @small
* @runInSeparateProcess
*/
public function testCheckHtAccessWork()
{
@ -241,7 +240,6 @@ class InstallTest extends TestCase
/**
* @small
* @runInSeparateProcess
*/
public function testImagick()
{
@ -264,7 +262,6 @@ class InstallTest extends TestCase
/**
* @small
* @runInSeparateProcess
*/
public function testImagickNotFound()
{

Some files were not shown because too many files have changed in this diff Show more