keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #6315 from MrPetovan/bug/6309-add-fulltext-index-profile

Browse source 
Rework mod/match and mod/msearch
This commit is contained in:
Michael Vogel 2018-12-27 18:04:06 +01:00 committed by GitHub
commit 94eca77041
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
131 changed files with 508 additions and 762 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bin/auth_ejabberd.php
View file

@ -49,8 +49,7 @@ $directory = realpath($directory . DIRECTORY_SEPARATOR . "..");
chdir($directory);
require_once "boot.php";
require_once "include/dba.php";
require dirname(__DIR__) . '/vendor/autoload.php';
$a = new App(dirname(__DIR__));

2
bin/console.php
View file

@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
include_once dirname(__DIR__) . '/boot.php';
require dirname(__DIR__) . '/vendor/autoload.php';
$a = new Friendica\App(dirname(__DIR__));
\Friendica\BaseObject::setApp($a);

3
bin/daemon.php
View file

@ -30,8 +30,7 @@ if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
chdir($directory);
}
require_once "boot.php";
require_once "include/dba.php";
require dirname(__DIR__) . '/vendor/autoload.php';
$a = new App(dirname(__DIR__));

2
bin/worker.php
View file

@ -26,7 +26,7 @@ if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
chdir($directory);
}
require_once "boot.php";
require dirname(__DIR__) . '/vendor/autoload.php';
$a = new App(dirname(__DIR__));

4
boot.php
View file

@ -17,8 +17,6 @@
* easily as email does today.
*/
require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
use Friendica\App;
use Friendica\BaseObject;
use Friendica\Core\Addon;
@ -35,8 +33,6 @@ use Friendica\Model\Contact;
use Friendica\Model\Conversation;
use Friendica\Util\DateTimeFormat;
require_once 'include/text.php';
define('FRIENDICA_PLATFORM', 'Friendica');
define('FRIENDICA_CODENAME', 'The Tazmans Flax-lily');
define('FRIENDICA_VERSION', '2018.12-rc');

11
composer.json
View file

@ -14,6 +14,7 @@
},
"require": {
"php": ">=5.6.1",
"ext-curl": "*",
"ext-dom": "*",
"ext-json": "*",
"ext-xml": "*",
@ -55,7 +56,15 @@
},
"psr-0": {
"": "library/"
}
},
"files": [
"include/conversation.php",
"include/dba.php",
"include/enotify.php",
"include/items.php",
"include/text.php",
"boot.php"
]
},
"config": {
"autoloader-suffix": "Friendica",

3
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "11efc727fd6cae00c1230616e31ad2a2",
"content-hash": "9e0c66963fa451c1c317569c89c1b278",
"packages": [
{
"name": "asika/simple-console",
@ -3563,6 +3563,7 @@
"prefer-lowest": false,
"platform": {
"php": ">=5.6.1",
"ext-curl": "*",
"ext-dom": "*",
"ext-json": "*",
"ext-xml": "*"

3
config/dbstructure.config.php
View file

@ -34,7 +34,7 @@
use Friendica\Database\DBA;
if (!defined('DB_UPDATE_VERSION')) {
define('DB_UPDATE_VERSION', 1291);
define('DB_UPDATE_VERSION', 1292);
}
return [
@ -1059,6 +1059,7 @@ return [
"indexes" => [
"PRIMARY" => ["id"],
"uid_is-default" => ["uid", "is-default"],
"pub_keywords" => ["FULLTEXT", "pub_keywords"],
]
],
"profile_check" => [

1
include/api.php
View file

@ -46,7 +46,6 @@ use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings;
use Friendica\Util\XML;
require_once 'include/conversation.php';
require_once 'mod/share.php';
require_once 'mod/item.php';
require_once 'mod/wall_upload.php';

3
include/items.php
View file

@ -24,10 +24,7 @@ use Friendica\Util\ParseUrl;
use Friendica\Util\Strings;
use Friendica\Util\Temporal;
require_once 'include/text.php';
require_once 'mod/share.php';
require_once 'include/enotify.php';
function add_page_info_data(array $data, $no_photos = false)
{
Addon::callHooks('page_info_data', $data);

2
include/text.php
View file

@ -30,8 +30,6 @@ use Friendica\Util\Strings;
use Friendica\Util\XML;
use Friendica\Content\Text\HTML;
require_once "include/conversation.php";
/**
* Turn user/group ACLs stored as angle bracketed text into arrays
*

6
index.php
View file

@ -4,12 +4,10 @@
* Friendica
*/
use Friendica\App;
require_once 'boot.php';
require dirname(__DIR__) . '/vendor/autoload.php';
// We assume that the index.php is called by a frontend process
// The value is set to "true" by default in App
$a = new App(__DIR__, false);
$a = new Friendica\App(__DIR__, false);
$a->runFrontend();

2
mod/acl.php
View file

@ -14,8 +14,6 @@ use Friendica\Model\Item;
use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings;
require_once 'include/dba.php';
function acl_content(App $a)
{
if (!local_user()) {

4
mod/admin.php
View file

@ -33,10 +33,6 @@ use Friendica\Util\Network;
use Friendica\Util\Strings;
use Friendica\Util\Temporal;
require_once 'include/enotify.php';
require_once 'include/text.php';
require_once 'include/items.php';
/**
* @brief Process send data from the admin panels subpages
*

2
mod/allfriends.php
View file

@ -15,8 +15,6 @@ use Friendica\Module;
use Friendica\Util\Proxy as ProxyUtils;
require_once 'include/dba.php';
function allfriends_content(App $a)
{
$o = '';

2
mod/attach.php
View file

@ -8,8 +8,6 @@ use Friendica\Core\L10n;
use Friendica\Database\DBA;
use Friendica\Util\Security;
require_once 'include/dba.php';
function attach_init(App $a)
{
if ($a->argc != 2) {

3
mod/bookmarklet.php
View file

@ -11,9 +11,6 @@ use Friendica\Core\System;
use Friendica\Module\Login;
use Friendica\Util\Strings;
require_once 'include/conversation.php';
require_once 'include/items.php';
function bookmarklet_init()
{
$_GET["mode"] = "minimal";

2
mod/common.php
View file

@ -14,8 +14,6 @@ use Friendica\Module;
use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings;
require_once 'include/dba.php';
function common_content(App $a)
{
$o = '';

2
mod/community.php
View file

@ -93,8 +93,6 @@ function community_content(App $a, $update = 0)
}
}
require_once 'include/conversation.php';
if (!$update) {
$tabs = [];

3
mod/dfrn_confirm.php
View file

@ -36,9 +36,6 @@ use Friendica\Util\Network;
use Friendica\Util\Strings;
use Friendica\Util\XML;
require_once 'include/enotify.php';
require_once 'include/items.php';
function dfrn_confirm_post(App $a, $handsfree = null)
{
$node = null;

2
mod/dfrn_notify.php
View file

@ -16,8 +16,6 @@ use Friendica\Protocol\DFRN;
use Friendica\Protocol\Diaspora;
use Friendica\Util\Strings;
require_once 'include/items.php';
function dfrn_notify_post(App $a) {
Logger::log(__function__, Logger::TRACE);

2
mod/dfrn_poll.php
View file

@ -17,8 +17,6 @@ use Friendica\Util\Network;
use Friendica\Util\Strings;
use Friendica\Util\XML;
require_once 'include/items.php';
function dfrn_poll_init(App $a)
{
Login::sessionAuth();

2
mod/dfrn_request.php
View file

@ -30,8 +30,6 @@ use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
use Friendica\Util\Strings;
require_once 'include/enotify.php';
function dfrn_request_init(App $a)
{
if ($a->argc > 1) {

2
mod/display.php
View file

@ -214,8 +214,6 @@ function display_content(App $a, $update = false, $update_uid = 0)
return;
}
require_once 'include/conversation.php';
$o = '';
if ($update) {

2
mod/events.php
View file

@ -22,8 +22,6 @@ use Friendica\Util\DateTimeFormat;
use Friendica\Util\Strings;
use Friendica\Util\Temporal;
require_once 'include/items.php';
function events_init(App $a)
{
if (!local_user()) {

4
mod/feedtest.php
View file

@ -12,10 +12,6 @@ use Friendica\Model\Contact;
use Friendica\Protocol\Feed;
use Friendica\Util\Network;
require_once 'boot.php';
require_once 'include/dba.php';
require_once 'include/text.php';
function feedtest_content(App $a)
{
if (!local_user()) {

2
mod/filer.php
View file

@ -10,8 +10,6 @@ use Friendica\Core\Renderer;
use Friendica\Model\FileTag;
use Friendica\Util\XML;
require_once 'include/items.php';
function filer_content(App $a)
{
if (! local_user()) {

5
mod/item.php
View file

@ -38,10 +38,6 @@ use Friendica\Util\Emailer;
use Friendica\Util\Security;
use Friendica\Util\Strings;
require_once 'include/enotify.php';
require_once 'include/text.php';
require_once 'include/items.php';
function item_post(App $a) {
if (!local_user() && !remote_user()) {
return 0;
@ -668,7 +664,6 @@ function item_post(App $a) {
// preview mode - prepare the body for display and send it via json
if ($preview) {
require_once 'include/conversation.php';
// We set the datarray ID to -1 because in preview mode the dataray
// doesn't have an ID.
$datarray["id"] = -1;

2
mod/like.php
View file

@ -5,8 +5,6 @@ use Friendica\Core\System;
use Friendica\Model\Item;
use Friendica\Util\Strings;
require_once 'include/items.php';
function like_content(App $a) {
if (!local_user() && !remote_user()) {
return false;

4
mod/lostpass.php
View file

@ -13,10 +13,6 @@ use Friendica\Model\User;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Strings;
require_once 'boot.php';
require_once 'include/enotify.php';
require_once 'include/text.php';
function lostpass_post(App $a)
{
$loginame = Strings::escapeTags(trim($_POST['login-name']));

2
mod/manage.php
View file

@ -10,8 +10,6 @@ use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Database\DBA;
require_once "include/text.php";
function manage_post(App $a) {
if (! local_user()) {

116
mod/match.php
View file

@ -12,11 +12,9 @@ use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Model\Contact;
use Friendica\Model\Profile;
use Friendica\Util\Network;
use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings;
require_once 'include/text.php';
/**
* @brief Controller for /match.
@ -26,13 +24,12 @@ require_once 'include/text.php';
*
* @param App $a App
*
* @return void|string
* @return string
*/
function match_content(App $a)
{
$o = '';
if (! local_user()) {
return;
if (!local_user()) {
return '';
}
$a->page['aside'] .= Widget::findPeople();
@ -40,91 +37,102 @@ function match_content(App $a)
$_SESSION['return_path'] = $a->cmd;
$r = q(
"SELECT `pub_keywords`, `prv_keywords` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
intval(local_user())
);
if (! DBA::isResult($r)) {
return;
$profile = Profile::getByUID(local_user());
if (!DBA::isResult($profile)) {
return '';
}
if (! $r[0]['pub_keywords'] && (! $r[0]['prv_keywords'])) {
if (!$profile['pub_keywords'] && (!$profile['prv_keywords'])) {
notice(L10n::t('No keywords to match. Please add keywords to your default profile.') . EOL);
return;
return '';
}
$params = [];
$tags = trim($r[0]['pub_keywords'] . ' ' . $r[0]['prv_keywords']);
if ($tags) {
$pager = new Pager($a->query_string);
$tags = trim($profile['pub_keywords'] . ' ' . $profile['prv_keywords']);
$params['s'] = $tags;
if ($pager->getPage() != 1) {
$params['p'] = $pager->getPage();
}
$params['n'] = 100;
if (strlen(Config::get('system', 'directory'))) {
$x = Network::post(get_server().'/msearch', $params)->getBody();
$host = get_server();
} else {
$x = Network::post(System::baseUrl() . '/msearch', $params)->getBody();
$host = System::baseUrl();
}
$j = json_decode($x);
$msearch_json = Network::post($host . '/msearch', $params)->getBody();
if (count($j->results)) {
$pager->setItemsPerPage($j->items_page);
$msearch = json_decode($msearch_json);
$id = 0;
$start = defaults($_GET, 'start', 0);
$entries = [];
$paginate = '';
foreach ($j->results as $jj) {
$match_nurl = Strings::normaliseLink($jj->url);
$match = q(
"SELECT `nurl` FROM `contact` WHERE `uid` = '%d' AND nurl='%s' LIMIT 1",
intval(local_user()),
DBA::escape($match_nurl)
);
if (!empty($msearch->results)) {
for ($i = $start;count($entries) < 10 && $i < $msearch->total; $i++) {
$profile = $msearch->results[$i];
if (!count($match)) {
$jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
$connlnk = System::baseUrl() . '/follow/?url=' . $jj->url;
// Already known contact
if (Contact::getIdForURL($profile->url, local_user(), true)) {
continue;
}
// Workaround for wrong directory photo URL
$profile->photo = str_replace('http:///photo/', get_server() . '/photo/', $profile->photo);
$connlnk = System::baseUrl() . '/follow/?url=' . $profile->url;
$photo_menu = [
'profile' => [L10n::t("View Profile"), Contact::magicLink($jj->url)],
'profile' => [L10n::t("View Profile"), Contact::magicLink($profile->url)],
'follow' => [L10n::t("Connect/Follow"), $connlnk]
];
$contact_details = Contact::getDetailsByURL($jj->url, local_user());
$contact_details = Contact::getDetailsByURL($profile->url, 0);
$entry = [
'url' => Contact::magicLink($jj->url),
'itemurl' => defaults($contact_details, 'addr', $jj->url),
'name' => $jj->name,
'url' => Contact::magicLink($profile->url),
'itemurl' => defaults($contact_details, 'addr', $profile->url),
'name' => $profile->name,
'details' => defaults($contact_details, 'location', ''),
'tags' => defaults($contact_details, 'keywords', ''),
'about' => defaults($contact_details, 'about', ''),
'account_type' => Contact::getAccountType($contact_details),
'thumb' => ProxyUtils::proxifyUrl($jj->photo, false, ProxyUtils::SIZE_THUMB),
'inttxt' => ' ' . L10n::t('is interested in:'),
'thumb' => ProxyUtils::proxifyUrl($profile->photo, false, ProxyUtils::SIZE_THUMB),
'conntxt' => L10n::t('Connect'),
'connlnk' => $connlnk,
'img_hover' => $jj->tags,
'img_hover' => $profile->tags,
'photo_menu' => $photo_menu,
'id' => ++$id,
'id' => $i,
];
$entries[] = $entry;
}
$data = [
'class' => 'pager',
'first' => [
'url' => 'match',
'text' => L10n::t('first'),
'class' => 'previous' . ($start == 0 ? 'disabled' : '')
],
'next' => [
'url' => 'match?start=' . $i,
'text' => L10n::t('next'),
'class' => 'next' . ($i >= $msearch->total ? ' disabled' : '')
]
];
$tpl = Renderer::getMarkupTemplate('paginate.tpl');
$paginate = Renderer::replaceMacros($tpl, ['pager' => $data]);
}
if (empty($entries)) {
info(L10n::t('No matches') . EOL);
}
$tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
$o .= Renderer::replaceMacros($tpl, [
$o = Renderer::replaceMacros($tpl, [
'$title' => L10n::t('Profile Match'),
'$contacts' => $entries,
'$paginate' => $pager->renderFull($j->total)
'$paginate' => $paginate
]);
} else {
info(L10n::t('No matches') . EOL);
}
}
return $o;
}

2
mod/message.php
View file

@ -21,8 +21,6 @@ use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings;
use Friendica\Util\Temporal;
require_once 'include/conversation.php';
function message_init(App $a)
{
$tabs = '';

77
mod/msearch.php
View file

@ -4,45 +4,64 @@ use Friendica\App;
use Friendica\Core\System;
use Friendica\Database\DBA;
function msearch_post(App $a) {
$perpage = (($_POST['n']) ? $_POST['n'] : 80);
$page = (($_POST['p']) ? intval($_POST['p'] - 1) : 0);
$startrec = (($page+1) * $perpage) - $perpage;
$search = $_POST['s'];
if(! strlen($search))
killme();
$r = q("SELECT COUNT(*) AS `total` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 AND `user`.`hidewall` = 0 AND MATCH `pub_keywords` AGAINST ('%s') ",
DBA::escape($search)
);
if (DBA::isResult($r))
$total = $r[0]['total'];
function msearch_post(App $a)
{
$search = defaults($_POST, 's', '');
$perpage = intval(defaults($_POST, 'n', 80));
$page = intval(defaults($_POST, 'p', 1));
$startrec = ($page - 1) * $perpage;
$total = 0;
$results = [];
$r = q("SELECT `pub_keywords`, `username`, `nickname`, `user`.`uid` FROM `user` LEFT JOIN `profile` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 AND `user`.`hidewall` = 0 AND MATCH `pub_keywords` AGAINST ('%s') LIMIT %d , %d ",
DBA::escape($search),
intval($startrec),
intval($perpage)
if (!strlen($search)) {
$output = ['total' => 0, 'items_page' => $perpage, 'page' => $page, 'results' => $results];
echo json_encode($output);
exit();
}
$count_stmt = DBA::p(
"SELECT COUNT(*) AS `total`
FROM `profile`
JOIN `user` ON `user`.`uid` = `profile`.`uid`
WHERE `is-default` = 1
AND `user`.`hidewall` = 0
AND MATCH(`pub_keywords`) AGAINST (?)",
$search
);
if (DBA::isResult($r)) {
foreach($r as $rr)
if (DBA::isResult($count_stmt)) {
$row = DBA::fetch($count_stmt);
$total = $row['total'];
}
DBA::close($count_stmt);
$search_stmt = DBA::p(
"SELECT `pub_keywords`, `username`, `nickname`, `user`.`uid`
FROM `user`
JOIN `profile` ON `user`.`uid` = `profile`.`uid`
WHERE `is-default` = 1
AND `user`.`hidewall` = 0
AND MATCH(`pub_keywords`) AGAINST (?)
LIMIT ?, ?",
$search,
$startrec,
$perpage
);
while($search_result = DBA::fetch($search_stmt)) {
$results[] = [
'name' => $rr['name'],
'url' => System::baseUrl() . '/profile/' . $rr['nickname'],
'photo' => System::baseUrl() . '/photo/avatar/' . $rr['uid'] . '.jpg',
'tags' => str_replace([',',' '],[' ',' '],$rr['pub_keywords'])
'name' => $search_result['name'],
'url' => System::baseUrl() . '/profile/' . $search_result['nickname'],
'photo' => System::baseUrl() . '/photo/avatar/' . $search_result['uid'] . '.jpg',
'tags' => str_replace([',', ' '], [' ', ' '], $search_result['pub_keywords'])
];
}
$output = ['total' => $total, 'items_page' => $perpage, 'page' => $page + 1, 'results' => $results];
$output = ['total' => $total, 'items_page' => $perpage, 'page' => $page, 'results' => $results];
echo json_encode($output);
killme();
exit();
}

3
mod/network.php
View file

@ -30,9 +30,6 @@ use Friendica\Util\DateTimeFormat;
use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings;
require_once 'include/conversation.php';
require_once 'include/items.php';
function network_init(App $a)
{
if (!local_user()) {

2
mod/nodeinfo.php
View file

@ -12,8 +12,6 @@ use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Util\Network;
require_once 'include/dba.php';
function nodeinfo_wellknown(App $a) {
$nodeinfo = ['links' => [['rel' => 'http://nodeinfo.diaspora.software/ns/schema/1.0',
'href' => System::baseUrl().'/nodeinfo/1.0']]];

2
mod/notes.php
View file

@ -34,8 +34,6 @@ function notes_content(App $a, $update = false)
return;
}
require_once 'include/conversation.php';
$o = Profile::getTabs($a, true);
if (!$update) {

2
mod/parse_url.php
View file

@ -15,8 +15,6 @@ use Friendica\Core\Logger;
use Friendica\Util\Network;
use Friendica\Util\ParseUrl;
require_once 'include/items.php';
function parse_url_content(App $a)
{
$text = null;

4
mod/photos.php
View file

@ -34,8 +34,6 @@ use Friendica\Util\Temporal;
use Friendica\Util\Strings;
use Friendica\Util\XML;
require_once 'include/items.php';
function photos_init(App $a) {
if ($a->argc > 1) {
@ -946,8 +944,6 @@ function photos_content(App $a)
return;
}
require_once 'include/conversation.php';
if (empty($a->data['user'])) {
notice(L10n::t('No photos selected') . EOL);
return;

2
mod/phpinfo.php
View file

@ -3,8 +3,6 @@
* @file mod/phpinfo.php
*/
require_once 'boot.php';
function phpinfo_content()
{
if (!is_site_admin()) {

2
mod/ping.php
View file

@ -22,8 +22,6 @@ use Friendica\Util\Temporal;
use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\XML;
require_once 'include/enotify.php';
/**
* @brief Outputs the counts and the lists of various notifications
*

2
mod/poke.php
View file

@ -25,8 +25,6 @@ use Friendica\Model\Item;
use Friendica\Util\Strings;
use Friendica\Util\XML;
require_once 'include/items.php';
function poke_init(App $a)
{
if (!local_user()) {

3
mod/profile.php
View file

@ -127,9 +127,6 @@ function profile_content(App $a, $update = 0)
return Login::form();
}
require_once 'include/conversation.php';
require_once 'include/items.php';
$groups = [];
$remote_cid = null;

2
mod/pubsub.php
View file

@ -9,8 +9,6 @@ use Friendica\Protocol\OStatus;
use Friendica\Util\Strings;
use Friendica\Core\System;
require_once 'include/items.php';
function hub_return($valid, $body)
{
if ($valid) {

2
mod/register.php
View file

@ -18,8 +18,6 @@ use Friendica\Model;
use Friendica\Module\Tos;
use Friendica\Util\Strings;
require_once 'include/enotify.php';
function register_post(App $a)
{
BaseModule::checkFormSecurityTokenRedirectOnError('/register', 'register');

2
mod/regmod.php
View file

@ -13,8 +13,6 @@ use Friendica\Model\Register;
use Friendica\Model\User;
use Friendica\Module\Login;
require_once 'include/enotify.php';
function user_allow($hash)
{
$a = get_app();

2
mod/removeme.php
View file

@ -12,8 +12,6 @@ use Friendica\Database\DBA;
use Friendica\Model\User;
use Friendica\Util\Strings;
require_once 'include/enotify.php';
function removeme_post(App $a)
{
if (!local_user()) {

2
mod/salmon.php
View file

@ -14,8 +14,6 @@ use Friendica\Protocol\Salmon;
use Friendica\Util\Crypto;
use Friendica\Util\Strings;
require_once 'include/items.php';
function salmon_post(App $a, $xml = '') {
if (empty($xml)) {

1
mod/search.php
View file

@ -18,7 +18,6 @@ use Friendica\Database\DBA;
use Friendica\Model\Item;
use Friendica\Util\Strings;
require_once 'include/conversation.php';
require_once 'mod/dirfind.php';
function search_saved_searches() {

2
mod/subthread.php
View file

@ -13,8 +13,6 @@ use Friendica\Util\Security;
use Friendica\Util\Strings;
use Friendica\Util\XML;
require_once 'include/items.php';
function subthread_content(App $a) {
if (!local_user() && !remote_user()) {

2
mod/tagger.php
View file

@ -13,8 +13,6 @@ use Friendica\Model\Item;
use Friendica\Util\Strings;
use Friendica\Util\XML;
require_once 'include/items.php';
function tagger_content(App $a) {
if (!local_user() && !remote_user()) {

4
mod/videos.php
View file

@ -18,8 +18,6 @@ use Friendica\Model\Profile;
use Friendica\Protocol\DFRN;
use Friendica\Util\Security;
require_once 'include/items.php';
function videos_init(App $a)
{
if ($a->argc > 1) {
@ -195,8 +193,6 @@ function videos_content(App $a)
return;
}
require_once 'include/conversation.php';
if (empty($a->data['user'])) {
notice(L10n::t('No videos selected') . EOL );
return;

3
src/App.php
View file

@ -11,9 +11,6 @@ use Exception;
use Friendica\Database\DBA;
use Friendica\Network\HTTPException\InternalServerErrorException;
require_once 'boot.php';
require_once 'include/text.php';
/**
*
* class: App

2
src/BaseObject.php
View file

@ -4,8 +4,6 @@
*/
namespace Friendica;
require_once 'boot.php';
/**
* Basic object
*

2
src/Content/ForumManager.php
View file

@ -15,8 +15,6 @@ use Friendica\Database\DBA;
use Friendica\Model\Contact;
use Friendica\Util\Proxy as ProxyUtils;
require_once 'include/dba.php';
/**
* @brief This class handles methods related to the forum functionality
*/

3
src/Content/Nav.php
View file

@ -15,9 +15,6 @@ use Friendica\Database\DBA;
use Friendica\Model\Contact;
use Friendica\Model\Profile;
require_once 'boot.php';
require_once 'include/text.php';
class Nav
{
private static $selected = [

2
src/Content/OEmbed.php
View file

@ -23,8 +23,6 @@ use Friendica\Util\ParseUrl;
use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings;
require_once 'include/dba.php';
/**
* Handles all OEmbed content fetching and replacement
*

2
src/Content/Pager.php
View file

@ -169,7 +169,7 @@ class Pager
'next' => [
'url' => $this->ensureQueryParameter($this->baseQueryString . '&page=' . ($this->getPage() + 1)),
'text' => L10n::t('older'),
'class' => 'next' . ($displayedItemCount <= 0 ? ' disabled' : '')
'class' => 'next' . ($displayedItemCount < $this->getItemsPerPage() ? ' disabled' : '')
]
];

3
src/Content/Widget.php
View file

@ -21,9 +21,6 @@ use Friendica\Model\Profile;
use Friendica\Util\Strings;
use Friendica\Util\XML;
require_once 'boot.php';
require_once 'include/dba.php';
class Widget
{
/**

3
src/Content/Widget/CalendarExport.php
View file

@ -10,9 +10,6 @@ use Friendica\Content\Feature;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
require_once 'boot.php';
require_once 'include/text.php';
/**
* TagCloud widget
*

2
src/Content/Widget/TagCloud.php
View file

@ -13,8 +13,6 @@ use Friendica\Database\DBA;
use Friendica\Model\Item;
use Friendica\Util\Security;
require_once 'include/dba.php';
/**
* TagCloud widget
*

2
src/Core/Config.php
View file

@ -12,8 +12,6 @@ use Friendica\App;
use Friendica\BaseObject;
use Friendica\Core\Config;
require_once 'include/dba.php';
/**
* @brief Arbitrary system configuration storage
*

2
src/Core/Config/JITConfigAdapter.php
View file

@ -4,8 +4,6 @@ namespace Friendica\Core\Config;
use Friendica\BaseObject;
use Friendica\Database\DBA;
require_once 'include/dba.php';
/**
* JustInTime Configuration Adapter
*

2
src/Core/Config/JITPConfigAdapter.php
View file

@ -4,8 +4,6 @@ namespace Friendica\Core\Config;
use Friendica\BaseObject;
use Friendica\Database\DBA;
require_once 'include/dba.php';
/**
* JustInTime User Configuration Adapter
*

2
src/Core/Config/PreloadConfigAdapter.php
View file

@ -6,8 +6,6 @@ use Exception;
use Friendica\BaseObject;
use Friendica\Database\DBA;
require_once 'include/dba.php';
/**
* Preload Configuration Adapter
*

2
src/Core/Config/PreloadPConfigAdapter.php
View file

@ -6,8 +6,6 @@ use Exception;
use Friendica\BaseObject;
use Friendica\Database\DBA;
require_once 'include/dba.php';
/**
* Preload User Configuration Adapter
*

2
src/Core/Console/AutomaticInstallation.php
View file

@ -11,8 +11,6 @@ use Friendica\Database\DBA;
use Friendica\Database\DBStructure;
use RuntimeException;
require_once 'include/dba.php';
class AutomaticInstallation extends Console
{
protected function getHelp()

3
src/Core/Console/DatabaseStructure.php
View file

@ -8,9 +8,6 @@ use Friendica\Database\DBA;
use Friendica\Database\DBStructure;
use RuntimeException;
require_once 'boot.php';
require_once 'include/dba.php';
/**
* @brief Performs database updates from the command line
*

2
src/Core/Console/GlobalCommunitySilence.php
View file

@ -8,8 +8,6 @@ use Friendica\Network\Probe;
use Friendica\Util\Strings;
use RuntimeException;
require_once 'include/text.php';
/**
* @brief tool to silence accounts on the global community page
*

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

@ -4,9 +4,6 @@ namespace Friendica\Core\Console;
use Friendica\Core;
require_once 'boot.php';
require_once 'include/dba.php';
/**
* @brief Sets maintenance mode for this node
*

1
src/Core/Installer.php
View file

@ -585,7 +585,6 @@ class Installer
*/
public function checkDB($dbhost, $dbuser, $dbpass, $dbdata)
{
require_once 'include/dba.php';
if (!DBA::connect($dbhost, $dbuser, $dbpass, $dbdata)) {
$this->addCheck(L10n::t('Could not connect to database.'), false, true, '');

3
src/Core/L10n.php
View file

@ -10,9 +10,6 @@ use Friendica\Core\Addon;
use Friendica\Core\Logger;
use Friendica\Core\System;
require_once 'boot.php';
require_once 'include/dba.php';
/**
* 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").

2
src/Core/NotificationsManager.php
View file

@ -19,8 +19,6 @@ use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Temporal;
use Friendica\Util\XML;
require_once 'include/dba.php';
/**
* @brief Methods for read and write notifications from/to database
* or for formatting notifications

2
src/Core/PConfig.php
View file

@ -11,8 +11,6 @@ namespace Friendica\Core;
use Friendica\App;
use Friendica\BaseObject;
require_once 'include/dba.php';
/**
* @brief Management of user configuration storage
* Note:

3
src/Core/Session/CacheSessionHandler.php
View file

@ -8,9 +8,6 @@ use Friendica\Core\Logger;
use Friendica\Core\Session;
use SessionHandlerInterface;
require_once 'boot.php';
require_once 'include/text.php';
/**
* SessionHandler using Friendica Cache
*

4
src/Core/Session/DatabaseSessionHandler.php
View file

@ -8,10 +8,6 @@ use Friendica\Core\Session;
use Friendica\Database\DBA;
use SessionHandlerInterface;
require_once 'boot.php';
require_once 'include/dba.php';
require_once 'include/text.php';
/**
* SessionHandler using database
*

2
src/Core/Theme.php
View file

@ -9,8 +9,6 @@ namespace Friendica\Core;
use Friendica\Core\Logger;
use Friendica\Core\System;
require_once 'boot.php';
/**
* Some functions to handle themes
*/

2
src/Core/UserImport.php
View file

@ -13,8 +13,6 @@ use Friendica\Model\Photo;
use Friendica\Object\Image;
use Friendica\Util\Strings;
require_once "include/dba.php";
/**
* @brief UserImport class
*/

2
src/Core/Worker.php
View file

@ -11,8 +11,6 @@ use Friendica\Model\Process;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
require_once 'include/dba.php';
/**
* @file src/Core/Worker.php
*

2
src/Database/DBA.php
View file

@ -16,8 +16,6 @@ use PDO;
use PDOException;
use PDOStatement;
require_once 'include/dba.php';
/**
* @class MySQL database class
*

681
src/Database/DBStructure.php
View file

@ -2,6 +2,7 @@
/**
* @file src/Database/DBStructure.php
*/
namespace Friendica\Database;
use Exception;
@ -11,11 +12,6 @@ use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Util\DateTimeFormat;
require_once 'boot.php';
require_once 'include/dba.php';
require_once 'include/enotify.php';
require_once 'include/text.php';
/**
* @brief This class contain functions for the database management
*
@ -27,6 +23,9 @@ class DBStructure
const UPDATE_SUCCESSFUL = 1; // Database check was successful
const UPDATE_FAILED = 2; // Database check failed
const RENAME_COLUMN = 0;
const RENAME_PRIMARY_KEY = 1;
/**
* Database structure definition loaded from config/dbstructure.config.php
*
@ -37,18 +36,19 @@ class DBStructure
/*
* Converts all tables from MyISAM to InnoDB
*/
public static function convertToInnoDB() {
public static function convertToInnoDB()
{
$r = q("SELECT `TABLE_NAME` FROM `information_schema`.`tables` WHERE `engine` = 'MyISAM' AND `table_schema` = '%s'",
DBA::escape(DBA::databaseName()));
if (!DBA::isResult($r)) {
echo L10n::t('There are no tables on MyISAM.')."\n";
echo L10n::t('There are no tables on MyISAM.') . "\n";
return;
}
foreach ($r AS $table) {
$sql = sprintf("ALTER TABLE `%s` engine=InnoDB;", DBA::escape($table['TABLE_NAME']));
echo $sql."\n";
echo $sql . "\n";
$result = DBA::e($sql);
if (!DBA::isResult($result)) {
@ -57,80 +57,28 @@ class DBStructure
}
}
private static function tableStructure($table) {
$structures = q("DESCRIBE `%s`", $table);
/**
* @brief Print out database error messages
*
* @param string $message Message to be added to the error message
*
* @return string Error message
*/
private static function printUpdateError($message)
{
echo L10n::t("\nError %d occurred during database update:\n%s\n",
DBA::errorNo(), DBA::errorMessage());
$full_columns = q("SHOW FULL COLUMNS FROM `%s`", $table);
$indexes = q("SHOW INDEX FROM `%s`", $table);
$table_status = q("SHOW TABLE STATUS WHERE `name` = '%s'", $table);
if (DBA::isResult($table_status)) {
$table_status = $table_status[0];
} else {
$table_status = [];
return L10n::t('Errors encountered performing database changes: ') . $message . EOL;
}
$fielddata = [];
$indexdata = [];
if (DBA::isResult($indexes)) {
foreach ($indexes AS $index) {
if ($index['Key_name'] != 'PRIMARY' && $index['Non_unique'] == '0' && !isset($indexdata[$index["Key_name"]])) {
$indexdata[$index["Key_name"]] = ['UNIQUE'];
}
$column = $index["Column_name"];
if ($index["Sub_part"] != "") {
$column .= "(".$index["Sub_part"].")";
}
$indexdata[$index["Key_name"]][] = $column;
}
}
if (DBA::isResult($structures)) {
foreach ($structures AS $field) {
// Replace the default size values so that we don't have to define them
$search = ['tinyint(1)', 'tinyint(3) unsigned', 'tinyint(4)', 'smallint(5) unsigned', 'smallint(6)', 'mediumint(8) unsigned', 'mediumint(9)', 'bigint(20)', 'int(10) unsigned', 'int(11)'];
$replace = ['boolean', 'tinyint unsigned', 'tinyint', 'smallint unsigned', 'smallint', 'mediumint unsigned', 'mediumint', 'bigint', 'int unsigned', 'int'];
$field["Type"] = str_replace($search, $replace, $field["Type"]);
$fielddata[$field["Field"]]["type"] = $field["Type"];
if ($field["Null"] == "NO") {
$fielddata[$field["Field"]]["not null"] = true;
}
if (isset($field["Default"])) {
$fielddata[$field["Field"]]["default"] = $field["Default"];
}
if ($field["Extra"] != "") {
$fielddata[$field["Field"]]["extra"] = $field["Extra"];
}
if ($field["Key"] == "PRI") {
$fielddata[$field["Field"]]["primary"] = true;
}
}
}
if (DBA::isResult($full_columns)) {
foreach ($full_columns AS $column) {
$fielddata[$column["Field"]]["Collation"] = $column["Collation"];
$fielddata[$column["Field"]]["comment"] = $column["Comment"];
}
}
return ["fields" => $fielddata, "indexes" => $indexdata, "table_status" => $table_status];
}
public static function printStructure() {
public static function printStructure()
{
$database = self::definition(false);
echo "-- ------------------------------------------\n";
echo "-- ".FRIENDICA_PLATFORM." ".FRIENDICA_VERSION." (".FRIENDICA_CODENAME,")\n";
echo "-- DB_UPDATE_VERSION ".DB_UPDATE_VERSION."\n";
echo "-- " . FRIENDICA_PLATFORM . " " . FRIENDICA_VERSION . " (" . FRIENDICA_CODENAME, ")\n";
echo "-- DB_UPDATE_VERSION " . DB_UPDATE_VERSION . "\n";
echo "-- ------------------------------------------\n\n\n";
foreach ($database AS $name => $structure) {
echo "--\n";
@ -143,17 +91,155 @@ class DBStructure
}
/**
* @brief Print out database error messages
* Loads the database structure definition from the config/dbstructure.config.php file.
* On first pass, defines DB_UPDATE_VERSION constant.
*
* @param string $message Message to be added to the error message
*
* @return string Error message
* @see config/dbstructure.config.php
* @param boolean $with_addons_structure Whether to tack on addons additional tables
* @return array
* @throws Exception
*/
private static function printUpdateError($message) {
echo L10n::t("\nError %d occurred during database update:\n%s\n",
DBA::errorNo(), DBA::errorMessage());
public static function definition($with_addons_structure = true)
{
if (!self::$definition) {
$a = \Friendica\BaseObject::getApp();
return L10n::t('Errors encountered performing database changes: ').$message.EOL;
$filename = $a->getBasePath() . '/config/dbstructure.config.php';
if (!is_readable($filename)) {
throw new Exception('Missing database structure config file config/dbstructure.config.php');
}
$definition = require $filename;
if (!$definition) {
throw new Exception('Corrupted database structure config file config/dbstructure.config.php');
}
self::$definition = $definition;
} else {
$definition = self::$definition;
}
if ($with_addons_structure) {
Hook::callAll('dbstructure_definition', $definition);
}
return $definition;
}
private static function createTable($name, $structure, $verbose, $action)
{
$r = true;
$engine = "";
$comment = "";
$sql_rows = [];
$primary_keys = [];
foreach ($structure["fields"] AS $fieldname => $field) {
$sql_rows[] = "`" . DBA::escape($fieldname) . "` " . self::FieldCommand($field);
if (!empty($field['primary'])) {
$primary_keys[] = $fieldname;
}
}
if (!empty($structure["indexes"])) {
foreach ($structure["indexes"] AS $indexname => $fieldnames) {
$sql_index = self::createIndex($indexname, $fieldnames, "");
if (!is_null($sql_index)) {
$sql_rows[] = $sql_index;
}
}
}
if (isset($structure["engine"])) {
$engine = " ENGINE=" . $structure["engine"];
}
if (isset($structure["comment"])) {
$comment = " COMMENT='" . DBA::escape($structure["comment"]) . "'";
}
$sql = implode(",\n\t", $sql_rows);
$sql = sprintf("CREATE TABLE IF NOT EXISTS `%s` (\n\t", DBA::escape($name)) . $sql .
"\n)" . $engine . " DEFAULT COLLATE utf8mb4_general_ci" . $comment;
if ($verbose) {
echo $sql . ";\n";
}
if ($action) {
$r = DBA::e($sql);
}
return $r;
}
private static function FieldCommand($parameters, $create = true)
{
$fieldstruct = $parameters["type"];
if (isset($parameters["Collation"])) {
$fieldstruct .= " COLLATE " . $parameters["Collation"];
}
if (isset($parameters["not null"])) {
$fieldstruct .= " NOT NULL";
}
if (isset($parameters["default"])) {
if (strpos(strtolower($parameters["type"]), "int") !== false) {
$fieldstruct .= " DEFAULT " . $parameters["default"];
} else {
$fieldstruct .= " DEFAULT '" . $parameters["default"] . "'";
}
}
if (isset($parameters["extra"])) {
$fieldstruct .= " " . $parameters["extra"];
}
if (isset($parameters["comment"])) {
$fieldstruct .= " COMMENT '" . DBA::escape($parameters["comment"]) . "'";
}
/*if (($parameters["primary"] != "") && $create)
$fieldstruct .= " PRIMARY KEY";*/
return ($fieldstruct);
}
private static function createIndex($indexname, $fieldnames, $method = "ADD")
{
$method = strtoupper(trim($method));
if ($method != "" && $method != "ADD") {
throw new Exception("Invalid parameter 'method' in self::createIndex(): '$method'");
}
if (in_array($fieldnames[0], ["UNIQUE", "FULLTEXT"])) {
$index_type = array_shift($fieldnames);
$method .= " " . $index_type;
}
$names = "";
foreach ($fieldnames AS $fieldname) {
if ($names != "") {
$names .= ",";
}
if (preg_match('|(.+)\((\d+)\)|', $fieldname, $matches)) {
$names .= "`" . DBA::escape($matches[1]) . "`(" . intval($matches[2]) . ")";
} else {
$names .= "`" . DBA::escape($fieldname) . "`";
}
}
if ($indexname == "PRIMARY") {
return sprintf("%s PRIMARY KEY(%s)", $method, $names);
}
$sql = sprintf("%s INDEX `%s` (%s)", $method, DBA::escape($indexname), $names);
return ($sql);
}
/**
@ -166,10 +252,11 @@ class DBStructure
* @param array $definition An array of the definition tables
* @return string Empty string if the update is successful, error messages otherwise
*/
public static function update($verbose, $action, $install = false, array $tables = null, array $definition = null) {
public static function update($verbose, $action, $install = false, array $tables = null, array $definition = null)
{
if ($action && !$install) {
Config::set('system', 'maintenance', 1);
Config::set('system', 'maintenance_reason', L10n::t('%s: Database update', DateTimeFormat::utcNow().' '.date('e')));
Config::set('system', 'maintenance_reason', L10n::t('%s: Database update', DateTimeFormat::utcNow() . ' ' . date('e')));
}
$errors = '';
@ -221,16 +308,16 @@ class DBStructure
} else {
foreach ($structure["indexes"] AS $indexname => $fieldnames) {
if (isset($database[$name]["indexes"][$indexname])) {
$current_index_definition = implode(",",$database[$name]["indexes"][$indexname]);
$current_index_definition = implode(",", $database[$name]["indexes"][$indexname]);
} else {
$current_index_definition = "__NOT_SET__";
}
$new_index_definition = implode(",",$fieldnames);
$new_index_definition = implode(",", $fieldnames);
if ($current_index_definition != $new_index_definition) {
if ($fieldnames[0] == "UNIQUE") {
$is_unique = true;
if ($ignore == "") {
$temp_name = "temp-".$name;
$temp_name = "temp-" . $name;
}
}
}
@ -242,29 +329,29 @@ class DBStructure
* and index name doesn't start with "local_"
*/
foreach ($database[$name]["indexes"] as $indexname => $fieldnames) {
$current_index_definition = implode(",",$fieldnames);
$current_index_definition = implode(",", $fieldnames);
if (isset($structure["indexes"][$indexname])) {
$new_index_definition = implode(",",$structure["indexes"][$indexname]);
$new_index_definition = implode(",", $structure["indexes"][$indexname]);
} else {
$new_index_definition = "__NOT_SET__";
}
if ($current_index_definition != $new_index_definition && substr($indexname, 0, 6) != 'local_') {
$sql2=self::dropIndex($indexname);
$sql2 = self::dropIndex($indexname);
if ($sql3 == "") {
$sql3 = "ALTER".$ignore." TABLE `".$temp_name."` ".$sql2;
$sql3 = "ALTER" . $ignore . " TABLE `" . $temp_name . "` " . $sql2;
} else {
$sql3 .= ", ".$sql2;
$sql3 .= ", " . $sql2;
}
}
}
// Compare the field structure field by field
foreach ($structure["fields"] AS $fieldname => $parameters) {
if (!isset($database[$name]["fields"][$fieldname])) {
$sql2=self::addTableField($fieldname, $parameters);
$sql2 = self::addTableField($fieldname, $parameters);
if ($sql3 == "") {
$sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2;
$sql3 = "ALTER" . $ignore . " TABLE `" . $temp_name . "` " . $sql2;
} else {
$sql3 .= ", ".$sql2;
$sql3 .= ", " . $sql2;
}
} else {
// Compare the field definition
@ -289,9 +376,9 @@ class DBStructure
if ($current_field_definition != $new_field_definition) {
$sql2 = self::modifyTableField($fieldname, $parameters);
if ($sql3 == "") {
$sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2;
$sql3 = "ALTER" . $ignore . " TABLE `" . $temp_name . "` " . $sql2;
} else {
$sql3 .= ", ".$sql2;
$sql3 .= ", " . $sql2;
}
}
}
@ -306,23 +393,21 @@ class DBStructure
if (!$is_new_table) {
foreach ($structure["indexes"] AS $indexname => $fieldnames) {
if (isset($database[$name]["indexes"][$indexname])) {
$current_index_definition = implode(",",$database[$name]["indexes"][$indexname]);
$current_index_definition = implode(",", $database[$name]["indexes"][$indexname]);
} else {
$current_index_definition = "__NOT_SET__";
}
$new_index_definition = implode(",",$fieldnames);
$new_index_definition = implode(",", $fieldnames);
if ($current_index_definition != $new_index_definition) {
$sql2 = self::createIndex($indexname, $fieldnames);
// Fetch the "group by" fields for unique indexes
if ($fieldnames[0] == "UNIQUE") {
$group_by = self::groupBy($indexname, $fieldnames);
}
$group_by = self::groupBy($fieldnames);
if ($sql2 != "") {
if ($sql3 == "") {
$sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2;
$sql3 = "ALTER" . $ignore . " TABLE `" . $temp_name . "` " . $sql2;
} else {
$sql3 .= ", ".$sql2;
$sql3 .= ", " . $sql2;
}
}
}
@ -331,24 +416,24 @@ class DBStructure
if (isset($database[$name]["table_status"]["Comment"])) {
$structurecomment = defaults($structure, "comment", "");
if ($database[$name]["table_status"]["Comment"] != $structurecomment) {
$sql2 = "COMMENT = '".DBA::escape($structurecomment)."'";
$sql2 = "COMMENT = '" . DBA::escape($structurecomment) . "'";
if ($sql3 == "") {
$sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2;
$sql3 = "ALTER" . $ignore . " TABLE `" . $temp_name . "` " . $sql2;
} else {
$sql3 .= ", ".$sql2;
$sql3 .= ", " . $sql2;
}
}
}
if (isset($database[$name]["table_status"]["Engine"]) && isset($structure['engine'])) {
if ($database[$name]["table_status"]["Engine"] != $structure['engine']) {
$sql2 = "ENGINE = '".DBA::escape($structure['engine'])."'";
$sql2 = "ENGINE = '" . DBA::escape($structure['engine']) . "'";
if ($sql3 == "") {
$sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2;
$sql3 = "ALTER" . $ignore . " TABLE `" . $temp_name . "` " . $sql2;
} else {
$sql3 .= ", ".$sql2;
$sql3 .= ", " . $sql2;
}
}
}
@ -358,9 +443,9 @@ class DBStructure
$sql2 = "DEFAULT COLLATE utf8mb4_general_ci";
if ($sql3 == "") {
$sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2;
$sql3 = "ALTER" . $ignore . " TABLE `" . $temp_name . "` " . $sql2;
} else {
$sql3 .= ", ".$sql2;
$sql3 .= ", " . $sql2;
}
}
}
@ -385,9 +470,9 @@ class DBStructure
if ($field_definition['Collation'] != $parameters['Collation']) {
$sql2 = self::modifyTableField($fieldname, $parameters);
if (($sql3 == "") || (substr($sql3, -2, 2) == "; ")) {
$sql3 .= "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2;
$sql3 .= "ALTER" . $ignore . " TABLE `" . $temp_name . "` " . $sql2;
} else {
$sql3 .= ", ".$sql2;
$sql3 .= ", " . $sql2;
}
}
}
@ -412,27 +497,27 @@ class DBStructure
if ($ignore != "") {
echo "SET session old_alter_table=1;\n";
} else {
echo "DROP TABLE IF EXISTS `".$temp_name."`;\n";
echo "CREATE TABLE `".$temp_name."` LIKE `".$name."`;\n";
echo "DROP TABLE IF EXISTS `" . $temp_name . "`;\n";
echo "CREATE TABLE `" . $temp_name . "` LIKE `" . $name . "`;\n";
}
}
echo $sql3."\n";
echo $sql3 . "\n";
if ($is_unique && ($temp_name != $name)) {
if ($ignore != "") {
echo "SET session old_alter_table=0;\n";
} else {
echo "INSERT INTO `".$temp_name."` SELECT ".DBA::anyValueFallback($field_list)." FROM `".$name."`".$group_by.";\n";
echo "DROP TABLE `".$name."`;\n";
echo "RENAME TABLE `".$temp_name."` TO `".$name."`;\n";
echo "INSERT INTO `" . $temp_name . "` SELECT " . DBA::anyValueFallback($field_list) . " FROM `" . $name . "`" . $group_by . ";\n";
echo "DROP TABLE `" . $name . "`;\n";
echo "RENAME TABLE `" . $temp_name . "` TO `" . $name . "`;\n";
}
}
}
if ($action) {
if (!$install) {
Config::set('system', 'maintenance_reason', L10n::t('%s: updating %s table.', DateTimeFormat::utcNow().' '.date('e'), $name));
Config::set('system', 'maintenance_reason', L10n::t('%s: updating %s table.', DateTimeFormat::utcNow() . ' ' . date('e'), $name));
}
// Ensure index conversion to unique removes duplicates
@ -440,13 +525,13 @@ class DBStructure
if ($ignore != "") {
DBA::e("SET session old_alter_table=1;");
} else {
$r = DBA::e("DROP TABLE IF EXISTS `".$temp_name."`;");
$r = DBA::e("DROP TABLE IF EXISTS `" . $temp_name . "`;");
if (!DBA::isResult($r)) {
$errors .= self::printUpdateError($sql3);
return $errors;
}
$r = DBA::e("CREATE TABLE `".$temp_name."` LIKE `".$name."`;");
$r = DBA::e("CREATE TABLE `" . $temp_name . "` LIKE `" . $name . "`;");
if (!DBA::isResult($r)) {
$errors .= self::printUpdateError($sql3);
return $errors;
@ -462,17 +547,17 @@ class DBStructure
if ($ignore != "") {
DBA::e("SET session old_alter_table=0;");
} else {
$r = DBA::e("INSERT INTO `".$temp_name."` SELECT ".$field_list." FROM `".$name."`".$group_by.";");
$r = DBA::e("INSERT INTO `" . $temp_name . "` SELECT " . $field_list . " FROM `" . $name . "`" . $group_by . ";");
if (!DBA::isResult($r)) {
$errors .= self::printUpdateError($sql3);
return $errors;
}
$r = DBA::e("DROP TABLE `".$name."`;");
$r = DBA::e("DROP TABLE `" . $name . "`;");
if (!DBA::isResult($r)) {
$errors .= self::printUpdateError($sql3);
return $errors;
}
$r = DBA::e("RENAME TABLE `".$temp_name."` TO `".$name."`;");
$r = DBA::e("RENAME TABLE `" . $temp_name . "` TO `" . $name . "`;");
if (!DBA::isResult($r)) {
$errors .= self::printUpdateError($sql3);
return $errors;
@ -497,133 +582,105 @@ class DBStructure
return $errors;
}
private static function FieldCommand($parameters, $create = true) {
$fieldstruct = $parameters["type"];
private static function tableStructure($table)
{
$structures = q("DESCRIBE `%s`", $table);
if (isset($parameters["Collation"])) {
$fieldstruct .= " COLLATE ".$parameters["Collation"];
}
$full_columns = q("SHOW FULL COLUMNS FROM `%s`", $table);
if (isset($parameters["not null"])) {
$fieldstruct .= " NOT NULL";
}
$indexes = q("SHOW INDEX FROM `%s`", $table);
if (isset($parameters["default"])) {
if (strpos(strtolower($parameters["type"]),"int")!==false) {
$fieldstruct .= " DEFAULT ".$parameters["default"];
$table_status = q("SHOW TABLE STATUS WHERE `name` = '%s'", $table);
if (DBA::isResult($table_status)) {
$table_status = $table_status[0];
} else {
$fieldstruct .= " DEFAULT '".$parameters["default"]."'";
}
}
if (isset($parameters["extra"])) {
$fieldstruct .= " ".$parameters["extra"];
$table_status = [];
}
if (isset($parameters["comment"])) {
$fieldstruct .= " COMMENT '".DBA::escape($parameters["comment"])."'";
$fielddata = [];
$indexdata = [];
if (DBA::isResult($indexes)) {
foreach ($indexes AS $index) {
if ($index["Key_name"] != "PRIMARY" && $index["Non_unique"] == "0" && !isset($indexdata[$index["Key_name"]])) {
$indexdata[$index["Key_name"]] = ["UNIQUE"];
}
/*if (($parameters["primary"] != "") && $create)
$fieldstruct .= " PRIMARY KEY";*/
return($fieldstruct);
if ($index["Index_type"] == "FULLTEXT" && !isset($indexdata[$index["Key_name"]])) {
$indexdata[$index["Key_name"]] = ["FULLTEXT"];
}
private static function createTable($name, $structure, $verbose, $action) {
$r = true;
$column = $index["Column_name"];
$engine = "";
$comment = "";
$sql_rows = [];
$primary_keys = [];
foreach ($structure["fields"] AS $fieldname => $field) {
$sql_rows[] = "`".DBA::escape($fieldname)."` ".self::FieldCommand($field);
if (!empty($field['primary'])) {
$primary_keys[] = $fieldname;
if ($index["Sub_part"] != "") {
$column .= "(" . $index["Sub_part"] . ")";
}
$indexdata[$index["Key_name"]][] = $column;
}
}
if (DBA::isResult($structures)) {
foreach ($structures AS $field) {
// Replace the default size values so that we don't have to define them
$search = ['tinyint(1)', 'tinyint(3) unsigned', 'tinyint(4)', 'smallint(5) unsigned', 'smallint(6)', 'mediumint(8) unsigned', 'mediumint(9)', 'bigint(20)', 'int(10) unsigned', 'int(11)'];
$replace = ['boolean', 'tinyint unsigned', 'tinyint', 'smallint unsigned', 'smallint', 'mediumint unsigned', 'mediumint', 'bigint', 'int unsigned', 'int'];
$field["Type"] = str_replace($search, $replace, $field["Type"]);
$fielddata[$field["Field"]]["type"] = $field["Type"];
if ($field["Null"] == "NO") {
$fielddata[$field["Field"]]["not null"] = true;
}
if (isset($field["Default"])) {
$fielddata[$field["Field"]]["default"] = $field["Default"];
}
if ($field["Extra"] != "") {
$fielddata[$field["Field"]]["extra"] = $field["Extra"];
}
if ($field["Key"] == "PRI") {
$fielddata[$field["Field"]]["primary"] = true;
}
}
}
if (DBA::isResult($full_columns)) {
foreach ($full_columns AS $column) {
$fielddata[$column["Field"]]["Collation"] = $column["Collation"];
$fielddata[$column["Field"]]["comment"] = $column["Comment"];
}
}
if (!empty($structure["indexes"])) {
foreach ($structure["indexes"] AS $indexname => $fieldnames) {
$sql_index = self::createIndex($indexname, $fieldnames, "");
if (!is_null($sql_index)) {
$sql_rows[] = $sql_index;
}
}
return ["fields" => $fielddata, "indexes" => $indexdata, "table_status" => $table_status];
}
if (isset($structure["engine"])) {
$engine = " ENGINE=" . $structure["engine"];
}
if (isset($structure["comment"])) {
$comment = " COMMENT='" . DBA::escape($structure["comment"]) . "'";
}
$sql = implode(",\n\t", $sql_rows);
$sql = sprintf("CREATE TABLE IF NOT EXISTS `%s` (\n\t", DBA::escape($name)).$sql.
"\n)" . $engine . " DEFAULT COLLATE utf8mb4_general_ci" . $comment;
if ($verbose) {
echo $sql.";\n";
}
if ($action) {
$r = DBA::e($sql);
}
return $r;
}
private static function addTableField($fieldname, $parameters) {
$sql = sprintf("ADD `%s` %s", DBA::escape($fieldname), self::FieldCommand($parameters));
return($sql);
}
private static function modifyTableField($fieldname, $parameters) {
$sql = sprintf("MODIFY `%s` %s", DBA::escape($fieldname), self::FieldCommand($parameters, false));
return($sql);
}
private static function dropIndex($indexname) {
private static function dropIndex($indexname)
{
$sql = sprintf("DROP INDEX `%s`", DBA::escape($indexname));
return($sql);
return ($sql);
}
private static function createIndex($indexname, $fieldnames, $method = "ADD") {
$method = strtoupper(trim($method));
if ($method!="" && $method!="ADD") {
throw new Exception("Invalid parameter 'method' in self::createIndex(): '$method'");
private static function addTableField($fieldname, $parameters)
{
$sql = sprintf("ADD `%s` %s", DBA::escape($fieldname), self::FieldCommand($parameters));
return ($sql);
}
if ($fieldnames[0] == "UNIQUE") {
array_shift($fieldnames);
$method .= ' UNIQUE';
private static function modifyTableField($fieldname, $parameters)
{
$sql = sprintf("MODIFY `%s` %s", DBA::escape($fieldname), self::FieldCommand($parameters, false));
return ($sql);
}
$names = "";
foreach ($fieldnames AS $fieldname) {
if ($names != "") {
$names .= ",";
}
if (preg_match('|(.+)\((\d+)\)|', $fieldname, $matches)) {
$names .= "`".DBA::escape($matches[1])."`(".intval($matches[2]).")";
} else {
$names .= "`".DBA::escape($fieldname)."`";
}
}
if ($indexname == "PRIMARY") {
return sprintf("%s PRIMARY KEY(%s)", $method, $names);
}
$sql = sprintf("%s INDEX `%s` (%s)", $method, DBA::escape($indexname), $names);
return($sql);
}
private static function groupBy($indexname, $fieldnames) {
/**
* Constructs a GROUP BY clause from a UNIQUE index definition.
*
* @param array $fieldnames
* @return string
*/
private static function groupBy(array $fieldnames)
{
if ($fieldnames[0] != "UNIQUE") {
return "";
}
@ -637,9 +694,9 @@ class DBStructure
}
if (preg_match('|(.+)\((\d+)\)|', $fieldname, $matches)) {
$names .= "`".DBA::escape($matches[1])."`";
$names .= "`" . DBA::escape($matches[1]) . "`";
} else {
$names .= "`".DBA::escape($fieldname)."`";
$names .= "`" . DBA::escape($fieldname) . "`";
}
}
@ -647,81 +704,9 @@ class DBStructure
return $sql;
}
/**
* Check if a table exists
*
* @param string $table Table name
*
* @return boolean Does the table exist?
*/
public static function existsTable($table)
{
if (empty($table)) {
return false;
}
$table = DBA::escape($table);
$sql = "SHOW TABLES LIKE '" . $table . "';";
$stmt = DBA::p($sql);
if (is_bool($stmt)) {
$retval = $stmt;
} else {
$retval = (DBA::numRows($stmt) > 0);
}
DBA::close($stmt);
return $retval;
}
/**
* Check if the columns of the table exists
*
* @param string $table Table name
* @param array $columns Columns to check ( Syntax: [ $col1, $col2, .. ] )
*
* @return boolean Does the table exist?
*/
public static function existsColumn($table, $columns = []) {
if (empty($table)) {
return false;
}
if (is_null($columns) || empty($columns)) {
return self::existsTable($table);
}
$table = DBA::escape($table);
foreach ($columns AS $column) {
$sql = "SHOW COLUMNS FROM `" . $table . "` LIKE '" . $column . "';";
$stmt = DBA::p($sql);
if (is_bool($stmt)) {
$retval = $stmt;
} else {
$retval = (DBA::numRows($stmt) > 0);
}
DBA::close($stmt);
if (!$retval) {
return false;
}
}
return true;
}
const RENAME_COLUMN = 0;
const RENAME_PRIMARY_KEY = 1;
/**
* Renames columns or the primary key of a table
*
* @todo You cannot rename a primary key if "auto increment" is set
*
* @param string $table Table name
@ -732,7 +717,8 @@ class DBStructure
* @return boolean Was the renaming successful?
*
*/
public static function rename($table, $columns, $type = self::RENAME_COLUMN) {
public static function rename($table, $columns, $type = self::RENAME_COLUMN)
{
if (empty($table) || empty($columns)) {
return false;
}
@ -783,40 +769,73 @@ class DBStructure
}
/**
* Loads the database structure definition from the config/dbstructure.config.php file.
* On first pass, defines DB_UPDATE_VERSION constant.
* Check if the columns of the table exists
*
* @see config/dbstructure.config.php
* @param boolean $with_addons_structure Whether to tack on addons additional tables
* @return array
* @throws Exception
* @param string $table Table name
* @param array $columns Columns to check ( Syntax: [ $col1, $col2, .. ] )
*
* @return boolean Does the table exist?
*/
public static function definition($with_addons_structure = true)
public static function existsColumn($table, $columns = [])
{
if (!self::$definition) {
$a = \Friendica\BaseObject::getApp();
$filename = $a->getBasePath() . '/config/dbstructure.config.php';
if (!is_readable($filename)) {
throw new Exception('Missing database structure config file config/dbstructure.config.php');
if (empty($table)) {
return false;
}
$definition = require $filename;
if (!$definition) {
throw new Exception('Corrupted database structure config file config/dbstructure.config.php');
if (is_null($columns) || empty($columns)) {
return self::existsTable($table);
}
self::$definition = $definition;
$table = DBA::escape($table);
foreach ($columns AS $column) {
$sql = "SHOW COLUMNS FROM `" . $table . "` LIKE '" . $column . "';";
$stmt = DBA::p($sql);
if (is_bool($stmt)) {
$retval = $stmt;
} else {
$definition = self::$definition;
$retval = (DBA::numRows($stmt) > 0);
}
if ($with_addons_structure) {
Hook::callAll('dbstructure_definition', $definition);
DBA::close($stmt);
if (!$retval) {
return false;
}
}
return $definition;
return true;
}
/**
* Check if a table exists
*
* @param string $table Table name
*
* @return boolean Does the table exist?
*/
public static function existsTable($table)
{
if (empty($table)) {
return false;
}
$table = DBA::escape($table);
$sql = "SHOW TABLES LIKE '" . $table . "';";
$stmt = DBA::p($sql);
if (is_bool($stmt)) {
$retval = $stmt;
} else {
$retval = (DBA::numRows($stmt) > 0);
}
DBA::close($stmt);
return $retval;
}
}

2
src/Database/PostUpdate.php
View file

@ -13,8 +13,6 @@ use Friendica\Model\ItemURI;
use Friendica\Model\PermissionSet;
use Friendica\Database\DBA;
require_once 'include/dba.php';
/**
* Post update functions
*/

2
src/Model/APContact.php
View file

@ -16,8 +16,6 @@ use Friendica\Util\JsonLD;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Strings;
require_once 'boot.php';
class APContact extends BaseObject
{
/**

6
src/Model/Contact.php
View file

@ -27,10 +27,6 @@ use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
use Friendica\Util\Strings;
require_once 'boot.php';
require_once 'include/dba.php';
require_once 'include/text.php';
/**
* @brief functions for interacting with a contact
*/
@ -1376,8 +1372,6 @@ class Contact extends BaseObject
{
$a = self::getApp();
require_once 'include/conversation.php';
$cid = Self::getIdForURL($contact_url);
$contact = DBA::selectFirst('contact', ['contact-type', 'network'], ['id' => $cid]);

2
src/Model/Conversation.php
View file

@ -10,8 +10,6 @@ use Friendica\Core\Protocol;
use Friendica\Database\DBA;
use Friendica\Util\DateTimeFormat;
require_once "include/dba.php";
class Conversation
{
/*

4
src/Model/Event.php
View file

@ -19,10 +19,6 @@ use Friendica\Util\Map;
use Friendica\Util\Strings;
use Friendica\Util\XML;
require_once 'boot.php';
require_once 'include/dba.php';
require_once 'include/items.php';
/**
* @brief functions for interacting with the event database table
*/

2
src/Model/GContact.php
View file

@ -19,8 +19,6 @@ use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
use Friendica\Util\Strings;
require_once 'include/dba.php';
/**
* @brief This class handles GlobalContact related functions
*/

4
src/Model/Group.php
View file

@ -12,10 +12,6 @@ use Friendica\Core\Renderer;
use Friendica\Database\DBA;
use Friendica\Util\Security;
require_once 'boot.php';
require_once 'include/dba.php';
require_once 'include/text.php';
/**
* @brief functions for interacting with the group database table
*/

4
src/Model/Item.php
View file

@ -36,10 +36,6 @@ use Friendica\Util\Security;
use Friendica\Util\Strings;
use Text_LanguageDetect;
require_once 'boot.php';
require_once 'include/items.php';
require_once 'include/text.php';
class Item extends BaseObject
{
// Posting types, inspired by https://www.w3.org/TR/activitystreams-vocabulary/#object-types

4
src/Model/ItemContent.php
View file

@ -11,10 +11,6 @@ use Friendica\Content\Text;
use Friendica\Core\PConfig;
use Friendica\Core\Protocol;
require_once 'boot.php';
require_once 'include/items.php';
require_once 'include/text.php';
class ItemContent extends BaseObject
{
/**

2
src/Model/ItemURI.php
View file

@ -9,8 +9,6 @@ namespace Friendica\Model;
use Friendica\BaseObject;
use Friendica\Database\DBA;
require_once 'boot.php';
class ItemURI extends BaseObject
{
/**

2
src/Model/Mail.php
View file

@ -13,8 +13,6 @@ use Friendica\Database\DBA;
use Friendica\Network\Probe;
use Friendica\Util\DateTimeFormat;
require_once 'include/dba.php';
/**
* Class to handle private messages
*/

2
src/Model/PermissionSet.php
View file

@ -7,8 +7,6 @@ namespace Friendica\Model;
use Friendica\BaseObject;
use Friendica\Database\DBA;
require_once 'include/dba.php';
/**
* @brief functions for interacting with the permission set of an object (item, photo, event, ...)
*/

2
src/Model/Photo.php
View file

@ -16,8 +16,6 @@ use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
use Friendica\Util\Security;
require_once 'include/dba.php';
/**
* Class to handle photo dabatase table
*/

2
src/Model/Process.php
View file

@ -8,8 +8,6 @@ use Friendica\BaseObject;
use Friendica\Database\DBA;
use Friendica\Util\DateTimeFormat;
require_once 'include/dba.php';
/**
* @brief functions for interacting with a process
*/

2
src/Model/Profile.php
View file

@ -28,8 +28,6 @@ use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings;
use Friendica\Util\Temporal;
require_once 'include/dba.php';
class Profile
{
/**

2
src/Model/PushSubscriber.php
View file

@ -9,8 +9,6 @@ use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\Util\DateTimeFormat;
require_once 'include/dba.php';
class PushSubscriber
{
/**

2
src/Model/Queue.php
View file

@ -9,8 +9,6 @@ use Friendica\Core\Logger;
use Friendica\Database\DBA;
use Friendica\Util\DateTimeFormat;
require_once 'include/dba.php';
class Queue
{
/**

4
src/Model/Term.php
View file

@ -7,10 +7,6 @@ namespace Friendica\Model;
use Friendica\Core\System;
use Friendica\Database\DBA;
require_once 'boot.php';
require_once 'include/conversation.php';
require_once 'include/dba.php';
class Term
{
public static function tagTextFromItemId($itemid)

4
src/Model/User.php
View file

@ -24,10 +24,6 @@ use Friendica\Util\Network;
use Friendica\Util\Strings;
use LightOpenID;
require_once 'boot.php';
require_once 'include/dba.php';
require_once 'include/enotify.php';
require_once 'include/text.php';
/**
* @brief This class handles User related functions
*/

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