use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
-use Friendica\Core\Network;
+use Friendica\Core\Protocol;
use Friendica\Core\PConfig;
use Friendica\Core\System;
use Friendica\Core\Worker;
*/
/**
- * @name Network
+ * @name Network constants
* @deprecated since version 3.6
- * @see Friendica\Core\Network
+ * @see Friendica\Core\Protocol
*
* Network and protocol family types
* @{
*/
-define('NETWORK_DFRN' , Network::DFRN); // Friendica, Mistpark, other DFRN implementations
-define('NETWORK_ZOT' , Network::ZOT); // Zot! - Currently unsupported
-define('NETWORK_OSTATUS' , Network::OSTATUS); // GNU-social, Pleroma, Mastodon, other OStatus implementations
-define('NETWORK_FEED' , Network::FEED); // RSS/Atom feeds with no known "post/notify" protocol
-define('NETWORK_DIASPORA' , Network::DIASPORA); // Diaspora
-define('NETWORK_MAIL' , Network::MAIL); // IMAP/POP
-define('NETWORK_FACEBOOK' , Network::FACEBOOK); // Facebook API
-define('NETWORK_LINKEDIN' , Network::LINKEDIN); // LinkedIn
-define('NETWORK_XMPP' , Network::XMPP); // XMPP - Currently unsupported
-define('NETWORK_MYSPACE' , Network::MYSPACE); // MySpace - Currently unsupported
-define('NETWORK_GPLUS' , Network::GPLUS); // Google+
-define('NETWORK_PUMPIO' , Network::PUMPIO); // pump.io
-define('NETWORK_TWITTER' , Network::TWITTER); // Twitter
-define('NETWORK_DIASPORA2', Network::DIASPORA2); // Diaspora connector
-define('NETWORK_STATUSNET', Network::STATUSNET); // Statusnet connector
-define('NETWORK_APPNET' , Network::APPNET); // app.net - Dead protocol
-define('NETWORK_NEWS' , Network::NEWS); // Network News Transfer Protocol - Currently unsupported
-define('NETWORK_ICALENDAR', Network::ICALENDAR); // iCalendar - Currently unsupported
-define('NETWORK_PNUT' , Network::PNUT); // pnut.io - Currently unsupported
-define('NETWORK_PHANTOM' , Network::PHANTOM); // Place holder
+define('NETWORK_DFRN' , Protocol::DFRN); // Friendica, Mistpark, other DFRN implementations
+define('NETWORK_ZOT' , Protocol::ZOT); // Zot! - Currently unsupported
+define('NETWORK_OSTATUS' , Protocol::OSTATUS); // GNU-social, Pleroma, Mastodon, other OStatus implementations
+define('NETWORK_FEED' , Protocol::FEED); // RSS/Atom feeds with no known "post/notify" protocol
+define('NETWORK_DIASPORA' , Protocol::DIASPORA); // Diaspora
+define('NETWORK_MAIL' , Protocol::MAIL); // IMAP/POP
+define('NETWORK_FACEBOOK' , Protocol::FACEBOOK); // Facebook API
+define('NETWORK_LINKEDIN' , Protocol::LINKEDIN); // LinkedIn
+define('NETWORK_XMPP' , Protocol::XMPP); // XMPP - Currently unsupported
+define('NETWORK_MYSPACE' , Protocol::MYSPACE); // MySpace - Currently unsupported
+define('NETWORK_GPLUS' , Protocol::GPLUS); // Google+
+define('NETWORK_PUMPIO' , Protocol::PUMPIO); // pump.io
+define('NETWORK_TWITTER' , Protocol::TWITTER); // Twitter
+define('NETWORK_DIASPORA2', Protocol::DIASPORA2); // Diaspora connector
+define('NETWORK_STATUSNET', Protocol::STATUSNET); // Statusnet connector
+define('NETWORK_APPNET' , Protocol::APPNET); // app.net - Dead protocol
+define('NETWORK_NEWS' , Protocol::NEWS); // Network News Transfer Protocol - Currently unsupported
+define('NETWORK_ICALENDAR', Protocol::ICALENDAR); // iCalendar - Currently unsupported
+define('NETWORK_PNUT' , Protocol::PNUT); // pnut.io - Currently unsupported
+define('NETWORK_PHANTOM' , Protocol::PHANTOM); // Place holder
/**
* @}
*/
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
-use Friendica\Core\Network;
+use Friendica\Core\Protocol;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Model\GContact;
-use Friendica\Util\Network as NetworkUtil;
+use Friendica\Util\Network;
require_once "mod/proxy.php";
}
if ($privmail) {
- $trimmed = Network::formatMention($rr['url'], $rr['name']);
+ $trimmed = Protocol::formatMention($rr['url'], $rr['name']);
} else {
$trimmed = mb_substr($rr['name'],0,20);
}
if (! $localsearch) {
$p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : '');
- $x = NetworkUtil::curl(get_server() . '/lsearch?f=' . $p . '&search=' . urlencode($search));
+ $x = Network::curl(get_server() . '/lsearch?f=' . $p . '&search=' . urlencode($search));
if ($x['success']) {
$j = json_decode($x['body'],true);
if ($j && isset($j['results'])) {
use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\L10n;
-use Friendica\Core\Network;
+use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
$profiledata["photo"] = $matches[1];
}
$profiledata["nickname"] = $profiledata["name"];
- $profiledata["network"] = Network::matchByProfileUrl($profiledata["url"]);
+ $profiledata["network"] = Protocol::matchByProfileUrl($profiledata["url"]);
$profiledata["address"] = "";
$profiledata["about"] = "";
use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\L10n;
-use Friendica\Core\Network;
+use Friendica\Core\Protocol;
use Friendica\Core\PConfig;
use Friendica\Core\System;
use Friendica\Model\Contact;
use Friendica\Object\Image;
use Friendica\Util\Map;
-use Friendica\Util\Network as NetworkUtil;
+use Friendica\Util\Network;
use Friendica\Util\ParseUrl;
require_once "include/bbcode.php";
} else {
$scaled = $mtch[1];
}
- $i = NetworkUtil::fetchUrl($scaled);
+ $i = Network::fetchUrl($scaled);
if (!$i) {
return $srctext;
}
if (x($data, "name") && x($data, "addr")) {
$userid_compact = $data["name"] . " (" . $data["addr"] . ")";
} else {
- $userid_compact = Network::getAddrFromProfileUrl($profile, $author);
+ $userid_compact = Protocol::getAddrFromProfileUrl($profile, $author);
}
if (x($data, "addr")) {
$userid = $data["addr"];
} else {
- $userid = Network::formatMention($profile, $author);
+ $userid = Protocol::formatMention($profile, $author);
}
if (x($data, "name")) {
+++ /dev/null
-<?php\r
-\r
-/*\r
- * @file src/Core/Network.php\r
- */\r
-\r
-namespace Friendica\Core;\r
-\r
-use Friendica\Util;\r
-\r
-/**\r
- * Manage compatibility with federated networks\r
- *\r
- * @author Hypolite Petovan <mrpetovan@gmail.com>\r
- */\r
-class Network\r
-{\r
- const DFRN = 'dfrn'; // Friendica, Mistpark, other DFRN implementations\r
- const DIASPORA = 'dspr'; // Diaspora\r
- const DIASPORA2 = 'dspc'; // Diaspora connector\r
- const STATUSNET = 'stac'; // Statusnet connector\r
- const OSTATUS = 'stat'; // GNU-social, Pleroma, Mastodon, other OStatus implementations\r
- const FEED = 'feed'; // RSS/Atom feeds with no known "post/notify" protocol\r
- const MAIL = 'mail'; // IMAP/POP\r
- const XMPP = 'xmpp'; // XMPP - Currently unsupported\r
-\r
- const FACEBOOK = 'face'; // Facebook API\r
- const LINKEDIN = 'lnkd'; // LinkedIn\r
- const MYSPACE = 'mysp'; // MySpace - Currently unsupported\r
- const GPLUS = 'goog'; // Google+\r
- const PUMPIO = 'pump'; // pump.io\r
- const TWITTER = 'twit'; // Twitter\r
- const APPNET = 'apdn'; // app.net - Dead protocol\r
-\r
- const NEWS = 'nntp'; // Network News Transfer Protocol - Currently unsupported\r
- const ICALENDAR = 'ical'; // iCalendar - Currently unsupported\r
- const PNUT = 'pnut'; // pnut.io - Currently unsupported\r
- const ZOT = 'zot!'; // Zot! - Currently unsupported\r
-\r
- const PHANTOM = 'unkn'; // Place holder\r
-\r
- /**\r
- * Returns the address string for the provided profile URL\r
- *\r
- * @param string $profile_url\r
- * @return string\r
- * @throws Exception\r
- */\r
- public static function getAddrFromProfileUrl($profile_url)\r
- {\r
- $network = self::matchByProfileUrl($profile_url, $matches);\r
-\r
- if ($network === self::PHANTOM) {\r
- throw new Exception('Unknown network for profile URL: ' . $profile_url);\r
- }\r
-\r
- $addr = $matches[2] . '@' . $matches[1];\r
-\r
- return $addr;\r
- }\r
-\r
- /**\r
- * Guesses the network from a profile URL\r
- *\r
- * @param string $profile_url\r
- * @param array $matches preg_match return array: [0] => Full match [1] => hostname [2] => username\r
- * @return type\r
- */\r
- public static function matchByProfileUrl($profile_url, &$matches = [])\r
- {\r
- if (preg_match('=https?://(twitter\.com)/(.*)=ism', $profile_url, $matches)) {\r
- return self::TWITTER;\r
- }\r
-\r
- if (preg_match('=https?://(alpha\.app\.net)/(.*)=ism', $profile_url, $matches)) {\r
- return self::APPNET;\r
- }\r
-\r
- if (preg_match('=https?://(plus\.google\.com)/(.*)=ism', $profile_url, $matches)) {\r
- return self::GPLUS;\r
- }\r
-\r
- if (preg_match('=https?://(.*)/profile/(.*)=ism', $profile_url, $matches)) {\r
- return self::DFRN;\r
- }\r
-\r
- if (preg_match('=https?://(.*)/u/(.*)=ism', $profile_url, $matches)) {\r
- return self::DIASPORA;\r
- }\r
-\r
- if (preg_match('=https?://(.*)/channel/(.*)=ism', $profile_url, $matches)) {\r
- // RedMatrix/Hubzilla is identified as Diaspora - friendica can't connect directly to it\r
- return self::DIASPORA;\r
- }\r
-\r
- if (preg_match('=https?://(.*)/user/(.*)=ism', $profile_url, $matches)) {\r
- $statusnet_host = $matches[1];\r
- $statusnet_user = $matches[2];\r
- $UserData = Util\Network::fetchUrl('http://' . $statusnet_host . '/api/users/show.json?user_id=' . $statusnet_user);\r
- $user = json_decode($UserData);\r
- if ($user) {\r
- $matches[2] = $user->screen_name;\r
- return self::STATUSNET;\r
- }\r
- }\r
-\r
- // pumpio (http://host.name/user)\r
- if (preg_match('=https?://([\.\w]+)/([\.\w]+)$=ism', $profile_url, $matches)) {\r
- return self::PUMPIO;\r
- }\r
-\r
- return self::PHANTOM;\r
- }\r
-\r
- /**\r
- * Returns a formatted mention from a profile URL and a display name\r
- *\r
- * @param string $profile_url\r
- * @param string $display_name\r
- * @return string\r
- */\r
- public static function formatMention($profile_url, $display_name)\r
- {\r
- return $display_name . '(' . self::getAddrFromProfileUrl($profile_url) . ')';\r
- }\r
-}\r
--- /dev/null
+<?php\r
+/*\r
+ * @file src/Core/Protocol.php\r
+ */\r
+namespace Friendica\Core;\r
+\r
+use Friendica\Util\Network;\r
+\r
+/**\r
+ * Manage compatibility with federated networks\r
+ *\r
+ * @author Hypolite Petovan <mrpetovan@gmail.com>\r
+ */\r
+class Protocol\r
+{\r
+ const DFRN = 'dfrn'; // Friendica, Mistpark, other DFRN implementations\r
+ const DIASPORA = 'dspr'; // Diaspora\r
+ const DIASPORA2 = 'dspc'; // Diaspora connector\r
+ const STATUSNET = 'stac'; // Statusnet connector\r
+ const OSTATUS = 'stat'; // GNU-social, Pleroma, Mastodon, other OStatus implementations\r
+ const FEED = 'feed'; // RSS/Atom feeds with no known "post/notify" protocol\r
+ const MAIL = 'mail'; // IMAP/POP\r
+ const XMPP = 'xmpp'; // XMPP - Currently unsupported\r
+\r
+ const FACEBOOK = 'face'; // Facebook API\r
+ const LINKEDIN = 'lnkd'; // LinkedIn\r
+ const MYSPACE = 'mysp'; // MySpace - Currently unsupported\r
+ const GPLUS = 'goog'; // Google+\r
+ const PUMPIO = 'pump'; // pump.io\r
+ const TWITTER = 'twit'; // Twitter\r
+ const APPNET = 'apdn'; // app.net - Dead protocol\r
+\r
+ const NEWS = 'nntp'; // Network News Transfer Protocol - Currently unsupported\r
+ const ICALENDAR = 'ical'; // iCalendar - Currently unsupported\r
+ const PNUT = 'pnut'; // pnut.io - Currently unsupported\r
+ const ZOT = 'zot!'; // Zot! - Currently unsupported\r
+\r
+ const PHANTOM = 'unkn'; // Place holder\r
+\r
+ /**\r
+ * Returns the address string for the provided profile URL\r
+ *\r
+ * @param string $profile_url\r
+ * @return string\r
+ * @throws Exception\r
+ */\r
+ public static function getAddrFromProfileUrl($profile_url)\r
+ {\r
+ $network = self::matchByProfileUrl($profile_url, $matches);\r
+\r
+ if ($network === self::PHANTOM) {\r
+ throw new Exception('Unknown network for profile URL: ' . $profile_url);\r
+ }\r
+\r
+ $addr = $matches[2] . '@' . $matches[1];\r
+\r
+ return $addr;\r
+ }\r
+\r
+ /**\r
+ * Guesses the network from a profile URL\r
+ *\r
+ * @param string $profile_url\r
+ * @param array $matches preg_match return array: [0] => Full match [1] => hostname [2] => username\r
+ * @return type\r
+ */\r
+ public static function matchByProfileUrl($profile_url, &$matches = [])\r
+ {\r
+ if (preg_match('=https?://(twitter\.com)/(.*)=ism', $profile_url, $matches)) {\r
+ return self::TWITTER;\r
+ }\r
+\r
+ if (preg_match('=https?://(alpha\.app\.net)/(.*)=ism', $profile_url, $matches)) {\r
+ return self::APPNET;\r
+ }\r
+\r
+ if (preg_match('=https?://(plus\.google\.com)/(.*)=ism', $profile_url, $matches)) {\r
+ return self::GPLUS;\r
+ }\r
+\r
+ if (preg_match('=https?://(.*)/profile/(.*)=ism', $profile_url, $matches)) {\r
+ return self::DFRN;\r
+ }\r
+\r
+ if (preg_match('=https?://(.*)/u/(.*)=ism', $profile_url, $matches)) {\r
+ return self::DIASPORA;\r
+ }\r
+\r
+ if (preg_match('=https?://(.*)/channel/(.*)=ism', $profile_url, $matches)) {\r
+ // RedMatrix/Hubzilla is identified as Diaspora - friendica can't connect directly to it\r
+ return self::DIASPORA;\r
+ }\r
+\r
+ if (preg_match('=https?://(.*)/user/(.*)=ism', $profile_url, $matches)) {\r
+ $statusnet_host = $matches[1];\r
+ $statusnet_user = $matches[2];\r
+ $UserData = Network::fetchUrl('http://' . $statusnet_host . '/api/users/show.json?user_id=' . $statusnet_user);\r
+ $user = json_decode($UserData);\r
+ if ($user) {\r
+ $matches[2] = $user->screen_name;\r
+ return self::STATUSNET;\r
+ }\r
+ }\r
+\r
+ // pumpio (http://host.name/user)\r
+ if (preg_match('=https?://([\.\w]+)/([\.\w]+)$=ism', $profile_url, $matches)) {\r
+ return self::PUMPIO;\r
+ }\r
+\r
+ return self::PHANTOM;\r
+ }\r
+\r
+ /**\r
+ * Returns a formatted mention from a profile URL and a display name\r
+ *\r
+ * @param string $profile_url\r
+ * @param string $display_name\r
+ * @return string\r
+ */\r
+ public static function formatMention($profile_url, $display_name)\r
+ {\r
+ return $display_name . '(' . self::getAddrFromProfileUrl($profile_url) . ')';\r
+ }\r
+}\r
projects / friendica.git / commitdiff