chdir($directory);
-require_once "boot.php";
-require_once "include/dba.php";
+require dirname(__DIR__) . '/vendor/autoload.php';
$a = new App(dirname(__DIR__));
#!/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);
chdir($directory);
}
-require_once "boot.php";
-require_once "include/dba.php";
+require dirname(__DIR__) . '/vendor/autoload.php';
$a = new App(dirname(__DIR__));
chdir($directory);
}
-require_once "boot.php";
+require dirname(__DIR__) . '/vendor/autoload.php';
$a = new App(dirname(__DIR__));
* 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;
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');
},
"require": {
"php": ">=5.6.1",
+ "ext-curl": "*",
"ext-dom": "*",
"ext-json": "*",
"ext-xml": "*",
},
"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",
"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",
"prefer-lowest": false,
"platform": {
"php": ">=5.6.1",
+ "ext-curl": "*",
"ext-dom": "*",
"ext-json": "*",
"ext-xml": "*"
use Friendica\Database\DBA;
if (!defined('DB_UPDATE_VERSION')) {
- define('DB_UPDATE_VERSION', 1291);
+ define('DB_UPDATE_VERSION', 1292);
}
return [
"indexes" => [
"PRIMARY" => ["id"],
"uid_is-default" => ["uid", "is-default"],
+ "pub_keywords" => ["FULLTEXT", "pub_keywords"],
]
],
"profile_check" => [
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';
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);
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
*
* Friendica
*/
-use Friendica\App;
-
-require_once 'boot.php';
+require __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();
use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings;
-require_once 'include/dba.php';
-
function acl_content(App $a)
{
if (!local_user()) {
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
*
use Friendica\Util\Proxy as ProxyUtils;
-require_once 'include/dba.php';
-
function allfriends_content(App $a)
{
$o = '';
use Friendica\Database\DBA;
use Friendica\Util\Security;
-require_once 'include/dba.php';
-
function attach_init(App $a)
{
if ($a->argc != 2) {
use Friendica\Module\Login;
use Friendica\Util\Strings;
-require_once 'include/conversation.php';
-require_once 'include/items.php';
-
function bookmarklet_init()
{
$_GET["mode"] = "minimal";
use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings;
-require_once 'include/dba.php';
-
function common_content(App $a)
{
$o = '';
}
}
- require_once 'include/conversation.php';
-
if (!$update) {
$tabs = [];
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;
use Friendica\Protocol\Diaspora;
use Friendica\Util\Strings;
-require_once 'include/items.php';
-
function dfrn_notify_post(App $a) {
Logger::log(__function__, Logger::TRACE);
use Friendica\Util\Strings;
use Friendica\Util\XML;
-require_once 'include/items.php';
-
function dfrn_poll_init(App $a)
{
Login::sessionAuth();
use Friendica\Util\Network;
use Friendica\Util\Strings;
-require_once 'include/enotify.php';
-
function dfrn_request_init(App $a)
{
if ($a->argc > 1) {
return;
}
- require_once 'include/conversation.php';
-
$o = '';
if ($update) {
$parent = Item::selectFirst(['uid'], ['uri' => $item_parent_uri, 'wall' => true]);
if (DBA::isResult($parent)) {
- $a->profile['uid'] = $parent['uid'];
- $a->profile['profile_uid'] = $parent['uid'];
+ $a->profile['uid'] = defaults($a->profile, 'uid', $parent['uid']);
+ $a->profile['profile_uid'] = defaults($a->profile, 'profile_uid', $parent['uid']);
$is_remote_contact = Contact::isFollower(remote_user(), $a->profile['profile_uid']);
}
use Friendica\Util\Strings;
use Friendica\Util\Temporal;
-require_once 'include/items.php';
-
function events_init(App $a)
{
if (!local_user()) {
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()) {
use Friendica\Model\FileTag;
use Friendica\Util\XML;
-require_once 'include/items.php';
-
function filer_content(App $a)
{
if (! local_user()) {
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;
// 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;
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;
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']));
use Friendica\Core\System;
use Friendica\Database\DBA;
-require_once "include/text.php";
-
function manage_post(App $a) {
if (! local_user()) {
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.
*
* @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();
$_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']);
+ $tags = trim($profile['pub_keywords'] . ' ' . $profile['prv_keywords']);
- if ($tags) {
- $pager = new Pager($a->query_string);
+ $params['s'] = $tags;
+ $params['n'] = 100;
- $params['s'] = $tags;
- if ($pager->getPage() != 1) {
- $params['p'] = $pager->getPage();
- }
+ if (strlen(Config::get('system', 'directory'))) {
+ $host = get_server();
+ } else {
+ $host = System::baseUrl();
+ }
- if (strlen(Config::get('system', 'directory'))) {
- $x = Network::post(get_server().'/msearch', $params)->getBody();
- } else {
- $x = Network::post(System::baseUrl() . '/msearch', $params)->getBody();
- }
+ $msearch_json = Network::post($host . '/msearch', $params)->getBody();
- $j = json_decode($x);
-
- if (count($j->results)) {
- $pager->setItemsPerPage($j->items_page);
-
- $id = 0;
-
- 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 (!count($match)) {
- $jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
- $connlnk = System::baseUrl() . '/follow/?url=' . $jj->url;
- $photo_menu = [
- 'profile' => [L10n::t("View Profile"), Contact::magicLink($jj->url)],
- 'follow' => [L10n::t("Connect/Follow"), $connlnk]
- ];
-
- $contact_details = Contact::getDetailsByURL($jj->url, local_user());
-
- $entry = [
- 'url' => Contact::magicLink($jj->url),
- 'itemurl' => defaults($contact_details, 'addr', $jj->url),
- 'name' => $jj->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:'),
- 'conntxt' => L10n::t('Connect'),
- 'connlnk' => $connlnk,
- 'img_hover' => $jj->tags,
- 'photo_menu' => $photo_menu,
- 'id' => ++$id,
- ];
- $entries[] = $entry;
- }
- }
+ $msearch = json_decode($msearch_json);
+
+ $start = defaults($_GET, 'start', 0);
+ $entries = [];
+ $paginate = '';
- $tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
+ if (!empty($msearch->results)) {
+ for ($i = $start;count($entries) < 10 && $i < $msearch->total; $i++) {
+ $profile = $msearch->results[$i];
- $o .= Renderer::replaceMacros($tpl, [
- '$title' => L10n::t('Profile Match'),
- '$contacts' => $entries,
- '$paginate' => $pager->renderFull($j->total)
- ]);
- } else {
- info(L10n::t('No matches') . EOL);
+ // 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($profile->url)],
+ 'follow' => [L10n::t("Connect/Follow"), $connlnk]
+ ];
+
+ $contact_details = Contact::getDetailsByURL($profile->url, 0);
+
+ $entry = [
+ '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($profile->photo, false, ProxyUtils::SIZE_THUMB),
+ 'conntxt' => L10n::t('Connect'),
+ 'connlnk' => $connlnk,
+ 'img_hover' => $profile->tags,
+ 'photo_menu' => $photo_menu,
+ '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, [
+ '$title' => L10n::t('Profile Match'),
+ '$contacts' => $entries,
+ '$paginate' => $paginate
+ ]);
+
return $o;
}
use Friendica\Util\Strings;
use Friendica\Util\Temporal;
-require_once 'include/conversation.php';
-
function message_init(App $a)
{
$tabs = '';
use Friendica\Core\System;
use Friendica\Database\DBA;
-function msearch_post(App $a) {
+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;
- $perpage = (($_POST['n']) ? $_POST['n'] : 80);
- $page = (($_POST['p']) ? intval($_POST['p'] - 1) : 0);
- $startrec = (($page+1) * $perpage) - $perpage;
+ $total = 0;
+ $results = [];
- $search = $_POST['s'];
- if(! strlen($search))
- killme();
+ if (!strlen($search)) {
+ $output = ['total' => 0, 'items_page' => $perpage, 'page' => $page, 'results' => $results];
+ echo json_encode($output);
+ exit();
+ }
- $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)
+ $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))
- $total = $r[0]['total'];
+ if (DBA::isResult($count_stmt)) {
+ $row = DBA::fetch($count_stmt);
+ $total = $row['total'];
+ }
- $results = [];
+ DBA::close($count_stmt);
- $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)
+ $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
);
- if (DBA::isResult($r)) {
- foreach($r as $rr)
- $results[] = [
- 'name' => $rr['name'],
- 'url' => System::baseUrl() . '/profile/' . $rr['nickname'],
- 'photo' => System::baseUrl() . '/photo/avatar/' . $rr['uid'] . '.jpg',
- 'tags' => str_replace([',',' '],[' ',' '],$rr['pub_keywords'])
- ];
+ while($search_result = DBA::fetch($search_stmt)) {
+ $results[] = [
+ '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();
}
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()) {
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']]];
return;
}
- require_once 'include/conversation.php';
-
$o = Profile::getTabs($a, true);
if (!$update) {
use Friendica\Util\Network;
use Friendica\Util\ParseUrl;
-require_once 'include/items.php';
-
function parse_url_content(App $a)
{
$text = null;
use Friendica\Util\Strings;
use Friendica\Util\XML;
-require_once 'include/items.php';
-
function photos_init(App $a) {
if ($a->argc > 1) {
return;
}
- require_once 'include/conversation.php';
-
if (empty($a->data['user'])) {
notice(L10n::t('No photos selected') . EOL);
return;
* @file mod/phpinfo.php
*/
-require_once 'boot.php';
-
function phpinfo_content()
{
if (!is_site_admin()) {
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
*
use Friendica\Util\Strings;
use Friendica\Util\XML;
-require_once 'include/items.php';
-
function poke_init(App $a)
{
if (!local_user()) {
return Login::form();
}
- require_once 'include/conversation.php';
- require_once 'include/items.php';
-
$groups = [];
$remote_cid = null;
use Friendica\Util\Strings;
use Friendica\Core\System;
-require_once 'include/items.php';
-
function hub_return($valid, $body)
{
if ($valid) {
use Friendica\Module\Tos;
use Friendica\Util\Strings;
-require_once 'include/enotify.php';
-
function register_post(App $a)
{
BaseModule::checkFormSecurityTokenRedirectOnError('/register', 'register');
use Friendica\Model\User;
use Friendica\Module\Login;
-require_once 'include/enotify.php';
-
function user_allow($hash)
{
$a = get_app();
use Friendica\Model\User;
use Friendica\Util\Strings;
-require_once 'include/enotify.php';
-
function removeme_post(App $a)
{
if (!local_user()) {
use Friendica\Util\Crypto;
use Friendica\Util\Strings;
-require_once 'include/items.php';
-
function salmon_post(App $a, $xml = '') {
if (empty($xml)) {
use Friendica\Model\Item;
use Friendica\Util\Strings;
-require_once 'include/conversation.php';
require_once 'mod/dirfind.php';
function search_saved_searches() {
use Friendica\Util\Strings;
use Friendica\Util\XML;
-require_once 'include/items.php';
-
function subthread_content(App $a) {
if (!local_user() && !remote_user()) {
use Friendica\Util\Strings;
use Friendica\Util\XML;
-require_once 'include/items.php';
-
function tagger_content(App $a) {
if (!local_user() && !remote_user()) {
use Friendica\Protocol\DFRN;
use Friendica\Util\Security;
-require_once 'include/items.php';
-
function videos_init(App $a)
{
if ($a->argc > 1) {
return;
}
- require_once 'include/conversation.php';
-
if (empty($a->data['user'])) {
notice(L10n::t('No videos selected') . EOL );
return;
use Friendica\Database\DBA;
use Friendica\Network\HTTPException\InternalServerErrorException;
-require_once 'boot.php';
-require_once 'include/text.php';
-
/**
*
* class: App
*/
namespace Friendica;
-require_once 'boot.php';
-
/**
* Basic object
*
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
*/
use Friendica\Model\Contact;
use Friendica\Model\Profile;
-require_once 'boot.php';
-require_once 'include/text.php';
-
class Nav
{
private static $selected = [
use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings;
-require_once 'include/dba.php';
-
/**
* Handles all OEmbed content fetching and replacement
*
'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' : '')
]
];
use Friendica\Util\Strings;
use Friendica\Util\XML;
-require_once 'boot.php';
-require_once 'include/dba.php';
-
class Widget
{
/**
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
-require_once 'boot.php';
-require_once 'include/text.php';
-
/**
* TagCloud widget
*
use Friendica\Model\Item;
use Friendica\Util\Security;
-require_once 'include/dba.php';
-
/**
* TagCloud widget
*
use Friendica\BaseObject;
use Friendica\Core\Config;
-require_once 'include/dba.php';
-
/**
* @brief Arbitrary system configuration storage
*
use Friendica\BaseObject;
use Friendica\Database\DBA;
-require_once 'include/dba.php';
-
/**
* JustInTime Configuration Adapter
*
use Friendica\BaseObject;
use Friendica\Database\DBA;
-require_once 'include/dba.php';
-
/**
* JustInTime User Configuration Adapter
*
use Friendica\BaseObject;
use Friendica\Database\DBA;
-require_once 'include/dba.php';
-
/**
* Preload Configuration Adapter
*
use Friendica\BaseObject;
use Friendica\Database\DBA;
-require_once 'include/dba.php';
-
/**
* Preload User Configuration Adapter
*
use Friendica\Database\DBStructure;
use RuntimeException;
-require_once 'include/dba.php';
-
class AutomaticInstallation extends Console
{
protected function getHelp()
use Friendica\Database\DBStructure;
use RuntimeException;
-require_once 'boot.php';
-require_once 'include/dba.php';
-
/**
* @brief Performs database updates from the command line
*
use Friendica\Util\Strings;
use RuntimeException;
-require_once 'include/text.php';
-
/**
* @brief tool to silence accounts on the global community page
*
use Friendica\Core;
-require_once 'boot.php';
-require_once 'include/dba.php';
-
/**
* @brief Sets maintenance mode for this node
*
*/
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, '');
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").
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
use Friendica\App;
use Friendica\BaseObject;
-require_once 'include/dba.php';
-
/**
* @brief Management of user configuration storage
* Note:
use Friendica\Core\Session;
use SessionHandlerInterface;
-require_once 'boot.php';
-require_once 'include/text.php';
-
/**
* SessionHandler using Friendica Cache
*
use Friendica\Database\DBA;
use SessionHandlerInterface;
-require_once 'boot.php';
-require_once 'include/dba.php';
-require_once 'include/text.php';
-
/**
* SessionHandler using database
*
use Friendica\Core\Logger;
use Friendica\Core\System;
-require_once 'boot.php';
-
/**
* Some functions to handle themes
*/
use Friendica\Object\Image;
use Friendica\Util\Strings;
-require_once "include/dba.php";
-
/**
* @brief UserImport class
*/
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
-require_once 'include/dba.php';
-
/**
* @file src/Core/Worker.php
*
use PDOException;
use PDOStatement;
-require_once 'include/dba.php';
-
/**
* @class MySQL database class
*
/**
* @file src/Database/DBStructure.php
*/
+
namespace Friendica\Database;
use Exception;
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
*
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
*
/*
* 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)) {
}
}
- 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);
+ return L10n::t('Errors encountered performing database changes: ') . $message . EOL;
+ }
- $indexes = q("SHOW INDEX FROM `%s`", $table);
+ public static function printStructure()
+ {
+ $database = self::definition(false);
- $table_status = q("SHOW TABLE STATUS WHERE `name` = '%s'", $table);
+ echo "-- ------------------------------------------\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";
+ echo "-- TABLE $name\n";
+ echo "--\n";
+ self::createTable($name, $structure, true, false);
- if (DBA::isResult($table_status)) {
- $table_status = $table_status[0];
- } else {
- $table_status = [];
+ echo "\n";
}
+ }
- $fielddata = [];
- $indexdata = [];
+ /**
+ * Loads the database structure definition from the config/dbstructure.config.php file.
+ * On first pass, defines DB_UPDATE_VERSION constant.
+ *
+ * @see config/dbstructure.config.php
+ * @param boolean $with_addons_structure Whether to tack on addons additional tables
+ * @return array
+ * @throws Exception
+ */
+ public static function definition($with_addons_structure = true)
+ {
+ if (!self::$definition) {
+ $a = \Friendica\BaseObject::getApp();
- 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'];
- }
+ $filename = $a->getBasePath() . '/config/dbstructure.config.php';
- $column = $index["Column_name"];
+ if (!is_readable($filename)) {
+ throw new Exception('Missing database structure config file config/dbstructure.config.php');
+ }
- if ($index["Sub_part"] != "") {
- $column .= "(".$index["Sub_part"].")";
- }
+ $definition = require $filename;
- $indexdata[$index["Key_name"]][] = $column;
+ if (!$definition) {
+ throw new Exception('Corrupted database structure config file config/dbstructure.config.php');
}
+
+ self::$definition = $definition;
+ } else {
+ $definition = self::$definition;
}
- 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 ($with_addons_structure) {
+ Hook::callAll('dbstructure_definition', $definition);
+ }
- if (isset($field["Default"])) {
- $fielddata[$field["Field"]]["default"] = $field["Default"];
- }
+ return $definition;
+ }
- if ($field["Extra"] != "") {
- $fielddata[$field["Field"]]["extra"] = $field["Extra"];
- }
+ private static function createTable($name, $structure, $verbose, $action)
+ {
+ $r = true;
- if ($field["Key"] == "PRI") {
- $fielddata[$field["Field"]]["primary"] = 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 (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;
}
- public static function printStructure() {
- $database = self::definition(false);
+ private static function FieldCommand($parameters, $create = true)
+ {
+ $fieldstruct = $parameters["type"];
- echo "-- ------------------------------------------\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";
- echo "-- TABLE $name\n";
- echo "--\n";
- self::createTable($name, $structure, true, false);
+ if (isset($parameters["Collation"])) {
+ $fieldstruct .= " COLLATE " . $parameters["Collation"];
+ }
- echo "\n";
+ 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);
}
- /**
- * @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());
+ 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);
+ }
+
- return L10n::t('Errors encountered performing database changes: ').$message.EOL;
+ $sql = sprintf("%s INDEX `%s` (%s)", $method, DBA::escape($indexname), $names);
+ return ($sql);
}
/**
* @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 = '';
} 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;
}
}
}
* 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
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;
}
}
}
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;
}
}
}
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;
}
}
}
$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;
}
}
}
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;
}
}
}
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
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;
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;
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"];
- } else {
- $fieldstruct .= " DEFAULT '".$parameters["default"]."'";
- }
- }
- if (isset($parameters["extra"])) {
- $fieldstruct .= " ".$parameters["extra"];
- }
+ $table_status = q("SHOW TABLE STATUS WHERE `name` = '%s'", $table);
- if (isset($parameters["comment"])) {
- $fieldstruct .= " COMMENT '".DBA::escape($parameters["comment"])."'";
+ if (DBA::isResult($table_status)) {
+ $table_status = $table_status[0];
+ } else {
+ $table_status = [];
}
- /*if (($parameters["primary"] != "") && $create)
- $fieldstruct .= " PRIMARY KEY";*/
+ $fielddata = [];
+ $indexdata = [];
- return($fieldstruct);
- }
+ 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"];
+ }
- private static function createTable($name, $structure, $verbose, $action) {
- $r = true;
+ if ($index["Index_type"] == "FULLTEXT" && !isset($indexdata[$index["Key_name"]])) {
+ $indexdata[$index["Key_name"]] = ["FULLTEXT"];
+ }
- $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;
- }
- }
+ $column = $index["Column_name"];
- 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 ($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"]);
- if (isset($structure["engine"])) {
- $engine = " ENGINE=" . $structure["engine"];
- }
+ $fielddata[$field["Field"]]["type"] = $field["Type"];
+ if ($field["Null"] == "NO") {
+ $fielddata[$field["Field"]]["not null"] = true;
+ }
- if (isset($structure["comment"])) {
- $comment = " COMMENT='" . DBA::escape($structure["comment"]) . "'";
- }
+ if (isset($field["Default"])) {
+ $fielddata[$field["Field"]]["default"] = $field["Default"];
+ }
- $sql = implode(",\n\t", $sql_rows);
+ if ($field["Extra"] != "") {
+ $fielddata[$field["Field"]]["extra"] = $field["Extra"];
+ }
- $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 ($field["Key"] == "PRI") {
+ $fielddata[$field["Field"]]["primary"] = true;
+ }
+ }
}
-
- if ($action) {
- $r = DBA::e($sql);
+ if (DBA::isResult($full_columns)) {
+ foreach ($full_columns AS $column) {
+ $fielddata[$column["Field"]]["Collation"] = $column["Collation"];
+ $fielddata[$column["Field"]]["comment"] = $column["Comment"];
+ }
}
- 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);
+ return ["fields" => $fielddata, "indexes" => $indexdata, "table_status" => $table_status];
}
- 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'");
- }
-
- if ($fieldnames[0] == "UNIQUE") {
- array_shift($fieldnames);
- $method .= ' UNIQUE';
- }
-
- $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);
- }
-
+ private static function addTableField($fieldname, $parameters)
+ {
+ $sql = sprintf("ADD `%s` %s", DBA::escape($fieldname), self::FieldCommand($parameters));
+ return ($sql);
+ }
- $sql = sprintf("%s INDEX `%s` (%s)", $method, DBA::escape($indexname), $names);
- 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 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 "";
}
}
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) . "`";
}
}
}
/**
- * Check if a table exists
+ * Renames columns or the primary key of a table
*
- * @param string $table Table name
+ * @todo You cannot rename a primary key if "auto increment" is set
+ *
+ * @param string $table Table name
+ * @param array $columns Columns Syntax for Rename: [ $old1 => [ $new1, $type1 ], $old2 => [ $new2, $type2 ], ... ] )
+ * Syntax for Primary Key: [ $col1, $col2, ...] )
+ * @param int $type The type of renaming (Default is Column)
+ *
+ * @return boolean Was the renaming successful?
*
- * @return boolean Does the table exist?
*/
- public static function existsTable($table)
+ public static function rename($table, $columns, $type = self::RENAME_COLUMN)
{
- if (empty($table)) {
+ if (empty($table) || empty($columns)) {
+ return false;
+ }
+
+ if (!is_array($columns)) {
return false;
}
$table = DBA::escape($table);
- $sql = "SHOW TABLES LIKE '" . $table . "';";
+ $sql = "ALTER TABLE `" . $table . "`";
+ switch ($type) {
+ case self::RENAME_COLUMN:
+ if (!self::existsColumn($table, array_keys($columns))) {
+ return false;
+ }
+ $sql .= implode(',', array_map(
+ function ($to, $from) {
+ return " CHANGE `" . $from . "` `" . $to[0] . "` " . $to[1];
+ },
+ $columns,
+ array_keys($columns)
+ ));
+ break;
+ case self::RENAME_PRIMARY_KEY:
+ if (!self::existsColumn($table, $columns)) {
+ return false;
+ }
+ $sql .= " DROP PRIMARY KEY, ADD PRIMARY KEY(`" . implode('`, `', $columns) . "`)";
+ break;
+ default:
+ return false;
+ }
+
+ $sql .= ";";
$stmt = DBA::p($sql);
if (is_bool($stmt)) {
$retval = $stmt;
} else {
- $retval = (DBA::numRows($stmt) > 0);
+ $retval = true;
}
DBA::close($stmt);
}
/**
- * Check if the columns of the table exists
+ * 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 = []) {
+ public static function existsColumn($table, $columns = [])
+ {
if (empty($table)) {
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
- * @param array $columns Columns Syntax for Rename: [ $old1 => [ $new1, $type1 ], $old2 => [ $new2, $type2 ], ... ] )
- * Syntax for Primary Key: [ $col1, $col2, ...] )
- * @param int $type The type of renaming (Default is Column)
+ * Check if a table exists
*
- * @return boolean Was the renaming successful?
+ * @param string $table Table name
*
+ * @return boolean Does the table exist?
*/
- public static function rename($table, $columns, $type = self::RENAME_COLUMN) {
- if (empty($table) || empty($columns)) {
- return false;
- }
-
- if (!is_array($columns)) {
+ public static function existsTable($table)
+ {
+ if (empty($table)) {
return false;
}
$table = DBA::escape($table);
- $sql = "ALTER TABLE `" . $table . "`";
- switch ($type) {
- case self::RENAME_COLUMN:
- if (!self::existsColumn($table, array_keys($columns))) {
- return false;
- }
- $sql .= implode(',', array_map(
- function ($to, $from) {
- return " CHANGE `" . $from . "` `" . $to[0] . "` " . $to[1];
- },
- $columns,
- array_keys($columns)
- ));
- break;
- case self::RENAME_PRIMARY_KEY:
- if (!self::existsColumn($table, $columns)) {
- return false;
- }
- $sql .= " DROP PRIMARY KEY, ADD PRIMARY KEY(`" . implode('`, `', $columns) . "`)";
- break;
- default:
- return false;
- }
-
- $sql .= ";";
+ $sql = "SHOW TABLES LIKE '" . $table . "';";
$stmt = DBA::p($sql);
if (is_bool($stmt)) {
$retval = $stmt;
} else {
- $retval = true;
+ $retval = (DBA::numRows($stmt) > 0);
}
DBA::close($stmt);
return $retval;
}
-
- /**
- * Loads the database structure definition from the config/dbstructure.config.php file.
- * On first pass, defines DB_UPDATE_VERSION constant.
- *
- * @see config/dbstructure.config.php
- * @param boolean $with_addons_structure Whether to tack on addons additional tables
- * @return array
- * @throws Exception
- */
- public static function definition($with_addons_structure = true)
- {
- 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');
- }
-
- $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;
- }
}
use Friendica\Model\PermissionSet;
use Friendica\Database\DBA;
-require_once 'include/dba.php';
-
/**
* Post update functions
*/
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Strings;
-require_once 'boot.php';
-
class APContact extends BaseObject
{
/**
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
*/
{
$a = self::getApp();
- require_once 'include/conversation.php';
-
$cid = Self::getIdForURL($contact_url);
$contact = DBA::selectFirst('contact', ['contact-type', 'network'], ['id' => $cid]);
use Friendica\Database\DBA;
use Friendica\Util\DateTimeFormat;
-require_once "include/dba.php";
-
class Conversation
{
/*
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
*/
use Friendica\Util\Network;
use Friendica\Util\Strings;
-require_once 'include/dba.php';
-
/**
* @brief This class handles GlobalContact related functions
*/
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
*/
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
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
{
/**
use Friendica\BaseObject;
use Friendica\Database\DBA;
-require_once 'boot.php';
-
class ItemURI extends BaseObject
{
/**
use Friendica\Network\Probe;
use Friendica\Util\DateTimeFormat;
-require_once 'include/dba.php';
-
/**
* Class to handle private messages
*/
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, ...)
*/
use Friendica\Util\Network;
use Friendica\Util\Security;
-require_once 'include/dba.php';
-
/**
* Class to handle photo dabatase table
*/
use Friendica\Database\DBA;
use Friendica\Util\DateTimeFormat;
-require_once 'include/dba.php';
-
/**
* @brief functions for interacting with a process
*/
use Friendica\Util\Strings;
use Friendica\Util\Temporal;
-require_once 'include/dba.php';
-
class Profile
{
/**
use Friendica\Database\DBA;
use Friendica\Util\DateTimeFormat;
-require_once 'include/dba.php';
-
class PushSubscriber
{
/**
use Friendica\Database\DBA;
use Friendica\Util\DateTimeFormat;
-require_once 'include/dba.php';
-
class Queue
{
/**
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)
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
*/
use Friendica\Database\DBA;
use Friendica\Util\Strings;
-require_once 'include/dba.php';
-require_once 'include/text.php';
-
/**
* Hashtag module.
*/
use Friendica\Util\Strings;
use LightOpenID;
-require_once 'boot.php';
-require_once 'include/text.php';
-
/**
* Login module
*
use Friendica\Core\L10n;
use Friendica\Core\System;
-require_once 'boot.php';
-
/**
* Logout module
*
define('REQUEST_TOKEN_DURATION', 300);
define('ACCESS_TOKEN_DURATION', 31536000);
-require_once 'include/dba.php';
-
/**
* @brief OAuthDataStore class
*/
use Friendica\Util\XML;
use DomXPath;
-require_once 'include/dba.php';
-
/**
* @brief This class contain functions for probing URL
*
use Friendica\Util\Strings;
use Friendica\Util\Temporal;
-require_once 'include/dba.php';
-require_once 'include/text.php';
-require_once 'boot.php';
-require_once 'include/conversation.php';
-
/**
* An item
*/
use Friendica\Object\Post;
use Friendica\Util\Security;
-require_once 'boot.php';
-require_once 'include/text.php';
-
/**
* A list of threads
*
use HTMLPurifier;
use HTMLPurifier_Config;
-require_once 'boot.php';
-require_once 'include/dba.php';
-require_once "include/enotify.php";
-require_once "include/items.php";
-require_once "include/text.php";
-
/**
* @brief This class contain functions to create and send DFRN XML files
*/
use Friendica\Util\XML;
use SimpleXMLElement;
-require_once 'include/dba.php';
-require_once 'include/items.php';
-
/**
* @brief This class contain functions to create and send Diaspora XML files
*
use Friendica\Util\Network;
use Friendica\Util\XML;
-require_once 'include/dba.php';
-require_once 'include/items.php';
-
/**
* @brief This class contain functions to import feeds
*
use Friendica\Util\Strings;
use Friendica\Util\XML;
-require_once 'include/dba.php';
-require_once 'include/items.php';
require_once 'mod/share.php';
-require_once 'include/enotify.php';
require_once 'include/api.php';
/**
use Friendica\Util\Strings;
use Friendica\Util\XML;
-require_once 'include/dba.php';
-
class PortableContact
{
/**
use Friendica\Database\DBA;
use Friendica\Model\User;
-require_once 'include/dba.php';
-
class ExAuth
{
private $bDebug;
use Friendica\Object\Image;
use Friendica\Util\Strings;
-require_once 'include/dba.php';
-
/**
* @brief Class with methods for extracting certain content from an url
*/
$charset = trim(trim(trim(array_pop($matches)), ';,'));
}
- if ($charset == '') {
- $charset = 'utf-8';
- }
+ if ($charset && strtoupper($charset) != 'UTF-8') {
+ // See https://github.com/friendica/friendica/issues/5470#issuecomment-418351211
+ $charset = str_ireplace('latin-1', 'latin1', $charset);
- if (($charset != '') && (strtoupper($charset) != 'UTF-8')) {
Logger::log('detected charset ' . $charset, Logger::DEBUG);
$body = iconv($charset, 'UTF-8//TRANSLIT', $body);
}
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
-require_once 'boot.php';
-require_once 'include/text.php';
-
/**
* @brief Temporal class
*/
use Friendica\Model\Contact;
use Friendica\Util\DateTimeFormat;
-require_once 'include/dba.php';
-
class Cron
{
public static function execute($parameter = '', $generation = 0)
use Friendica\Protocol\PortableContact;
use Friendica\Util\Proxy as ProxyUtils;
-require_once 'include/dba.php';
require_once 'mod/nodeinfo.php';
class CronJobs
use Friendica\Core\Worker;
use Friendica\Database\DBA;
-require_once 'include/dba.php';
-
class DBClean {
public static function execute($stage = 0) {
use Friendica\Util\Strings;
use Friendica\Util\Network;
-require_once 'include/items.php';
-
class Delivery extends BaseObject
{
const MAIL = 'mail';
use Friendica\Database\DBA;
use Friendica\Model\Item;
-require_once 'include/dba.php';
-
class Expire
{
public static function execute($param = '', $hook_function = '')
{
$a = BaseObject::getApp();
- require_once 'include/items.php';
-
Hook::loadHooks();
if ($param == 'delete') {
use Friendica\Protocol\OStatus;
use Friendica\Protocol\Salmon;
-require_once 'include/dba.php';
-require_once 'include/items.php';
-
/*
* The notifier is typically called with:
*
use Friendica\Util\Strings;
use Friendica\Util\XML;
-require_once 'include/dba.php';
-
class OnePoll
{
public static function execute($contact_id = 0, $command = '')
{
$a = BaseObject::getApp();
- require_once 'include/items.php';
-
Logger::log('start');
$manual_id = 0;
use Friendica\Protocol\OStatus;
use Friendica\Util\Network;
-require_once 'include/items.php';
-
class PubSubPublish
{
public static function execute($pubsubpublish_id = 0)
use Friendica\Protocol\PortableContact;
use Friendica\Protocol\Salmon;
-require_once 'include/dba.php';
-require_once 'include/items.php';
-
class Queue
{
public static function execute($queue_id = 0)
use Friendica\Core\Protocol;
use Friendica\Model\Item;
-require_once 'include/dba.php';
-
class RemoveContact {
public static function execute($id) {
use Friendica\Database\DBA;
use Friendica\Model\Item;
-require_once 'include/dba.php';
-
class RemoveUser {
public static function execute($uid)
{
use Friendica\Core\Logger;
use Friendica\Model\Item;
-require_once "include/items.php";
-
class SpoolPost {
public static function execute() {
$path = get_spoolpath();
// Mocking that we can use CURL
$this->setFunctions(['curl_init' => true]);
- // needed because of "normalise_link"
- require_once __DIR__ . '/../../../include/text.php';
-
$install = new Installer();
$this->assertFalse($install->checkHtAccess('https://test'));
class CurlResultTest extends TestCase
{
- public function setUp()
- {
- parent::setUp();
-
- require_once __DIR__.'/../../../boot.php';
- require_once __DIR__.'/../../../include/text.php';
- }
-
/**
* @small
*/
use Friendica\Model\User;
use Friendica\Util\DateTimeFormat;
-require_once 'include/dba.php';
-
/**
*
* update.php - automatic system update
*/
use Friendica\Core\PConfig;
-require_once 'boot.php';
-
function get_scheme_info($scheme)
{
$theme = get_app()->getCurrentTheme();
projects / friendica.git / commitdiff