require_once('include/autoloader.php');
+use \Friendica\Core\Config;
+
require_once('include/config.php');
require_once('include/network.php');
require_once('include/plugin.php');
define ( 'FRIENDICA_CODENAME', 'Asparagus');
define ( 'FRIENDICA_VERSION', '3.5.1-dev' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
-define ( 'DB_UPDATE_VERSION', 1212 );
+define ( 'DB_UPDATE_VERSION', 1213 );
/**
* @brief Constant with a HTML line break.
$scheme = $this->scheme;
- if ((x($this->config, 'system')) && (x($this->config['system'], 'ssl_policy'))) {
- if (intval($this->config['system']['ssl_policy']) === SSL_POLICY_FULL) {
- $scheme = 'https';
- }
+ if (Config::get('system', 'ssl_policy') === SSL_POLICY_FULL) {
+ $scheme = 'https';
+ }
- // Basically, we have $ssl = true on any links which can only be seen by a logged in user
- // (and also the login link). Anything seen by an outsider will have it turned off.
+ // Basically, we have $ssl = true on any links which can only be seen by a logged in user
+ // (and also the login link). Anything seen by an outsider will have it turned off.
- if ($this->config['system']['ssl_policy'] == SSL_POLICY_SELFSIGN) {
- if ($ssl) {
- $scheme = 'https';
- } else {
- $scheme = 'http';
- }
+ if (Config::get('system', 'ssl_policy') == SSL_POLICY_SELFSIGN) {
+ if ($ssl) {
+ $scheme = 'https';
+ } else {
+ $scheme = 'http';
}
}
- if (get_config('config', 'hostname') != '') {
+ if (Config::get('config', 'hostname') != '') {
$this->hostname = get_config('config', 'hostname');
}
// If the last worker fork was less than 10 seconds before then don't fork another one.
// This should prevent the forking of masses of workers.
if (get_config("system", "worker")) {
- if ((time() - get_config("system", "proc_run_started")) < 10)
- return;
-
+ $cachekey = "app:proc_run:started";
+ $result = Cache::get($cachekey);
+ if (!is_null($result)) {
+ if ((time() - $result) < 10) {
+ return;
+ }
+ }
// Set the timestamp of the last proc_run
- set_config("system", "proc_run_started", time());
+ Cache::set($cachekey, time(), CACHE_MINUTE);
}
$args[0] = ((x($this->config,'php_path')) && (strlen($this->config['php_path'])) ? $this->config['php_path'] : 'php');
function clean_urls() {
$a = get_app();
- // if($a->config['system']['clean_urls'])
return true;
- // return false;
}
function z_path() {
$stored = intval($build);
$current = intval(DB_UPDATE_VERSION);
if($stored < $current) {
- load_config('database');
+ Config::load('database');
// We're reporting a different version than what is currently installed.
// Run any existing update scripts to bring the database up to current.
// $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
$is_mobile = $a->is_mobile || $a->is_tablet;
- $standard_system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : '');
+ $standard_system_theme = Config::get('system', 'theme', '');
$standard_theme_name = ((isset($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $standard_system_theme);
- if($is_mobile) {
- if(isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) {
+ if ($is_mobile) {
+ if (isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) {
$system_theme = $standard_system_theme;
$theme_name = $standard_theme_name;
- }
- else {
- $system_theme = ((isset($a->config['system']['mobile-theme'])) ? $a->config['system']['mobile-theme'] : $standard_system_theme);
+ } else {
+ $system_theme = Config::get('system', 'mobile-theme', '');
+ if ($system_theme == '') {
+ $system_theme = $standard_system_theme;
+ }
$theme_name = ((isset($_SESSION) && x($_SESSION,'mobile-theme')) ? $_SESSION['mobile-theme'] : $system_theme);
if($theme_name === '---') {
-- ------------------------------------------
-- Friendica 3.5.1-dev (Asparagus)
--- DB_UPDATE_VERSION 1212
+-- DB_UPDATE_VERSION 1213
-- ------------------------------------------
--
CREATE TABLE IF NOT EXISTS `addon` (
`id` int(11) NOT NULL auto_increment,
- `name` varchar(255) NOT NULL DEFAULT '',
+ `name` varchar(190) NOT NULL DEFAULT '',
`version` varchar(255) NOT NULL DEFAULT '',
`installed` tinyint(1) NOT NULL DEFAULT 0,
`hidden` tinyint(1) NOT NULL DEFAULT 0,
`timestamp` bigint(20) NOT NULL DEFAULT 0,
`plugin_admin` tinyint(1) NOT NULL DEFAULT 0,
- PRIMARY KEY(`id`)
+ PRIMARY KEY(`id`),
+ UNIQUE INDEX `name` (`name`)
) DEFAULT CHARSET=utf8mb4;
--
--
CREATE TABLE IF NOT EXISTS `cache` (
`k` varbinary(255) NOT NULL,
- `v` text,
+ `v` mediumtext,
`expire_mode` int(11) NOT NULL DEFAULT 0,
`updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
PRIMARY KEY(`k`),
- INDEX `updated` (`updated`),
INDEX `expire_mode_updated` (`expire_mode`,`updated`)
) DEFAULT CHARSET=utf8mb4;
`id` int(10) unsigned NOT NULL auto_increment,
`cat` varbinary(255) NOT NULL DEFAULT '',
`k` varbinary(255) NOT NULL DEFAULT '',
- `v` text,
+ `v` mediumtext,
PRIMARY KEY(`id`),
UNIQUE INDEX `cat_k` (`cat`,`k`)
) DEFAULT CHARSET=utf8mb4;
`bd` date NOT NULL DEFAULT '0000-00-00',
`notify_new_posts` tinyint(1) NOT NULL DEFAULT 0,
`fetch_further_information` tinyint(1) NOT NULL DEFAULT 0,
- `ffi_keyword_blacklist` mediumtext,
+ `ffi_keyword_blacklist` text,
PRIMARY KEY(`id`),
INDEX `uid_name` (`uid`,`name`),
- INDEX `uid_self` (`uid`,`self`),
+ INDEX `self_uid` (`self`,`uid`),
INDEX `alias_uid` (`alias`(32),`uid`),
- INDEX `uid_pending` (`uid`,`pending`),
- INDEX `uid_blocked` (`uid`,`blocked`),
+ INDEX `pending_uid` (`pending`,`uid`),
+ INDEX `blocked_uid` (`blocked`,`uid`),
INDEX `uid_rel_network_poll` (`uid`,`rel`,`network`,`poll`(64),`archive`),
INDEX `uid_network_batch` (`uid`,`network`,`batch`(64)),
INDEX `addr_uid` (`addr`(32),`uid`),
INDEX `nurl_uid` (`nurl`(32),`uid`),
- INDEX `nick_uid` (`nick`(32),`uid`)
+ INDEX `nick_uid` (`nick`(32),`uid`),
+ INDEX `dfrn-id` (`dfrn-id`),
+ INDEX `issued-id` (`issued-id`)
) DEFAULT CHARSET=utf8mb4;
--
CREATE TABLE IF NOT EXISTS `conv` (
`id` int(10) unsigned NOT NULL auto_increment,
`guid` varchar(64) NOT NULL DEFAULT '',
- `recips` mediumtext,
+ `recips` text,
`uid` int(11) NOT NULL DEFAULT 0,
`creator` varchar(255) NOT NULL DEFAULT '',
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- `subject` mediumtext,
+ `subject` text,
PRIMARY KEY(`id`),
INDEX `uid` (`uid`)
) DEFAULT CHARSET=utf8mb4;
`pubkey` text,
`updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
PRIMARY KEY(`id`),
- INDEX `addr` (`addr`(32))
+ INDEX `addr` (`addr`(32)),
+ INDEX `url` (`url`)
) DEFAULT CHARSET=utf8mb4;
--
`generation` tinyint(3) NOT NULL DEFAULT 0,
`server_url` varchar(255) NOT NULL DEFAULT '',
PRIMARY KEY(`id`),
- INDEX `nurl` (`nurl`(32)),
- INDEX `name` (`name`(32)),
+ INDEX `nurl` (`nurl`(64)),
+ INDEX `name` (`name`(64)),
INDEX `nick` (`nick`(32)),
- INDEX `addr` (`addr`(32)),
+ INDEX `addr` (`addr`(64)),
+ INDEX `hide_network_updated` (`hide`,`network`,`updated`),
INDEX `updated` (`updated`)
) DEFAULT CHARSET=utf8mb4;
`updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
PRIMARY KEY(`id`),
UNIQUE INDEX `cid_uid_gcid_zcid` (`cid`,`uid`,`gcid`,`zcid`),
- INDEX `gcid` (`gcid`),
- INDEX `zcid` (`zcid`)
+ INDEX `gcid` (`gcid`)
) DEFAULT CHARSET=utf8mb4;
--
`gid` int(10) unsigned NOT NULL DEFAULT 0,
`contact-id` int(10) unsigned NOT NULL DEFAULT 0,
PRIMARY KEY(`id`),
- INDEX `cid_contactid` (`cid`,`contact-id`),
- INDEX `uid_contactid` (`uid`,`contact-id`),
+ INDEX `contactid` (`contact-id`),
+ INDEX `gid_contactid` (`gid`,`contact-id`),
UNIQUE INDEX `uid_gid_contactid` (`uid`,`gid`,`contact-id`)
) DEFAULT CHARSET=utf8mb4;
`function` varchar(255) NOT NULL DEFAULT '',
`priority` int(11) unsigned NOT NULL DEFAULT 0,
PRIMARY KEY(`id`),
- INDEX `hook_file_function` (`hook`(30),`file`(60),`function`(30))
+ UNIQUE INDEX `hook_file_function` (`hook`(50),`file`(80),`function`(60))
) DEFAULT CHARSET=utf8mb4;
--
INDEX `uid_created` (`uid`,`created`),
INDEX `uid_unseen_contactid` (`uid`,`unseen`,`contact-id`),
INDEX `uid_network_received` (`uid`,`network`,`received`),
- INDEX `uid_received` (`uid`,`received`),
INDEX `uid_network_commented` (`uid`,`network`,`commented`),
- INDEX `uid_title` (`uid`,`title`),
INDEX `uid_thrparent` (`uid`,`thr-parent`),
INDEX `uid_parenturi` (`uid`,`parent-uri`),
- INDEX `uid_contactid_id` (`uid`,`contact-id`,`id`),
INDEX `uid_contactid_created` (`uid`,`contact-id`,`created`),
INDEX `authorid_created` (`author-id`,`created`),
INDEX `uid_uri` (`uid`,`uri`),
- INDEX `uid_wall_created` (`uid`,`wall`,`created`),
INDEX `resource-id` (`resource-id`),
- INDEX `uid_type` (`uid`,`type`),
INDEX `contactid_allowcid_allowpid_denycid_denygid` (`contact-id`,`allow_cid`(10),`allow_gid`(10),`deny_cid`(10),`deny_gid`(10)),
INDEX `uid_type_changed` (`uid`,`type`,`changed`),
INDEX `contactid_verb` (`contact-id`,`verb`),
`parent-uri` varchar(255) NOT NULL DEFAULT '',
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
PRIMARY KEY(`id`),
- INDEX `uid` (`uid`),
INDEX `uid_seen` (`uid`,`seen`),
INDEX `convid` (`convid`),
INDEX `uri` (`uri`(64)),
`uid` int(11) NOT NULL DEFAULT 0,
`mid` int(11) NOT NULL DEFAULT 0,
PRIMARY KEY(`id`),
- INDEX `uid_mid` (`uid`,`mid`)
+ UNIQUE INDEX `uid_mid` (`uid`,`mid`)
) DEFAULT CHARSET=utf8mb4;
--
`name_cache` tinytext,
`msg_cache` mediumtext,
PRIMARY KEY(`id`),
- INDEX `uid_hash` (`uid`,`hash`),
- INDEX `uid_seen_date` (`uid`,`seen`,`date`),
- INDEX `uid_type_link` (`uid`,`type`,`link`),
- INDEX `uid_link` (`uid`,`link`),
- INDEX `uid_date` (`uid`,`date`)
+ INDEX `hash_uid` (`hash`,`uid`),
+ INDEX `seen_uid_date` (`seen`,`uid`,`date`),
+ INDEX `uid_date` (`uid`,`date`),
+ INDEX `uid_type_link` (`uid`,`type`,`link`)
) DEFAULT CHARSET=utf8mb4;
--
`master-parent-item` int(10) unsigned NOT NULL DEFAULT 0,
`parent-item` int(10) unsigned NOT NULL DEFAULT 0,
`receiver-uid` int(11) NOT NULL DEFAULT 0,
- PRIMARY KEY(`id`),
- INDEX `master-parent-item` (`master-parent-item`)
+ PRIMARY KEY(`id`)
) DEFAULT CHARSET=utf8mb4;
--
--
CREATE TABLE IF NOT EXISTS `oembed` (
`url` varbinary(255) NOT NULL,
- `content` text,
+ `content` mediumtext,
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
PRIMARY KEY(`url`),
INDEX `created` (`created`)
`url` varbinary(255) NOT NULL,
`guessing` tinyint(1) NOT NULL DEFAULT 0,
`oembed` tinyint(1) NOT NULL DEFAULT 0,
- `content` text,
+ `content` mediumtext,
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
PRIMARY KEY(`url`,`guessing`,`oembed`),
INDEX `created` (`created`)
PRIMARY KEY(`id`),
INDEX `uid_contactid` (`uid`,`contact-id`),
INDEX `uid_profile` (`uid`,`profile`),
- INDEX `uid_album_created` (`uid`,`album`(32),`created`),
+ INDEX `uid_album_scale_created` (`uid`,`album`(32),`scale`,`created`),
INDEX `uid_album_resource-id_created` (`uid`,`album`(32),`resource-id`(64),`created`),
INDEX `resource-id` (`resource-id`(64))
) DEFAULT CHARSET=utf8mb4;
CREATE TABLE IF NOT EXISTS `poll` (
`id` int(11) NOT NULL auto_increment,
`uid` int(11) NOT NULL DEFAULT 0,
- `q0` mediumtext,
- `q1` mediumtext,
- `q2` mediumtext,
- `q3` mediumtext,
- `q4` mediumtext,
- `q5` mediumtext,
- `q6` mediumtext,
- `q7` mediumtext,
- `q8` mediumtext,
- `q9` mediumtext,
+ `q0` text,
+ `q1` text,
+ `q2` text,
+ `q3` text,
+ `q4` text,
+ `q5` text,
+ `q6` text,
+ `q7` text,
+ `q8` text,
+ `q9` text,
PRIMARY KEY(`id`),
INDEX `uid` (`uid`)
) DEFAULT CHARSET=utf8mb4;
`thumb` varchar(255) NOT NULL DEFAULT '',
`publish` tinyint(1) NOT NULL DEFAULT 0,
`net-publish` tinyint(1) NOT NULL DEFAULT 0,
- PRIMARY KEY(`id`)
+ PRIMARY KEY(`id`),
+ INDEX `uid_is-default` (`uid`,`is-default`)
) DEFAULT CHARSET=utf8mb4;
--
`uid` int(10) unsigned NOT NULL DEFAULT 0,
PRIMARY KEY(`tid`),
INDEX `oid_otype_type_term` (`oid`,`otype`,`type`,`term`),
- INDEX `uid_term_tid` (`uid`,`term`(32),`tid`),
- INDEX `type_term` (`type`,`term`(32)),
INDEX `uid_otype_type_term_global_created` (`uid`,`otype`,`type`,`term`(32),`global`,`created`),
INDEX `uid_otype_type_url` (`uid`,`otype`,`type`,`url`(64)),
INDEX `guid` (`guid`(64))
`mention` tinyint(1) NOT NULL DEFAULT 0,
`network` varchar(32) NOT NULL DEFAULT '',
PRIMARY KEY(`iid`),
- INDEX `created` (`created`),
- INDEX `commented` (`commented`),
INDEX `uid_network_commented` (`uid`,`network`,`commented`),
INDEX `uid_network_created` (`uid`,`network`,`created`),
INDEX `uid_contactid_commented` (`uid`,`contact-id`,`commented`),
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`pid` int(11) NOT NULL DEFAULT 0,
`executed` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY(`id`),
- INDEX `created` (`created`)
+ PRIMARY KEY(`id`)
) DEFAULT CHARSET=utf8mb4;
* **birthday_input_format** - Default value is "ymd".
* **block_local_dir** (Boolean) - Blocks the access to the directory of the local users.
* **curl_range_bytes** - Maximum number of bytes that should be fetched. Default is 0, which mean "no limit".
+* **db_log** - Name of a logfile to log slow database queries
+* **db_loglimit** - If a database call lasts longer than this value it is logged
+* **db_log_index** - Name of a logfile to log queries with bad indexes
+* **db_log_index_watch** - Watchlist of indexes to watch
+* **db_loglimit_index** - Number of index rows needed to be logged for indexes on the watchlist
+* **db_loglimit_index_high** - Number of index rows to be logged anyway (for any index)
+* **db_log_index_blacklist** - Blacklist of indexes that shouldn't be watched
* **dbclean** (Boolean) - Enable the automatic database cleanup process
* **default_service_class** -
* **delivery_batch_count** - Number of deliveries per process. Default value is 1. (Disabled when using the worker)
*/
class Config {
+ private static $cache;
+
/**
* @brief Loads all configuration values of family into a cached storage.
*
* The category of the configuration value
* @return void
*/
- public static function load($family) {
+ public static function load($family = "config") {
+
+ // We don't preload "system" anymore.
+ // This reduces the number of database reads a lot.
+ if ($family === 'system') {
+ return;
+ }
+
$a = get_app();
- $r = q("SELECT `v`, `k` FROM `config` WHERE `cat` = '%s' ORDER BY `cat`, `k`, `id`", dbesc($family));
+ $r = q("SELECT `v`, `k` FROM `config` WHERE `cat` = '%s'", dbesc($family));
if (dbm::is_result($r)) {
foreach ($r as $rr) {
$k = $rr['k'];
$a->config[$k] = $rr['v'];
} else {
$a->config[$family][$k] = $rr['v'];
+ self::$cache[$family][$k] = $rr['v'];
}
}
- } else if ($family != 'config') {
- // Negative caching
- $a->config[$family] = "!<unset>!";
}
}
$a = get_app();
if (!$refresh) {
- // Looking if the whole family isn't set
- if (isset($a->config[$family])) {
- if ($a->config[$family] === '!<unset>!') {
- return $default_value;
- }
- }
- if (isset($a->config[$family][$key])) {
- if ($a->config[$family][$key] === '!<unset>!') {
+ // Do we have the cached value? Then return it
+ if (isset(self::$cache[$family][$key])) {
+ if (self::$cache[$family][$key] === '!<unset>!') {
return $default_value;
+ } else {
+ return self::$cache[$family][$key];
}
- return $a->config[$family][$key];
}
}
- $ret = q("SELECT `v` FROM `config` WHERE `cat` = '%s' AND `k` = '%s' ORDER BY `id` DESC LIMIT 1",
+ $ret = q("SELECT `v` FROM `config` WHERE `cat` = '%s' AND `k` = '%s'",
dbesc($family),
dbesc($key)
);
- if (count($ret)) {
+ if (dbm::is_result($ret)) {
// manage array value
$val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']);
- $a->config[$family][$key] = $val;
+ // Assign the value from the database to the cache
+ self::$cache[$family][$key] = $val;
return $val;
- } else {
- $a->config[$family][$key] = '!<unset>!';
+ } elseif (isset($a->config[$family][$key])) {
+
+ // Assign the value (mostly) from the .htconfig.php to the cache
+ self::$cache[$family][$key] = $a->config[$family][$key];
+
+ return $a->config[$family][$key];
}
+
+ self::$cache[$family][$key] = '!<unset>!';
+
return $default_value;
}
$stored = self::get($family, $key);
- if ($stored == $value) {
+ if ($stored === $value) {
return true;
}
- $a->config[$family][$key] = $value;
+ if ($family === 'config') {
+ $a->config[$key] = $value;
+ } elseif ($family != 'system') {
+ $a->config[$family][$key] = $value;
+ }
+
+ // Assign the just added value to the cache
+ self::$cache[$family][$key] = $value;
// manage array value
$dbvalue = (is_array($value) ? serialize($value) : $value);
*/
public static function delete($family, $key) {
- $a = get_app();
- if (x($a->config[$family],$key)) {
- unset($a->config[$family][$key]);
+ if (isset(self::$cache[$family][$key])) {
+ unset(self::$cache[$family][$key]);
}
$ret = q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s'",
dbesc($family),
return $ret;
}
-
}
if ($type=='' || $type=='g'){
+ /// @todo We should cache this query.
+ // This can be done when we can delete cache entries via wildcard
$r = q("SELECT `group`.`id`, `group`.`name`, GROUP_CONCAT(DISTINCT `group_member`.`contact-id` SEPARATOR ',') AS uids
FROM `group`
INNER JOIN `group_member` ON `group_member`.`gid`=`group`.`id` AND `group_member`.`uid` = `group`.`uid`
*
* @todo Automatically detect if incoming data is HTML or BBCode
*/
+
+use \Friendica\Core\Config;
+
require_once('include/HTTPExceptions.php');
require_once('include/bbcode.php');
$logo = App::get_baseurl() . '/images/friendica-64.png';
$email = $a->config['admin_email'];
$closed = (($a->config['register_policy'] == REGISTER_CLOSED) ? 'true' : 'false');
- $private = (($a->config['system']['block_public']) ? 'true' : 'false');
+ $private = ((Config::get('system', 'block_public')) ? 'true' : 'false');
$textlimit = (string) (($a->config['max_import_size']) ? $a->config['max_import_size'] : 200000);
if($a->config['api_import_size'])
$texlimit = string($a->config['api_import_size']);
- $ssl = (($a->config['system']['have_ssl']) ? 'true' : 'false');
+ $ssl = ((Config::get('system', 'have_ssl')) ? 'true' : 'false');
$sslserver = (($ssl === 'true') ? str_replace('http:','https:',App::get_baseurl()) : '');
$config = array(
set_config("system", "cache_cleared_half_hour", time());
}
- if (($max_level <= CACHE_QUARTER_HOUR) AND (get_config("system", "cache_cleared_hour")) < time() - self::duration(CACHE_QUARTER_HOUR)) {
+ if (($max_level <= CACHE_QUARTER_HOUR) AND (get_config("system", "cache_cleared_quarter_hour")) < time() - self::duration(CACHE_QUARTER_HOUR)) {
q("DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
dbesc(datetime_convert('UTC','UTC',"now - 15 minutes")), intval(CACHE_QUARTER_HOUR));
<?php /** @file */
+use \Friendica\Core\Config;
+
require_once('boot.php');
// Everything we need to boot standalone 'background' processes
global $a, $db;
- if(is_null($a)) {
+ if (is_null($a)) {
$a = new App;
}
- if(is_null($db)) {
- @include(".htconfig.php");
- require_once("dba.php");
- $db = new dba($db_host, $db_user, $db_pass, $db_data);
- unset($db_host, $db_user, $db_pass, $db_data);
+ if (is_null($db)) {
+ @include(".htconfig.php");
+ require_once("dba.php");
+ $db = new dba($db_host, $db_user, $db_pass, $db_data);
+ unset($db_host, $db_user, $db_pass, $db_data);
};
require_once('include/session.php');
- load_config('config');
- load_config('system');
+ Config::load();
$a->set_baseurl(get_config('system','url'));
$extra_sql = unavailable_networks();
- $r = q("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = %d AND NOT `self` $extra_sql ORDER BY `network`",
+ $r = q("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = %d AND `network` != '' $extra_sql ORDER BY `network`",
intval(local_user())
);
*
* This script is started from mod/item.php to save some time when doing a post.
*/
+
+use \Friendica\Core\Config;
+
require_once("boot.php");
require_once("include/threads.php");
unset($db_host, $db_user, $db_pass, $db_data);
}
- load_config('config');
- load_config('system');
+ Config::load();
if ($argc != 2) {
return;
chdir($directory);
}
+use \Friendica\Core\Config;
+
require_once("boot.php");
require_once("include/photos.php");
require_once("include/user.php");
require_once('mod/nodeinfo.php');
require_once('include/post_update.php');
- load_config('config');
- load_config('system');
+ Config::load();
// Don't check this stuff if the function is called by the poller
if (App::callstack() != "poller_run") {
: ''
);
- $contacts = q("SELECT `contact`.`id` FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
- WHERE `rel` IN (%d, %d) AND `poll` != '' AND `network` IN ('%s', '%s', '%s', '%s', '%s', '%s')
- $sql_extra
- AND NOT `self` AND NOT `contact`.`blocked` AND NOT `contact`.`readonly` AND NOT `contact`.`archive`
- AND NOT `user`.`account_expired` AND NOT `user`.`account_removed` $abandon_sql ORDER BY RAND()",
+ $contacts = q("SELECT `contact`.`id` FROM `user`
+ STRAIGHT_JOIN `contact`
+ ON `contact`.`uid` = `user`.`uid` AND `contact`.`rel` IN (%d, %d) AND `contact`.`poll` != ''
+ AND `contact`.`network` IN ('%s', '%s', '%s', '%s', '%s', '%s') $sql_extra
+ AND NOT `contact`.`self` AND NOT `contact`.`blocked` AND NOT `contact`.`readonly`
+ AND NOT `contact`.`archive`
+ WHERE NOT `user`.`account_expired` AND NOT `user`.`account_removed` $abandon_sql ORDER BY RAND()",
intval(CONTACT_IS_SHARING),
intval(CONTACT_IS_FRIEND),
dbesc(NETWORK_DFRN),
<?php
-require_once("boot.php");
+use \Friendica\Core\Config;
+require_once("boot.php");
function cronhooks_run(&$argv, &$argc){
global $a, $db;
require_once('include/session.php');
require_once('include/datetime.php');
- load_config('config');
- load_config('system');
+ Config::load();
// Don't check this stuff if the function is called by the poller
if (App::callstack() != "poller_run") {
<?php
+use \Friendica\Core\Config;
+
if (!file_exists("boot.php") AND (sizeof($_SERVER["argv"]) != 0)) {
$directory = dirname($_SERVER["argv"][0]);
require_once('include/post_update.php');
require_once('mod/nodeinfo.php');
- load_config('config');
- load_config('system');
+ Config::load();
$a->set_baseurl(get_config('system','url'));
* @brief Some functions for date and time related tasks.
*/
+use \Friendica\Core\Config;
/**
* @brief Two-level sort for timezones.
$lang = substr(get_browser_language(), 0, 2);
// Check if the detected language is supported by the picker
- if (!in_array($lang, array("ar", "ro", "id", "bg", "fa", "ru", "uk", "en", "el", "de", "nl", "tr", "fr", "es", "th", "pl", "pt", "ch", "se", "kr", "it", "da", "no", "ja", "vi", "sl", "cs", "hu")))
- $lang = ((isset($a->config['system']['language'])) ? $a->config['system']['language'] : 'en');
+ if (!in_array($lang, array("ar", "ro", "id", "bg", "fa", "ru", "uk", "en", "el", "de", "nl", "tr", "fr", "es", "th", "pl", "pt", "ch", "se", "kr", "it", "da", "no", "ja", "vi", "sl", "cs", "hu"))) {
+ $lang = Config::get('system', 'language', 'en');
+ }
$o = '';
$dateformat = '';
return $return;
}
+ /**
+ * @brief Analyze a database query and log this if some conditions are met.
+ *
+ * @param string $query The database query that will be analyzed
+ */
+ public function log_index($query) {
+ $a = get_app();
+
+ if ($a->config["system"]["db_log_index"] == "") {
+ return;
+ }
+
+ // Don't explain an explain statement
+ if (strtolower(substr($query, 0, 7)) == "explain") {
+ return;
+ }
+
+ // Only do the explain on "select", "update" and "delete"
+ if (!in_array(strtolower(substr($query, 0, 6)), array("select", "update", "delete"))) {
+ return;
+ }
+
+ $r = $this->q("EXPLAIN ".$query);
+ if (!dbm::is_result($r)) {
+ return;
+ }
+
+ $watchlist = explode(',', $a->config["system"]["db_log_index_watch"]);
+ $blacklist = explode(',', $a->config["system"]["db_log_index_blacklist"]);
+
+ foreach ($r AS $row) {
+ if ((intval($a->config["system"]["db_loglimit_index"]) > 0)) {
+ $log = (in_array($row['key'], $watchlist) AND
+ ($row['rows'] >= intval($a->config["system"]["db_loglimit_index"])));
+ } else
+ $log = false;
+
+ if ((intval($a->config["system"]["db_loglimit_index_high"]) > 0) AND ($row['rows'] >= intval($a->config["system"]["db_loglimit_index_high"]))) {
+ $log = true;
+ }
+
+ if (in_array($row['key'], $blacklist) OR ($row['key'] == "")) {
+ $log = false;
+ }
+
+ if ($log) {
+ $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+ @file_put_contents($a->config["system"]["db_log_index"], datetime_convert()."\t".
+ $row['key']."\t".$row['rows']."\t".$row['Extra']."\t".
+ basename($backtrace[1]["file"])."\t".
+ $backtrace[1]["line"]."\t".$backtrace[2]["function"]."\t".
+ substr($query, 0, 2000)."\n", FILE_APPEND);
+ }
+ }
+ }
+
public function q($sql, $onlyquery = false) {
$a = get_app();
//logger("dba: q: $stmt", LOGGER_ALL);
if ($stmt === false)
logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true), LOGGER_DEBUG);
+
+ $db->log_index($stmt);
+
return $db->q($stmt);
}
$stmt = @vsprintf($sql,$args); // Disabled warnings
if ($stmt === false)
logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true), LOGGER_DEBUG);
+
+ $db->log_index($stmt);
+
$db->q("SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;");
$retval = $db->q($stmt);
$db->q("SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ;");
unset($db_host, $db_user, $db_pass, $db_data);
}
- Config::load('config');
- Config::load('system');
+ Config::load();
if (!Config::get('system', 'dbclean', false)) {
return;
$definition = db_definition($charset);
}
- // Ensure index conversion to unique removes duplicates
- $sql_config = "SET session old_alter_table=1;";
- if ($verbose) {
- echo $sql_config."\n";
- }
- if ($action) {
- $db->q($sql_config);
- }
-
// MySQL >= 5.7.4 doesn't support the IGNORE keyword in ALTER TABLE statements
if ((version_compare($db->server_info(), '5.7.4') >= 0) AND
!(strpos($db->server_info(), 'MariaDB') !== false)) {
}
$is_new_table = True;
} else {
+ $is_unique = false;
+ $temp_name = $name;
+
+ foreach ($structure["indexes"] AS $indexname => $fieldnames) {
+ if (isset($database[$name]["indexes"][$indexname])) {
+ $current_index_definition = implode(",",$database[$name]["indexes"][$indexname]);
+ } else {
+ $current_index_definition = "__NOT_SET__";
+ }
+ $new_index_definition = implode(",",$fieldnames);
+ if ($current_index_definition != $new_index_definition) {
+ if ($fieldnames[0] == "UNIQUE") {
+ $is_unique = true;
+ // Deactivated. See below for the reason
+ //if ($ignore == "") {
+ // $temp_name = "temp-".$name;
+ //}
+ }
+ }
+ }
+
/*
* Drop the index if it isn't present in the definition
* or the definition differ from current status
if ($current_index_definition != $new_index_definition && substr($indexname, 0, 6) != 'local_') {
$sql2=db_drop_index($indexname);
if ($sql3 == "") {
- $sql3 = "ALTER".$ignore." TABLE `".$name."` ".$sql2;
+ $sql3 = "ALTER".$ignore." TABLE `".$temp_name."` ".$sql2;
} else {
$sql3 .= ", ".$sql2;
}
if (!isset($database[$name]["fields"][$fieldname])) {
$sql2=db_add_table_field($fieldname, $parameters);
if ($sql3 == "") {
- $sql3 = "ALTER TABLE `".$name."` ".$sql2;
+ $sql3 = "ALTER TABLE `".$temp_name."` ".$sql2;
} else {
$sql3 .= ", ".$sql2;
}
if ($current_field_definition != $new_field_definition) {
$sql2=db_modify_table_field($fieldname, $parameters);
if ($sql3 == "") {
- $sql3 = "ALTER TABLE `".$name."` ".$sql2;
+ $sql3 = "ALTER TABLE `".$temp_name."` ".$sql2;
} else {
$sql3 .= ", ".$sql2;
}
$sql2=db_create_index($indexname, $fieldnames);
if ($sql2 != "") {
if ($sql3 == "")
- $sql3 = "ALTER" . $ignore . " TABLE `".$name."` ".$sql2;
+ $sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2;
else
$sql3 .= ", ".$sql2;
}
if ($sql3 != "") {
$sql3 .= ";";
- if ($verbose)
+ if ($verbose) {
+ // Ensure index conversion to unique removes duplicates
+ if ($is_unique) {
+ // By now the alternative is commented out.
+ // This is a preparation for the time when we found a good SQL routine.
+ //if ($ignore != "") {
+ echo "SET session old_alter_table=1;\n";
+ //} else {
+ // echo "CREATE TABLE `".$temp_name."` LIKE `".$name."`;\n";
+ //}
+ }
+
echo $sql3."\n";
+ if ($is_unique) {
+ // By now the alternative is commented out.
+ // This is a preparation for the time when we found a good SQL routine.
+ //if ($ignore != "") {
+ echo "SET session old_alter_table=0;\n";
+ //} else {
+ // echo "INSERT IGNORE INTO `".$temp_name."` SELECT * FROM `".$name."`;\n";
+ // echo "DROP TABLE `".$name."`;\n";
+ // echo "RENAME TABLE `".$temp_name."` TO `".$name."`;\n";
+ //}
+ }
+ }
+
if ($action) {
+ // Ensure index conversion to unique removes duplicates
+ if ($is_unique) {
+ // By now the alternative is commented out.
+ // This is a preparation for the time when we found a good SQL routine.
+ //if ($ignore != "") {
+ $db->q("SET session old_alter_table=1;");
+ //} else {
+ // $r = $db->q("CREATE TABLE `".$temp_name."` LIKE `".$name."`;");
+ // if (!dbm::is_result($r)) {
+ // $errors .= t('Errors encountered performing database changes.').$sql3.EOL;
+ // return $errors;
+ // }
+ //}
+ }
+
$r = @$db->q($sql3);
- if (dbm::is_result($r))
+ if (!dbm::is_result($r))
$errors .= t('Errors encountered performing database changes.').$sql3.EOL;
+
+ if ($is_unique) {
+ // By now the alternative is commented out.
+ // This is a preparation for the time when we found a good SQL routine.
+ //if ($ignore != "") {
+ $db->q("SET session old_alter_table=0;");
+ //} else {
+ // We have to check if "INSERT IGNORE" will work on newer MySQL versions
+ // $r = $db->q("INSERT IGNORE INTO `".$temp_name."` SELECT * FROM `".$name."`;");
+ // if (!dbm::is_result($r)) {
+ // $errors .= t('Errors encountered performing database changes.').$sql3.EOL;
+ // return $errors;
+ // }
+ // $r = $db->q("DROP TABLE `".$name."`;");
+ // if (!dbm::is_result($r)) {
+ // $errors .= t('Errors encountered performing database changes.').$sql3.EOL;
+ // return $errors;
+ // }
+ // $r = $db->q("RENAME TABLE `".$temp_name."` TO `".$name."`;");
+ // if (!dbm::is_result($r)) {
+ // $errors .= t('Errors encountered performing database changes.').$sql3.EOL;
+ // return $errors;
+ // }
+ //}
+ }
}
}
}
$database["addon"] = array(
"fields" => array(
"id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
- "name" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
+ "name" => array("type" => "varchar(190)", "not null" => "1", "default" => ""),
"version" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"installed" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"hidden" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
),
"indexes" => array(
"PRIMARY" => array("id"),
+ "name" => array("UNIQUE", "name"),
)
);
$database["attach"] = array(
$database["cache"] = array(
"fields" => array(
"k" => array("type" => "varbinary(255)", "not null" => "1", "primary" => "1"),
- "v" => array("type" => "text"),
+ "v" => array("type" => "mediumtext"),
"expire_mode" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
"updated" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
),
"indexes" => array(
"PRIMARY" => array("k"),
- "updated" => array("updated"),
"expire_mode_updated" => array("expire_mode", "updated"),
)
);
"id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
"cat" => array("type" => "varbinary(255)", "not null" => "1", "default" => ""),
"k" => array("type" => "varbinary(255)", "not null" => "1", "default" => ""),
- "v" => array("type" => "text"),
+ "v" => array("type" => "mediumtext"),
),
"indexes" => array(
"PRIMARY" => array("id"),
"bd" => array("type" => "date", "not null" => "1", "default" => "0000-00-00"),
"notify_new_posts" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"fetch_further_information" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
- "ffi_keyword_blacklist" => array("type" => "mediumtext"),
+ "ffi_keyword_blacklist" => array("type" => "text"),
),
"indexes" => array(
"PRIMARY" => array("id"),
"uid_name" => array("uid", "name"),
- "uid_self" => array("uid", "self"),
+ "self_uid" => array("self", "uid"),
"alias_uid" => array("alias(32)", "uid"),
- "uid_pending" => array("uid", "pending"),
- "uid_blocked" => array("uid", "blocked"),
+ "pending_uid" => array("pending", "uid"),
+ "blocked_uid" => array("blocked", "uid"),
"uid_rel_network_poll" => array("uid", "rel", "network", "poll(64)", "archive"),
"uid_network_batch" => array("uid", "network", "batch(64)"),
"addr_uid" => array("addr(32)", "uid"),
"nurl_uid" => array("nurl(32)", "uid"),
"nick_uid" => array("nick(32)", "uid"),
+ "dfrn-id" => array("dfrn-id"),
+ "issued-id" => array("issued-id"),
)
);
$database["conv"] = array(
"fields" => array(
"id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
"guid" => array("type" => "varchar(64)", "not null" => "1", "default" => ""),
- "recips" => array("type" => "mediumtext"),
+ "recips" => array("type" => "text"),
"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
"creator" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"updated" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
- "subject" => array("type" => "mediumtext"),
+ "subject" => array("type" => "text"),
),
"indexes" => array(
"PRIMARY" => array("id"),
"indexes" => array(
"PRIMARY" => array("id"),
"addr" => array("addr(32)"),
+ "url" => array("url"),
)
);
$database["ffinder"] = array(
),
"indexes" => array(
"PRIMARY" => array("id"),
- "nurl" => array("nurl(32)"),
- "name" => array("name(32)"),
+ "nurl" => array("nurl(64)"),
+ "name" => array("name(64)"),
"nick" => array("nick(32)"),
- "addr" => array("addr(32)"),
+ "addr" => array("addr(64)"),
+ "hide_network_updated" => array("hide", "network", "updated"),
"updated" => array("updated"),
)
);
"PRIMARY" => array("id"),
"cid_uid_gcid_zcid" => array("UNIQUE", "cid","uid","gcid","zcid"),
"gcid" => array("gcid"),
- "zcid" => array("zcid"),
)
);
$database["group"] = array(
),
"indexes" => array(
"PRIMARY" => array("id"),
+ "contactid" => array("contact-id"),
"gid_contactid" => array("gid", "contact-id"),
- "uid_contactid" => array("uid", "contact-id"),
"uid_gid_contactid" => array("UNIQUE", "uid", "gid", "contact-id"),
)
);
),
"indexes" => array(
"PRIMARY" => array("id"),
- "hook_file_function" => array("hook(30)","file(60)","function(30)"),
+ "hook_file_function" => array("UNIQUE", "hook(50)","file(80)","function(60)"),
)
);
$database["intro"] = array(
"uid_created" => array("uid","created"),
"uid_unseen_contactid" => array("uid","unseen","contact-id"),
"uid_network_received" => array("uid","network","received"),
- "uid_received" => array("uid","received"),
"uid_network_commented" => array("uid","network","commented"),
- "uid_title" => array("uid","title"),
"uid_thrparent" => array("uid","thr-parent"),
"uid_parenturi" => array("uid","parent-uri"),
- "uid_contactid_id" => array("uid","contact-id","id"),
"uid_contactid_created" => array("uid","contact-id","created"),
"authorid_created" => array("author-id","created"),
"uid_uri" => array("uid", "uri"),
- "uid_wall_created" => array("uid","wall","created"),
"resource-id" => array("resource-id"),
- "uid_type" => array("uid","type"),
- "contactid_allowcid_allowpid_denycid_denygid" => array("contact-id","allow_cid(10)","allow_gid(10)","deny_cid(10)","deny_gid(10)"),
+ "contactid_allowcid_allowpid_denycid_denygid" => array("contact-id","allow_cid(10)","allow_gid(10)","deny_cid(10)","deny_gid(10)"), //
"uid_type_changed" => array("uid","type","changed"),
"contactid_verb" => array("contact-id","verb"),
"deleted_changed" => array("deleted","changed"),
),
"indexes" => array(
"PRIMARY" => array("id"),
- "uid" => array("uid"),
"uid_seen" => array("uid", "seen"),
"convid" => array("convid"),
"uri" => array("uri(64)"),
),
"indexes" => array(
"PRIMARY" => array("id"),
- "uid_mid" => array("uid","mid"),
+ "uid_mid" => array("UNIQUE", "uid","mid"),
)
);
$database["notify"] = array(
),
"indexes" => array(
"PRIMARY" => array("id"),
- "uid_hash" => array("uid", "hash"),
- "uid_seen_date" => array("uid", "seen", "date"),
- "uid_type_link" => array("uid", "type", "link"),
- "uid_link" => array("uid", "link"),
+ "hash_uid" => array("hash", "uid"),
+ "seen_uid_date" => array("seen", "uid", "date"),
"uid_date" => array("uid", "date"),
+ "uid_type_link" => array("uid", "type", "link"),
)
);
$database["notify-threads"] = array(
),
"indexes" => array(
"PRIMARY" => array("id"),
- "master-parent-item" => array("master-parent-item"),
)
);
$database["oembed"] = array(
"fields" => array(
"url" => array("type" => "varbinary(255)", "not null" => "1", "primary" => "1"),
- "content" => array("type" => "text"),
+ "content" => array("type" => "mediumtext"),
"created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
),
"indexes" => array(
"url" => array("type" => "varbinary(255)", "not null" => "1", "primary" => "1"),
"guessing" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0", "primary" => "1"),
"oembed" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0", "primary" => "1"),
- "content" => array("type" => "text"),
+ "content" => array("type" => "mediumtext"),
"created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
),
"indexes" => array(
"PRIMARY" => array("id"),
"uid_contactid" => array("uid", "contact-id"),
"uid_profile" => array("uid", "profile"),
- "uid_album_created" => array("uid", "album(32)", "created"),
+ "uid_album_scale_created" => array("uid", "album(32)", "scale", "created"),
"uid_album_resource-id_created" => array("uid", "album(32)", "resource-id(64)", "created"),
"resource-id" => array("resource-id(64)"),
)
"fields" => array(
"id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
- "q0" => array("type" => "mediumtext"),
- "q1" => array("type" => "mediumtext"),
- "q2" => array("type" => "mediumtext"),
- "q3" => array("type" => "mediumtext"),
- "q4" => array("type" => "mediumtext"),
- "q5" => array("type" => "mediumtext"),
- "q6" => array("type" => "mediumtext"),
- "q7" => array("type" => "mediumtext"),
- "q8" => array("type" => "mediumtext"),
- "q9" => array("type" => "mediumtext"),
+ "q0" => array("type" => "text"),
+ "q1" => array("type" => "text"),
+ "q2" => array("type" => "text"),
+ "q3" => array("type" => "text"),
+ "q4" => array("type" => "text"),
+ "q5" => array("type" => "text"),
+ "q6" => array("type" => "text"),
+ "q7" => array("type" => "text"),
+ "q8" => array("type" => "text"),
+ "q9" => array("type" => "text"),
),
"indexes" => array(
"PRIMARY" => array("id"),
),
"indexes" => array(
"PRIMARY" => array("id"),
+ "uid_is-default" => array("uid", "is-default"),
)
);
$database["profile_check"] = array(
"indexes" => array(
"PRIMARY" => array("tid"),
"oid_otype_type_term" => array("oid","otype","type","term"),
- "uid_term_tid" => array("uid","term(32)","tid"),
- "type_term" => array("type","term(32)"),
"uid_otype_type_term_global_created" => array("uid","otype","type","term(32)","global","created"),
"uid_otype_type_url" => array("uid","otype","type","url(64)"),
"guid" => array("guid(64)"),
),
"indexes" => array(
"PRIMARY" => array("iid"),
- "created" => array("created"),
- "commented" => array("commented"),
"uid_network_commented" => array("uid","network","commented"),
"uid_network_created" => array("uid","network","created"),
"uid_contactid_commented" => array("uid","contact-id","commented"),
),
"indexes" => array(
"PRIMARY" => array("id"),
- "created" => array("created"),
)
);
<?php
+use \Friendica\Core\Config;
+
require_once("boot.php");
function dbupdate_run(&$argv, &$argc) {
unset($db_host, $db_user, $db_pass, $db_data);
}
- load_config('config');
- load_config('system');
+ Config::load();
update_db($a);
}
<?php
+
+use \Friendica\Core\Config;
+
require_once("boot.php");
require_once('include/queue_fn.php');
require_once('include/html2plain.php');
require_once('include/bbcode.php');
require_once('include/email.php');
- load_config('config');
- load_config('system');
+ Config::load();
load_hooks();
`contact`.`name-date`, `contact`.`uri-date`, `contact`.`avatar-date`,
`contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
`sign`.`signed_text`, `sign`.`signature`, `sign`.`signer`
- FROM `item` USE INDEX (`uid_wall_changed`, `uid_type_changed`) $sql_post_table
+ FROM `item` USE INDEX (`uid_wall_changed`) $sql_post_table
STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
AND (NOT `contact`.`blocked` OR `contact`.`pending`)
LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id`
foreach($servers AS $server) {
$server = trim($server);
+ $addr = "relay@".str_replace("http://", "", normalise_link($server));
$batch = $server."/receive/public";
- $relais = q("SELECT `batch`, `id`, `name`,`network` FROM `contact` WHERE `uid` = 0 AND `batch` = '%s' LIMIT 1", dbesc($batch));
+ $relais = q("SELECT `batch`, `id`, `name`,`network` FROM `contact` WHERE `uid` = 0 AND `batch` = '%s' AND `addr` = '%s' AND `nurl` = '%s' LIMIT 1",
+ dbesc($batch), dbesc($addr), dbesc(normalise_link($server)));
if (!$relais) {
- $addr = "relay@".str_replace("http://", "", normalise_link($server));
-
$r = q("INSERT INTO `contact` (`uid`, `created`, `name`, `nick`, `addr`, `url`, `nurl`, `batch`, `network`, `rel`, `blocked`, `pending`, `writable`, `name-date`, `uri-date`, `avatar-date`)
VALUES (0, '%s', '%s', 'relay', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 1, '%s', '%s', '%s')",
datetime_convert(),
<?php
require_once("boot.php");
+use \Friendica\Core\Config;
+
function directory_run(&$argv, &$argc){
global $a, $db;
unset($db_host, $db_user, $db_pass, $db_data);
};
- load_config('config');
- load_config('system');
-
+ Config::load();
if($argc != 2)
return;
- load_config('system');
-
load_hooks();
<?php
+use \Friendica\Core\Config;
+
require_once("boot.php");
require_once("include/socgraph.php");
-
function discover_poco_run(&$argv, &$argc){
global $a, $db;
require_once('include/session.php');
require_once('include/datetime.php');
- load_config('config');
- load_config('system');
+ Config::load();
// Don't check this stuff if the function is called by the poller
if (App::callstack() != "poller_run")
<?php
+use \Friendica\Core\Config;
+
require_once("boot.php");
function expire_run(&$argv, &$argc){
}
if(is_null($db)) {
- @include(".htconfig.php");
- require_once("include/dba.php");
- $db = new dba($db_host, $db_user, $db_pass, $db_data);
- unset($db_host, $db_user, $db_pass, $db_data);
- };
+ @include(".htconfig.php");
+ require_once("include/dba.php");
+ $db = new dba($db_host, $db_user, $db_pass, $db_data);
+ unset($db_host, $db_user, $db_pass, $db_data);
+ };
require_once('include/session.php');
require_once('include/datetime.php');
require_once('include/items.php');
require_once('include/Contact.php');
- load_config('config');
- load_config('system');
+ Config::load();
$a->set_baseurl(get_config('system','url'));
<?php
+use \Friendica\Core\Config;
+
require_once("boot.php");
require_once('include/Scrape.php');
require_once('include/socgraph.php');
require_once('include/session.php');
require_once('include/datetime.php');
- load_config('config');
- load_config('system');
+ Config::load();
$a->set_baseurl(get_config('system','url'));
require_once('include/ForumManager.php');
require_once('include/bbcode.php');
require_once("mod/proxy.php");
+require_once('include/cache.php');
/**
*
$bd_format = t('g A l F d') ; // 8 AM Friday January 18
$bd_short = t('F d');
- $r = q("SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event`
- INNER JOIN `contact` ON `contact`.`id` = `event`.`cid`
- WHERE `event`.`uid` = %d AND `type` = 'birthday' AND `start` < '%s' AND `finish` > '%s'
- ORDER BY `start` ASC ",
- intval(local_user()),
- dbesc(datetime_convert('UTC','UTC','now + 6 days')),
- dbesc(datetime_convert('UTC','UTC','now'))
- );
-
+ $cachekey = "get_birthdays:".local_user();
+ $r = Cache::get($cachekey);
+ if (is_null($r)) {
+ $r = q("SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event`
+ INNER JOIN `contact` ON `contact`.`id` = `event`.`cid`
+ WHERE `event`.`uid` = %d AND `type` = 'birthday' AND `start` < '%s' AND `finish` > '%s'
+ ORDER BY `start` ASC ",
+ intval(local_user()),
+ dbesc(datetime_convert('UTC','UTC','now + 6 days')),
+ dbesc(datetime_convert('UTC','UTC','now'))
+ );
+ if (dbm::is_result($r)) {
+ Cache::set($cachekey, $r, CACHE_HOUR);
+ }
+ }
if (dbm::is_result($r)) {
$total = 0;
$now = strtotime('now');
<?php
+
+use \Friendica\Core\Config;
+
require_once("boot.php");
require_once('include/queue_fn.php');
require_once('include/html2plain.php');
require_once('include/items.php');
require_once('include/bbcode.php');
require_once('include/email.php');
- load_config('config');
- load_config('system');
+
+ Config::load();
load_hooks();
<?php
+use \Friendica\Core\Config;
+
require_once("boot.php");
require_once("include/follow.php");
require_once('include/socgraph.php');
require_once('include/queue_fn.php');
- load_config('config');
- load_config('system');
+ Config::load();
$a->set_baseurl(get_config('system','url'));
*
*/
+use \Friendica\Core\Config;
+
require_once("include/dba.php");
if(! function_exists('get_browser_language')) {
break;
}
}
- if(isset($preferred))
+ if (isset($preferred)) {
return $preferred;
+ }
// in case none matches, get the system wide configured language, or fall back to English
- $a = get_app();
- return ((isset($a->config['system']['language'])) ? $a->config['system']['language'] : 'en');
+ return Config::get('system', 'language', 'en');
}}
/// @todo This query needs to be renewed. It is really slow
// At this time we just store the data in the cache
$albums = qu("SELECT COUNT(DISTINCT `resource-id`) AS `total`, `album`
- FROM `photo` USE INDEX (`uid_album_created`)
+ FROM `photo`
WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s' $sql_extra
GROUP BY `album` ORDER BY `created` DESC",
intval($uid),
} else {
// This query doesn't do the count and is much faster
$albums = qu("SELECT DISTINCT(`album`), '' AS `total`
- FROM `photo` USE INDEX (`uid_album_created`)
+ FROM `photo`
WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s' $sql_extra
GROUP BY `album` ORDER BY `created` DESC",
intval($uid),
$lines = explode("\n", $msg);
$msg = "";
$recycle = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8');
+ $ellipsis = html_entity_decode("…", ENT_QUOTES, 'UTF-8');
foreach ($lines AS $row=>$line) {
if (iconv_strlen(trim($msg."\n".$line), "UTF-8") <= $limit)
$msg = trim($msg."\n".$line);
// Is the new message empty by now or is it a reshared message?
elseif (($msg == "") OR (($row == 1) AND (substr($msg, 0, 4) == $recycle)))
- $msg = iconv_substr(iconv_substr(trim($msg."\n".$line), 0, $limit, "UTF-8"), 0, -3, "UTF-8")."...";
+ $msg = iconv_substr(iconv_substr(trim($msg."\n".$line), 0, $limit, "UTF-8"), 0, -3, "UTF-8").$ellipsis;
else
break;
}
};
// Quit when in maintenance
- if (get_config('system', 'maintenance', true))
+ if (Config::get('system', 'maintenance', true)) {
return;
+ }
$a->start_process();
$mypid = getmypid();
- $cooldown = Config::get("system", "worker_cooldown", 0);
-
// Quit when in maintenance
- if (get_config('system', 'maintenance', true)) {
+ if (Config::get('system', 'maintenance', true)) {
return false;
}
$argv = json_decode($queue["parameter"]);
- $argc = count($argv);
-
// Check for existance and validity of the include file
$include = $argv[0];
$funcname = str_replace(".php", "", basename($argv[0]))."_run";
if (function_exists($funcname)) {
- logger("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." ".$queue["parameter"]);
-
- // For better logging create a new process id for every worker call
- // But preserve the old one for the worker
- $old_process_id = $a->process_id;
- $a->process_id = uniqid("wrk", true);
- $funcname($argv, $argc);
-
- $a->process_id = $old_process_id;
-
- if ($cooldown > 0) {
- logger("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." - in cooldown for ".$cooldown." seconds");
- sleep($cooldown);
- }
-
- logger("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." - done");
+ poller_exec_function($queue, $funcname, $argv);
q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($queue["id"]));
} else {
return true;
}
+/**
+ * @brief Execute a function from the queue
+ *
+ * @param array $queue Workerqueue entry
+ * @param string $funcname name of the function
+ */
+function poller_exec_function($queue, $funcname, $argv) {
+
+ $a = get_app();
+
+ $mypid = getmypid();
+
+ $argc = count($argv);
+
+ logger("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." ".$queue["parameter"]);
+
+ $stamp = (float)microtime(true);
+
+ // We use the callstack here to analyze the performance of executed worker entries.
+ // For this reason the variables have to be initialized.
+ if (Config::get("system", "profiler")) {
+ $a->performance["start"] = microtime(true);
+ $a->performance["database"] = 0;
+ $a->performance["database_write"] = 0;
+ $a->performance["network"] = 0;
+ $a->performance["file"] = 0;
+ $a->performance["rendering"] = 0;
+ $a->performance["parser"] = 0;
+ $a->performance["marktime"] = 0;
+ $a->performance["markstart"] = microtime(true);
+ $a->callstack = array();
+ }
+
+ // For better logging create a new process id for every worker call
+ // But preserve the old one for the worker
+ $old_process_id = $a->process_id;
+ $a->process_id = uniqid("wrk", true);
+
+ $funcname($argv, $argc);
+
+ $a->process_id = $old_process_id;
+
+ $duration = number_format(microtime(true) - $stamp, 3);
+
+ logger("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." - done in ".$duration." seconds.");
+
+ // Write down the performance values into the log
+ if (Config::get("system", "profiler")) {
+ $duration = microtime(true)-$a->performance["start"];
+
+ if (Config::get("rendertime", "callstack")) {
+ if (isset($a->callstack["database"])) {
+ $o = "\nDatabase Read:\n";
+ foreach ($a->callstack["database"] AS $func => $time) {
+ $time = round($time, 3);
+ if ($time > 0)
+ $o .= $func.": ".$time."\n";
+ }
+ }
+ if (isset($a->callstack["database_write"])) {
+ $o .= "\nDatabase Write:\n";
+ foreach ($a->callstack["database_write"] AS $func => $time) {
+ $time = round($time, 3);
+ if ($time > 0)
+ $o .= $func.": ".$time."\n";
+ }
+ }
+ if (isset($a->callstack["network"])) {
+ $o .= "\nNetwork:\n";
+ foreach ($a->callstack["network"] AS $func => $time) {
+ $time = round($time, 3);
+ if ($time > 0)
+ $o .= $func.": ".$time."\n";
+ }
+ }
+ } else {
+ $o = '';
+ }
+
+ logger("ID ".$queue["id"].": ".$funcname.": ".sprintf("DB: %s/%s, Net: %s, I/O: %s, Other: %s, Total: %s".$o,
+ number_format($a->performance["database"] - $a->performance["database_write"], 2),
+ number_format($a->performance["database_write"], 2),
+ number_format($a->performance["network"], 2),
+ number_format($a->performance["file"], 2),
+ number_format($duration - ($a->performance["database"] + $a->performance["network"] + $a->performance["file"]), 2),
+ number_format($duration, 2)),
+ LOGGER_DEBUG);
+ }
+
+ $cooldown = Config::get("system", "worker_cooldown", 0);
+
+ if ($cooldown > 0) {
+ logger("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." - in cooldown for ".$cooldown." seconds");
+ sleep($cooldown);
+ }
+}
+
/**
* @brief Checks if the number of database connections has reached a critical limit.
*
function poller_max_connections_reached() {
// Fetch the max value from the config. This is needed when the system cannot detect the correct value by itself.
- $max = get_config("system", "max_connections");
+ $max = Config::get("system", "max_connections");
// Fetch the percentage level where the poller will get active
$maxlevel = Config::get("system", "max_connections_level", 75);
logger("Load: ".$load."/".$maxsysload." - processes: ".$active."/".$entries." (".$processlist.") - maximum: ".$queues."/".$maxqueues, LOGGER_DEBUG);
// Are there fewer workers running as possible? Then fork a new one.
- if (!get_config("system", "worker_dont_fork") AND ($queues > ($active + 1)) AND ($entries > 1)) {
+ if (!Config::get("system", "worker_dont_fork") AND ($queues > ($active + 1)) AND ($entries > 1)) {
logger("Active workers: ".$active."/".$queues." Fork a new worker.", LOGGER_DEBUG);
$args = array("php", "include/poller.php", "no_cron");
$a = get_app();
if (function_exists("proc_open")) {
// When was the last time that we called the worker?
// Less than one minute? Then we quit
- if ((time() - get_config("system", "worker_started")) < 60) {
+ if ((time() - Config::get("system", "worker_started")) < 60) {
return;
}
logger("Start", LOGGER_DEBUG);
$r = q("SELECT `contact`.`id`, `contact`.`last-item`,
- (SELECT MAX(`changed`) FROM `item` FORCE INDEX (`uid_wall_changed`) WHERE `wall` AND `uid` = `user`.`uid`) AS `lastitem_date`
+ (SELECT MAX(`changed`) FROM `item` USE INDEX (`uid_wall_changed`) WHERE `wall` AND `uid` = `user`.`uid`) AS `lastitem_date`
FROM `user`
INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self`");
require_once('include/items.php');
- load_config('config');
- load_config('system');
+ Config::load();
// Don't check this stuff if the function is called by the poller
if (App::callstack() != "poller_run") {
<?php
+
+use \Friendica\Core\Config;
+
require_once("boot.php");
require_once('include/queue_fn.php');
require_once('include/dfrn.php');
require_once('include/bbcode.php');
require_once('include/socgraph.php');
- load_config('config');
- load_config('system');
+ Config::load();
// Don't check this stuff if the function is called by the poller
if (App::callstack() != "poller_run")
* @file include/remove_contact.php
* @brief Removes orphaned data from deleted contacts
*/
+
+use \Friendica\Core\Config;
+
require_once("boot.php");
function remove_contact_run($argv, $argc) {
unset($db_host, $db_user, $db_pass, $db_data);
}
- load_config('config');
- load_config('system');
+ Config::load();
if ($argc != 2) {
return;
$default_expire = time() + 300;
$memcache = cache::memcache();
- if (is_object($memcache)) {
- $memcache->set(get_app()->get_hostname().":session:".$id, $data, MEMCACHE_COMPRESSED, $expire);
+ $a = get_app();
+ if (is_object($memcache) AND is_object($a)) {
+ $memcache->set($a->get_hostname().":session:".$id, $data, MEMCACHE_COMPRESSED, $expire);
return true;
}
<?php
+
+use \Friendica\Core\Config;
+
require_once("boot.php");
require_once("include/threads.php");
unset($db_host, $db_user, $db_pass, $db_data);
}
-load_config('config');
-load_config('system');
+Config::load();
update_shadow_copy();
killme();
if (in_array($contact["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS)))
$contact["url"] = clean_contact_url($contact["url"]);
- $r = q("SELECT `id`, `last_contact`, `last_failure`, `network` FROM `gcontact` WHERE `nurl` = '%s' ORDER BY `id` LIMIT 2",
+ $r = q("SELECT `id`, `last_contact`, `last_failure`, `network` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 2",
dbesc(normalise_link($contact["url"])));
if ($r) {
* @file include/spool_post.php
* @brief Posts items that wer spooled because they couldn't be posted.
*/
+
+use \Friendica\Core\Config;
+
require_once("boot.php");
require_once("include/items.php");
unset($db_host, $db_user, $db_pass, $db_data);
}
- load_config('config');
- load_config('system');
+ Config::load();
$path = get_spoolpath();
<?php
+
+use \Friendica\Core\Config;
+
require_once("boot.php");
require_once("include/tags.php");
unset($db_host, $db_user, $db_pass, $db_data);
}
-load_config('config');
-load_config('system');
+Config::load();
update_items();
killme();
<?php
+
+use \Friendica\Core\Config;
+
require_once("boot.php");
require_once("include/threads.php");
unset($db_host, $db_user, $db_pass, $db_data);
}
-load_config('config');
-load_config('system');
+Config::load();
update_threads();
update_threads_mention();
<?php
+use \Friendica\Core\Config;
+
require_once("boot.php");
function update_gcontact_run(&$argv, &$argc){
require_once('include/Scrape.php');
require_once("include/socgraph.php");
- load_config('config');
- load_config('system');
+ Config::load();
$a->set_baseurl(get_config('system','url'));
*
*/
+use \Friendica\Core\Config;
+
require_once('boot.php');
require_once('object/BaseObject.php');
* Load configs from db. Overwrite configs from .htconfig.php
*/
- load_config('config');
- load_config('system');
+ Config::load();
if ($a->max_processes_reached() OR $a->maxload_reached()) {
header($_SERVER["SERVER_PROTOCOL"].' 503 Service Temporarily Unavailable');
*
*/
- $a->config['system']['curl_timeout'] = 120;
-
- $res = post_url($dfrn_confirm,$params);
+ $res = post_url($dfrn_confirm, $params, null, $redirects, 120);
logger(' Confirm: received data: ' . $res, LOGGER_DATA);
// Fetch some data from the author (We could combine both queries - but I think this is more readable)
$r = q("SELECT `user`.`prvkey`, `contact`.`addr`, `user`.`nickname`, `contact`.`nick` FROM `user`
- INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid`
+ INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self`
WHERE `user`.`uid` = %d", intval($item[0]["uid"]));
if (!$r) {
header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
<?php
+use \Friendica\Core\Config;
+
function friendica_init(App $a) {
if ($a->argv[1]=="json"){
$register_policy = Array('REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN');
$visible_plugins[] = $rr['name'];
}
- load_config('feature_lock');
+ Config::load('feature_lock');
$locked_features = array();
if(is_array($a->config['feature_lock']) && count($a->config['feature_lock'])) {
foreach($a->config['feature_lock'] as $k => $v) {
// on they just get buried deeper. It has happened to me a couple of times also.
- if((! $group) && (! $cid) && (! $star)) {
+ if (!$group && !$cid && !$star) {
- $unseen = q("SELECT `id` FROM `item` WHERE `unseen` AND `uid` = %d",
+ $unseen = q("SELECT `id` FROM `item` WHERE `unseen` AND `uid` = %d LIMIT 1",
intval(local_user()));
- if ($unseen)
+ if (dbm::is_result($unseen)) {
$r = q("UPDATE `item` SET `unseen` = 0
WHERE `unseen` = 1 AND `uid` = %d",
intval(local_user())
);
- }
- else {
- if($update_unseen) {
+ }
+ } elseif ($update_unseen) {
- $unseen = q("SELECT `id` FROM `item` ".$update_unseen);
+ $unseen = q("SELECT `id` FROM `item` ".$update_unseen. " LIMIT 1");
- if ($unseen)
- $r = q("UPDATE `item` SET `unseen` = 0 $update_unseen");
+ if (dbm::is_result($unseen)) {
+ $r = q("UPDATE `item` SET `unseen` = 0 $update_unseen");
}
}
$o .= conversation($a,$items,$mode,$update);
- if(!$update) {
- if(get_pconfig(local_user(),'system','infinite_scroll')) {
+ if (!$update) {
+ if (get_pconfig(local_user(),'system','infinite_scroll')) {
$o .= scroll_loader();
- } elseif(!get_config('system', 'old_pager')) {
+ } elseif (!get_config('system', 'old_pager')) {
$o .= alt_pager($a,count($items));
} else {
$o .= paginate($a);
// Fetch some data from the author (We could combine both queries - but I think this is more readable)
$r = q("SELECT `user`.`prvkey`, `contact`.`addr`, `user`.`nickname`, `contact`.`nick` FROM `user`
- INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid`
+ INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self`
WHERE `user`.`uid` = %d", intval($item[0]["uid"]));
if (!dbm::is_result($r)) {
header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
require_once('include/threads.php');
require_once('include/Probe.php');
+use \Friendica\Core\Config;
+
function photos_init(App $a) {
if ($a->argc > 1)
$prevlink = '';
$nextlink = '';
- if ($_GET['order'] === 'posted')
- $order = 'ASC';
- else
- $order = 'DESC';
-
+ /// @todo This query is totally bad, the whole functionality has to be changed
+ // The query leads to a really intense used index.
+ // By now we hide it if someone wants to.
+ if (!Config::get('system', 'no_count', false)) {
+ if ($_GET['order'] === 'posted')
+ $order = 'ASC';
+ else
+ $order = 'DESC';
- $prvnxt = qu("SELECT `resource-id` FROM `photo` WHERE `album` = '%s' AND `uid` = %d AND `scale` = 0
- $sql_extra ORDER BY `created` $order ",
- dbesc($ph[0]['album']),
- intval($owner_uid)
- );
+ $prvnxt = qu("SELECT `resource-id` FROM `photo` WHERE `album` = '%s' AND `uid` = %d AND `scale` = 0
+ $sql_extra ORDER BY `created` $order ",
+ dbesc($ph[0]['album']),
+ intval($owner_uid)
+ );
- if (count($prvnxt)) {
- for($z = 0; $z < count($prvnxt); $z++) {
- if ($prvnxt[$z]['resource-id'] == $ph[0]['resource-id']) {
- $prv = $z - 1;
- $nxt = $z + 1;
- if ($prv < 0)
- $prv = count($prvnxt) - 1;
- if ($nxt >= count($prvnxt))
- $nxt = 0;
- break;
+ if (count($prvnxt)) {
+ for($z = 0; $z < count($prvnxt); $z++) {
+ if ($prvnxt[$z]['resource-id'] == $ph[0]['resource-id']) {
+ $prv = $z - 1;
+ $nxt = $z + 1;
+ if ($prv < 0)
+ $prv = count($prvnxt) - 1;
+ if ($nxt >= count($prvnxt))
+ $nxt = 0;
+ break;
+ }
}
- }
- $edit_suffix = ((($cmd === 'edit') && ($can_post)) ? '/edit' : '');
- $prevlink = 'photos/' . $a->data['user']['nickname'] . '/image/' . $prvnxt[$prv]['resource-id'] . $edit_suffix . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '');
- $nextlink = 'photos/' . $a->data['user']['nickname'] . '/image/' . $prvnxt[$nxt]['resource-id'] . $edit_suffix . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '');
- }
-
+ $edit_suffix = ((($cmd === 'edit') && ($can_post)) ? '/edit' : '');
+ $prevlink = 'photos/' . $a->data['user']['nickname'] . '/image/' . $prvnxt[$prv]['resource-id'] . $edit_suffix . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '');
+ $nextlink = 'photos/' . $a->data['user']['nickname'] . '/image/' . $prvnxt[$nxt]['resource-id'] . $edit_suffix . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '');
+ }
+ }
if (count($ph) == 1)
$hires = $lores = $ph[0];
require_once('include/group.php');
require_once('mod/proxy.php');
require_once('include/xml.php');
+require_once('include/cache.php');
/**
* @brief Outputs the counts and the lists of various notifications
}
}
- $ev = qu("SELECT count(`event`.`id`) AS total, type, start, adjust FROM `event`
- WHERE `event`.`uid` = %d AND `start` < '%s' AND `finish` > '%s' and `ignore` = 0
- ORDER BY `start` ASC ",
- intval(local_user()),
- dbesc(datetime_convert('UTC', 'UTC', 'now + 7 days')),
- dbesc(datetime_convert('UTC', 'UTC', 'now'))
- );
+ $cachekey = "ping_init:".local_user();
+ $ev = Cache::get($cachekey);
+ if (is_null($ev)) {
+ $ev = qu("SELECT count(`event`.`id`) AS total, type, start, adjust FROM `event`
+ WHERE `event`.`uid` = %d AND `start` < '%s' AND `finish` > '%s' and `ignore` = 0
+ ORDER BY `start` ASC ",
+ intval(local_user()),
+ dbesc(datetime_convert('UTC', 'UTC', 'now + 7 days')),
+ dbesc(datetime_convert('UTC', 'UTC', 'now'))
+ );
+ if (dbm::is_result($ev)) {
+ Cache::set($cachekey, $ev, CACHE_HOUR);
+ }
+ }
if (dbm::is_result($ev)) {
$all_events = intval($ev[0]['total']);
<?php
-define('UPDATE_VERSION' , 1212);
+define('UPDATE_VERSION' , 1213);
/**
*
<?php
+use \Friendica\Core\Config;
+
require_once("boot.php");
$a = new App;
require_once("include/dba.php");
$db = new dba($db_host, $db_user, $db_pass, $db_data, false);
- unset($db_host, $db_user, $db_pass, $db_data);
-load_config('config');
-load_config('system');
+unset($db_host, $db_user, $db_pass, $db_data);
+
+Config::load();
$maint_mode = 1;
if($argc > 1)
projects / friendica.git / commitdiff