From 06c3af9b60c99b86424c9f9626f976bcf1bf5b5e Mon Sep 17 00:00:00 2001
From: Adam Magness <adam.magness@gmail.com>
Date: Thu, 9 Nov 2017 11:05:18 -0500
Subject: [PATCH] Move Cache to src
relocate the cache class to Friendica\Core namespace
---
boot.php | 586 ++++++++++++----------
include/Photo.php | 1 +
include/bbcode.php | 1 +
include/cronjobs.php | 1 +
include/discover_poco.php | 2 +-
include/gprobe.php | 2 +-
include/identity.php | 347 +++++++------
include/oembed.php | 1 +
include/ostatus.php | 535 +++++++++++---------
include/photos.php | 2 +-
include/queue.php | 31 +-
include/session.php | 49 +-
include/socgraph.php | 1 +
mod/ping.php | 94 ++--
mod/poco.php | 1 +
mod/search.php | 1 +
src/App.php | 2 +-
src/Core/Cache.php | 243 +++++++++
src/Network/Probe.php | 2 +-
src/Protocol/Diaspora.php | 2 +-
vendor/pear/text_languagedetect/phpcs.xml | 1 +
21 files changed, 1177 insertions(+), 728 deletions(-)
create mode 100644 src/Core/Cache.php
diff --git a/boot.php b/boot.php
index 95d1b52fd1..4e20058bcf 100644
--- a/boot.php
+++ b/boot.php
@@ -18,10 +18,11 @@
* easily as email does today.
*/
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php');
+require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
use Friendica\App;
use Friendica\Core\System;
+use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Core\Worker;
@@ -34,18 +35,17 @@ require_once 'include/text.php';
require_once 'include/datetime.php';
require_once 'include/pgettext.php';
require_once 'include/nav.php';
-require_once 'include/cache.php';
require_once 'include/features.php';
require_once 'include/identity.php';
require_once 'update.php';
require_once 'include/dbstructure.php';
require_once 'include/poller.php';
-define ( 'FRIENDICA_PLATFORM', 'Friendica');
-define ( 'FRIENDICA_CODENAME', 'Asparagus');
-define ( 'FRIENDICA_VERSION', '3.6-dev' );
-define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
-define ( 'DB_UPDATE_VERSION', 1235 );
+define('FRIENDICA_PLATFORM', 'Friendica');
+define('FRIENDICA_CODENAME', 'Asparagus');
+define('FRIENDICA_VERSION', '3.6-dev');
+define('DFRN_PROTOCOL_VERSION', '2.23');
+define('DB_UPDATE_VERSION', 1235);
/**
* @brief Constant with a HTML line break.
@@ -54,8 +54,8 @@ define ( 'DB_UPDATE_VERSION', 1235 );
* feed for the source.
* This can be used in HTML and JavaScript where needed a line break.
*/
-define ( 'EOL', "<br />\r\n" );
-define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
+define('EOL', "<br />\r\n");
+define('ATOM_TIME', 'Y-m-d\TH:i:s\Z');
/**
* @brief Image storage quality.
@@ -65,17 +65,15 @@ define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
* $a->config['system']['jpeg_quality'] = n;
* in .htconfig.php, where n is netween 1 and 100, and with very poor results
* below about 50
- *
*/
-define ( 'JPEG_QUALITY', 100 );
+define('JPEG_QUALITY', 100);
/**
* $a->config['system']['png_quality'] from 0 (uncompressed) to 9
*/
-define ( 'PNG_QUALITY', 8 );
+define('PNG_QUALITY', 8);
/**
- *
* An alternate way of limiting picture upload sizes. Specify the maximum pixel
* length that pictures are allowed to be (for non-square pictures, it will apply
* to the longest side). Pictures longer than this length will be resized to be
@@ -88,14 +86,13 @@ define ( 'PNG_QUALITY', 8 );
*
* If you don't want to set a maximum length, set to -1. The default value is
* defined by 'MAX_IMAGE_LENGTH' below.
- *
*/
-define ( 'MAX_IMAGE_LENGTH', -1 );
+define('MAX_IMAGE_LENGTH', -1);
/**
* Not yet used
*/
-define ( 'DEFAULT_DB_ENGINE', 'InnoDB' );
+define('DEFAULT_DB_ENGINE', 'InnoDB');
/**
* @name SSL Policy
@@ -103,9 +100,9 @@ define ( 'DEFAULT_DB_ENGINE', 'InnoDB' );
* SSL redirection policies
* @{
*/
-define ( 'SSL_POLICY_NONE', 0 );
-define ( 'SSL_POLICY_FULL', 1 );
-define ( 'SSL_POLICY_SELFSIGN', 2 );
+define('SSL_POLICY_NONE', 0);
+define('SSL_POLICY_FULL', 1);
+define('SSL_POLICY_SELFSIGN', 2);
/* @}*/
/**
@@ -114,11 +111,11 @@ define ( 'SSL_POLICY_SELFSIGN', 2 );
* log levels
* @{
*/
-define ( 'LOGGER_NORMAL', 0 );
-define ( 'LOGGER_TRACE', 1 );
-define ( 'LOGGER_DEBUG', 2 );
-define ( 'LOGGER_DATA', 3 );
-define ( 'LOGGER_ALL', 4 );
+define('LOGGER_NORMAL', 0);
+define('LOGGER_TRACE', 1);
+define('LOGGER_DEBUG', 2);
+define('LOGGER_DATA', 3);
+define('LOGGER_ALL', 4);
/* @}*/
/**
@@ -127,14 +124,14 @@ define ( 'LOGGER_ALL', 4 );
* Cache levels
* @{
*/
-define ( 'CACHE_MONTH', 0 );
-define ( 'CACHE_WEEK', 1 );
-define ( 'CACHE_DAY', 2 );
-define ( 'CACHE_HOUR', 3 );
-define ( 'CACHE_HALF_HOUR', 4 );
-define ( 'CACHE_QUARTER_HOUR', 5 );
-define ( 'CACHE_FIVE_MINUTES', 6 );
-define ( 'CACHE_MINUTE', 7 );
+define('CACHE_MONTH', 0);
+define('CACHE_WEEK', 1);
+define('CACHE_DAY', 2);
+define('CACHE_HOUR', 3);
+define('CACHE_HALF_HOUR', 4);
+define('CACHE_QUARTER_HOUR', 5);
+define('CACHE_FIVE_MINUTES', 6);
+define('CACHE_MINUTE', 7);
/* @}*/
/**
@@ -143,10 +140,12 @@ define ( 'CACHE_MINUTE', 7 );
* Registration policies
* @{
*/
-define ( 'REGISTER_CLOSED', 0 );
-define ( 'REGISTER_APPROVE', 1 );
-define ( 'REGISTER_OPEN', 2 );
-/** @}*/
+define('REGISTER_CLOSED', 0);
+define('REGISTER_APPROVE', 1);
+define('REGISTER_OPEN', 2);
+/**
+ * @}
+*/
/**
* @name Contact_is
@@ -154,10 +153,12 @@ define ( 'REGISTER_OPEN', 2 );
* Relationship types
* @{
*/
-define ( 'CONTACT_IS_FOLLOWER', 1);
-define ( 'CONTACT_IS_SHARING', 2);
-define ( 'CONTACT_IS_FRIEND', 3);
-/** @}*/
+define('CONTACT_IS_FOLLOWER', 1);
+define('CONTACT_IS_SHARING', 2);
+define('CONTACT_IS_FRIEND', 3);
+/**
+ * @}
+ */
/**
* @name Update
@@ -165,9 +166,11 @@ define ( 'CONTACT_IS_FRIEND', 3);
* DB update return values
* @{
*/
-define ( 'UPDATE_SUCCESS', 0);
-define ( 'UPDATE_FAILED', 1);
-/** @}*/
+define('UPDATE_SUCCESS', 0);
+define('UPDATE_FAILED', 1);
+/**
+ * @}
+ */
/**
* @name page/profile types
@@ -180,13 +183,15 @@ define ( 'UPDATE_FAILED', 1);
*
* @{
*/
-define ( 'PAGE_NORMAL', 0 );
-define ( 'PAGE_SOAPBOX', 1 );
-define ( 'PAGE_COMMUNITY', 2 );
-define ( 'PAGE_FREELOVE', 3 );
-define ( 'PAGE_BLOG', 4 );
-define ( 'PAGE_PRVGROUP', 5 );
-/** @}*/
+define('PAGE_NORMAL', 0);
+define('PAGE_SOAPBOX', 1);
+define('PAGE_COMMUNITY', 2);
+define('PAGE_FREELOVE', 3);
+define('PAGE_BLOG', 4);
+define('PAGE_PRVGROUP', 5);
+/**
+ * @}
+ */
/**
* @name account types
@@ -204,11 +209,13 @@ define ( 'PAGE_PRVGROUP', 5 );
* Associated page types: PAGE_COMMUNITY, PAGE_PRVGROUP
* @{
*/
-define ( 'ACCOUNT_TYPE_PERSON', 0 );
-define ( 'ACCOUNT_TYPE_ORGANISATION',1 );
-define ( 'ACCOUNT_TYPE_NEWS', 2 );
-define ( 'ACCOUNT_TYPE_COMMUNITY', 3 );
-/** @}*/
+define('ACCOUNT_TYPE_PERSON', 0);
+define('ACCOUNT_TYPE_ORGANISATION', 1);
+define('ACCOUNT_TYPE_NEWS', 2);
+define('ACCOUNT_TYPE_COMMUNITY', 3);
+/**
+ * @}
+ */
/**
* @name CP
@@ -216,10 +223,12 @@ define ( 'ACCOUNT_TYPE_COMMUNITY', 3 );
* Type of the community page
* @{
*/
-define ( 'CP_NO_COMMUNITY_PAGE', -1 );
-define ( 'CP_USERS_ON_SERVER', 0 );
-define ( 'CP_GLOBAL_COMMUNITY', 1 );
-/** @}*/
+define('CP_NO_COMMUNITY_PAGE', -1);
+define('CP_USERS_ON_SERVER', 0);
+define('CP_GLOBAL_COMMUNITY', 1);
+/**
+ * @}
+ */
/**
* @name Protocols
@@ -234,7 +243,9 @@ define('PROTOCOL_OSTATUS_SALMON', 3);
define('PROTOCOL_OSTATUS_FEED', 4); // Deprecated
define('PROTOCOL_GS_CONVERSATION', 5); // Deprecated
define('PROTOCOL_SPLITTED_CONV', 6);
-/** @}*/
+/**
+ * @}
+ */
/**
* @name Network
@@ -242,28 +253,30 @@ define('PROTOCOL_SPLITTED_CONV', 6);
* Network and protocol family types
* @{
*/
-define ( 'NETWORK_DFRN', 'dfrn'); // Friendica, Mistpark, other DFRN implementations
-define ( 'NETWORK_ZOT', 'zot!'); // Zot!
-define ( 'NETWORK_OSTATUS', 'stat'); // status.net, identi.ca, GNU-social, other OStatus implementations
-define ( 'NETWORK_FEED', 'feed'); // RSS/Atom feeds with no known "post/notify" protocol
-define ( 'NETWORK_DIASPORA', 'dspr'); // Diaspora
-define ( 'NETWORK_MAIL', 'mail'); // IMAP/POP
-define ( 'NETWORK_MAIL2', 'mai2'); // extended IMAP/POP
-define ( 'NETWORK_FACEBOOK', 'face'); // Facebook API
-define ( 'NETWORK_LINKEDIN', 'lnkd'); // LinkedIn
-define ( 'NETWORK_XMPP', 'xmpp'); // XMPP
-define ( 'NETWORK_MYSPACE', 'mysp'); // MySpace
-define ( 'NETWORK_GPLUS', 'goog'); // Google+
-define ( 'NETWORK_PUMPIO', 'pump'); // pump.io
-define ( 'NETWORK_TWITTER', 'twit'); // Twitter
-define ( 'NETWORK_DIASPORA2', 'dspc'); // Diaspora connector
-define ( 'NETWORK_STATUSNET', 'stac'); // Statusnet connector
-define ( 'NETWORK_APPNET', 'apdn'); // app.net
-define ( 'NETWORK_NEWS', 'nntp'); // Network News Transfer Protocol
-define ( 'NETWORK_ICALENDAR', 'ical'); // iCalendar
-define ( 'NETWORK_PNUT', 'pnut'); // pnut.io
-define ( 'NETWORK_PHANTOM', 'unkn'); // Place holder
-/** @}*/
+define('NETWORK_DFRN', 'dfrn'); // Friendica, Mistpark, other DFRN implementations
+define('NETWORK_ZOT', 'zot!'); // Zot!
+define('NETWORK_OSTATUS', 'stat'); // status.net, identi.ca, GNU-social, other OStatus implementations
+define('NETWORK_FEED', 'feed'); // RSS/Atom feeds with no known "post/notify" protocol
+define('NETWORK_DIASPORA', 'dspr'); // Diaspora
+define('NETWORK_MAIL', 'mail'); // IMAP/POP
+define('NETWORK_MAIL2', 'mai2'); // extended IMAP/POP
+define('NETWORK_FACEBOOK', 'face'); // Facebook API
+define('NETWORK_LINKEDIN', 'lnkd'); // LinkedIn
+define('NETWORK_XMPP', 'xmpp'); // XMPP
+define('NETWORK_MYSPACE', 'mysp'); // MySpace
+define('NETWORK_GPLUS', 'goog'); // Google+
+define('NETWORK_PUMPIO', 'pump'); // pump.io
+define('NETWORK_TWITTER', 'twit'); // Twitter
+define('NETWORK_DIASPORA2', 'dspc'); // Diaspora connector
+define('NETWORK_STATUSNET', 'stac'); // Statusnet connector
+define('NETWORK_APPNET', 'apdn'); // app.net
+define('NETWORK_NEWS', 'nntp'); // Network News Transfer Protocol
+define('NETWORK_ICALENDAR', 'ical'); // iCalendar
+define('NETWORK_PNUT', 'pnut'); // pnut.io
+define('NETWORK_PHANTOM', 'unkn'); // Place holder
+/**
+ * @}
+ */
/**
* These numbers are used in stored permissions
@@ -298,12 +311,12 @@ $netgroup_ids = array(
/**
* Maximum number of "people who like (or don't like) this" that we will list by name
*/
-define ( 'MAX_LIKERS', 75);
+define('MAX_LIKERS', 75);
/**
* Communication timeout
*/
-define ( 'ZCURL_TIMEOUT' , (-1));
+define('ZCURL_TIMEOUT', (-1));
/**
* @name Notify
@@ -311,21 +324,21 @@ define ( 'ZCURL_TIMEOUT' , (-1));
* Email notification options
* @{
*/
-define ( 'NOTIFY_INTRO', 0x0001 );
-define ( 'NOTIFY_CONFIRM', 0x0002 );
-define ( 'NOTIFY_WALL', 0x0004 );
-define ( 'NOTIFY_COMMENT', 0x0008 );
-define ( 'NOTIFY_MAIL', 0x0010 );
-define ( 'NOTIFY_SUGGEST', 0x0020 );
-define ( 'NOTIFY_PROFILE', 0x0040 );
-define ( 'NOTIFY_TAGSELF', 0x0080 );
-define ( 'NOTIFY_TAGSHARE', 0x0100 );
-define ( 'NOTIFY_POKE', 0x0200 );
-define ( 'NOTIFY_SHARE', 0x0400 );
-
-define ( 'SYSTEM_EMAIL', 0x4000 );
-
-define ( 'NOTIFY_SYSTEM', 0x8000 );
+define('NOTIFY_INTRO', 0x0001);
+define('NOTIFY_CONFIRM', 0x0002);
+define('NOTIFY_WALL', 0x0004);
+define('NOTIFY_COMMENT', 0x0008);
+define('NOTIFY_MAIL', 0x0010);
+define('NOTIFY_SUGGEST', 0x0020);
+define('NOTIFY_PROFILE', 0x0040);
+define('NOTIFY_TAGSELF', 0x0080);
+define('NOTIFY_TAGSHARE', 0x0100);
+define('NOTIFY_POKE', 0x0200);
+define('NOTIFY_SHARE', 0x0400);
+
+define('SYSTEM_EMAIL', 0x4000);
+
+define('NOTIFY_SYSTEM', 0x8000);
/* @}*/
@@ -335,17 +348,17 @@ define ( 'NOTIFY_SYSTEM', 0x8000 );
* Tag/term types
* @{
*/
-define ( 'TERM_UNKNOWN', 0 );
-define ( 'TERM_HASHTAG', 1 );
-define ( 'TERM_MENTION', 2 );
-define ( 'TERM_CATEGORY', 3 );
-define ( 'TERM_PCATEGORY', 4 );
-define ( 'TERM_FILE', 5 );
-define ( 'TERM_SAVEDSEARCH', 6 );
-define ( 'TERM_CONVERSATION', 7 );
-
-define ( 'TERM_OBJ_POST', 1 );
-define ( 'TERM_OBJ_PHOTO', 2 );
+define('TERM_UNKNOWN', 0);
+define('TERM_HASHTAG', 1);
+define('TERM_MENTION', 2);
+define('TERM_CATEGORY', 3);
+define('TERM_PCATEGORY', 4);
+define('TERM_FILE', 5);
+define('TERM_SAVEDSEARCH', 6);
+define('TERM_CONVERSATION', 7);
+
+define('TERM_OBJ_POST', 1);
+define('TERM_OBJ_PHOTO', 2);
/**
* @name Namespaces
@@ -353,22 +366,22 @@ define ( 'TERM_OBJ_PHOTO', 2 );
* Various namespaces we may need to parse
* @{
*/
-define ( 'NAMESPACE_ZOT', 'http://purl.org/zot' );
-define ( 'NAMESPACE_DFRN' , 'http://purl.org/macgirvin/dfrn/1.0' );
-define ( 'NAMESPACE_THREAD' , 'http://purl.org/syndication/thread/1.0' );
-define ( 'NAMESPACE_TOMB' , 'http://purl.org/atompub/tombstones/1.0' );
-define ( 'NAMESPACE_ACTIVITY', 'http://activitystrea.ms/spec/1.0/' );
-define ( 'NAMESPACE_ACTIVITY_SCHEMA', 'http://activitystrea.ms/schema/1.0/' );
-define ( 'NAMESPACE_MEDIA', 'http://purl.org/syndication/atommedia' );
-define ( 'NAMESPACE_SALMON_ME', 'http://salmon-protocol.org/ns/magic-env' );
-define ( 'NAMESPACE_OSTATUSSUB', 'http://ostatus.org/schema/1.0/subscribe' );
-define ( 'NAMESPACE_GEORSS', 'http://www.georss.org/georss' );
-define ( 'NAMESPACE_POCO', 'http://portablecontacts.net/spec/1.0' );
-define ( 'NAMESPACE_FEED', 'http://schemas.google.com/g/2010#updates-from' );
-define ( 'NAMESPACE_OSTATUS', 'http://ostatus.org/schema/1.0' );
-define ( 'NAMESPACE_STATUSNET', 'http://status.net/schema/api/1/' );
-define ( 'NAMESPACE_ATOM1', 'http://www.w3.org/2005/Atom' );
-define ( 'NAMESPACE_MASTODON', 'http://mastodon.social/schema/1.0' );
+define('NAMESPACE_ZOT', 'http://purl.org/zot');
+define('NAMESPACE_DFRN', 'http://purl.org/macgirvin/dfrn/1.0');
+define('NAMESPACE_THREAD', 'http://purl.org/syndication/thread/1.0');
+define('NAMESPACE_TOMB', 'http://purl.org/atompub/tombstones/1.0');
+define('NAMESPACE_ACTIVITY', 'http://activitystrea.ms/spec/1.0/');
+define('NAMESPACE_ACTIVITY_SCHEMA', 'http://activitystrea.ms/schema/1.0/');
+define('NAMESPACE_MEDIA', 'http://purl.org/syndication/atommedia');
+define('NAMESPACE_SALMON_ME', 'http://salmon-protocol.org/ns/magic-env');
+define('NAMESPACE_OSTATUSSUB', 'http://ostatus.org/schema/1.0/subscribe');
+define('NAMESPACE_GEORSS', 'http://www.georss.org/georss');
+define('NAMESPACE_POCO', 'http://portablecontacts.net/spec/1.0');
+define('NAMESPACE_FEED', 'http://schemas.google.com/g/2010#updates-from');
+define('NAMESPACE_OSTATUS', 'http://ostatus.org/schema/1.0');
+define('NAMESPACE_STATUSNET', 'http://status.net/schema/api/1/');
+define('NAMESPACE_ATOM1', 'http://www.w3.org/2005/Atom');
+define('NAMESPACE_MASTODON', 'http://mastodon.social/schema/1.0');
/* @}*/
/**
@@ -377,46 +390,46 @@ define ( 'NAMESPACE_MASTODON', 'http://mastodon.social/schema/1.0' );
* Activity stream defines
* @{
*/
-define ( 'ACTIVITY_LIKE', NAMESPACE_ACTIVITY_SCHEMA . 'like' );
-define ( 'ACTIVITY_DISLIKE', NAMESPACE_DFRN . '/dislike' );
-define ( 'ACTIVITY_ATTEND', NAMESPACE_ZOT . '/activity/attendyes' );
-define ( 'ACTIVITY_ATTENDNO', NAMESPACE_ZOT . '/activity/attendno' );
-define ( 'ACTIVITY_ATTENDMAYBE', NAMESPACE_ZOT . '/activity/attendmaybe' );
-
-define ( 'ACTIVITY_OBJ_HEART', NAMESPACE_DFRN . '/heart' );
-
-define ( 'ACTIVITY_FRIEND', NAMESPACE_ACTIVITY_SCHEMA . 'make-friend' );
-define ( 'ACTIVITY_REQ_FRIEND', NAMESPACE_ACTIVITY_SCHEMA . 'request-friend' );
-define ( 'ACTIVITY_UNFRIEND', NAMESPACE_ACTIVITY_SCHEMA . 'remove-friend' );
-define ( 'ACTIVITY_FOLLOW', NAMESPACE_ACTIVITY_SCHEMA . 'follow' );
-define ( 'ACTIVITY_UNFOLLOW', NAMESPACE_ACTIVITY_SCHEMA . 'stop-following' );
-define ( 'ACTIVITY_JOIN', NAMESPACE_ACTIVITY_SCHEMA . 'join' );
-
-define ( 'ACTIVITY_POST', NAMESPACE_ACTIVITY_SCHEMA . 'post' );
-define ( 'ACTIVITY_UPDATE', NAMESPACE_ACTIVITY_SCHEMA . 'update' );
-define ( 'ACTIVITY_TAG', NAMESPACE_ACTIVITY_SCHEMA . 'tag' );
-define ( 'ACTIVITY_FAVORITE', NAMESPACE_ACTIVITY_SCHEMA . 'favorite' );
-define ( 'ACTIVITY_UNFAVORITE', NAMESPACE_ACTIVITY_SCHEMA . 'unfavorite' );
-define ( 'ACTIVITY_SHARE', NAMESPACE_ACTIVITY_SCHEMA . 'share' );
-define ( 'ACTIVITY_DELETE', NAMESPACE_ACTIVITY_SCHEMA . 'delete' );
-
-define ( 'ACTIVITY_POKE', NAMESPACE_ZOT . '/activity/poke' );
-define ( 'ACTIVITY_MOOD', NAMESPACE_ZOT . '/activity/mood' );
-
-define ( 'ACTIVITY_OBJ_BOOKMARK', NAMESPACE_ACTIVITY_SCHEMA . 'bookmark' );
-define ( 'ACTIVITY_OBJ_COMMENT', NAMESPACE_ACTIVITY_SCHEMA . 'comment' );
-define ( 'ACTIVITY_OBJ_NOTE', NAMESPACE_ACTIVITY_SCHEMA . 'note' );
-define ( 'ACTIVITY_OBJ_PERSON', NAMESPACE_ACTIVITY_SCHEMA . 'person' );
-define ( 'ACTIVITY_OBJ_IMAGE', NAMESPACE_ACTIVITY_SCHEMA . 'image' );
-define ( 'ACTIVITY_OBJ_PHOTO', NAMESPACE_ACTIVITY_SCHEMA . 'photo' );
-define ( 'ACTIVITY_OBJ_VIDEO', NAMESPACE_ACTIVITY_SCHEMA . 'video' );
-define ( 'ACTIVITY_OBJ_P_PHOTO', NAMESPACE_ACTIVITY_SCHEMA . 'profile-photo' );
-define ( 'ACTIVITY_OBJ_ALBUM', NAMESPACE_ACTIVITY_SCHEMA . 'photo-album' );
-define ( 'ACTIVITY_OBJ_EVENT', NAMESPACE_ACTIVITY_SCHEMA . 'event' );
-define ( 'ACTIVITY_OBJ_GROUP', NAMESPACE_ACTIVITY_SCHEMA . 'group' );
-define ( 'ACTIVITY_OBJ_TAGTERM', NAMESPACE_DFRN . '/tagterm' );
-define ( 'ACTIVITY_OBJ_PROFILE', NAMESPACE_DFRN . '/profile' );
-define ( 'ACTIVITY_OBJ_QUESTION', 'http://activityschema.org/object/question' );
+define('ACTIVITY_LIKE', NAMESPACE_ACTIVITY_SCHEMA . 'like');
+define('ACTIVITY_DISLIKE', NAMESPACE_DFRN . '/dislike');
+define('ACTIVITY_ATTEND', NAMESPACE_ZOT . '/activity/attendyes');
+define('ACTIVITY_ATTENDNO', NAMESPACE_ZOT . '/activity/attendno');
+define('ACTIVITY_ATTENDMAYBE', NAMESPACE_ZOT . '/activity/attendmaybe');
+
+define('ACTIVITY_OBJ_HEART', NAMESPACE_DFRN . '/heart');
+
+define('ACTIVITY_FRIEND', NAMESPACE_ACTIVITY_SCHEMA . 'make-friend');
+define('ACTIVITY_REQ_FRIEND', NAMESPACE_ACTIVITY_SCHEMA . 'request-friend');
+define('ACTIVITY_UNFRIEND', NAMESPACE_ACTIVITY_SCHEMA . 'remove-friend');
+define('ACTIVITY_FOLLOW', NAMESPACE_ACTIVITY_SCHEMA . 'follow');
+define('ACTIVITY_UNFOLLOW', NAMESPACE_ACTIVITY_SCHEMA . 'stop-following');
+define('ACTIVITY_JOIN', NAMESPACE_ACTIVITY_SCHEMA . 'join');
+
+define('ACTIVITY_POST', NAMESPACE_ACTIVITY_SCHEMA . 'post');
+define('ACTIVITY_UPDATE', NAMESPACE_ACTIVITY_SCHEMA . 'update');
+define('ACTIVITY_TAG', NAMESPACE_ACTIVITY_SCHEMA . 'tag');
+define('ACTIVITY_FAVORITE', NAMESPACE_ACTIVITY_SCHEMA . 'favorite');
+define('ACTIVITY_UNFAVORITE', NAMESPACE_ACTIVITY_SCHEMA . 'unfavorite');
+define('ACTIVITY_SHARE', NAMESPACE_ACTIVITY_SCHEMA . 'share');
+define('ACTIVITY_DELETE', NAMESPACE_ACTIVITY_SCHEMA . 'delete');
+
+define('ACTIVITY_POKE', NAMESPACE_ZOT . '/activity/poke');
+define('ACTIVITY_MOOD', NAMESPACE_ZOT . '/activity/mood');
+
+define('ACTIVITY_OBJ_BOOKMARK', NAMESPACE_ACTIVITY_SCHEMA . 'bookmark');
+define('ACTIVITY_OBJ_COMMENT', NAMESPACE_ACTIVITY_SCHEMA . 'comment');
+define('ACTIVITY_OBJ_NOTE', NAMESPACE_ACTIVITY_SCHEMA . 'note');
+define('ACTIVITY_OBJ_PERSON', NAMESPACE_ACTIVITY_SCHEMA . 'person');
+define('ACTIVITY_OBJ_IMAGE', NAMESPACE_ACTIVITY_SCHEMA . 'image');
+define('ACTIVITY_OBJ_PHOTO', NAMESPACE_ACTIVITY_SCHEMA . 'photo');
+define('ACTIVITY_OBJ_VIDEO', NAMESPACE_ACTIVITY_SCHEMA . 'video');
+define('ACTIVITY_OBJ_P_PHOTO', NAMESPACE_ACTIVITY_SCHEMA . 'profile-photo');
+define('ACTIVITY_OBJ_ALBUM', NAMESPACE_ACTIVITY_SCHEMA . 'photo-album');
+define('ACTIVITY_OBJ_EVENT', NAMESPACE_ACTIVITY_SCHEMA . 'event');
+define('ACTIVITY_OBJ_GROUP', NAMESPACE_ACTIVITY_SCHEMA . 'group');
+define('ACTIVITY_OBJ_TAGTERM', NAMESPACE_DFRN . '/tagterm');
+define('ACTIVITY_OBJ_PROFILE', NAMESPACE_DFRN . '/profile');
+define('ACTIVITY_OBJ_QUESTION', 'http://activityschema.org/object/question');
/* @}*/
/**
@@ -425,9 +438,9 @@ define ( 'ACTIVITY_OBJ_QUESTION', 'http://activityschema.org/object/question' );
* Item weight for query ordering
* @{
*/
-define ( 'GRAVITY_PARENT', 0);
-define ( 'GRAVITY_LIKE', 3);
-define ( 'GRAVITY_COMMENT', 6);
+define('GRAVITY_PARENT', 0);
+define('GRAVITY_LIKE', 3);
+define('GRAVITY_COMMENT', 6);
/* @}*/
/**
@@ -436,12 +449,12 @@ define ( 'GRAVITY_COMMENT', 6);
* Process priority for the worker
* @{
*/
-define('PRIORITY_UNDEFINED', 0);
-define('PRIORITY_CRITICAL', 10);
-define('PRIORITY_HIGH', 20);
-define('PRIORITY_MEDIUM', 30);
-define('PRIORITY_LOW', 40);
-define('PRIORITY_NEGLIGIBLE',50);
+define('PRIORITY_UNDEFINED', 0);
+define('PRIORITY_CRITICAL', 10);
+define('PRIORITY_HIGH', 20);
+define('PRIORITY_MEDIUM', 30);
+define('PRIORITY_LOW', 40);
+define('PRIORITY_NEGLIGIBLE', 50);
/* @}*/
/**
@@ -459,7 +472,7 @@ define('SR_SCOPE_TAGS', 'tags');
/**
* Lowest possible date time value
*/
-define ('NULL_DATE', '0001-01-01 00:00:00');
+define('NULL_DATE', '0001-01-01 00:00:00');
// Normally this constant is defined - but not if "pcntl" isn't installed
if (!defined("SIGTERM")) {
@@ -471,16 +484,15 @@ if (!defined("SIGTERM")) {
* See here: http://php.net/manual/en/curl.constants.php#117928
*/
if (!defined('CURLE_OPERATION_TIMEDOUT')) {
- define('CURLE_OPERATION_TIMEDOUT', CURLE_OPERATION_TIMEOUTED);
+ define('CURLE_OPERATION_TIMEDOUT', CURLE_OPERATION_TIMEOUTED);
}
/**
- *
* Reverse the effect of magic_quotes_gpc if it is enabled.
* Please disable magic_quotes_gpc so we don't have to do this.
* See http://php.net/manual/en/security.magicquotes.disabling.php
- *
*/
-function startup() {
+function startup()
+{
error_reporting(E_ERROR | E_WARNING | E_PARSE);
set_time_limit(0);
@@ -510,7 +522,8 @@ function startup() {
*
* Useful in functions which require it but don't get it passed to them
*/
-function get_app() {
+function get_app()
+{
global $a;
if (empty($a)) {
@@ -530,12 +543,13 @@ function get_app() {
* e.g. x('') or x(0) returns 0;
*
* @param string|array $s variable to check
- * @param string $k key inside the array to check
+ * @param string $k key inside the array to check
*
* @return bool|int
*/
-function x($s, $k = NULL) {
- if ($k != NULL) {
+function x($s, $k = null)
+{
+ if ($k != null) {
if ((is_array($s)) && (array_key_exists($k, $s))) {
if ($s[$k]) {
return (int) 1;
@@ -557,8 +571,9 @@ function x($s, $k = NULL) {
/**
* @brief Called from db initialisation if db is dead.
*/
-function system_unavailable() {
- include('system_unavailable.php');
+function system_unavailable()
+{
+ include 'system_unavailable.php';
system_down();
killme();
}
@@ -571,18 +586,20 @@ function system_unavailable() {
* @return string
* @TODO Function is deprecated and only used in some addons
*/
-function z_root() {
+function z_root()
+{
return System::baseUrl();
}
/**
* @brief Return absolut URL for given $path.
*
- * @param string $path
+ * @param string $path given path
*
* @return string
*/
-function absurl($path) {
+function absurl($path)
+{
if (strpos($path, '/') === 0) {
return z_path() . $path;
}
@@ -594,17 +611,18 @@ function absurl($path) {
*
* @return boolean
*/
-function is_ajax() {
+function is_ajax()
+{
return (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest');
}
/**
* @brief Function to check if request was an AJAX (xmlhttprequest) request.
*
- * @param $via_worker boolean Is the check run via the poller?
+ * @param boolean $via_worker boolean Is the check run via the poller?
*/
-function check_db($via_worker) {
-
+function check_db($via_worker)
+{
$build = Config::get('system', 'build');
if (!x($build)) {
Config::set('system', 'build', DB_UPDATE_VERSION);
@@ -621,9 +639,11 @@ function check_db($via_worker) {
/**
* Sets the base url for use in cmdline programs which don't have
* $_SERVER variables
+ *
+ * @param object $a App
*/
-function check_url(App $a) {
-
+function check_url(App $a)
+{
$url = Config::get('system', 'url');
// if the url isn't set or the stored url is radically different
@@ -644,8 +664,10 @@ function check_url(App $a) {
/**
* @brief Automatic database updates
+ * @param object $a App
*/
-function update_db(App $a) {
+function update_db(App $a)
+{
$build = Config::get('system', 'build');
if (!x($build)) {
$build = Config::set('system', 'build', DB_UPDATE_VERSION);
@@ -712,9 +734,9 @@ function update_db(App $a) {
return;
}
-function run_update_function($x) {
+function run_update_function($x)
+{
if (function_exists('update_' . $x)) {
-
// There could be a lot of processes running or about to run.
// We want exactly one process to run the update command.
// So store the fact that we're taking responsibility
@@ -764,11 +786,10 @@ function run_update_function($x) {
* Then go through the config list and if we have a plugin that isn't installed,
* call the install procedure and add it to the database.
*
- * @param App $a
- *
+ * @param object $a App
*/
-function check_plugins(App $a) {
-
+function check_plugins(App $a)
+{
$r = q("SELECT * FROM `addon` WHERE `installed` = 1");
if (DBM::is_result($r)) {
$installed = $r;
@@ -810,7 +831,8 @@ function check_plugins(App $a) {
return;
}
-function get_guid($size = 16, $prefix = "") {
+function get_guid($size = 16, $prefix = "")
+{
if ($prefix == "") {
$a = get_app();
$prefix = hash("crc32", $a->get_hostname());
@@ -832,18 +854,17 @@ function get_guid($size = 16, $prefix = "") {
/**
* @brief Wrapper for adding a login box.
*
- * @param bool $register
- * If $register == true provide a registration link.
- * This will most always depend on the value of $a->config['register_policy'].
- * @param bool $hiddens
+ * @param bool $register If $register == true provide a registration link.
+ * This will most always depend on the value of $a->config['register_policy'].
+ * @param bool $hiddens optional
*
- * @return string
- * Returns the complete html for inserting into the page
+ * @return string Returns the complete html for inserting into the page
*
* @hooks 'login_hook'
* string $o
*/
-function login($register = false, $hiddens = false) {
+function login($register = false, $hiddens = false)
+{
$a = get_app();
$o = "";
$reg = false;
@@ -861,17 +882,21 @@ function login($register = false, $hiddens = false) {
if (local_user()) {
$tpl = get_markup_template("logout.tpl");
} else {
- $a->page['htmlhead'] .= replace_macros(get_markup_template("login_head.tpl"), array(
+ $a->page['htmlhead'] .= replace_macros(
+ get_markup_template("login_head.tpl"),
+ array(
'$baseurl' => $a->get_baseurl(true)
- ));
+ )
+ );
$tpl = get_markup_template("login.tpl");
$_SESSION['return_url'] = $a->query_string;
$a->module = 'login';
}
- $o .= replace_macros($tpl, array(
-
+ $o .= replace_macros(
+ $tpl,
+ array(
'$dest_url' => $dest_url,
'$logout' => t('Logout'),
'$login' => t('Login'),
@@ -895,7 +920,8 @@ function login($register = false, $hiddens = false) {
'$privacytitle' => t('Website Privacy Policy'),
'$privacylink' => t('privacy policy'),
- ));
+ )
+ );
call_hooks('login_hook', $o);
@@ -905,7 +931,8 @@ function login($register = false, $hiddens = false) {
/**
* @brief Used to end the current process, after saving session state.
*/
-function killme() {
+function killme()
+{
global $session_exists;
if (!get_app()->is_backend()) {
@@ -922,7 +949,8 @@ function killme() {
/**
* @brief Redirect to another URL and terminate this process.
*/
-function goaway($s) {
+function goaway($s)
+{
if (!strstr(normalise_link($s), "http://")) {
$s = System::baseUrl() . "/" . $s;
}
@@ -936,7 +964,8 @@ function goaway($s) {
*
* @return int|bool user id or false
*/
-function local_user() {
+function local_user()
+{
if (x($_SESSION, 'authenticated') && x($_SESSION, 'uid')) {
return intval($_SESSION['uid']);
}
@@ -948,7 +977,8 @@ function local_user() {
*
* @return int|bool public contact id or false
*/
-function public_contact() {
+function public_contact()
+{
static $public_contact_id = false;
if (!$public_contact_id && x($_SESSION, 'authenticated')) {
@@ -971,7 +1001,8 @@ function public_contact() {
*
* @return int|bool visitor_id or false
*/
-function remote_user() {
+function remote_user()
+{
// You cannot be both local and remote
if (local_user()) {
return false;
@@ -989,7 +1020,8 @@ function remote_user() {
*
* @param string $s - Text of notice
*/
-function notice($s) {
+function notice($s)
+{
$a = get_app();
if (!x($_SESSION, 'sysmsg')) {
$_SESSION['sysmsg'] = array();
@@ -1006,7 +1038,8 @@ function notice($s) {
*
* @param string $s - Text of notice
*/
-function info($s) {
+function info($s)
+{
$a = get_app();
if (local_user() && PConfig::get(local_user(), 'system', 'ignore_info')) {
@@ -1026,7 +1059,8 @@ function info($s) {
*
* @return int
*/
-function get_max_import_size() {
+function get_max_import_size()
+{
$a = get_app();
return ((x($a->config, 'max_import_size')) ? $a->config['max_import_size'] : 0 );
}
@@ -1038,12 +1072,14 @@ function get_max_import_size() {
*
* @return boolean "false" if proc_run couldn't be executed
*/
-function proc_run() {
+function proc_run()
+{
$proc_args = func_get_args();
call_user_func_array('Friendica\Core\Worker::add', $proc_args);
}
-function current_theme() {
+function current_theme()
+{
$app_base_themes = array('duepuntozero', 'dispy', 'quattro');
$a = get_app();
@@ -1053,7 +1089,8 @@ function current_theme() {
// Find the theme that belongs to the user whose stuff we are looking at
if ($a->profile_uid && ($a->profile_uid != local_user())) {
- $r = q("select theme from user where uid = %d limit 1",
+ $r = q(
+ "select theme from user where uid = %d limit 1",
intval($a->profile_uid)
);
if (DBM::is_result($r)) {
@@ -1107,15 +1144,17 @@ function current_theme() {
}
}
- if ($theme_name &&
- (file_exists('view/theme/' . $theme_name . '/style.css') ||
- file_exists('view/theme/' . $theme_name . '/style.php'))) {
+ if ($theme_name
+ && (file_exists('view/theme/' . $theme_name . '/style.css')
+ || file_exists('view/theme/' . $theme_name . '/style.php'))
+ ) {
return($theme_name);
}
foreach ($app_base_themes as $t) {
- if (file_exists('view/theme/' . $t . '/style.css') ||
- file_exists('view/theme/' . $t . '/style.php')) {
+ if (file_exists('view/theme/' . $t . '/style.css')
+ || file_exists('view/theme/' . $t . '/style.php')
+ ) {
return($t);
}
}
@@ -1135,7 +1174,8 @@ function current_theme() {
*
* @return string
*/
-function current_theme_url() {
+function current_theme_url()
+{
$a = get_app();
$t = current_theme();
@@ -1148,10 +1188,9 @@ function current_theme_url() {
return('view/theme/' . $t . '/style.css');
}
-function feed_birthday($uid, $tz) {
-
+function feed_birthday($uid, $tz)
+{
/**
- *
* Determine the next birthday, but only if the birthday is published
* in the default profile. We _could_ also look for a private profile that the
* recipient can see, but somebody could get mad at us if they start getting
@@ -1166,7 +1205,6 @@ function feed_birthday($uid, $tz) {
* viewer's timezone also, but first we are going to convert it from the birthday
* person's timezone to GMT - so the viewer may find the birthday starting at
* 6:00PM the day before, but that will correspond to midnight to the birthday person.
- *
*/
$birthday = '';
@@ -1174,8 +1212,9 @@ function feed_birthday($uid, $tz) {
$tz = 'UTC';
}
- $p = q("SELECT `dob` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
- intval($uid)
+ $p = q(
+ "SELECT `dob` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
+ intval($uid)
);
if (DBM::is_result($p)) {
@@ -1200,7 +1239,8 @@ function feed_birthday($uid, $tz) {
*
* @return bool true if user is an admin
*/
-function is_site_admin() {
+function is_site_admin()
+{
$a = get_app();
$adminlist = explode(",", str_replace(" ", "", $a->config['admin_email']));
@@ -1215,12 +1255,13 @@ function is_site_admin() {
/**
* @brief Returns querystring as string from a mapped array.
*
- * @param array $params mapped array with query parameters
- * @param string $name of parameter, default null
+ * @param array $params mapped array with query parameters
+ * @param string $name of parameter, default null
*
* @return string
*/
-function build_querystring($params, $name = null) {
+function build_querystring($params, $name = null)
+{
$ret = "";
foreach ($params as $key => $val) {
if (is_array($val)) {
@@ -1244,7 +1285,8 @@ function build_querystring($params, $name = null) {
return $ret;
}
-function explode_querystring($query) {
+function explode_querystring($query)
+{
$arg_st = strpos($query, '?');
if ($arg_st !== false) {
$base = substr($query, 0, $arg_st);
@@ -1280,7 +1322,8 @@ function explode_querystring($query) {
*
* Taken from http://webcheatsheet.com/php/get_current_page_url.php
*/
-function curPageURL() {
+function curPageURL()
+{
$pageURL = 'http';
if ($_SERVER["HTTPS"] == "on") {
$pageURL .= "s";
@@ -1296,7 +1339,8 @@ function curPageURL() {
return $pageURL;
}
-function random_digits($digits) {
+function random_digits($digits)
+{
$rn = '';
for ($i = 0; $i < $digits; $i++) {
/// @TODO rand() is different to mt_rand() and maybe lesser "random"
@@ -1305,7 +1349,8 @@ function random_digits($digits) {
return $rn;
}
-function get_server() {
+function get_server()
+{
$server = Config::get("system", "directory");
if ($server == "") {
@@ -1315,7 +1360,8 @@ function get_server() {
return($server);
}
-function get_temppath() {
+function get_temppath()
+{
$a = get_app();
$temppath = Config::get("system", "temppath");
@@ -1355,7 +1401,8 @@ function get_temppath() {
return '';
}
-function get_cachefile($file, $writemode = true) {
+function get_cachefile($file, $writemode = true)
+{
$cache = get_itemcachepath();
if ((!$cache) || (!is_dir($cache))) {
@@ -1377,7 +1424,8 @@ function get_cachefile($file, $writemode = true) {
return $cachepath;
}
-function clear_cache($basepath = "", $path = "") {
+function clear_cache($basepath = "", $path = "")
+{
if ($path == "") {
$basepath = get_itemcachepath();
$path = $basepath;
@@ -1412,7 +1460,8 @@ function clear_cache($basepath = "", $path = "") {
}
}
-function get_itemcachepath() {
+function get_itemcachepath()
+{
// Checking, if the cache is deactivated
$cachetime = (int) Config::get('system', 'itemcache_duration');
if ($cachetime < 0) {
@@ -1445,7 +1494,8 @@ function get_itemcachepath() {
*
* @return string Spool path
*/
-function get_spoolpath() {
+function get_spoolpath()
+{
$spoolpath = Config::get('system', 'spoolpath');
if (($spoolpath != "") && App::directory_usable($spoolpath)) {
// We have a spool path and it is usable
@@ -1478,22 +1528,25 @@ function get_spoolpath() {
}
/// @deprecated
-function set_template_engine(App $a, $engine = 'internal') {
-/// @note This function is no longer necessary, but keep it as a wrapper to the class method
-/// to avoid breaking themes again unnecessarily
-/// @TODO maybe output a warning here so the theme developer can see it? PHP won't show such warnings like Java does.
+function set_template_engine(App $a, $engine = 'internal')
+{
+ /// @note This function is no longer necessary, but keep it as a wrapper to the class method
+ /// to avoid breaking themes again unnecessarily
+ /// @TODO maybe output a warning here so the theme developer can see it? PHP won't show such warnings like Java does.
$a->set_template_engine($engine);
}
if (!function_exists('exif_imagetype')) {
- function exif_imagetype($file) {
+ function exif_imagetype($file)
+ {
$size = getimagesize($file);
return $size[2];
}
}
-function validate_include(&$file) {
+function validate_include(&$file)
+{
$orig_file = $file;
$file = realpath($file);
@@ -1524,7 +1577,8 @@ function validate_include(&$file) {
return ($valid);
}
-function current_load() {
+function current_load()
+{
if (!function_exists('sys_getloadavg')) {
return false;
}
@@ -1543,7 +1597,8 @@ function current_load() {
*
* @return int
*/
-function argc() {
+function argc()
+{
return get_app()->argc;
}
@@ -1553,7 +1608,8 @@ function argc() {
* @param int $x argv key
* @return string Value of the argv key
*/
-function argv($x) {
+function argv($x)
+{
if (array_key_exists($x, get_app()->argv)) {
return get_app()->argv[$x];
}
@@ -1574,11 +1630,11 @@ function argv($x) {
* 'pageno' => $pageno The number of the actual page
* 'reload_uri' => $reload_uri The URI of the content we have to load
*/
-function infinite_scroll_data($module) {
-
+function infinite_scroll_data($module)
+{
if (PConfig::get(local_user(), 'system', 'infinite_scroll')
- && ($module == "network") && ($_GET["mode"] != "minimal")) {
-
+ && ($module == "network") && ($_GET["mode"] != "minimal")
+ ) {
// get the page number
if (is_string($_GET["page"])) {
$pageno = $_GET["page"];
@@ -1589,7 +1645,7 @@ function infinite_scroll_data($module) {
$reload_uri = "";
// try to get the uri from which we load the content
- foreach ($_GET AS $param => $value) {
+ foreach ($_GET as $param => $value) {
if (($param != "page") && ($param != "q")) {
$reload_uri .= "&" . $param . "=" . urlencode($value);
}
diff --git a/include/Photo.php b/include/Photo.php
index 1ed90bbf83..761abc770c 100644
--- a/include/Photo.php
+++ b/include/Photo.php
@@ -5,6 +5,7 @@
*/
use Friendica\App;
+use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\System;
use Friendica\Database\DBM;
diff --git a/include/bbcode.php b/include/bbcode.php
index daabd21b96..a611605471 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -1,6 +1,7 @@
<?php
use Friendica\App;
+use Friendica\Core\Cache;
use Friendica\Core\System;
use Friendica\Core\Config;
diff --git a/include/cronjobs.php b/include/cronjobs.php
index 453db6d014..00064b1125 100644
--- a/include/cronjobs.php
+++ b/include/cronjobs.php
@@ -1,6 +1,7 @@
<?php
use Friendica\App;
+use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Database\DBM;
use Friendica\Network\Probe;
diff --git a/include/discover_poco.php b/include/discover_poco.php
index c0ff2a6554..bb8daad6f3 100644
--- a/include/discover_poco.php
+++ b/include/discover_poco.php
@@ -1,5 +1,5 @@
<?php
-
+use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
diff --git a/include/gprobe.php b/include/gprobe.php
index dbc11dee0b..7003051851 100644
--- a/include/gprobe.php
+++ b/include/gprobe.php
@@ -1,5 +1,5 @@
<?php
-
+use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Database\DBM;
use Friendica\Network\Probe;
diff --git a/include/identity.php b/include/identity.php
index f336891a3c..d8670537b8 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -4,6 +4,7 @@
*/
use Friendica\App;
+use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Core\System;
@@ -13,7 +14,6 @@ use Friendica\Database\DBM;
require_once 'include/ForumManager.php';
require_once 'include/bbcode.php';
require_once 'mod/proxy.php';
-require_once 'include/cache.php';
/**
*
@@ -34,20 +34,21 @@ require_once 'include/cache.php';
* the theme is chosen before the _init() function of a theme is run, which will usually
* load a lot of theme-specific content
*
- * @param App $a
- * @param string $nickname
- * @param int $profile
- * @param array $profiledata
+ * @param object $a App
+ * @param string $nickname string
+ * @param int $profile int
+ * @param array $profiledata array
*/
-function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) {
-
- $user = q("SELECT `uid` FROM `user` WHERE `nickname` = '%s' LIMIT 1",
+function profile_load(App $a, $nickname, $profile = 0, $profiledata = array())
+{
+ $user = q(
+ "SELECT `uid` FROM `user` WHERE `nickname` = '%s' LIMIT 1",
dbesc($nickname)
);
if (!$user && count($user) && !count($profiledata)) {
logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
- notice( t('Requested account is not available.') . EOL );
+ notice(t('Requested account is not available.') . EOL);
$a->error = 404;
return;
}
@@ -56,7 +57,7 @@ function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) {
if (empty($pdata) && empty($profiledata)) {
logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
- notice( t('Requested profile is not available.') . EOL );
+ notice(t('Requested profile is not available.') . EOL);
$a->error = 404;
return;
}
@@ -64,8 +65,9 @@ function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) {
// fetch user tags if this isn't the default profile
if (!$pdata['is-default']) {
- $x = q("SELECT `pub_keywords` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
- intval($pdata['profile_uid'])
+ $x = q(
+ "SELECT `pub_keywords` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
+ intval($pdata['profile_uid'])
);
if ($x && count($x))
$pdata['pub_keywords'] = $x[0]['pub_keywords'];
@@ -79,8 +81,9 @@ function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) {
$a->page['title'] = $a->profile['name'] . " @ " . $a->config['sitename'];
- if (!$profiledata && !PConfig::get(local_user(),'system','always_my_theme'))
- $_SESSION['theme'] = $a->profile['theme'];
+ if (!$profiledata && !PConfig::get(local_user(), 'system', 'always_my_theme')) {
+ $_SESSION['theme'] = $a->profile['theme'];
+ }
$_SESSION['mobile-theme'] = $a->profile['mobile-theme'];
@@ -92,30 +95,35 @@ function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) {
$theme_info_file = "view/theme/" . current_theme() . "/theme.php";
if (file_exists($theme_info_file)) {
- require_once $theme_info_file;
+ include_once $theme_info_file;
}
- if (! (x($a->page,'aside')))
+ if (! (x($a->page, 'aside'))) {
$a->page['aside'] = '';
+ }
if (local_user() && local_user() == $a->profile['uid'] && $profiledata) {
- $a->page['aside'] .= replace_macros(get_markup_template('profile_edlink.tpl'),array(
- '$editprofile' => t('Edit profile'),
- '$profid' => $a->profile['id']
- ));
+ $a->page['aside'] .= replace_macros(
+ get_markup_template('profile_edlink.tpl'),
+ array(
+ '$editprofile' => t('Edit profile'),
+ '$profid' => $a->profile['id']
+ )
+ );
}
- $block = (((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
+ $block = (((Config::get('system', 'block_public')) && (! local_user()) && (! remote_user())) ? true : false);
/**
* @todo
* By now, the contact block isn't shown, when a different profile is given
* But: When this profile was on the same server, then we could display the contacts
*/
- if ($profiledata)
+ if ($profiledata) {
$a->page['aside'] .= profile_sidebar($profiledata, true);
- else
+ } else {
$a->page['aside'] .= profile_sidebar($a->profile, $block);
+ }
/*if (! $block)
$a->page['aside'] .= contact_block();*/
@@ -132,14 +140,14 @@ function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) {
* Passing a non-zero profile ID can also allow a preview of a selected profile
* by the owner
*
- * @param string $nickname
- * @param int $uid
- * @param int $profile
- * ID of the profile
+ * @param string $nickname nick
+ * @param int $uid uid
+ * @param int $profile ID of the profile
* @returns array
* Includes all available profile data
*/
-function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) {
+function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0)
+{
if (remote_user() && count($_SESSION['remote'])) {
foreach ($_SESSION['remote'] as $visitor) {
if ($visitor['uid'] == $uid) {
@@ -156,7 +164,8 @@ function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) {
if ($profile) {
$profile_int = intval($profile);
- $r = dba::fetch_first("SELECT `contact`.`id` AS `contact_id`, `contact`.`photo` AS `contact_photo`,
+ $r = dba::fetch_first(
+ "SELECT `contact`.`id` AS `contact_id`, `contact`.`photo` AS `contact_photo`,
`contact`.`thumb` AS `contact_thumb`, `contact`.`micro` AS `contact_micro`,
`profile`.`uid` AS `profile_uid`, `profile`.*,
`contact`.`avatar-date` AS picdate, `contact`.`addr`, `user`.*
@@ -164,12 +173,13 @@ function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) {
INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` AND `contact`.`self`
INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
WHERE `user`.`nickname` = ? AND `profile`.`id` = ? LIMIT 1",
- $nickname,
- $profile_int
+ $nickname,
+ $profile_int
);
}
if (!DBM::is_result($r)) {
- $r = dba::fetch_first("SELECT `contact`.`id` AS `contact_id`, `contact`.`photo` as `contact_photo`,
+ $r = dba::fetch_first(
+ "SELECT `contact`.`id` AS `contact_id`, `contact`.`photo` as `contact_photo`,
`contact`.`thumb` AS `contact_thumb`, `contact`.`micro` AS `contact_micro`,
`profile`.`uid` AS `profile_uid`, `profile`.*,
`contact`.`avatar-date` AS picdate, `contact`.`addr`, `user`.*
@@ -177,7 +187,7 @@ function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) {
INNER JOIN `contact` ON `contact`.`uid` = `profile`.`uid` AND `contact`.`self`
INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
WHERE `user`.`nickname` = ? AND `profile`.`is-default` LIMIT 1",
- $nickname
+ $nickname
);
}
@@ -203,7 +213,8 @@ function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) {
* @hooks 'profile_sidebar'
* array $arr
*/
-function profile_sidebar($profile, $block = 0) {
+function profile_sidebar($profile, $block = 0)
+{
$a = get_app();
$o = '';
@@ -230,7 +241,7 @@ function profile_sidebar($profile, $block = 0) {
// don't show connect link to yourself
- $connect = (($profile['uid'] != local_user()) ? t('Connect') : False);
+ $connect = (($profile['uid'] != local_user()) ? t('Connect') : false);
// don't show connect link to authenticated visitors either
if (remote_user() && count($_SESSION['remote'])) {
@@ -258,7 +269,7 @@ function profile_sidebar($profile, $block = 0) {
if ($connect && ($profile['network'] != NETWORK_DFRN) && !isset($profile['remoteconnect']))
$connect = false;
- $remoteconnect = NULL;
+ $remoteconnect = null;
if (isset($profile['remoteconnect']))
$remoteconnect = $profile['remoteconnect'];
@@ -272,15 +283,19 @@ function profile_sidebar($profile, $block = 0) {
$wallmessage_link = "wallmessage/".$profile["nickname"];
if (remote_user()) {
- $r = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND `id` = '%s' AND `rel` = %d",
+ $r = q(
+ "SELECT `url` FROM `contact` WHERE `uid` = %d AND `id` = '%s' AND `rel` = %d",
intval($profile['uid']),
intval(remote_user()),
- intval(CONTACT_IS_FRIEND));
+ intval(CONTACT_IS_FRIEND)
+ );
} else {
- $r = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `rel` = %d",
+ $r = q(
+ "SELECT `url` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `rel` = %d",
intval($profile['uid']),
dbesc(normalise_link(get_my_url())),
- intval(CONTACT_IS_FRIEND));
+ intval(CONTACT_IS_FRIEND)
+ );
}
if ($r) {
$remote_url = $r[0]["url"];
@@ -293,10 +308,12 @@ function profile_sidebar($profile, $block = 0) {
}
// show edit profile to yourself
- if (!$is_contact && $profile['uid'] == local_user() && feature_enabled(local_user(),'multi_profiles')) {
+ if (!$is_contact && $profile['uid'] == local_user() && feature_enabled(local_user(), 'multi_profiles')) {
$profile['edit'] = array(System::baseUrl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles'));
- $r = q("SELECT * FROM `profile` WHERE `uid` = %d",
- local_user());
+ $r = q(
+ "SELECT * FROM `profile` WHERE `uid` = %d",
+ local_user()
+ );
$profile['menu'] = array(
'chg_photo' => t('Change profile photo'),
@@ -305,7 +322,6 @@ function profile_sidebar($profile, $block = 0) {
);
if (DBM::is_result($r)) {
-
foreach ($r as $rr) {
$profile['menu']['entries'][] = array(
'photo' => $rr['thumb'],
@@ -315,14 +331,11 @@ function profile_sidebar($profile, $block = 0) {
'isdefault' => $rr['is-default'],
'visibile_to_everybody' => t('visible to everybody'),
'edit_visibility' => t('Edit visibility'),
-
);
}
-
-
}
}
- if (!$is_contact && $profile['uid'] == local_user() && !feature_enabled(local_user(),'multi_profiles')) {
+ if (!$is_contact && $profile['uid'] == local_user() && !feature_enabled(local_user(), 'multi_profiles')) {
$profile['edit'] = array(System::baseUrl(). '/profiles/'.$profile['id'], t('Edit profile'),"", t('Edit profile'));
$profile['menu'] = array(
'chg_photo' => t('Change profile photo'),
@@ -334,34 +347,36 @@ function profile_sidebar($profile, $block = 0) {
// Fetch the account type
$account_type = account_type($profile);
- if ((x($profile,'address') == 1)
- || (x($profile,'location') == 1)
- || (x($profile,'locality') == 1)
- || (x($profile,'region') == 1)
- || (x($profile,'postal-code') == 1)
- || (x($profile,'country-name') == 1))
+ if ((x($profile, 'address') == 1)
+ || (x($profile, 'location') == 1)
+ || (x($profile, 'locality') == 1)
+ || (x($profile, 'region') == 1)
+ || (x($profile, 'postal-code') == 1)
+ || (x($profile, 'country-name') == 1)
+ ) {
$location = t('Location:');
+ }
- $gender = ((x($profile,'gender') == 1) ? t('Gender:') : False);
+ $gender = ((x($profile, 'gender') == 1) ? t('Gender:') : false);
- $marital = ((x($profile,'marital') == 1) ? t('Status:') : False);
+ $marital = ((x($profile, 'marital') == 1) ? t('Status:') : false);
- $homepage = ((x($profile,'homepage') == 1) ? t('Homepage:') : False);
+ $homepage = ((x($profile, 'homepage') == 1) ? t('Homepage:') : false);
- $about = ((x($profile,'about') == 1) ? t('About:') : False);
+ $about = ((x($profile, 'about') == 1) ? t('About:') : false);
- $xmpp = ((x($profile,'xmpp') == 1) ? t('XMPP:') : False);
+ $xmpp = ((x($profile, 'xmpp') == 1) ? t('XMPP:') : false);
if (($profile['hidewall'] || $block) && (! local_user()) && (! remote_user())) {
- $location = $pdesc = $gender = $marital = $homepage = $about = False;
+ $location = $pdesc = $gender = $marital = $homepage = $about = false;
}
- $firstname = ((strpos($profile['name'],' '))
- ? trim(substr($profile['name'],0,strpos($profile['name'],' '))) : $profile['name']);
- $lastname = (($firstname === $profile['name']) ? '' : trim(substr($profile['name'],strlen($firstname))));
+ $firstname = ((strpos($profile['name'], ' '))
+ ? trim(substr($profile['name'], 0, strpos($profile['name'], ' '))) : $profile['name']);
+ $lastname = (($firstname === $profile['name']) ? '' : trim(substr($profile['name'], strlen($firstname))));
- if ($profile['guid'] != "")
+ if ($profile['guid'] != "") {
$diaspora = array(
'guid' => $profile['guid'],
'podloc' => System::baseUrl(),
@@ -374,19 +389,24 @@ function profile_sidebar($profile, $block = 0) {
'photo100' => $profile['contact_thumb'],
'photo50' => $profile['contact_micro'],
);
- else
+ } else {
$diaspora = false;
+ }
if (!$block) {
$contact_block = contact_block();
if (is_array($a->profile) && !$a->profile['hide-friends']) {
- $r = q("SELECT `gcontact`.`updated` FROM `contact` INNER JOIN `gcontact` WHERE `gcontact`.`nurl` = `contact`.`nurl` AND `self` AND `uid` = %d LIMIT 1",
- intval($a->profile['uid']));
- if (DBM::is_result($r))
+ $r = q(
+ "SELECT `gcontact`.`updated` FROM `contact` INNER JOIN `gcontact` WHERE `gcontact`.`nurl` = `contact`.`nurl` AND `self` AND `uid` = %d LIMIT 1",
+ intval($a->profile['uid'])
+ );
+ if (DBM::is_result($r)) {
$updated = date("c", strtotime($r[0]['updated']));
+ }
- $r = q("SELECT COUNT(*) AS `total` FROM `contact`
+ $r = q(
+ "SELECT COUNT(*) AS `total` FROM `contact`
WHERE `uid` = %d
AND NOT `self` AND NOT `blocked` AND NOT `pending`
AND NOT `hidden` AND NOT `archive`
@@ -396,33 +416,40 @@ function profile_sidebar($profile, $block = 0) {
dbesc(NETWORK_DIASPORA),
dbesc(NETWORK_OSTATUS)
);
- if (DBM::is_result($r))
+ if (DBM::is_result($r)) {
$contacts = intval($r[0]['total']);
+ }
}
}
$p = array();
foreach ($profile as $k => $v) {
- $k = str_replace('-','_',$k);
+ $k = str_replace('-', '_', $k);
$p[$k] = $v;
}
- if (isset($p["about"]))
+ if (isset($p["about"])) {
$p["about"] = bbcode($p["about"]);
+ }
- if (isset($p["address"]))
+ if (isset($p["address"])) {
$p["address"] = bbcode($p["address"]);
- else
+ } else {
$p["address"] = bbcode($p["location"]);
+ }
if (isset($p["photo"])) {
$p["photo"] = proxy_url($p["photo"], false, PROXY_SIZE_SMALL);
}
- if ($a->theme['template_engine'] === 'internal')
+
+ if ($a->theme['template_engine'] === 'internal') {
$location = template_escape($location);
+ }
$tpl = get_markup_template('profile_vcard.tpl');
- $o .= replace_macros($tpl, array(
+ $o .= replace_macros(
+ $tpl,
+ array(
'$profile' => $p,
'$xmpp' => $xmpp,
'$connect' => $connect,
@@ -433,7 +460,7 @@ function profile_sidebar($profile, $block = 0) {
'$account_type' => $account_type,
'$location' => $location,
'$gender' => $gender,
-// '$pdesc' => $pdesc,
+ // '$pdesc' => $pdesc,
'$marital' => $marital,
'$homepage' => $homepage,
'$about' => $about,
@@ -442,7 +469,8 @@ function profile_sidebar($profile, $block = 0) {
'$updated' => $updated,
'$diaspora' => $diaspora,
'$contact_block' => $contact_block,
- ));
+ )
+ );
$arr = array('profile' => &$profile, 'entry' => &$o);
@@ -452,33 +480,36 @@ function profile_sidebar($profile, $block = 0) {
}
-function get_birthdays() {
-
+function get_birthdays()
+{
$a = get_app();
$o = '';
- if (! local_user() || $a->is_mobile || $a->is_tablet)
+ if (! local_user() || $a->is_mobile || $a->is_tablet) {
return $o;
+ }
-// $mobile_detect = new Mobile_Detect();
-// $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
-
-// if ($is_mobile)
-// return $o;
+ /**
+ * $mobile_detect = new Mobile_Detect();
+ * $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
+ * if ($is_mobile)
+ * return $o;
+ */
- $bd_format = t('g A l F d') ; // 8 AM Friday January 18
+ $bd_format = t('g A l F d'); // 8 AM Friday January 18
$bd_short = t('F d');
$cachekey = "get_birthdays:".local_user();
$r = Cache::get($cachekey);
if (is_null($r)) {
- $s = dba::p("SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event`
- INNER JOIN `contact` ON `contact`.`id` = `event`.`cid`
- WHERE `event`.`uid` = ? AND `type` = 'birthday' AND `start` < ? AND `finish` > ?
- ORDER BY `start` ASC ",
- local_user(),
- datetime_convert('UTC','UTC','now + 6 days'),
- datetime_convert('UTC','UTC','now')
+ $s = dba::p(
+ "SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event`
+ INNER JOIN `contact` ON `contact`.`id` = `event`.`cid`
+ WHERE `event`.`uid` = ? AND `type` = 'birthday' AND `start` < ? AND `finish` > ?
+ ORDER BY `start` ASC ",
+ local_user(),
+ datetime_convert('UTC', 'UTC', 'now + 6 days'),
+ datetime_convert('UTC', 'UTC', 'now')
);
if (DBM::is_result($s)) {
$r = dba::inArray($s);
@@ -492,21 +523,25 @@ function get_birthdays() {
$istoday = false;
foreach ($r as $rr) {
- if (strlen($rr['name']))
+ if (strlen($rr['name'])) {
$total ++;
- if ((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now))
+ }
+ if ((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) {
$istoday = true;
+ }
}
$classtoday = $istoday ? ' birthday-today ' : '';
if ($total) {
foreach ($r as &$rr) {
- if (! strlen($rr['name']))
+ if (! strlen($rr['name'])) {
continue;
+ }
// avoid duplicates
- if (in_array($rr['cid'],$cids))
+ if (in_array($rr['cid'], $cids)) {
continue;
+ }
$cids[] = $rr['cid'];
$today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false);
@@ -520,14 +555,15 @@ function get_birthdays() {
$rr['link'] = $url;
$rr['title'] = $rr['name'];
$rr['date'] = day_translate(datetime_convert('UTC', $a->timezone, $rr['start'], $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ? ' ' . t('[today]') : '');
- $rr['startime'] = Null;
+ $rr['startime'] = null;
$rr['today'] = $today;
-
}
}
}
$tpl = get_markup_template("birthdays_reminder.tpl");
- return replace_macros($tpl, array(
+ return replace_macros(
+ $tpl,
+ array(
'$baseurl' => System::baseUrl(),
'$classtoday' => $classtoday,
'$count' => $total,
@@ -536,14 +572,14 @@ function get_birthdays() {
'$events' => $r,
'$lbr' => '{', // raw brackets mess up if/endif macro processing
'$rbr' => '}'
-
- ));
+ )
+ );
}
-function get_events() {
-
- require_once 'include/bbcode.php';
+function get_events()
+{
+ include_once 'include/bbcode.php';
$a = get_app();
@@ -551,21 +587,23 @@ function get_events() {
return $o;
}
-// $mobile_detect = new Mobile_Detect();
-// $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
-
-// if ($is_mobile)
-// return $o;
+ /**
+ * $mobile_detect = new Mobile_Detect();
+ * $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
+ * if ($is_mobile)
+ * return $o;
+ */
- $bd_format = t('g A l F d') ; // 8 AM Friday January 18
+ $bd_format = t('g A l F d'); // 8 AM Friday January 18
$bd_short = t('F d');
- $s = dba::p("SELECT `event`.* FROM `event`
- WHERE `event`.`uid` = ? AND `type` != 'birthday' AND `start` < ? AND `start` >= ?
- ORDER BY `start` ASC ",
- local_user(),
- datetime_convert('UTC','UTC','now + 7 days'),
- datetime_convert('UTC','UTC','now - 1 days')
+ $s = dba::p(
+ "SELECT `event`.* FROM `event`
+ WHERE `event`.`uid` = ? AND `type` != 'birthday' AND `start` < ? AND `start` >= ?
+ ORDER BY `start` ASC ",
+ local_user(),
+ datetime_convert('UTC', 'UTC', 'now + 7 days'),
+ datetime_convert('UTC', 'UTC', 'now - 1 days')
);
$r = array();
@@ -579,29 +617,29 @@ function get_events() {
$total ++;
}
- $strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start'],'Y-m-d');
- if ($strt === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) {
+ $strt = datetime_convert('UTC', $rr['convert'] ? $a->timezone : 'UTC', $rr['start'], 'Y-m-d');
+ if ($strt === datetime_convert('UTC', $a->timezone, 'now', 'Y-m-d')) {
$istoday = true;
}
- $title = strip_tags(html_entity_decode(bbcode($rr['summary']),ENT_QUOTES,'UTF-8'));
+ $title = strip_tags(html_entity_decode(bbcode($rr['summary']), ENT_QUOTES, 'UTF-8'));
if (strlen($title) > 35) {
- $title = substr($title,0,32) . '... ';
+ $title = substr($title, 0, 32) . '... ';
}
- $description = substr(strip_tags(bbcode($rr['desc'])),0,32) . '... ';
+ $description = substr(strip_tags(bbcode($rr['desc'])), 0, 32) . '... ';
if (! $description) {
$description = t('[No description]');
}
- $strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start']);
+ $strt = datetime_convert('UTC', $rr['convert'] ? $a->timezone : 'UTC', $rr['start']);
- if (substr($strt,0,10) < datetime_convert('UTC',$a->timezone,'now','Y-m-d')) {
+ if (substr($strt, 0, 10) < datetime_convert('UTC', $a->timezone, 'now', 'Y-m-d')) {
continue;
}
- $today = ((substr($strt,0,10) === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) ? true : false);
+ $today = ((substr($strt, 0, 10) === datetime_convert('UTC', $a->timezone, 'now', 'Y-m-d')) ? true : false);
$rr['title'] = $title;
$rr['description'] = $desciption;
@@ -615,27 +653,32 @@ function get_events() {
$classtoday = (($istoday) ? 'event-today' : '');
}
$tpl = get_markup_template("events_reminder.tpl");
- return replace_macros($tpl, array(
+ return replace_macros(
+ $tpl,
+ array(
'$baseurl' => System::baseUrl(),
'$classtoday' => $classtoday,
'$count' => count($r),
'$event_reminders' => t('Event Reminders'),
'$event_title' => t('Events this week:'),
'$events' => $r,
- ));
+ )
+ );
}
-function advanced_profile(App $a) {
-
+function advanced_profile(App $a)
+{
$o = '';
$uid = $a->profile['uid'];
- $o .= replace_macros(get_markup_template('section_title.tpl'),array(
+ $o .= replace_macros(
+ get_markup_template('section_title.tpl'),
+ array(
'$title' => t('Profile')
- ));
+ )
+ );
if ($a->profile['name']) {
-
$tpl = get_markup_template('profile_advanced.tpl');
$profile = array();
@@ -652,11 +695,10 @@ function advanced_profile(App $a) {
$val = ((intval($a->profile['dob']))
- ? day_translate(datetime_convert('UTC','UTC',$a->profile['dob'] . ' 00:00 +00:00',$year_bd_format))
- : day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],5) . ' 00:00 +00:00',$short_bd_format)));
+ ? day_translate(datetime_convert('UTC', 'UTC', $a->profile['dob'] . ' 00:00 +00:00', $year_bd_format))
+ : day_translate(datetime_convert('UTC', 'UTC', '2001-' . substr($a->profile['dob'], 5) . ' 00:00 +00:00', $short_bd_format)));
$profile['birthday'] = array( t('Birthday:'), $val);
-
}
if (!empty($a->profile['dob'])
&& $a->profile['dob'] > '0001-01-01'
@@ -751,7 +793,7 @@ function advanced_profile(App $a) {
}
//show subcribed forum if it is enabled in the usersettings
- if (feature_enabled($uid,'forumlist_profile')) {
+ if (feature_enabled($uid, 'forumlist_profile')) {
$profile['forumlist'] = array( t('Forums:'), ForumManager::profile_advanced($uid));
}
@@ -759,25 +801,29 @@ function advanced_profile(App $a) {
$profile['edit'] = array(System::baseUrl(). '/profiles/'.$a->profile['id'], t('Edit profile'),"", t('Edit profile'));
}
- return replace_macros($tpl, array(
+ return replace_macros(
+ $tpl,
+ array(
'$title' => t('Profile'),
'$basic' => t('Basic'),
'$advanced' => t('Advanced'),
'$profile' => $profile
- ));
+ )
+ );
}
return '';
}
-function profile_tabs($a, $is_owner=False, $nickname=Null) {
+function profile_tabs($a, $is_owner = false, $nickname = null)
+{
//echo "<pre>"; var_dump($a->user); killme();
if (is_null($nickname)) {
$nickname = $a->user['nickname'];
}
- if (x($_GET,'tab')) {
+ if (x($_GET, 'tab')) {
$tab = notags(trim($_GET['tab']));
}
@@ -828,8 +874,8 @@ function profile_tabs($a, $is_owner=False, $nickname=Null) {
'id' => 'events-tab',
'accesskey' => 'e',
);
- // if the user is not the owner of the calendar we only show a calendar
- // with the public events of the calendar owner
+ // if the user is not the owner of the calendar we only show a calendar
+ // with the public events of the calendar owner
} elseif (! $is_owner) {
$tabs[] = array(
'label' => t('Events'),
@@ -868,20 +914,21 @@ function profile_tabs($a, $is_owner=False, $nickname=Null) {
$tpl = get_markup_template('common_tabs.tpl');
- return replace_macros($tpl,array('$tabs' => $arr['tabs']));
+ return replace_macros($tpl, array('$tabs' => $arr['tabs']));
}
-function get_my_url() {
+function get_my_url()
+{
if (x($_SESSION, 'my_url')) {
return $_SESSION['my_url'];
}
return false;
}
-function zrl_init(App $a) {
+function zrl_init(App $a)
+{
$tmp_str = get_my_url();
if (validate_url($tmp_str)) {
-
// Is it a DDoS attempt?
// The check fetches the cached value from gprobe to reduce the load for this system
$urlparts = parse_url($tmp_str);
@@ -898,7 +945,8 @@ function zrl_init(App $a) {
}
}
-function zrl($s, $force = false) {
+function zrl($s, $force = false)
+{
if (! strlen($s)) {
return $s;
}
@@ -930,7 +978,8 @@ function zrl($s, $force = false) {
* @note Returns local_user instead of user ID if "always_my_theme"
* is set to true
*/
-function get_theme_uid() {
+function get_theme_uid()
+{
$uid = ((!empty($_REQUEST['puid'])) ? intval($_REQUEST['puid']) : 0);
if ((local_user()) && ((PConfig::get(local_user(), 'system', 'always_my_theme')) || (! $uid))) {
return local_user();
diff --git a/include/oembed.php b/include/oembed.php
index 18230fe87a..74ce90dd1a 100755
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -5,6 +5,7 @@
*/
use Friendica\App;
+use Friendica\Core\Cache;
use Friendica\Core\System;
use Friendica\ParseUrl;
use Friendica\Core\Config;
diff --git a/include/ostatus.php b/include/ostatus.php
index 51ca6e2356..0e8037dae7 100644
--- a/include/ostatus.php
+++ b/include/ostatus.php
@@ -4,6 +4,7 @@
*/
use Friendica\App;
+use Friendica\Core\Cache;
use Friendica\Core\System;
use Friendica\Core\Config;
use Friendica\Database\DBM;
@@ -23,30 +24,28 @@ require_once 'include/follow.php';
require_once 'include/api.php';
require_once 'mod/proxy.php';
require_once 'include/xml.php';
-require_once 'include/cache.php';
/**
* @brief This class contain functions for the OStatus protocol
- *
*/
-class ostatus {
-
+class ostatus
+{
private static $itemlist;
private static $conv_list = array();
/**
* @brief Fetches author data
*
- * @param object $xpath The xpath object
- * @param object $context The xml context of the author details
- * @param array $importer user record of the importing user
- * @param array $contact Called by reference, will contain the fetched contact
- * @param bool $onlyfetch Only fetch the header without updating the contact entries
+ * @param object $xpath The xpath object
+ * @param object $context The xml context of the author details
+ * @param array $importer user record of the importing user
+ * @param array $contact Called by reference, will contain the fetched contact
+ * @param bool $onlyfetch Only fetch the header without updating the contact entries
*
* @return array Array of author related entries for the item
*/
- private static function fetchauthor($xpath, $context, $importer, &$contact, $onlyfetch) {
-
+ private static function fetchauthor($xpath, $context, $importer, &$contact, $onlyfetch)
+ {
$author = array();
$author["author-link"] = $xpath->evaluate('atom:author/atom:uri/text()', $context)->item(0)->nodeValue;
$author["author-name"] = $xpath->evaluate('atom:author/atom:name/text()', $context)->item(0)->nodeValue;
@@ -56,7 +55,7 @@ class ostatus {
$alternate = $xpath->query("atom:author/atom:link[@rel='alternate']", $context)->item(0)->attributes;
if (is_object($alternate)) {
- foreach ($alternate AS $attributes) {
+ foreach ($alternate as $attributes) {
if (($attributes->name == "href") && ($attributes->textContent != "")) {
$author["author-link"] = $attributes->textContent;
}
@@ -117,10 +116,10 @@ class ostatus {
$avatarlist = array();
$avatars = $xpath->query("atom:author/atom:link[@rel='avatar']", $context);
- foreach ($avatars AS $avatar) {
+ foreach ($avatars as $avatar) {
$href = "";
$width = 0;
- foreach ($avatar->attributes AS $attributes) {
+ foreach ($avatar->attributes as $attributes) {
if ($attributes->name == "href") {
$href = $attributes->textContent;
}
@@ -148,7 +147,6 @@ class ostatus {
// Only update the contacts if it is an OStatus contact
if ($r && ($r['id'] > 0) && !$onlyfetch && ($contact["network"] == NETWORK_OSTATUS)) {
-
// This contact is vital, so we awake it from the dead
unmark_for_death($contact);
@@ -233,13 +231,13 @@ class ostatus {
/**
* @brief Fetches author data from a given XML string
*
- * @param string $xml The XML
- * @param array $importer user record of the importing user
+ * @param string $xml The XML
+ * @param array $importer user record of the importing user
*
* @return array Array of author related entries for the item
*/
- public static function salmon_author($xml, $importer) {
-
+ public static function salmon_author($xml, $importer)
+ {
if ($xml == "")
return;
@@ -258,7 +256,7 @@ class ostatus {
$entries = $xpath->query('/atom:entry');
- foreach ($entries AS $entry) {
+ foreach ($entries as $entry) {
// fetch the author
$author = self::fetchauthor($xpath, $entry, $importer, $contact, true);
return $author;
@@ -272,10 +270,11 @@ class ostatus {
*
* @return array attributes
*/
- private static function read_attributes($element) {
+ private static function read_attributes($element)
+ {
$attribute = array();
- foreach ($element->attributes AS $attributes) {
+ foreach ($element->attributes as $attributes) {
$attribute[$attributes->name] = $attributes->textContent;
}
@@ -285,28 +284,30 @@ class ostatus {
/**
* @brief Imports an XML string containing OStatus elements
*
- * @param string $xml The XML
- * @param array $importer user record of the importing user
- * @param array $contact
- * @param string $hub Called by reference, returns the fetched hub data
+ * @param string $xml The XML
+ * @param array $importer user record of the importing user
+ * @param array $contact contact
+ * @param string $hub Called by reference, returns the fetched hub data
*/
- public static function import($xml, $importer, &$contact, &$hub) {
+ public static function import($xml, $importer, &$contact, &$hub)
+ {
self::process($xml, $importer, $contact, $hub);
}
/**
* @brief Internal feed processing
*
- * @param string $xml The XML
- * @param array $importer user record of the importing user
- * @param array $contact
- * @param string $hub Called by reference, returns the fetched hub data
- * @param boolean $stored Is the post fresh imported or from the database?
+ * @param string $xml The XML
+ * @param array $importer user record of the importing user
+ * @param array $contact
+ * @param string $hub Called by reference, returns the fetched hub data
+ * @param boolean $stored Is the post fresh imported or from the database?
* @param boolean $initialize Is it the leading post so that data has to be initialized?
*
* @return boolean Could the XML be processed?
*/
- private static function process($xml, $importer, &$contact, &$hub, $stored = false, $initialize = true) {
+ private static function process($xml, $importer, &$contact, &$hub, $stored = false, $initialize = true)
+ {
if ($initialize) {
self::$itemlist = array();
self::$conv_list = array();
@@ -333,7 +334,7 @@ class ostatus {
$hub = "";
$hub_attributes = $xpath->query("/atom:feed/atom:link[@rel='hub']")->item(0)->attributes;
if (is_object($hub_attributes)) {
- foreach ($hub_attributes AS $hub_attribute) {
+ foreach ($hub_attributes as $hub_attribute) {
if ($hub_attribute->name == "href") {
$hub = $hub_attribute->textContent;
logger("Found hub ".$hub, LOGGER_DEBUG);
@@ -380,11 +381,11 @@ class ostatus {
// Reverse the order of the entries
$entrylist = array();
- foreach ($entries AS $entry) {
+ foreach ($entries as $entry) {
$entrylist[] = $entry;
}
- foreach (array_reverse($entrylist) AS $entry) {
+ foreach (array_reverse($entrylist) as $entry) {
// fetch the author
$authorelement = $xpath->query('/atom:entry/atom:author', $entry);
@@ -473,13 +474,13 @@ class ostatus {
$valid = !empty(self::$itemlist[0]['contact-id']);
if (!$valid) {
// If not, then it depends on this setting
- $valid = !Config::get('system','ostatus_full_threads');
+ $valid = !Config::get('system', 'ostatus_full_threads');
}
if ($valid) {
// Never post a thread when the only interaction by our contact was a like
$valid = false;
$verbs = array(ACTIVITY_POST, ACTIVITY_SHARE);
- foreach (self::$itemlist AS $item) {
+ foreach (self::$itemlist as $item) {
if (!empty($item['contact-id']) && in_array($item['verb'], $verbs)) {
$valid = true;
}
@@ -500,7 +501,7 @@ class ostatus {
$default_contact = $item['contact-id'];
}
}
- foreach (self::$itemlist AS $item) {
+ foreach (self::$itemlist as $item) {
$found = dba::exists('item', array('uid' => $importer["uid"], 'uri' => $item["uri"]));
if ($found) {
logger("Item with uri ".$item["uri"]." for user ".$importer["uid"]." already exists.", LOGGER_DEBUG);
@@ -526,8 +527,8 @@ class ostatus {
return true;
}
- private static function deleteNotice($item) {
-
+ private static function deleteNotice($item)
+ {
$condition = array('uid' => $item['uid'], 'author-link' => $item['author-link'], 'uri' => $item['uri']);
$deleted = dba::select('item', array('id', 'parent-uri'), $condition, array('limit' => 1));
if (!DBM::is_result($deleted)) {
@@ -536,9 +537,12 @@ class ostatus {
}
// Currently we don't have a central deletion function that we could use in this case. The function "item_drop" doesn't work for that case
- dba::update('item', array('deleted' => true, 'title' => '', 'body' => '',
+ dba::update(
+ 'item',
+ array('deleted' => true, 'title' => '', 'body' => '',
'edited' => datetime_convert(), 'changed' => datetime_convert()),
- array('id' => $deleted["id"]));
+ array('id' => $deleted["id"])
+ );
delete_thread($deleted["id"], $deleted["parent-uri"]);
@@ -548,12 +552,13 @@ class ostatus {
/**
* @brief Processes the XML for a post
*
- * @param object $xpath The xpath object
- * @param object $entry The xml entry that is processed
- * @param array $item The item array
- * @param array $importer user record of the importing user
+ * @param object $xpath The xpath object
+ * @param object $entry The xml entry that is processed
+ * @param array $item The item array
+ * @param array $importer user record of the importing user
*/
- private static function processPost($xpath, $entry, &$item, $importer) {
+ private static function processPost($xpath, $entry, &$item, $importer)
+ {
$item["body"] = html2bbcode($xpath->query('atom:content/text()', $entry)->item(0)->nodeValue);
$item["object-type"] = $xpath->query('activity:object-type/text()', $entry)->item(0)->nodeValue;
if (($item["object-type"] == ACTIVITY_OBJ_BOOKMARK) || ($item["object-type"] == ACTIVITY_OBJ_EVENT)) {
@@ -570,7 +575,7 @@ class ostatus {
$conv = $xpath->query('ostatus:conversation', $entry);
if (is_object($conv->item(0))) {
- foreach ($conv->item(0)->attributes AS $attributes) {
+ foreach ($conv->item(0)->attributes as $attributes) {
if ($attributes->name == "ref") {
$item['conversation-uri'] = $attributes->textContent;
}
@@ -584,7 +589,7 @@ class ostatus {
$inreplyto = $xpath->query('thr:in-reply-to', $entry);
if (is_object($inreplyto->item(0))) {
- foreach ($inreplyto->item(0)->attributes AS $attributes) {
+ foreach ($inreplyto->item(0)->attributes as $attributes) {
if ($attributes->name == "ref") {
$item["parent-uri"] = $attributes->textContent;
}
@@ -601,8 +606,8 @@ class ostatus {
$categories = $xpath->query('atom:category', $entry);
if ($categories) {
- foreach ($categories AS $category) {
- foreach ($category->attributes AS $attributes) {
+ foreach ($categories as $category) {
+ foreach ($category->attributes as $attributes) {
if ($attributes->name == "term") {
$term = $attributes->textContent;
if (strlen($item["tag"])) {
@@ -628,7 +633,7 @@ class ostatus {
$notice_info = $xpath->query('statusnet:notice_info', $entry);
if ($notice_info && ($notice_info->length > 0)) {
- foreach ($notice_info->item(0)->attributes AS $attributes) {
+ foreach ($notice_info->item(0)->attributes as $attributes) {
if ($attributes->name == "source") {
$item["app"] = strip_tags($attributes->textContent);
}
@@ -648,7 +653,7 @@ class ostatus {
$item["body"] .= $add_body;
// Only add additional data when there is no picture in the post
- if (!strstr($item["body"],'[/img]')) {
+ if (!strstr($item["body"], '[/img]')) {
$item["body"] = add_page_info_to_body($item["body"]);
}
@@ -690,11 +695,11 @@ class ostatus {
/**
* @brief Fetch the conversation for posts
*
- * @param string $conversation The link to the conversation
+ * @param string $conversation The link to the conversation
* @param string $conversation_uri The conversation in "uri" format
*/
- private static function fetchConversation($conversation, $conversation_uri) {
-
+ private static function fetchConversation($conversation, $conversation_uri)
+ {
// Ensure that we only store a conversation once in a process
if (isset(self::$conv_list[$conversation])) {
return;
@@ -723,7 +728,7 @@ class ostatus {
$links = $xpath->query('//link');
if ($links) {
- foreach ($links AS $link) {
+ foreach ($links as $link) {
$attribute = ostatus::read_attributes($link);
if (($attribute['rel'] == 'alternate') && ($attribute['type'] == 'application/atom+xml')) {
$file = $attribute['href'];
@@ -749,9 +754,12 @@ class ostatus {
/**
* @brief Store a feed in several conversation entries
*
- * @param string $xml The feed
+ * @param string $xml The feed
+ * @param string $conversation conversation
+ * @param string $conversation_uri conversation uri
*/
- private static function storeConversation($xml, $conversation = '', $conversation_uri = '') {
+ private static function storeConversation($xml, $conversation = '', $conversation_uri = '')
+ {
$doc = new DOMDocument();
@$doc->loadXML($xml);
@@ -763,7 +771,7 @@ class ostatus {
$entries = $xpath->query('/atom:feed/atom:entry');
// Now store the entries
- foreach ($entries AS $entry) {
+ foreach ($entries as $entry) {
$doc2 = new DOMDocument();
$doc2->preserveWhiteSpace = false;
$doc2->formatOutput = true;
@@ -776,7 +784,7 @@ class ostatus {
$inreplyto = $xpath->query('thr:in-reply-to', $entry);
if (is_object($inreplyto->item(0))) {
- foreach ($inreplyto->item(0)->attributes AS $attributes) {
+ foreach ($inreplyto->item(0)->attributes as $attributes) {
if ($attributes->name == "ref") {
$conv_data['reply-to-uri'] = $attributes->textContent;
}
@@ -788,7 +796,7 @@ class ostatus {
$conv = $xpath->query('ostatus:conversation', $entry);
if (is_object($conv->item(0))) {
- foreach ($conv->item(0)->attributes AS $attributes) {
+ foreach ($conv->item(0)->attributes as $attributes) {
if ($attributes->name == "ref") {
$conv_data['conversation-uri'] = $attributes->textContent;
}
@@ -825,7 +833,7 @@ class ostatus {
/**
* @brief Fetch the own post so that it can be stored later
- * @param array $item The item array
+ * @param array $item The item array
*
* We want to store the original data for later processing.
* This function is meant for cases where we process a feed with multiple entries.
@@ -833,7 +841,8 @@ class ostatus {
*
* @param string $self The link to the self item
*/
- private static function fetchSelf($self, &$item) {
+ private static function fetchSelf($self, &$item)
+ {
$condition = array('`item-uri` = ? AND `protocol` IN (?, ?)', $self, PROTOCOL_DFRN, PROTOCOL_OSTATUS_SALMON);
if (dba::exists('conversation', $condition)) {
logger('Conversation '.$item['uri'].' is already stored.', LOGGER_DEBUG);
@@ -862,11 +871,12 @@ class ostatus {
/**
* @brief Fetch related posts and processes them
*
- * @param string $related The link to the related item
+ * @param string $related The link to the related item
* @param string $related_uri The related item in "uri" format
- * @param array $importer user record of the importing user
+ * @param array $importer user record of the importing user
*/
- private static function fetchRelated($related, $related_uri, $importer) {
+ private static function fetchRelated($related, $related_uri, $importer)
+ {
$condition = array('`item-uri` = ? AND `protocol` IN (?, ?)', $related_uri, PROTOCOL_DFRN, PROTOCOL_OSTATUS_SALMON);
$conversation = dba::select('conversation', array('source', 'protocol'), $condition, array('limit' => 1));
if (DBM::is_result($conversation)) {
@@ -907,7 +917,7 @@ class ostatus {
$links = $xpath->query('//link');
if ($links) {
- foreach ($links AS $link) {
+ foreach ($links as $link) {
$attribute = self::read_attributes($link);
if (($attribute['rel'] == 'alternate') && ($attribute['type'] == 'application/atom+xml')) {
$atom_file = $attribute['href'];
@@ -967,14 +977,15 @@ class ostatus {
/**
* @brief Processes the XML for a repeated post
*
- * @param object $xpath The xpath object
- * @param object $entry The xml entry that is processed
- * @param array $item The item array
- * @param array $importer user record of the importing user
+ * @param object $xpath The xpath object
+ * @param object $entry The xml entry that is processed
+ * @param array $item The item array
+ * @param array $importer user record of the importing user
*
* @return array with data from links
*/
- private static function processRepeatedItem($xpath, $entry, &$item, $importer) {
+ private static function processRepeatedItem($xpath, $entry, &$item, $importer)
+ {
$activityobjects = $xpath->query('activity:object', $entry)->item(0);
if (!is_object($activityobjects)) {
@@ -1013,7 +1024,7 @@ class ostatus {
$inreplyto = $xpath->query('thr:in-reply-to', $activityobjects);
if (is_object($inreplyto->item(0))) {
- foreach ($inreplyto->item(0)->attributes AS $attributes) {
+ foreach ($inreplyto->item(0)->attributes as $attributes) {
if ($attributes->name == "ref") {
$item["parent-uri"] = $attributes->textContent;
}
@@ -1027,22 +1038,24 @@ class ostatus {
* @brief Processes links in the XML
*
* @param object $links The xml data that contain links
- * @param array $item The item array
+ * @param array $item The item array
*
* @return array with data from the links
*/
- private static function processLinks($links, &$item) {
+ private static function processLinks($links, &$item)
+ {
$link_data = array('add_body' => '', 'self' => '');
- foreach ($links AS $link) {
+ foreach ($links as $link) {
$attribute = self::read_attributes($link);
if (($attribute['rel'] != "") && ($attribute['href'] != "")) {
switch ($attribute['rel']) {
case "alternate":
$item["plink"] = $attribute['href'];
- if (($item["object-type"] == ACTIVITY_OBJ_QUESTION) ||
- ($item["object-type"] == ACTIVITY_OBJ_EVENT)) {
+ if (($item["object-type"] == ACTIVITY_OBJ_QUESTION)
+ || ($item["object-type"] == ACTIVITY_OBJ_EVENT)
+ ) {
$item["body"] .= add_page_info($attribute['href']);
}
break;
@@ -1054,7 +1067,7 @@ class ostatus {
}
break;
case "enclosure":
- $filetype = strtolower(substr($attribute['type'], 0, strpos($attribute['type'],'/')));
+ $filetype = strtolower(substr($attribute['type'], 0, strpos($attribute['type'], '/')));
if ($filetype == 'image') {
$link_data['add_body'] .= "\n[img]".$attribute['href'].'[/img]';
} else {
@@ -1089,15 +1102,16 @@ class ostatus {
return $link_data;
}
-/**
+ /**
* @brief Create an url out of an uri
*
* @param string $href URI in the format "parameter1:parameter1:..."
*
* @return string URL in the format http(s)://....
*/
- public static function convert_href($href) {
- $elements = explode(":",$href);
+ public static function convert_href($href)
+ {
+ $elements = explode(":", $href);
if ((count($elements) <= 2) || ($elements[0] != "tag"))
return $href;
@@ -1126,7 +1140,8 @@ class ostatus {
*
* @return string The guid if the post is a reshare
*/
- private static function get_reshared_guid($item) {
+ private static function get_reshared_guid($item)
+ {
$body = trim($item["body"]);
// Skip if it isn't a pure repeated messages
@@ -1138,7 +1153,7 @@ class ostatus {
if (strlen($body) > (strrpos($body, "[/share]") + 8))
return "";
- $attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body);
+ $attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "$1", $body);
// Skip if there is no shared message in there
if ($body == $attributes)
return false;
@@ -1162,14 +1177,16 @@ class ostatus {
*
* @return string The cleaned body
*/
- private static function format_picture_post($body) {
+ private static function format_picture_post($body)
+ {
$siteinfo = get_attached_data($body);
if (($siteinfo["type"] == "photo")) {
- if (isset($siteinfo["preview"]))
+ if (isset($siteinfo["preview"])) {
$preview = $siteinfo["preview"];
- else
+ } else {
$preview = $siteinfo["image"];
+ }
// Is it a remote picture? Then make a smaller preview here
$preview = proxy_url($preview, false, PROXY_SIZE_SMALL);
@@ -1178,10 +1195,11 @@ class ostatus {
$preview = str_replace(array("-0.jpg", "-0.png"), array("-2.jpg", "-2.png"), $preview);
$preview = str_replace(array("-1.jpg", "-1.png"), array("-2.jpg", "-2.png"), $preview);
- if (isset($siteinfo["url"]))
+ if (isset($siteinfo["url"])) {
$url = $siteinfo["url"];
- else
+ } else {
$url = $siteinfo["image"];
+ }
$body = trim($siteinfo["text"])." [url]".$url."[/url]\n[img]".$preview."[/img]";
}
@@ -1192,13 +1210,13 @@ class ostatus {
/**
* @brief Adds the header elements to the XML document
*
- * @param object $doc XML document
- * @param array $owner Contact data of the poster
+ * @param object $doc XML document
+ * @param array $owner Contact data of the poster
*
* @return object header root element
*/
- private static function add_header($doc, $owner) {
-
+ private static function add_header($doc, $owner)
+ {
$a = get_app();
$root = $doc->createElementNS(NAMESPACE_ATOM1, 'feed');
@@ -1254,10 +1272,12 @@ class ostatus {
/**
* @brief Add the link to the push hubs to the XML document
*
- * @param object $doc XML document
+ * @param object $doc XML document
* @param object $root XML root element where the hub links are added
+ * @param object $nick nick
*/
- public static function hublinks($doc, $root, $nick) {
+ public static function hublinks($doc, $root, $nick)
+ {
$h = System::baseUrl() . '/pubsubhubbub/'.$nick;
xml::add_element($doc, $root, "link", "", array("href" => $h, "rel" => "hub"));
}
@@ -1265,11 +1285,12 @@ class ostatus {
/**
* @brief Adds attachement data to the XML document
*
- * @param object $doc XML document
+ * @param object $doc XML document
* @param object $root XML root element where the hub links are added
- * @param array $item Data of the item that is to be posted
+ * @param array $item Data of the item that is to be posted
*/
- private static function get_attachment($doc, $root, $item) {
+ private static function get_attachment($doc, $root, $item)
+ {
$o = "";
$siteinfo = get_attached_data($item["body"]);
@@ -1329,13 +1350,13 @@ class ostatus {
/**
* @brief Adds the author element to the XML document
*
- * @param object $doc XML document
- * @param array $owner Contact data of the poster
+ * @param object $doc XML document
+ * @param array $owner Contact data of the poster
*
* @return object author element
*/
- private static function add_author($doc, $owner) {
-
+ private static function add_author($doc, $owner)
+ {
$r = q("SELECT `homepage`, `publish` FROM `profile` WHERE `uid` = %d AND `is-default` LIMIT 1", intval($owner["uid"]));
if (DBM::is_result($r)) {
$profile = $r[0];
@@ -1402,8 +1423,7 @@ class ostatus {
* @TODO Picture attachments should look like this:
* <a href="https://status.pirati.ca/attachment/572819" title="https://status.pirati.ca/file/heluecht-20151202T222602-rd3u49p.gif"
* class="attachment thumbnail" id="attachment-572819" rel="nofollow external">https://status.pirati.ca/attachment/572819</a>
- *
- */
+ */
/**
* @brief Returns the given activity if present - otherwise returns the "post" activity
@@ -1412,7 +1432,8 @@ class ostatus {
*
* @return string activity
*/
- private static function construct_verb($item) {
+ private static function construct_verb($item)
+ {
if ($item['verb'])
return $item['verb'];
return ACTIVITY_POST;
@@ -1425,7 +1446,8 @@ class ostatus {
*
* @return string Object type
*/
- private static function construct_objecttype($item) {
+ private static function construct_objecttype($item)
+ {
if (in_array($item['object-type'], array(ACTIVITY_OBJ_NOTE, ACTIVITY_OBJ_COMMENT)))
return $item['object-type'];
return ACTIVITY_OBJ_NOTE;
@@ -1434,14 +1456,15 @@ class ostatus {
/**
* @brief Adds an entry element to the XML document
*
- * @param object $doc XML document
- * @param array $item Data of the item that is to be posted
- * @param array $owner Contact data of the poster
- * @param bool $toplevel
+ * @param object $doc XML document
+ * @param array $item Data of the item that is to be posted
+ * @param array $owner Contact data of the poster
+ * @param bool $toplevel optional default false
*
* @return object Entry element
*/
- private static function entry($doc, $item, $owner, $toplevel = false) {
+ private static function entry($doc, $item, $owner, $toplevel = false)
+ {
$repeated_guid = self::get_reshared_guid($item);
if ($repeated_guid != "")
$xml = self::reshare_entry($doc, $item, $owner, $repeated_guid, $toplevel);
@@ -1461,23 +1484,20 @@ class ostatus {
/**
* @brief Adds a source entry to the XML document
*
- * @param object $doc XML document
- * @param array $contact Array of the contact that is added
+ * @param object $doc XML document
+ * @param array $contact Array of the contact that is added
*
* @return object Source element
*/
- private static function source_entry($doc, $contact) {
+ private static function source_entry($doc, $contact)
+ {
$source = $doc->createElement("source");
xml::add_element($doc, $source, "id", $contact["poll"]);
xml::add_element($doc, $source, "title", $contact["name"]);
- xml::add_element($doc, $source, "link", "", array("rel" => "alternate",
- "type" => "text/html",
- "href" => $contact["alias"]));
- xml::add_element($doc, $source, "link", "", array("rel" => "self",
- "type" => "application/atom+xml",
- "href" => $contact["poll"]));
+ xml::add_element($doc, $source, "link", "", array("rel" => "alternate", "type" => "text/html", "href" => $contact["alias"]));
+ xml::add_element($doc, $source, "link", "", array("rel" => "self", "type" => "application/atom+xml", "href" => $contact["poll"]));
xml::add_element($doc, $source, "icon", $contact["photo"]);
- xml::add_element($doc, $source, "updated", datetime_convert("UTC","UTC",$contact["success_update"]."+00:00",ATOM_TIME));
+ xml::add_element($doc, $source, "updated", datetime_convert("UTC", "UTC", $contact["success_update"]."+00:00", ATOM_TIME));
return $source;
}
@@ -1485,23 +1505,28 @@ class ostatus {
/**
* @brief Fetches contact data from the contact or the gcontact table
*
- * @param string $url URL of the contact
- * @param array $owner Contact data of the poster
+ * @param string $url URL of the contact
+ * @param array $owner Contact data of the poster
*
* @return array Contact array
*/
private static function contact_entry($url, $owner) {
- $r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` IN (0, %d) ORDER BY `uid` DESC LIMIT 1",
- dbesc(normalise_link($url)), intval($owner["uid"]));
+ $r = q(
+ "SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` IN (0, %d) ORDER BY `uid` DESC LIMIT 1",
+ dbesc(normalise_link($url)),
+ intval($owner["uid"])
+ );
if (DBM::is_result($r)) {
$contact = $r[0];
$contact["uid"] = -1;
}
if (!DBM::is_result($r)) {
- $r = q("SELECT * FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
- dbesc(normalise_link($url)));
+ $r = q(
+ "SELECT * FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
+ dbesc(normalise_link($url))
+ );
if (DBM::is_result($r)) {
$contact = $r[0];
$contact["uid"] = -1;
@@ -1509,19 +1534,22 @@ class ostatus {
}
}
- if (!DBM::is_result($r))
+ if (!DBM::is_result($r)) {
$contact = owner;
+ }
if (!isset($contact["poll"])) {
$data = Probe::uri($url);
$contact["poll"] = $data["poll"];
- if (!$contact["alias"])
+ if (!$contact["alias"]) {
$contact["alias"] = $data["alias"];
+ }
}
- if (!isset($contact["alias"]))
+ if (!isset($contact["alias"])) {
$contact["alias"] = $contact["url"];
+ }
return $contact;
}
@@ -1529,25 +1557,30 @@ class ostatus {
/**
* @brief Adds an entry element with reshared content
*
- * @param object $doc XML document
- * @param array $item Data of the item that is to be posted
- * @param array $owner Contact data of the poster
- * @param $repeated_guid
- * @param bool $toplevel Is it for en entry element (false) or a feed entry (true)?
+ * @param object $doc XML document
+ * @param array $item Data of the item that is to be posted
+ * @param array $owner Contact data of the poster
+ * @param $repeated_guid
+ * @param bool $toplevel Is it for en entry element (false) or a feed entry (true)?
*
* @return object Entry element
*/
- private static function reshare_entry($doc, $item, $owner, $repeated_guid, $toplevel) {
-
+ private static function reshare_entry($doc, $item, $owner, $repeated_guid, $toplevel)
+ {
if (($item["id"] != $item["parent"]) && (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) {
logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG);
}
$title = self::entry_header($doc, $entry, $owner, $toplevel);
- $r = q("SELECT * FROM `item` WHERE `uid` = %d AND `guid` = '%s' AND NOT `private` AND `network` IN ('%s', '%s', '%s') LIMIT 1",
- intval($owner["uid"]), dbesc($repeated_guid),
- dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS));
+ $r = q(
+ "SELECT * FROM `item` WHERE `uid` = %d AND `guid` = '%s' AND NOT `private` AND `network` IN ('%s', '%s', '%s') LIMIT 1",
+ intval($owner["uid"]),
+ dbesc($repeated_guid),
+ dbesc(NETWORK_DFRN),
+ dbesc(NETWORK_DIASPORA),
+ dbesc(NETWORK_OSTATUS)
+ );
if (DBM::is_result($r)) {
$repeated_item = $r[0];
} else {
@@ -1596,15 +1629,15 @@ class ostatus {
/**
* @brief Adds an entry element with a "like"
*
- * @param object $doc XML document
- * @param array $item Data of the item that is to be posted
- * @param array $owner Contact data of the poster
- * @param bool $toplevel Is it for en entry element (false) or a feed entry (true)?
+ * @param object $doc XML document
+ * @param array $item Data of the item that is to be posted
+ * @param array $owner Contact data of the poster
+ * @param bool $toplevel Is it for en entry element (false) or a feed entry (true)?
*
* @return object Entry element with "like"
*/
- private static function like_entry($doc, $item, $owner, $toplevel) {
-
+ private static function like_entry($doc, $item, $owner, $toplevel)
+ {
if (($item["id"] != $item["parent"]) && (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) {
logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG);
}
@@ -1616,8 +1649,11 @@ class ostatus {
$as_object = $doc->createElement("activity:object");
- $parent = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d",
- dbesc($item["thr-parent"]), intval($item["uid"]));
+ $parent = q(
+ "SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d",
+ dbesc($item["thr-parent"]),
+ intval($item["uid"])
+ );
$parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
xml::add_element($doc, $as_object, "activity:object-type", self::construct_objecttype($parent[0]));
@@ -1634,14 +1670,14 @@ class ostatus {
/**
* @brief Adds the person object element to the XML document
*
- * @param object $doc XML document
- * @param array $owner Contact data of the poster
- * @param array $contact Contact data of the target
+ * @param object $doc XML document
+ * @param array $owner Contact data of the poster
+ * @param array $contact Contact data of the target
*
* @return object author element
*/
- private static function add_person_object($doc, $owner, $contact) {
-
+ private static function add_person_object($doc, $owner, $contact)
+ {
$object = $doc->createElement("activity:object");
xml::add_element($doc, $object, "activity:object-type", ACTIVITY_OBJ_PERSON);
@@ -1679,10 +1715,10 @@ class ostatus {
/**
* @brief Adds a follow/unfollow entry element
*
- * @param object $doc XML document
- * @param array $item Data of the follow/unfollow message
- * @param array $owner Contact data of the poster
- * @param bool $toplevel Is it for en entry element (false) or a feed entry (true)?
+ * @param object $doc XML document
+ * @param array $item Data of the follow/unfollow message
+ * @param array $owner Contact data of the poster
+ * @param bool $toplevel Is it for en entry element (false) or a feed entry (true)?
*
* @return object Entry element
*/
@@ -1700,8 +1736,11 @@ class ostatus {
$item['follow'] = $contact['alias'];
}
- $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'",
- intval($owner['uid']), dbesc(normalise_link($contact["url"])));
+ $r = q(
+ "SELECT `id` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'",
+ intval($owner['uid']),
+ dbesc(normalise_link($contact["url"]))
+ );
if (DBM::is_result($r)) {
$connect_id = $r[0]['id'];
@@ -1719,8 +1758,8 @@ class ostatus {
$action = "unfollow";
}
- $item["uri"] = $item['parent-uri'] = $item['thr-parent'] =
- 'tag:'.get_app()->get_hostname().
+ $item["uri"] = $item['parent-uri'] = $item['thr-parent']
+ = 'tag:'.get_app()->get_hostname().
','.date('Y-m-d').':'.$action.':'.$owner['uid'].
':person:'.$connect_id.':'.$item['created'];
@@ -1741,15 +1780,15 @@ class ostatus {
/**
* @brief Adds a regular entry element
*
- * @param object $doc XML document
- * @param array $item Data of the item that is to be posted
- * @param array $owner Contact data of the poster
- * @param bool $toplevel Is it for en entry element (false) or a feed entry (true)?
+ * @param object $doc XML document
+ * @param array $item Data of the item that is to be posted
+ * @param array $owner Contact data of the poster
+ * @param bool $toplevel Is it for en entry element (false) or a feed entry (true)?
*
* @return object Entry element
*/
- private static function note_entry($doc, $item, $owner, $toplevel) {
-
+ private static function note_entry($doc, $item, $owner, $toplevel)
+ {
if (($item["id"] != $item["parent"]) && (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) {
logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG);
}
@@ -1768,14 +1807,15 @@ class ostatus {
/**
* @brief Adds a header element to the XML document
*
- * @param object $doc XML document
- * @param object $entry The entry element where the elements are added
- * @param array $owner Contact data of the poster
- * @param bool $toplevel Is it for en entry element (false) or a feed entry (true)?
+ * @param object $doc XML document
+ * @param object $entry The entry element where the elements are added
+ * @param array $owner Contact data of the poster
+ * @param bool $toplevel Is it for en entry element (false) or a feed entry (true)?
*
* @return string The title for the element
*/
- private static function entry_header($doc, &$entry, $owner, $toplevel) {
+ private static function entry_header($doc, &$entry, $owner, $toplevel)
+ {
/// @todo Check if this title stuff is really needed (I guess not)
if (!$toplevel) {
$entry = $doc->createElement("entry");
@@ -1803,18 +1843,19 @@ class ostatus {
/**
* @brief Adds elements to the XML document
*
- * @param object $doc XML document
- * @param object $entry Entry element where the content is added
- * @param array $item Data of the item that is to be posted
- * @param array $owner Contact data of the poster
- * @param string $title Title for the post
- * @param string $verb The activity verb
- * @param bool $complete Add the "status_net" element?
+ * @param object $doc XML document
+ * @param object $entry Entry element where the content is added
+ * @param array $item Data of the item that is to be posted
+ * @param array $owner Contact data of the poster
+ * @param string $title Title for the post
+ * @param string $verb The activity verb
+ * @param bool $complete Add the "status_net" element?
*/
- private static function entry_content($doc, $entry, $item, $owner, $title, $verb = "", $complete = true) {
-
- if ($verb == "")
+ private static function entry_content($doc, $entry, $item, $owner, $title, $verb = "", $complete = true)
+ {
+ if ($verb == "") {
$verb = self::construct_verb($item);
+ }
xml::add_element($doc, $entry, "id", $item["uri"]);
xml::add_element($doc, $entry, "title", $title);
@@ -1829,37 +1870,41 @@ class ostatus {
xml::add_element($doc, $entry, "content", $body, array("type" => "html"));
xml::add_element($doc, $entry, "link", "", array("rel" => "alternate", "type" => "text/html",
- "href" => System::baseUrl()."/display/".$item["guid"]));
+ "href" => System::baseUrl()."/display/".$item["guid"])
+ );
- if ($complete && ($item["id"] > 0))
+ if ($complete && ($item["id"] > 0)) {
xml::add_element($doc, $entry, "status_net", "", array("notice_id" => $item["id"]));
+ }
xml::add_element($doc, $entry, "activity:verb", $verb);
- xml::add_element($doc, $entry, "published", datetime_convert("UTC","UTC",$item["created"]."+00:00",ATOM_TIME));
- xml::add_element($doc, $entry, "updated", datetime_convert("UTC","UTC",$item["edited"]."+00:00",ATOM_TIME));
+ xml::add_element($doc, $entry, "published", datetime_convert("UTC", "UTC", $item["created"]."+00:00", ATOM_TIME));
+ xml::add_element($doc, $entry, "updated", datetime_convert("UTC", "UTC", $item["edited"]."+00:00", ATOM_TIME));
}
/**
* @brief Adds the elements at the foot of an entry to the XML document
*
- * @param object $doc XML document
- * @param object $entry The entry element where the elements are added
- * @param array $item Data of the item that is to be posted
- * @param array $owner Contact data of the poster
- * @param $complete
+ * @param object $doc XML document
+ * @param object $entry The entry element where the elements are added
+ * @param array $item Data of the item that is to be posted
+ * @param array $owner Contact data of the poster
+ * @param bool $complete default true
*/
- private static function entry_footer($doc, $entry, $item, $owner, $complete = true) {
-
+ private static function entry_footer($doc, $entry, $item, $owner, $complete = true)
+ {
$mentioned = array();
if (($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) {
$parent = q("SELECT `guid`, `author-link`, `owner-link` FROM `item` WHERE `id` = %d", intval($item["parent"]));
$parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
- $thrparent = q("SELECT `guid`, `author-link`, `owner-link`, `plink` FROM `item` WHERE `uid` = %d AND `uri` = '%s'",
- intval($owner["uid"]),
- dbesc($parent_item));
+ $thrparent = q(
+ "SELECT `guid`, `author-link`, `owner-link`, `plink` FROM `item` WHERE `uid` = %d AND `uri` = '%s'",
+ intval($owner["uid"]),
+ dbesc($parent_item)
+ );
if ($thrparent) {
$mentioned[$thrparent[0]["author-link"]] = $thrparent[0]["author-link"];
$mentioned[$thrparent[0]["owner-link"]] = $thrparent[0]["owner-link"];
@@ -1909,31 +1954,43 @@ class ostatus {
$tags = item_getfeedtags($item);
- if (count($tags))
- foreach ($tags as $t)
- if ($t[0] == "@")
+ if (count($tags)) {
+ foreach ($tags as $t) {
+ if ($t[0] == "@") {
$mentioned[$t[1]] = $t[1];
+ }
+ }
+ }
// Make sure that mentions are accepted (GNU Social has problems with mixing HTTP and HTTPS)
$newmentions = array();
- foreach ($mentioned AS $mention) {
+ foreach ($mentioned as $mention) {
$newmentions[str_replace("http://", "https://", $mention)] = str_replace("http://", "https://", $mention);
$newmentions[str_replace("https://", "http://", $mention)] = str_replace("https://", "http://", $mention);
}
$mentioned = $newmentions;
- foreach ($mentioned AS $mention) {
- $r = q("SELECT `forum`, `prv` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'",
+ foreach ($mentioned as $mention) {
+ $r = q(
+ "SELECT `forum`, `prv` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'",
intval($owner["uid"]),
- dbesc(normalise_link($mention)));
- if ($r[0]["forum"] || $r[0]["prv"])
- xml::add_element($doc, $entry, "link", "", array("rel" => "mentioned",
- "ostatus:object-type" => ACTIVITY_OBJ_GROUP,
- "href" => $mention));
- else
- xml::add_element($doc, $entry, "link", "", array("rel" => "mentioned",
- "ostatus:object-type" => ACTIVITY_OBJ_PERSON,
- "href" => $mention));
+ dbesc(normalise_link($mention))
+ );
+ if ($r[0]["forum"] || $r[0]["prv"]) {
+ xml::add_element($doc, $entry, "link", "",
+ array(
+ "rel" => "mentioned",
+ "ostatus:object-type" => ACTIVITY_OBJ_GROUP,
+ "href" => $mention)
+ );
+ } else {
+ xml::add_element($doc, $entry, "link", "",
+ array(
+ "rel" => "mentioned",
+ "ostatus:object-type" => ACTIVITY_OBJ_PERSON,
+ "href" => $mention)
+ );
+ }
}
if (!$item["private"]) {
@@ -1945,10 +2002,13 @@ class ostatus {
xml::add_element($doc, $entry, "mastodon:scope", "public");
}
- if (count($tags))
- foreach ($tags as $t)
- if ($t[0] != "@")
+ if (count($tags)) {
+ foreach ($tags as $t) {
+ if ($t[0] != "@") {
xml::add_element($doc, $entry, "category", "", array("term" => $t[2]));
+ }
+ }
+ }
self::get_attachment($doc, $entry, $item);
@@ -1959,11 +2019,13 @@ class ostatus {
$attributes = array("local_id" => $item["id"], "source" => $app);
- if (isset($parent["id"]))
+ if (isset($parent["id"])) {
$attributes["repeat_of"] = $parent["id"];
+ }
- if ($item["coord"] != "")
+ if ($item["coord"] != "") {
xml::add_element($doc, $entry, "georss:point", $item["coord"]);
+ }
xml::add_element($doc, $entry, "statusnet:notice_info", "", $attributes);
}
@@ -1972,14 +2034,15 @@ class ostatus {
/**
* @brief Creates the XML feed for a given nickname
*
- * @param App $a The application class
- * @param string $owner_nick Nickname of the feed owner
- * @param string $last_update Date of the last update
- * @param integer $max_items Number of maximum items to fetch
+ * @param object $a The application class
+ * @param string $owner_nick Nickname of the feed owner
+ * @param string $last_update Date of the last update
+ * @param integer $max_items Number of maximum items to fetch
*
* @return string XML feed
*/
- public static function feed(App $a, $owner_nick, &$last_update, $max_items = 300) {
+ public static function feed(App $a, $owner_nick, &$last_update, $max_items = 300)
+ {
$stamp = microtime(true);
$cachekey = "ostatus:feed:".$owner_nick.":".$last_update;
@@ -1993,10 +2056,12 @@ class ostatus {
return $result['feed'];
}
- $r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`
+ $r = q(
+ "SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`
FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
WHERE `contact`.`self` AND `user`.`nickname` = '%s' LIMIT 1",
- dbesc($owner_nick));
+ dbesc($owner_nick)
+ );
if (!DBM::is_result($r)) {
return;
}
@@ -2007,26 +2072,28 @@ class ostatus {
$last_update = 'now -30 days';
}
- $check_date = datetime_convert('UTC','UTC',$last_update,'Y-m-d H:i:s');
+ $check_date = datetime_convert('UTC', 'UTC', $last_update, 'Y-m-d H:i:s');
$authorid = get_contact($owner["url"], 0);
- $items = q("SELECT `item`.*, `item`.`id` AS `item_id` FROM `item` USE INDEX (`uid_contactid_created`)
+ $items = q(
+ "SELECT `item`.*, `item`.`id` AS `item_id` FROM `item` USE INDEX (`uid_contactid_created`)
STRAIGHT_JOIN `thread` ON `thread`.`iid` = `item`.`parent`
WHERE `item`.`uid` = %d AND `item`.`contact-id` = %d AND
`item`.`author-id` = %d AND `item`.`created` > '%s' AND
NOT `item`.`deleted` AND NOT `item`.`private` AND
`thread`.`network` IN ('%s', '%s')
ORDER BY `item`.`created` DESC LIMIT %d",
- intval($owner["uid"]), intval($owner["id"]),
- intval($authorid), dbesc($check_date),
- dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN), intval($max_items));
+ intval($owner["uid"]), intval($owner["id"]),
+ intval($authorid), dbesc($check_date),
+ dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN), intval($max_items)
+ );
$doc = new DOMDocument('1.0', 'utf-8');
$doc->formatOutput = true;
$root = self::add_header($doc, $owner);
- foreach ($items AS $item) {
+ foreach ($items as $item) {
if (Config::get('system', 'ostatus_debug')) {
$item['body'] .= 'ð¼';
}
@@ -2051,13 +2118,13 @@ class ostatus {
/**
* @brief Creates the XML for a salmon message
*
- * @param array $item Data of the item that is to be posted
+ * @param array $item Data of the item that is to be posted
* @param array $owner Contact data of the poster
*
* @return string XML for the salmon
*/
- public static function salmon($item,$owner) {
-
+ public static function salmon($item, $owner)
+ {
$doc = new DOMDocument('1.0', 'utf-8');
$doc->formatOutput = true;
diff --git a/include/photos.php b/include/photos.php
index 49ba83fa3c..592a138325 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -3,7 +3,7 @@
* @file include/photos.php
* @brief Functions related to photo handling.
*/
-
+use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
diff --git a/include/queue.php b/include/queue.php
index c930cd9cff..f3841c997c 100644
--- a/include/queue.php
+++ b/include/queue.php
@@ -1,5 +1,8 @@
<?php
-
+/**
+ * @file include/queue.php
+ */
+use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
@@ -11,9 +14,9 @@ require_once 'include/datetime.php';
require_once 'include/items.php';
require_once 'include/bbcode.php';
require_once 'include/socgraph.php';
-require_once 'include/cache.php';
-function queue_run(&$argv, &$argc) {
+function queue_run(&$argv, &$argc)
+{
global $a;
if ($argc > 1) {
@@ -26,15 +29,16 @@ function queue_run(&$argv, &$argc) {
$cachekey_server = 'queue_run:server:';
if (!$queue_id) {
-
logger('queue: start');
// Handling the pubsubhubbub requests
Worker::add(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), 'pubsubpublish');
- $r = q("SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue`
+ $r = q(
+ "SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue`
INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id`
- WHERE `queue`.`created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
+ WHERE `queue`.`created` < UTC_TIMESTAMP() - INTERVAL 3 DAY"
+ );
if (DBM::is_result($r)) {
foreach ($r as $rr) {
@@ -64,10 +68,12 @@ function queue_run(&$argv, &$argc) {
// delivering
- require_once 'include/salmon.php';
+ include_once 'include/salmon.php';
- $r = q("SELECT * FROM `queue` WHERE `id` = %d LIMIT 1",
- intval($queue_id));
+ $r = q(
+ "SELECT * FROM `queue` WHERE `id` = %d LIMIT 1",
+ intval($queue_id)
+ );
if (!DBM::is_result($r)) {
return;
@@ -75,7 +81,8 @@ function queue_run(&$argv, &$argc) {
$q_item = $r[0];
- $c = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
+ $c = q(
+ "SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
intval($q_item['cid'])
);
@@ -111,7 +118,8 @@ function queue_run(&$argv, &$argc) {
}
}
- $u = q("SELECT `user`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`
+ $u = q(
+ "SELECT `user`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`
FROM `user` WHERE `uid` = %d LIMIT 1",
intval($c[0]['uid'])
);
@@ -176,7 +184,6 @@ function queue_run(&$argv, &$argc) {
update_queue_time($q_item['id']);
}
break;
-
}
logger('Deliver status '.(int)$deliver_status.' for item '.$q_item['id'].' to '.$contact['name'].' <'.$contact['url'].'>');
diff --git a/include/session.php b/include/session.php
index 812de547c4..54c17e3754 100644
--- a/include/session.php
+++ b/include/session.php
@@ -1,27 +1,28 @@
<?php
-// Session management functions. These provide database storage of PHP
-// session info.
-
+/**
+ * Session management functions. These provide database storage of PHP session info.
+ */
+use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Database\DBM;
-require_once('include/cache.php');
-
$session_exists = 0;
$session_expire = 180000;
-function ref_session_open($s, $n) {
+function ref_session_open($s, $n)
+{
return true;
}
-function ref_session_read($id) {
+function ref_session_read($id)
+{
global $session_exists;
if (!x($id)) {
return '';
}
- $memcache = cache::memcache();
+ $memcache = Cache::memcache();
if (is_object($memcache)) {
$data = $memcache->get(get_app()->get_hostname().":session:".$id);
if (!is_bool($data)) {
@@ -50,13 +51,14 @@ function ref_session_read($id) {
* on the case. Uses the $session_expire global for existing session, 5 minutes
* for newly created session.
*
- * @global bool $session_exists Whether a session with the given id already exists
- * @global int $session_expire Session expiration delay in seconds
- * @param string $id Session ID with format: [a-z0-9]{26}
- * @param string $data Serialized session data
+ * @global bool $session_exists Whether a session with the given id already exists
+ * @global int $session_expire Session expiration delay in seconds
+ * @param string $id Session ID with format: [a-z0-9]{26}
+ * @param string $data Serialized session data
* @return boolean Returns false if parameters are missing, true otherwise
*/
-function ref_session_write($id, $data) {
+function ref_session_write($id, $data)
+{
global $session_exists, $session_expire;
if (!$id || !$data) {
@@ -66,7 +68,7 @@ function ref_session_write($id, $data) {
$expire = time() + $session_expire;
$default_expire = time() + 300;
- $memcache = cache::memcache();
+ $memcache = Cache::memcache();
$a = get_app();
if (is_object($memcache) && is_object($a)) {
$memcache->set($a->get_hostname().":session:".$id, $data, MEMCACHE_COMPRESSED, $expire);
@@ -85,12 +87,14 @@ function ref_session_write($id, $data) {
return true;
}
-function ref_session_close() {
+function ref_session_close()
+{
return true;
}
-function ref_session_destroy($id) {
- $memcache = cache::memcache();
+function ref_session_destroy($id)
+{
+ $memcache = Cache::memcache();
if (is_object($memcache)) {
$memcache->delete(get_app()->get_hostname().":session:".$id);
@@ -101,7 +105,8 @@ function ref_session_destroy($id) {
return true;
}
-function ref_session_gc($expire) {
+function ref_session_gc($expire)
+{
dba::delete('session', array("`expire` < ?", time()));
return true;
}
@@ -117,7 +122,9 @@ if (Config::get('system', 'ssl_policy') == SSL_POLICY_FULL) {
}
if (!Config::get('system', 'disable_database_session')) {
- session_set_save_handler('ref_session_open', 'ref_session_close',
- 'ref_session_read', 'ref_session_write',
- 'ref_session_destroy', 'ref_session_gc');
+ session_set_save_handler(
+ 'ref_session_open', 'ref_session_close',
+ 'ref_session_read', 'ref_session_write',
+ 'ref_session_destroy', 'ref_session_gc'
+ );
}
diff --git a/include/socgraph.php b/include/socgraph.php
index e1c0e13856..551fcfe2de 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -9,6 +9,7 @@
use Friendica\App;
use Friendica\Core\System;
+use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
diff --git a/mod/ping.php b/mod/ping.php
index 00620ddeb5..8688e8d5c2 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -1,18 +1,20 @@
<?php
-
+/**
+ * @file include/ping.php
+ */
use Friendica\App;
+use Friendica\Core\Cache;
use Friendica\Core\System;
use Friendica\Core\PConfig;
use Friendica\Database\DBM;
-require_once('include/datetime.php');
-require_once('include/bbcode.php');
-require_once('include/ForumManager.php');
-require_once('include/group.php');
-require_once('mod/proxy.php');
-require_once('include/xml.php');
-require_once('include/cache.php');
-require_once('include/enotify.php');
+require_once 'include/datetime.php';
+require_once 'include/bbcode.php';
+require_once 'include/ForumManager.php';
+require_once 'include/group.php';
+require_once 'mod/proxy.php';
+require_once 'include/xml.php';
+require_once 'include/enotify.php';
/**
* @brief Outputs the counts and the lists of various notifications
@@ -96,10 +98,9 @@ function ping_init(App $a)
$data['birthdays'] = $birthdays;
$data['birthdays-today'] = $birthdays_today;
- if (local_user()){
+ if (local_user()) {
// Different login session than the page that is calling us.
if (intval($_GET['uid']) && intval($_GET['uid']) != local_user()) {
-
$data = array('result' => array('invalid' => 1));
if ($format == 'json') {
@@ -120,7 +121,8 @@ function ping_init(App $a)
$notifs = ping_get_notifications(local_user());
- $items_unseen = q("SELECT `item`.`id`, `item`.`parent`, `item`.`verb`, `item`.`wall`, `item`.`author-name`,
+ $items_unseen = q(
+ "SELECT `item`.`id`, `item`.`parent`, `item`.`verb`, `item`.`wall`, `item`.`author-name`,
`item`.`contact-id`, `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`,
`pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`
FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id` = `item`.`parent`
@@ -128,7 +130,8 @@ function ping_init(App $a)
`item`.`deleted` = 0 AND `item`.`uid` = %d AND `pitem`.`parent` != 0
AND `item`.`contact-id` != %d
ORDER BY `item`.`created` DESC",
- intval(local_user()), intval(local_user())
+ intval(local_user()),
+ intval(local_user())
);
if (DBM::is_result($items_unseen)) {
@@ -169,13 +172,15 @@ function ping_init(App $a)
}
}
- $intros1 = q("SELECT `intro`.`id`, `intro`.`datetime`,
+ $intros1 = q(
+ "SELECT `intro`.`id`, `intro`.`datetime`,
`fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo`
FROM `intro` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
WHERE `intro`.`uid` = %d AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`fid` != 0",
intval(local_user())
);
- $intros2 = q("SELECT `intro`.`id`, `intro`.`datetime`,
+ $intros2 = q(
+ "SELECT `intro`.`id`, `intro`.`datetime`,
`contact`.`name`, `contact`.`url`, `contact`.`photo`
FROM `intro` LEFT JOIN `contact` ON `intro`.`contact-id` = `contact`.`id`
WHERE `intro`.`uid` = %d AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`contact-id` != 0",
@@ -186,17 +191,20 @@ function ping_init(App $a)
$intros = $intros1 + $intros2;
$myurl = System::baseUrl() . '/profile/' . $a->user['nickname'] ;
- $mails = q("SELECT `id`, `from-name`, `from-url`, `from-photo`, `created` FROM `mail`
+ $mails = q(
+ "SELECT `id`, `from-name`, `from-url`, `from-photo`, `created` FROM `mail`
WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ",
intval(local_user()),
dbesc($myurl)
);
$mail_count = count($mails);
- if ($a->config['register_policy'] == REGISTER_APPROVE && is_site_admin()){
- $regs = q("SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`, COUNT(*) AS `total`
+ if ($a->config['register_policy'] == REGISTER_APPROVE && is_site_admin()) {
+ $regs = q(
+ "SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`, COUNT(*) AS `total`
FROM `contact` RIGHT JOIN `register` ON `register`.`uid` = `contact`.`uid`
- WHERE `contact`.`self` = 1");
+ WHERE `contact`.`self` = 1"
+ );
if (DBM::is_result($regs)) {
$register_count = $regs[0]['total'];
@@ -206,7 +214,8 @@ function ping_init(App $a)
$cachekey = "ping_init:".local_user();
$ev = Cache::get($cachekey);
if (is_null($ev)) {
- $ev = q("SELECT type, start, adjust FROM `event`
+ $ev = q(
+ "SELECT 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()),
@@ -223,21 +232,21 @@ function ping_init(App $a)
if ($all_events) {
$str_now = datetime_convert('UTC', $a->timezone, 'now', 'Y-m-d');
- foreach($ev as $x) {
+ foreach ($ev as $x) {
$bd = false;
if ($x['type'] === 'birthday') {
$birthdays ++;
$bd = true;
- }
- else {
+ } else {
$events ++;
}
if (datetime_convert('UTC', ((intval($x['adjust'])) ? $a->timezone : 'UTC'), $x['start'], 'Y-m-d') === $str_now) {
$all_events_today ++;
- if ($bd)
+ if ($bd) {
$birthdays_today ++;
- else
+ } else {
$events_today ++;
+ }
}
}
}
@@ -311,7 +320,7 @@ function ping_init(App $a)
}
// sort notifications by $[]['date']
- $sort_function = function($a, $b) {
+ $sort_function = function ($a, $b) {
$adate = strtotime($a['date']);
$bdate = strtotime($b['date']);
@@ -426,7 +435,8 @@ function ping_get_notifications($uid)
$a = get_app();
do {
- $r = q("SELECT `notify`.*, `item`.`visible`, `item`.`spam`, `item`.`deleted`
+ $r = q(
+ "SELECT `notify`.*, `item`.`visible`, `item`.`spam`, `item`.`deleted`
FROM `notify` LEFT JOIN `item` ON `item`.`id` = `notify`.`iid`
WHERE `notify`.`uid` = %d AND `notify`.`msg` != ''
AND NOT (`notify`.`type` IN (%d, %d))
@@ -448,7 +458,7 @@ function ping_get_notifications($uid)
$offset += 50;
}
- foreach ($r AS $notification) {
+ foreach ($r as $notification) {
if (is_null($notification["visible"])) {
$notification["visible"] = true;
}
@@ -468,7 +478,8 @@ function ping_get_notifications($uid)
$notification["name"] = strip_tags(bbcode($notification["name"]));
$notification["message"] = format_notification_message($notification["name"], strip_tags(bbcode($notification["msg"])));
- q("UPDATE `notify` SET `name_cache` = '%s', `msg_cache` = '%s' WHERE `id` = %d",
+ q(
+ "UPDATE `notify` SET `name_cache` = '%s', `msg_cache` = '%s' WHERE `id` = %d",
dbesc($notification["name"]),
dbesc($notification["message"]),
intval($notification["id"])
@@ -477,8 +488,9 @@ function ping_get_notifications($uid)
$notification["href"] = System::baseUrl() . "/notify/view/" . $notification["id"];
- if ($notification["visible"] && !$notification["spam"] &&
- !$notification["deleted"] && !is_array($result[$notification["parent"]])) {
+ if ($notification["visible"] && !$notification["spam"]
+ && !$notification["deleted"] && !is_array($result[$notification["parent"]])
+ ) {
// Should we condense the notifications or show them all?
if (PConfig::get(local_user(), 'system', 'detailed_notif')) {
$result[$notification["id"]] = $notification;
@@ -496,19 +508,19 @@ function ping_get_notifications($uid)
* @brief Backward-compatible XML formatting for ping.php output
* @deprecated
*
- * @param array $data The initial ping data array
- * @param int $sysnotify_count Number of unseen system notifications
- * @param array $notifs Complete list of notification
- * @param array $sysmsgs List of system notice messages
- * @param array $sysmsgs_info List of system info messages
- * @param int $groups_unseen Number of unseen group items
- * @param int $forums_unseen Number of unseen forum items
+ * @param array $data The initial ping data array
+ * @param int $sysnotify Number of unseen system notifications
+ * @param array $notifs Complete list of notification
+ * @param array $sysmsgs List of system notice messages
+ * @param array $sysmsgs_info List of system info messages
+ * @param int $groups_unseen Number of unseen group items
+ * @param int $forums_unseen Number of unseen forum items
* @return array XML-transform ready data array
*/
function ping_format_xml_data($data, $sysnotify, $notifs, $sysmsgs, $sysmsgs_info, $groups_unseen, $forums_unseen)
{
$notifications = array();
- foreach($notifs as $key => $notif) {
+ foreach ($notifs as $key => $notif) {
$notifications[$key . ':note'] = $notif['message'];
$notifications[$key . ':@attributes'] = array(
@@ -524,10 +536,10 @@ function ping_format_xml_data($data, $sysnotify, $notifs, $sysmsgs, $sysmsgs_inf
}
$sysmsg = array();
- foreach ($sysmsgs as $key => $m){
+ foreach ($sysmsgs as $key => $m) {
$sysmsg[$key . ':notice'] = $m;
}
- foreach ($sysmsgs_info as $key => $m){
+ foreach ($sysmsgs_info as $key => $m) {
$sysmsg[$key . ':info'] = $m;
}
diff --git a/mod/poco.php b/mod/poco.php
index c5c5ef4c83..a32972f9ee 100644
--- a/mod/poco.php
+++ b/mod/poco.php
@@ -4,6 +4,7 @@
// https://web.archive.org/web/20160405005550/http://portablecontacts.net/draft-spec.html
use Friendica\App;
+use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Database\DBM;
diff --git a/mod/search.php b/mod/search.php
index 4c3d4586d1..984167fd78 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -1,6 +1,7 @@
<?php
use Friendica\App;
+use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Database\DBM;
diff --git a/src/App.php b/src/App.php
index ea44738571..4d06ba630d 100644
--- a/src/App.php
+++ b/src/App.php
@@ -3,11 +3,11 @@
namespace Friendica;
use Friendica\Core\System;
+use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Database\DBM;
-use Cache;
use dba;
use Detection\MobileDetect;
diff --git a/src/Core/Cache.php b/src/Core/Cache.php
new file mode 100644
index 0000000000..ab87bc3755
--- /dev/null
+++ b/src/Core/Cache.php
@@ -0,0 +1,243 @@
+<?php
+/**
+ * @file src/Core/Cache.php
+ */
+namespace Friendica\Core;
+
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
+use Friendica\Database\DBM;
+
+/**
+ * @brief Class for storing data for a short time
+ */
+class Cache
+{
+ /**
+ * @brief Check for memcache and open a connection if configured
+ *
+ * @return object|boolean The memcache object - or "false" if not successful
+ */
+ public static function memcache()
+ {
+ if (!function_exists('memcache_connect')) {
+ return false;
+ }
+
+ if (!Config::get('system', 'memcache')) {
+ return false;
+ }
+
+ $memcache_host = Config::get('system', 'memcache_host', '127.0.0.1');
+ $memcache_port = Config::get('system', 'memcache_port', 11211);
+
+ $memcache = new Memcache;
+
+ if (!$memcache->connect($memcache_host, $memcache_port)) {
+ return false;
+ }
+
+ return $memcache;
+ }
+
+ /**
+ * @brief Return the duration for a given cache level
+ *
+ * @param integer $level Cache level
+ *
+ * @return integer The cache duration in seconds
+ */
+ private static function duration($level)
+ {
+ switch ($level) {
+ case CACHE_MONTH:
+ $seconds = 2592000;
+ break;
+ case CACHE_WEEK:
+ $seconds = 604800;
+ break;
+ case CACHE_DAY:
+ $seconds = 86400;
+ break;
+ case CACHE_HOUR:
+ $seconds = 3600;
+ break;
+ case CACHE_HALF_HOUR:
+ $seconds = 1800;
+ break;
+ case CACHE_QUARTER_HOUR:
+ $seconds = 900;
+ break;
+ case CACHE_FIVE_MINUTES:
+ $seconds = 300;
+ break;
+ case CACHE_MINUTE:
+ $seconds = 60;
+ break;
+ }
+ return $seconds;
+ }
+
+ /**
+ * @brief Fetch cached data according to the key
+ *
+ * @param string $key The key to the cached data
+ *
+ * @return mixed Cached $value or "null" if not found
+ */
+ public static function get($key)
+ {
+ $memcache = self::memcache();
+ if (is_object($memcache)) {
+ // We fetch with the hostname as key to avoid problems with other applications
+ $cached = $memcache->get(get_app()->get_hostname().":".$key);
+ $value = @unserialize($cached);
+
+ // Only return a value if the serialized value is valid.
+ // We also check if the db entry is a serialized
+ // boolean 'false' value (which we want to return).
+ if ($cached === serialize(false) || $value !== false) {
+ return $value;
+ }
+
+ return null;
+ }
+
+ // Frequently clear cache
+ self::clear($duration);
+
+ $r = q(
+ "SELECT `v` FROM `cache` WHERE `k`='%s' LIMIT 1",
+ dbesc($key)
+ );
+
+ if (DBM::is_result($r)) {
+ $cached = $r[0]['v'];
+ $value = @unserialize($cached);
+
+ // Only return a value if the serialized value is valid.
+ // We also check if the db entry is a serialized
+ // boolean 'false' value (which we want to return).
+ if ($cached === serialize(false) || $value !== false) {
+ return $value;
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * @brief Put data in the cache according to the key
+ *
+ * The input $value can have multiple formats.
+ *
+ * @param string $key The key to the cached data
+ * @param mixed $value The value that is about to be stored
+ * @param integer $duration The cache lifespan
+ */
+ public static function set($key, $value, $duration = CACHE_MONTH)
+ {
+ // Do we have an installed memcache? Use it instead.
+ $memcache = self::memcache();
+ if (is_object($memcache)) {
+ // We store with the hostname as key to avoid problems with other applications
+ $memcache->set(get_app()->get_hostname().":".$key, serialize($value), MEMCACHE_COMPRESSED, self::duration($duration));
+ return;
+ }
+
+ /// @todo store the cache data in the same way like the config data
+ q(
+ "REPLACE INTO `cache` (`k`,`v`,`expire_mode`,`updated`) VALUES ('%s','%s',%d,'%s')",
+ dbesc($key),
+ dbesc(serialize($value)),
+ intval($duration),
+ dbesc(datetime_convert())
+ );
+ }
+
+ /**
+ * @brief Remove outdated data from the cache
+ *
+ * @param integer $max_level The maximum cache level that is to be cleared
+ */
+ public static function clear($max_level = CACHE_MONTH)
+ {
+ // Clear long lasting cache entries only once a day
+ if (Config::get("system", "cache_cleared_day") < time() - self::duration(CACHE_DAY)) {
+ if ($max_level == CACHE_MONTH) {
+ q(
+ "DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
+ dbesc(datetime_convert('UTC', 'UTC', "now - 30 days")),
+ intval(CACHE_MONTH)
+ );
+ }
+
+ if ($max_level <= CACHE_WEEK) {
+ q(
+ "DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
+ dbesc(datetime_convert('UTC', 'UTC', "now - 7 days")),
+ intval(CACHE_WEEK)
+ );
+ }
+
+ if ($max_level <= CACHE_DAY) {
+ q(
+ "DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
+ dbesc(datetime_convert('UTC', 'UTC', "now - 1 days")),
+ intval(CACHE_DAY)
+ );
+ }
+ Config::set("system", "cache_cleared_day", time());
+ }
+
+ if (($max_level <= CACHE_HOUR) && (Config::get("system", "cache_cleared_hour")) < time() - self::duration(CACHE_HOUR)) {
+ q(
+ "DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
+ dbesc(datetime_convert('UTC', 'UTC', "now - 1 hours")),
+ intval(CACHE_HOUR)
+ );
+
+ Config::set("system", "cache_cleared_hour", time());
+ }
+
+ if (($max_level <= CACHE_HALF_HOUR) && (Config::get("system", "cache_cleared_half_hour")) < time() - self::duration(CACHE_HALF_HOUR)) {
+ q(
+ "DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
+ dbesc(datetime_convert('UTC', 'UTC', "now - 30 minutes")),
+ intval(CACHE_HALF_HOUR)
+ );
+
+ Config::set("system", "cache_cleared_half_hour", time());
+ }
+
+ if (($max_level <= CACHE_QUARTER_HOUR) && (Config::get("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)
+ );
+
+ Config::set("system", "cache_cleared_quarter_hour", time());
+ }
+
+ if (($max_level <= CACHE_FIVE_MINUTES) && (Config::get("system", "cache_cleared_five_minute")) < time() - self::duration(CACHE_FIVE_MINUTES)) {
+ q(
+ "DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
+ dbesc(datetime_convert('UTC', 'UTC', "now - 5 minutes")),
+ intval(CACHE_FIVE_MINUTES)
+ );
+
+ Config::set("system", "cache_cleared_five_minute", time());
+ }
+
+ if (($max_level <= CACHE_MINUTE) && (Config::get("system", "cache_cleared_minute")) < time() - self::duration(CACHE_MINUTE)) {
+ q(
+ "DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
+ dbesc(datetime_convert('UTC', 'UTC', "now - 1 minutes")),
+ intval(CACHE_MINUTE)
+ );
+
+ Config::set("system", "cache_cleared_minute", time());
+ }
+ }
+}
diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 84a0344f32..9e2593a128 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -10,11 +10,11 @@ namespace Friendica\Network;
use Friendica\App;
use Friendica\Core\System;
+use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Database\DBM;
use dba;
-use Cache;
use xml;
use DomXPath;
diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 23d9adca6b..ad24f2457b 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -11,13 +11,13 @@ namespace Friendica\Protocol;
use Friendica\App;
use Friendica\Core\System;
+use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
use Friendica\Network\Probe;
-use Cache;
use dba;
use SimpleXMLElement;
use xml;
diff --git a/vendor/pear/text_languagedetect/phpcs.xml b/vendor/pear/text_languagedetect/phpcs.xml
index 5dd24befea..586ff6d195 100644
--- a/vendor/pear/text_languagedetect/phpcs.xml
+++ b/vendor/pear/text_languagedetect/phpcs.xml
@@ -7,6 +7,7 @@
<exclude name="PEAR.NamingConventions.ValidVariableName.PrivateNoUnderscore"/>
<exclude name="PEAR.NamingConventions.ValidFunctionName.PrivateNoUnderscore"/>
<exclude name="PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps"/>
+ <exclude name="PEAR.WhiteSpace.ScopeIndent.IncorrectExact"/>
<exclude name="PSR1.Methods.CamelCapsMethodName.NotCamelCaps"/>
</rule>
<description>PSR2 with tabs instead of spaces.</description>
--
2.39.5